Ticket #2754: alternate_base_paths2.diff

test/controller/render_test.rb

@@ -92 +92 @@
-  def render_to_string_test
-    @foo = render_to_string :inline => "this is a test"
-  end
+  
+  def alternate_only
+    # See if the alternate_base_path_* options works
+  end
-
-  def rescue_action(e) raise end
-    
@@ -240 +244 @@
-    @request.query_parameters[:local_name] = "Local David"
-    assert_equal "Goodbye, Local David", process_request.body
-  end
+  
+  def test_alternate_base_paths_before
+    ActionView::Base.alternate_base_paths_before =
+      [File.dirname(__FILE__) + "/../fixtures/alternate_base_path/"]
+    
+    @request.action = "hello_world"
+    assert_equal "Bonjour monde!", process_request.body
-
+    @request.action = "greeting"
+    assert_equal "<p>This is grand!</p>\n", process_request.body
+
+    ActionView::Base.alternate_base_paths_before = []
+  end
+
+  def test_alternate_base_paths_after
+    ActionView::Base.alternate_base_paths_after =
+      [File.dirname(__FILE__) + "/../fixtures/alternate_base_path/"]
+    
+    @request.action = "hello_world"
+    assert_equal "Hello world!", process_request.body
+
+    @request.action = "alternate_only"
+    assert_equal "Only the alternate base path has this file.", process_request.body
+
+    ActionView::Base.alternate_base_paths_after = []
+  end
+
-  private
-    def process_request
-      TestController.process(@request, @response)

lib/action_view/base.rb

@@ -138 +138 @@
-    # shortly.
-    @@local_assigns_support_string_keys = true
-    cattr_accessor :local_assigns_support_string_keys
+    
+    # Specify alternate paths for view files, if any.  The _before_ list will
+    # be checked before the primary @base_path while the _after_ list will be
+    # checked after.
+    @@alternate_base_paths_before = []
+    @@alternate_base_paths_after = []
+    cattr_accessor :alternate_base_paths_before, :alternate_base_paths_after
-
-    @@template_handlers = {}
- 
@@ -306 +313 @@
-
-    private
-      def full_template_path(template_path, extension)
-
+
+
+
+
+
+
+
+
+
+
+
+
-      end
+      
+      def all_base_paths
+        @@alternate_base_paths_before + [ @base_path ] + @@alternate_base_paths_after
+      end
+      
+      def only_one_base_path?
+        alternate_base_paths_before.empty? and alternate_base_paths_after.empty?
+      end
-
-      def template_exists?(template_path, extension)
-        file_path = full_template_path(template_path, extension)
+        template_is_cached_or_exists_on_disk?(file_path)
+      end
+      
+      def template_is_cached_or_exists_on_disk?(file_path)
-        @@method_names.has_key?(file_path) || FileTest.exists?(file_path)
-      end
-