Move ViewPaths module to its own file.

3 files changed, 71 insertions, 70 deletions

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
index 05348d8ba0..7028cd0379 100644
--- a/actionpack/lib/abstract_controller.rb
+++ b/actionpack/lib/abstract_controller.rb
@@ -19,4 +19,5 @@ module AbstractController
   autoload :Logger
   autoload :Rendering
   autoload :Translation
+  autoload :ViewPaths
 end
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 840f0b6c78..46a457e3f4 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,5 +1,4 @@
 require "abstract_controller/base"
-require "active_support/core_ext/array/wrap"
 
 module AbstractController
   class DoubleRenderError < Error
@@ -10,74 +9,6 @@ module AbstractController
     end
   end
 
-  module ViewPaths
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :_view_paths
-      self._view_paths = ActionView::PathSet.new
-    end
-
-    delegate :find_template, :template_exists?,
-             :view_paths, :formats, :formats=, :to => :lookup_context
-
-    # LookupContext is the object responsible to hold all information required to lookup
-    # templates, i.e. view paths and details. Check ActionView::LookupContext for more
-    # information.
-    def lookup_context
-      @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
-    end
-
-    def details_for_lookup
-      { }
-    end
-
-    def append_view_path(path)
-      lookup_context.view_paths.push(*path)
-    end
-
-    def prepend_view_path(path)
-      lookup_context.view_paths.unshift(*path)
-    end
-
-    module ClassMethods
-      # Append a path to the list of view paths for this controller.
-      #
-      # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into
-      # the default view path. You may also provide a custom view path
-      # (see ActionView::ViewPathSet for more information)
-      def append_view_path(path)
-        self.view_paths = view_paths.dup + Array(path)
-      end
-
-      # Prepend a path to the list of view paths for this controller.
-      #
-      # ==== Parameters
-      # path<String, ViewPath>:: If a String is provided, it gets converted into
-      # the default view path. You may also provide a custom view path
-      # (see ActionView::ViewPathSet for more information)
-      def prepend_view_path(path)
-        self.view_paths = Array(path) + view_paths.dup
-      end
-
-      # A list of all of the default view paths for this controller.
-      def view_paths
-        _view_paths
-      end
-
-      # Set the view paths.
-      #
-      # ==== Parameters
-      # paths<ViewPathSet, Object>:: If a ViewPathSet is provided, use that;
-      #   otherwise, process the parameter into a ViewPathSet.
-      def view_paths=(paths)
-        self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
-        self._view_paths.freeze
-      end
-    end
-  end
-
   module Rendering
     extend ActiveSupport::Concern
     include AbstractController::ViewPaths
@@ -166,7 +97,7 @@ module AbstractController
       end
 
       if (options.keys & [:partial, :file, :template]).empty?
-        options[:_prefix] ||= _prefix 
+        options[:_prefix] ||= _prefix
       end
 
       options[:template] ||= (options[:action] || action_name).to_s
diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb
new file mode 100644
index 0000000000..ec8f31cdfe
--- /dev/null
+++ b/actionpack/lib/abstract_controller/view_paths.rb
@@ -0,0 +1,69 @@
+module AbstractController
+  module ViewPaths
+    extend ActiveSupport::Concern
+
+    included do
+      class_attribute :_view_paths
+      self._view_paths = ActionView::PathSet.new
+    end
+
+    delegate :find_template, :template_exists?,
+             :view_paths, :formats, :formats=, :to => :lookup_context
+
+    # LookupContext is the object responsible to hold all information required to lookup
+    # templates, i.e. view paths and details. Check ActionView::LookupContext for more
+    # information.
+    def lookup_context
+      @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup)
+    end
+
+    def details_for_lookup
+      { }
+    end
+
+    def append_view_path(path)
+      lookup_context.view_paths.push(*path)
+    end
+
+    def prepend_view_path(path)
+      lookup_context.view_paths.unshift(*path)
+    end
+
+    module ClassMethods
+      # Append a path to the list of view paths for this controller.
+      #
+      # ==== Parameters
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
+      # (see ActionView::ViewPathSet for more information)
+      def append_view_path(path)
+        self.view_paths = view_paths.dup + Array(path)
+      end
+
+      # Prepend a path to the list of view paths for this controller.
+      #
+      # ==== Parameters
+      # path<String, ViewPath>:: If a String is provided, it gets converted into
+      # the default view path. You may also provide a custom view path
+      # (see ActionView::ViewPathSet for more information)
+      def prepend_view_path(path)
+        self.view_paths = Array(path) + view_paths.dup
+      end
+
+      # A list of all of the default view paths for this controller.
+      def view_paths
+        _view_paths
+      end
+
+      # Set the view paths.
+      #
+      # ==== Parameters
+      # paths<ViewPathSet, Object>:: If a ViewPathSet is provided, use that;
+      #   otherwise, process the parameter into a ViewPathSet.
+      def view_paths=(paths)
+        self._view_paths = paths.is_a?(ActionView::PathSet) ? paths : ActionView::Base.process_view_paths(paths)
+        self._view_paths.freeze
+      end
+    end
+  end
+end
\ No newline at end of file