Changeset 3884

Timestamp:

03/16/06 02:51:19 (3 years ago)

Author:

david

Message:

Dots in template path should not trip up rendering (closes #4244) [lmarlow@yahoo.com]

Files:

• trunk/actionpack/lib/action_view/base.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)
• trunk/actionpack/test/fixtures/test/dot.directory (added)
• trunk/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.rhtml (added)

trunk/actionpack/lib/action_view/base.rb

@@ -222 +222 @@
-
-      if use_full_path
-template_path.split('.'
+path_and_extension(template_path
-
-        if template_extension
@@ -336 +336 @@
-
-    def file_exists?(template_path)#:nodoc:
-template_path.split("."
+path_and_extension(template_path
-      
-      if template_file_extension
@@ -360 +360 @@
-        file_path = full_template_path(template_path, extension)
-        @@method_names.has_key?(file_path) || FileTest.exists?(file_path)
+      end
+
+      def path_and_extension(template_path)
+        template_path_without_extension = template_path.sub(/\.(\w+)$/, '')
+        [ template_path_without_extension, $1 ]
-      end
-

trunk/actionpack/test/controller/new_render_test.rb

@@ -74 +74 @@
-    render :file => 'test/render_file_with_ivar', :use_full_path => true
-  end
-
+
+
+
+
+
+
+
+
+
+
+
-  def render_xml_hello
-    @name = "David"
@@ -354 +364 @@
-  end
-
+  def test_render_file_not_using_full_path_with_relative_path
+    get :render_file_not_using_full_path_with_relative_path
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
+  def test_render_file_not_using_full_path_with_dot_in_path
+    get :render_file_not_using_full_path_with_dot_in_path
+    assert_equal "The secret is in the sauce\n", @response.body
+  end
+
-  def test_render_file_with_locals
-    get :render_file_with_locals