Use redmine_plugin kit as loader

Author: alexandermeindl

Gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem 'redmine_plugin_kit'

README.md

@@ -20,8 +20,9 @@ This is a fork of [redmine_wiki_lists](https://github.com/tkusukawa/redmine_wiki
 1. Clone this repository into `redmine/plugins/redmine_ref_issues`.
 
    ```shell
-   cd redmine/plugins
-   git clone https://github.com/alphanodes/redmine_ref_issues.git
+   cd redmine
+   git clone https://github.com/alphanodes/redmine_ref_issues.git plugins/redmine_ref_issues
+   bundle install
    ```
 
 2. Restart your Redmine application server.

init.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-raise "\n\033[31maredmine_ref_issues requires ruby 2.6 or newer. Please update your ruby version.\033[0m" if RUBY_VERSION < '2.6'
+loader = RedminePluginKit::Loader.new plugin_id: 'redmine_ref_issues'
 
 Redmine::Plugin.register :redmine_ref_issues do
   name 'Redmine ref_issues macro'
@@ -9,13 +9,9 @@
   version RedmineRefIssues::VERSION
   url 'https://github.com/alphanodes/redmine_ref_issues'
   author_url 'https://alphanodes.com/'
-  directory __dir__
 
   requires_redmine version_or_higher: '4.1'
 end
 
-if Rails.version > '6.0'
-  ActiveSupport.on_load(:active_record) { RedmineRefIssues.setup }
-else
-  Rails.configuration.to_prepare { RedmineRefIssues.setup }
-end
+RedminePluginKit::Loader.persisting { loader.load_model_hooks! }
+RedminePluginKit::Loader.to_prepare { RedmineRefIssues.setup! } if Rails.version < '6.0'

lib/redmine_ref_issues.rb

@@ -1,17 +1,11 @@
 # frozen_string_literal: true
 
 module RedmineRefIssues
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 
-  class << self
-    def setup
-      Dir[File.join(Redmine::Plugin.find(:redmine_ref_issues).directory,
-                    'lib',
-                    'redmine_ref_issues',
-                    'wiki_macros',
-                    '**/*_macro.rb')].sort.each { |f| require f }
-    end
+  include RedminePluginKit::PluginBase
 
+  class << self
     def cast_table_field(db_table, db_field)
       if Redmine::Database.postgresql?
         "CAST(#{db_table}.#{db_field} AS TEXT)"
@@ -24,5 +18,12 @@ def additionals_help_items
       [{ title: 'Redmine ref_issues macro',
          url: 'https://github.com/AlphaNodes/redmine_ref_issues#usage' }]
     end
+
+    private
+
+    def setup
+      # Macros
+      loader.load_macros!
+    end
   end
 end

lib/redmine_ref_issues/hooks/model_hook.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module RedmineRefIssues
+  module Hooks
+    class ModelHook < Redmine::Hook::Listener
+      def after_plugins_loaded(_context = {})
+        return if Rails.version < '6.0'
+
+        RedmineRefIssues.setup!
+      end
+    end
+  end
+end