Fix LoadError during startup with Redmine trunk r21288 redmica#33

Author: takenory

app/models/filter_rule.rb

@@ -20,7 +20,7 @@ def valid_access?(remote_ip)
 
     remote_ip_addr = IPAddr.new(remote_ip)
 
-    always_allowed_ip_list = IPFilterConfig['always_allowed_ip_list'] || []
+    always_allowed_ip_list = RedmineIpFilter::IpFilterConfig['always_allowed_ip_list'] || []
     (self.allowed_ip_list | always_allowed_ip_list).any? do |ip|
       begin
         IPAddr.new(ip).include?(remote_ip_addr)

init.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency 'redmine_ip_filter_hook_listener'
-require_dependency 'ip_filter_config'
+require File.expand_path('../lib/redmine_ip_filter/ip_filter_config', __FILE__)
+require File.expand_path('../lib/redmine_ip_filter/application_controller_patch', __FILE__)
+require File.expand_path('../lib/redmine_ip_filter/hook_listener', __FILE__)
 
 Redmine::Plugin.register :redmine_ip_filter do
   name 'Redmine Ip Filter'
@@ -14,8 +15,3 @@
   menu :admin_menu, :redmine_ip_filter, { controller: :filter_rules, action: :edit }, caption: :label_ip_filter, :html => { :class => 'icon icon-ip-filter' }
   settings :default => { 'allowed_ips' => '' }
 end
-
-Rails.configuration.to_prepare do
-  require_dependency 'application_controller_patch'
-  ApplicationController.send(:include, RedmineIPFilter::ApplicationControllerPatch)
-end

lib/ip_filter_config.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_dependency 'application_controller'
+require 'application_controller'
 
-module RedmineIPFilter
+module RedmineIpFilter
   module ApplicationControllerPatch
     def self.included(base)
       base.send(:include, InstanceMethod)
@@ -31,3 +31,5 @@ def check_remote_ip
     end
   end
 end
+
+ApplicationController.send(:include, RedmineIpFilter::ApplicationControllerPatch)

lib/application_controller_patch.rb lib/redmine_ip_filter/application_controller_patch.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module RedmineIpFilter
+  class HookListener < Redmine::Hook::ViewListener
+    def view_layouts_base_html_head(context)
+      stylesheet_link_tag 'redmine_ip_filter', plugin: :redmine_ip_filter
+    end
+  end
+end

lib/redmine_ip_filter/hook_listener.rb

@@ -0,0 +1,21 @@
+module RedmineIpFilter
+  class IpFilterConfig
+    @@instance = nil
+    @@config = {}
+
+    def self.[](key)
+      @@instance ||= new
+      @@config[key]
+    end
+
+    def initialize
+      file = "#{Rails.root}/plugins/redmine_ip_filter/config/ip_filter_config.yml"
+      if File.file?(file)
+        config = YAML.load_file(file)
+        if config.is_a?(Hash) && config.has_key?(Rails.env)
+          @@config = config[Rails.env]
+        end
+      end
+    end
+  end
+end

lib/redmine_ip_filter/ip_filter_config.rb

@@ -38,8 +38,8 @@ def test_valid_access_returns_true_remote_ip_includes_allowed_ip
   end
 
   def test_valid_access_returns_true_remote_ip_includes_always_allowed_ip
-    #IPFilterConfig.class_variable_set :@@config, {'always_allowed_ip_list' => ['33.44.55.66']}
-    IPFilterConfig.stubs(:'[]').with('always_allowed_ip_list').returns(['33.44.55.66', '44.55.66.77'])
+    #RedmineIpFilter::IpFilterConfig.class_variable_set :@@config, {'always_allowed_ip_list' => ['33.44.55.66']}
+    RedmineIpFilter::IpFilterConfig.stubs(:'[]').with('always_allowed_ip_list').returns(['33.44.55.66', '44.55.66.77'])
     assert @filter_rule.valid_access?('33.44.55.66')
     assert @filter_rule.valid_access?('44.55.66.77')
   end

lib/redmine_ip_filter_hook_listener.rb

@@ -1,10 +1,10 @@
 require File.expand_path('../../../test_helper', __FILE__)
 
-class IPFilterConfigTest < ActiveSupport::TestCase
+class IpFilterConfigTest < ActiveSupport::TestCase
 
   def setup
-    IPFilterConfig.class_variable_set :@@instance, nil
-    IPFilterConfig.class_variable_set :@@config, {}
+    RedmineIpFilter::IpFilterConfig.class_variable_set :@@instance, nil
+    RedmineIpFilter::IpFilterConfig.class_variable_set :@@config, {}
     @config_file = "#{Rails.root}/plugins/redmine_ip_filter/config/ip_filter_config.yml"
     @yml_data = YAML.load_file(File.dirname(__FILE__) + '/../../config/ip_filter_config.yml')
   end
@@ -13,19 +13,19 @@ def test_always_allowed_ip_list
     File.stubs(:file?).with(@config_file).returns(true)
     YAML.stubs(:load_file).with(@config_file).returns(@yml_data)
 
-    assert_equal ['127.0.0.1', '10.0.0.0/8'], IPFilterConfig['always_allowed_ip_list']
+    assert_equal ['127.0.0.1', '10.0.0.0/8'], RedmineIpFilter::IpFilterConfig['always_allowed_ip_list']
   end
 
   def test_always_allowed_ip_list_empty_when_configuration_blank
     File.stubs(:file?).with(@config_file).returns(true)
     YAML.stubs(:load_file).with(@config_file).returns('')
 
-    assert_nil IPFilterConfig['always_allowed_ip_list']
+    assert_nil RedmineIpFilter::IpFilterConfig['always_allowed_ip_list']
   end
 
   def test_always_allowed_ip_list_empty_when_configuration_file_does_not_exist
     File.stubs(:file?).with(@config_file).returns(false)
 
-    assert_nil IPFilterConfig['always_allowed_ip_list']
+    assert_nil RedmineIpFilter::IpFilterConfig['always_allowed_ip_list']
   end
 end