Changeset 958

Timestamp:

11/11/07 22:07:01 (1 year ago)

Author:

iv..@gweezlebur.com

Message:

Rendering partials with a collection or an object / Closes #292 / Thanks nagash

Files:

• trunk/lib/merb/mixins/render.rb (modified) (2 diffs)
• trunk/spec/merb/render_spec.rb (modified) (1 diff)

trunk/lib/merb/mixins/render.rb

@@ -277 +277 @@
-    # if you create a views/shared directory then you can call
-    # partials that live there like partial('shared/foo')
-local
+opt
-      choose_template_format(Merb.available_mime_types, {}) unless @_template_format
-      template = _cached_partials["#{template}.#{@_template_format}"] ||= find_partial(template)
-      @_merb_partial_locals = locals
-      unless template
-        raise TemplateNotFound, "No template matched at #{unmatched}"
-      end
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    end
-
@@ -302 +302 @@
-    
-    private
+
+      def render_partial(template, engine, locals={})
+       @_merb_partial_locals = locals
+       options = {
+         :file => template,
+         :view_context => clean_view_context(engine),
+         :opts => { :locals => locals }
+       }
+       engine.transform(options)
+      end
+
+      def partial_for_collection(template, collection, opts={})
+       # Delete the internal keys, so that everything else is considered
+       # a local declaration in the partial
+       local_name = opts.delete(:as)
+       opts.delete(:with)
+
+       engine = Template.engine_for(template)
+
+       ret = ''
+       [ collection ].flatten.each do |object|
+         opts.merge!({local_name.to_sym => object})
+         ret << render_partial(template, engine, opts)
+       end
+       ret
+      end
-    
-      # this returns a ViewContext object populated with all

trunk/spec/merb/render_spec.rb

@@ -32 +32 @@
-    content = c.partial("partials/#{@engine}", :yo => "Locals!")
-    content.clean.should == "Locals!"
+  end
+
+  it "should render a partial iterating over a collection" do
+    c = new_controller
+    content = c.partial("partials/#{@engine}_collection",
+      :with => (1..10).to_a)
+    content.clean.should == (1..10).to_a.join("\n")
+  end
+
+  it "should render a partial with an object" do
+    c = new_controller
+    content = c.partial("partials/#{@engine}_collection", :with => 1)
+    content.clean.should == '1'
+  end
+
+  it "should allow you to overwrite the local var using :as when rendering a collection" do
+    c = new_controller
+    content = c.partial("partials/#{@engine}_collection_with_locals", :with => (1..10).to_a, :as => :number)
+    content.clean.should == (1..10).to_a.join("\n")
+  end
+
+  it "should allow you to overwrite the local var using :as when render an object" do
+    c = new_controller
+    content = c.partial("partials/#{@engine}_collection_with_locals", :with => 1, :as => :number)
+    content.clean.should == '1'
+  end
+
+  it "should render a partial iterating over a collection with extra locals" do
+    c = new_controller
+    content = c.partial("partials/#{@engine}_collection_with_locals", :with => (1..10).to_a, :number => 'Locals!')
+    content.clean.should == (1..10).to_a.map { |i| "Locals!" }.join("\n")
-  end
-