Changeset 9177

Timestamp:

04/01/08 00:50:09 (1 month ago)

Author:

bitsweat

Message:

Support render :partial => collection of heterogeneous elements. Closes #11491.

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/partial_template.rb (modified) (2 diffs)
• trunk/actionpack/lib/action_view/partials.rb (modified) (2 diffs)
• trunk/actionpack/test/controller/fake_models.rb (modified) (1 diff)
• trunk/actionpack/test/controller/new_render_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Support render :partial => collection of heterogeneous elements.  #11491 [Zach Dennis]
-
-* Avoid remote_ip spoofing.  [Brian Candler]

trunk/actionpack/lib/action_view/partial_template.rb

@@ -8 +8 @@
-      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
@@ -25 +25 @@
-      @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] ||=

trunk/actionpack/lib/action_view/partials.rb

@@ -114 +114 @@
-        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
-            ""
@@ -127 +126 @@
-      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)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      end
-  end

trunk/actionpack/test/controller/fake_models.rb

@@ -4 +4 @@
-  end
-end
+
+class BadCustomer < Customer
+end
+
+class GoodCustomer < Customer
+end

trunk/actionpack/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
-
@@ -742 +757 @@
-  end
-
+  def test_partial_collection_shorthand_with_different_types_of_records
+    get :partial_collection_shorthand_with_different_types_of_records
+    assert_equal "Bonjour bad customer: mark1Bonjour good customer: craig2Bonjour bad customer: john3Bonjour good customer: zach4Bonjour good customer: brandon5Bonjour bad customer: dan6", @response.body
+  end
+
-  def test_empty_partial_collection
-    get :empty_partial_collection