need to explicitly require a resolver rails 6.0

cookpad · May 11, 2023 · 77ba5f3 · 77ba5f3
1 parent 8f02c65
commit 77ba5f3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/lib/chanko/config.rb b/lib/chanko/config.rb
@@ -1,10 +1,6 @@
-module Chanko
-  class NoCacheFileSystemResolver < ActionView::FileSystemResolver
-    def query(path, details, formats, locals, cache:)
-      super(path, details, formats, locals, cache: false)
-    end
-  end
+require 'chanko/resolver/no_cache_file_system_resolver'
 
+module Chanko
   module Config
     class << self
       attr_accessor(
@@ -27,16 +23,7 @@ def reset
         self.propagated_errors    = []
         self.proxy_method_name    = :unit
         self.raise_error          = Rails.env.development?
-
-        if Rails::VERSION::MAJOR >= 7
-          self.resolver = ActionView::FileSystemResolver
-        else
-          if Rails.env.development?
-            self.resolver = Chanko::NoCacheFileSystemResolver
-          else
-            self.resolver = ActionView::OptimizedFileSystemResolver
-          end
-        end
+        self.resolver = file_resolver_for_using_version_of_rails
         self.units_directory_path = "app/units"
       end
 
@@ -47,6 +34,13 @@ def units_directory_path=(path)
       def units_directory_path
         @resolved_units_directory_path ||= Rails.root.join(@units_directory_path).to_s
       end
+
+      def file_resolver_for_using_version_of_rails
+        return ActionView::FileSystemResolver if Rails::VERSION::MAJOR >= 7
+        return Chanko::Resolver::NoCacheFileSystemResolver if Rails.env.development?
+        return ActionView::OptimizedFileSystemResolver
+      end
+      private :file_resolver_for_using_version_of_rails
     end
 
     reset

diff --git a/lib/chanko/resolver/no_cache_file_system_resolver.rb b/lib/chanko/resolver/no_cache_file_system_resolver.rb
@@ -1,10 +1,12 @@
+unless defined?(ActionView::FileSystemResolver)
+  require 'action_view/template/resolver'
+end
+
 module Chanko
   module Resolver
-    if defined?(ActionView::OptimizedFileSystemResolver)
-      class NoCacheFileSystemResolver < ActionView::OptimizedFileSystemResolver
-        def query(path, details, formats, locals, cache:)
-          super(path, details, formats, locals, cache: false)
-        end
+    class NoCacheFileSystemResolver < ActionView::FileSystemResolver
+      def query(path, details, formats, locals, cache:)
+        super(path, details, formats, locals, cache: false)
       end
     end
   end