@@ -269,7 +269,7 @@ module Merb::RenderMixin with = [opts.delete(:with)].flatten as = opts.delete(:as) || template_location.match(%r[.*/_([^\.]*)])[1] - @_merb_partial_locals = opts + @_merb_partial_locals = opts.merge(:collection_index => 0, :collection_size => with.size) # this handles an edge-case where the name of the partial is _foo.* and your opts # have :foo as a key. @@ -278,7 +278,9 @@ module Merb::RenderMixin sent_template = with.map do |temp| @_merb_partial_locals[as.to_sym] = temp unless named_local if template_method && self.respond_to?(template_method) - send(template_method) + sent = send(template_method) + @_merb_partial_locals[:collection_index] += 1 + sent else raise TemplateNotFound, "Could not find template at #{template_location}.*" end lib/merb-core/controller/mixins/render.rb @@ -65,6 +65,13 @@ module Merb::Test::Fixtures render end end + + class PartialWithCollectionsAndCounter < RenderIt + def index + @foo = %w(1 2 3 4 5) + render + end + end class PartialWithLocals < RenderIt @@ -111,4 +118,4 @@ module Merb::Test::Fixtures end end end -end +end \ No newline at end of file spec/public/abstract_controller/controllers/partial.rb @@ -50,6 +50,10 @@ describe Merb::AbstractController, " Partials" do dispatch_should_make_body("BasicPartialWithMultipleRoots", "Base Index: Alt Partial") end + it "should be able to count collections" do + dispatch_should_make_body("PartialWithCollectionsAndCounter", "Partial counting: 0/5 1/5 2/5 3/5 4/5 ") + end + it "should render a partial using an absolute path" do dispatch_should_make_body("WithAbsolutePartial", "Index Absolute Partial") end spec/public/abstract_controller/partial_spec.rb 7cb2d479de25ea46661584b0b636810b0def0f01 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/fea472686b12a0f5da9c2eb1dfab4266836d2fbf fea472686b12a0f5da9c2eb1dfab4266836d2fbf 2008-07-24T22:29:40-07:00 2008-07-24T22:29:40-07:00 Adding the current index and collection size for partials rendered with a collection 4c7149fdc95d03de5f5d2945854329f5a39b3b06 Carl Lerche carllerche@mac.com