Changeset 8214

Timestamp:

11/26/07 03:59:23 (11 months ago)

Author:

rick

Message:

Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods. [rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (4 diffs)
• trunk/actionpack/lib/action_view/base.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/view_paths_test.rb (modified) (3 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Add #prepend_view_path and #append_view_path instance methods on ActionController::Base for consistency with the class methods.  [rick]
-
-* Refactor sanitizer helpers into HTML classes and make it easy to swap them out with custom implementations.  Closes #10129.  [rick]

trunk/actionpack/lib/action_controller/base.rb

@@ -431 +431 @@
-      # Adds a view_path to the front of the view_paths array.
-      # If the current class has no view paths, copy them from 
-
+.  This change will be visible for all future requests.
-      #
-      #   ArticleController.prepend_view_path("views/default")
@@ -443 +443 @@
-      # Adds a view_path to the end of the view_paths array.
-      # If the current class has no view paths, copy them from 
-
+. This change will be visible for all future requests.
-      #
-      #   ArticleController.append_view_path("views/default")
@@ -637 +637 @@
-      end
-
-      
-      self.view_paths = []
-      
@@ -648 +647 @@
-        (@template || self.class).view_paths = value
-      end
+
+      # Adds a view_path to the front of the view_paths array.
+      # This change affects the current request only.
+      #
+      #   self.prepend_view_path("views/default")
+      #   self.prepend_view_path(["views/default", "views/custom"])
+      #
+      def prepend_view_path(path)
+        (@template || self.class).prepend_view_path(path)
+      end
-      
+      # Adds a view_path to the end of the view_paths array.
+      # This change affects the current request only.
+      #
+      #   self.append_view_path("views/default")
+      #   self.append_view_path(["views/default", "views/custom"])
+      #
+      def append_view_path(path)
+        (@template || self.class).append_view_path(path)
+      end
+
-    protected
-      # Renders the content that will be returned to the browser as the response body.

trunk/actionpack/lib/action_view/base.rb

@@ -266 +266 @@
-
-    def initialize(view_paths = [], assigns_for_first_render = {}, controller = nil)#:nodoc:
-
+.dup
-      @assigns = assigns_for_first_render
-      @assigns_added = nil
@@ -471 +471 @@
-    def template_handler_preferences
-      TEMPLATE_HANDLER_PREFERENCES[template_format] || DEFAULT_TEMPLATE_HANDLER_PREFERENCE
+    end
+
+    # Adds a view_path to the front of the view_paths array.
+    # This change affects the current request only.
+    #
+    #   @template.prepend_view_path("views/default")
+    #   @template.prepend_view_path(["views/default", "views/custom"])
+    #
+    def prepend_view_path(path)
+      @view_paths.unshift(*path)
+    end
+    
+    # Adds a view_path to the end of the view_paths array.
+    # This change affects the current request only.
+    #
+    #   @template.append_view_path("views/default")
+    #   @template.append_view_path(["views/default", "views/custom"])
+    #
+    def append_view_path(path)
+      @view_paths.push(*path)
-    end
-

trunk/actionpack/test/controller/view_paths_test.rb

@@ -48 +48 @@
-  end
-  
-template_appends
+controller_appends_view
-    TestController.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
@@ -56 +56 @@
-  end
-  
-template_prepends
+controller_prepends_view
-    TestController.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
@@ -62 +62 @@
-    TestController.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+  end
+  
+  def test_template_appends_view_path_correctly
+    @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
+    class_view_paths = TestController.view_paths
+
+    @controller.append_view_path 'foo'
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
+    
+    @controller.append_view_path(%w(bar baz))
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal class_view_paths, TestController.view_paths
+  end
+  
+  def test_template_prepends_view_path_correctly
+    @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
+    class_view_paths = TestController.view_paths
+    
+    @controller.prepend_view_path 'baz'
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
+    
+    @controller.prepend_view_path(%w(foo bar))
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal class_view_paths, TestController.view_paths
-  end
-