Ticket #11491: render_partial_collection_with_multiple_element_types.patch

test/controller/new_render_test.rb

@@ -162 +162 @@
-  def partial_collection_shorthand_with_locals
-    render :partial => [ Customer.new("david"), Customer.new("mary") ], :locals => { :greeting => "Bonjour" }
-  end
+  
+  def partial_collection_shorthand_with_different_types_of_records
+    render :partial => [ 
+        BadCustomer.new("mark"), 
+        GoodCustomer.new("craig"), 
+        BadCustomer.new("john"),
+        GoodCustomer.new("zach"), 
+        GoodCustomer.new("brandon"), 
+        BadCustomer.new("dan") ], 
+      :locals => { :greeting => "Bonjour" }
+  end
-
+  def partial_collection_shorthand_with_different_types_of_records_with_counter
+    partial_collection_shorthand_with_different_types_of_records
+  end
+
-  def empty_partial_collection
-    render :partial => "customer", :collection => []
-  end
@@ -740 +755 @@
-    get :partial_collection_shorthand_with_locals
-    assert_equal "Bonjour: davidBonjour: mary", @response.body
-  end
-
+
+
+
+
+
+
-  def test_empty_partial_collection
-    get :empty_partial_collection
-    assert_equal " ", @response.body

test/controller/fake_models.rb

@@ -3 +3 @@
-    id.to_s
-  end
-end
+
+class BadCustomer < Customer
+end
+
+class GoodCustomer < Customer
+end
+  

lib/action_view/partials.rb

@@ -113 +113 @@
-          render_partial(builder_partial_path, object_assigns, (local_assigns || {}).merge(builder_partial_path.to_sym => partial_path))
-        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Associations::HasManyThroughAssociation
-          if partial_path.any?
-            path       = ActionController::RecordIdentifier.partial_path(partial_path.first)
-            collection = partial_path
-path
+nil
-          else
-            ""
-          end
@@ -126 +125 @@
-
-      def render_partial_collection(partial_path, collection, partial_spacer_template = nil, local_assigns = {}) #:nodoc:
-        return " " if collection.empty?
-
+
-        local_assigns = local_assigns ? local_assigns.clone : {}
+        spacer = partial_spacer_template ? render(:partial => partial_spacer_template) : ''
+                
+        if partial_path.nil?
+          render_partial_collection_with_unknown_partial_path(collection, local_assigns, spacer)
+        else
+          render_partial_collection_with_known_partial_path(collection, partial_path, local_assigns, spacer)
+        end.join(spacer)
+      end
+
+      def render_partial_collection_with_known_partial_path(collection, partial_path, local_assigns, spacer)
-        template = ActionView::PartialTemplate.new(self, partial_path, nil, local_assigns)
-        
-        spacer = partial_spacer_template ? render(:partial => partial_spacer_template) : ''
-        
-        collection.map do |element|
-          template.render_member(element)
-.join(spacer)
+
-      end
+      
+      def render_partial_collection_with_unknown_partial_path(collection, local_assigns, spacer)
+        templates = Hash.new
+        i = 0
+        collection.map do |element|
+          partial_path = ActionController::RecordIdentifier.partial_path(element) 
+          template = templates[partial_path] ||= ActionView::PartialTemplate.new(self, partial_path, nil, local_assigns)
+          template.counter = i
+          i += 1
+          template.render_member(element)
+        end
+      end
-  end
-end

lib/action_view/partial_template.rb

@@ -7 +7 @@
-      @path, @variable_name = extract_partial_name_and_path(view, partial_path)
-      super(view, @path, true, locals)
-      add_object_to_local_assigns!(object)
-
+
-      # This is needed here in order to compile template with knowledge of 'counter'
-      initialize_counter
-      
@@ -24 +24 @@
-    def render_member(object)
-      @locals[@counter_name] += 1
-      @locals[:object] = @locals[@variable_name] = object
-
+
+
+
+
-    end
-    
+    def counter=(num)
+      @locals[@counter_name] = num
+    end
+    
-    private
-
+
-    def add_object_to_local_assigns!(object)
-      @locals[:object] ||=
-        @locals[@variable_name] ||=