Changeset 6125

Timestamp:

02/04/07 22:27:45 (2 years ago)

Author:

rick

Message:

Fix issue with deprecation messing up #template_root= usage. Add #prepend_view_path and #append_view_path to allow modification of a copy of the
superclass' view_paths. [Rick]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (3 diffs)
• trunk/actionpack/lib/action_controller/components.rb (modified) (1 diff)
• trunk/actionpack/test/controller/view_paths_test.rb (modified) (1 diff)
• trunk/actionwebservice/test/scaffolded_controller_test.rb (modified) (1 diff)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Fix issue with deprecation messing up #template_root= usage.  Add #prepend_view_path and #append_view_path to allow modification of a copy of the
+superclass' view_paths.  [Rick]
-
-* Allow Controllers to have multiple view_paths instead of a single template_root.  Closes #2754 [John Long]

trunk/actionpack/lib/action_controller/base.rb

@@ -357 +357 @@
-      # Deprecated. Use view_paths instead.
-      def template_root=(path)
-view_paths.unshift(path)
-end
-deprecate :template_root= => :view_paths
+prepend_view_path path
+  template_root
+end
-      
-      # Deprecated. Use view_paths instead.
@@ -375 +375 @@
-        @@view_paths[name] = value
-      end
-
+
-      # View load paths for controller.
-      def view_paths
@@ -387 +387 @@
-          end
-        end
+      end
+      
+      # Adds a view_path to the front of the view_paths array.
+      # If the current class has no view paths, copy them from 
+      # the superclass
+      def prepend_view_path(path)
+        self.view_paths = view_paths.dup if view_paths.frozen?
+        view_paths.unshift(path)
+      end
+      
+      # Adds a view_path to the end of the view_paths array.
+      # If the current class has no view paths, copy them from 
+      # the superclass
+      def append_view_path(path)
+        self.view_paths = view_paths.dup if view_paths.frozen?
+        view_paths << path
-      end
-      

trunk/actionpack/lib/action_controller/components.rb

@@ -78 +78 @@
-        path_of_calling_controller = File.dirname(caller[1].split(/:\d+:/, 2).first)
-        path_of_controller_root    = path_of_calling_controller.sub(/#{Regexp.escape(File.dirname(controller_path))}$/, "")
-
-self.template_root = path_of_controller_roo
+
+view_paths.firs
-      end
-

trunk/actionpack/test/controller/view_paths_test.rb

@@ -47 +47 @@
-  def test_template_root_deprecated
-    assert_deprecated(/template_root.*view_paths/) do
-LOAD_PATH_ROOT
+'foo/bar'
-    end
-    assert_deprecated(/template_root.*view_paths/) do
-
+
+
-    end
-  end

trunk/actionwebservice/test/scaffolded_controller_test.rb

@@ -6 +6 @@
-end
-
-template_root = '.'
+view_load_paths = [ '.' ]
-
-class ScaffoldPerson < ActionWebService::Struct