Ticket #8076: render_partial_with_format_extension_fix.diff

actionpack/test/controller/render_test.rb

@@ -135 +135 @@
-  def partial
-    render :partial => 'partial'
-  end
+
+  def partial_dot_html
+    render :partial => 'partial.html.erb'
+  end
-  
-  def partial_as_rjs
-    render :update do |page|
@@ -393 +397 @@
-    assert_equal 'partial html', @response.body
-  end
-
+  def test_should_render_html_partial_with_dot
+    get :partial_dot_html
+    assert_equal 'partial html', @response.body
+  end
+
-  def test_should_render_html_formatted_partial_with_rjs
-    xhr :get, :partial_as_rjs
-    assert_equal %(Element.replace("foo", "partial html");), @response.body

actionpack/lib/action_view/partials.rb

@@ -110 +110 @@
-      end
-
-      def partial_counter_name(partial_name)
-"#{partial_name.split('/').last}_counter".intern
+partial_variable_name("#{partial_name.split('/').last}_counter")
-      end
-
+      def partial_variable_name(partial_name)
+        partial_name.split('.').first.intern
+      end
+
-      def extracting_object(partial_name, local_assigns, deprecated_local_assigns)
+        variable_name = partial_variable_name(partial_name)
-        if local_assigns.is_a?(Hash) || local_assigns.nil?
-partial
+variable
-        else
-          # deprecated form where object could be passed in as second parameter
-          local_assigns
@@ -132 +137 @@
-      end
-
-      def add_object_to_local_assigns!(partial_name, local_assigns, object)
-
+
+
-          if object.is_a?(ActionView::Base::ObjectWrapper)
-            object.value
-          else
-            object
-partial
+variable
-      end
-  end
-end