spec/public/abstract_controller/controllers/views/helpers/capture_non_string_return_value/index.erb spec/public/abstract_controller/controllers/views/helpers/capture_return_value/index.erb @@ -477,12 +477,22 @@ class Merb::AbstractController # # ==== Parameters # *args:: Arguments to pass to the block. - # &block:: The template block to call. + # &block:: The block to call. # # ==== Returns - # String:: The output of the block. + # String:: The output of a template block or the return value of a non-template block converted to a string. def capture(*args, &block) - send("capture_#{@_engine}", *args, &block) + ret = nil + + captured = send("capture_#{@_engine}", *args) do |*args| + ret = yield *args + end + + if captured.empty? + ret.to_s + else + captured + end end # Calls the concatenate method for the selected template engine. lib/merb-core/controller/abstract_controller.rb @@ -19,6 +19,12 @@ module Merb::Test::Fixtures class CaptureWithArgs < HelperTesting end + class CaptureReturnValue < HelperTesting + end + + class CaptureNonStringReturnValue < HelperTesting + end + class CaptureEq < HelperTesting def helper_using_capture(&blk) "Beginning... #{capture(&blk)}... Done" spec/public/abstract_controller/controllers/helpers.rb @@ -10,6 +10,14 @@ describe Merb::AbstractController, " with capture and concat" do dispatch_should_make_body("CaptureWithArgs", "Capture: one, two") end + it "should support capturing the return value of a non-template block" do + dispatch_should_make_body("CaptureReturnValue", "Capture") + end + + it "should support capturing the return value of a non-template block" do + dispatch_should_make_body("CaptureNonStringReturnValue", "Captured ''") + end + it "should support basic helpers that use capture with <%=" do dispatch_should_make_body("CaptureEq", "Pre. Beginning... Capturing... Done. Post.") end spec/public/abstract_controller/helper_spec.rb 15ac66c1907732d254765c67551be42ef4a76d61 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/03ff7c4957115750d6802b9dee969be14a4b3057 03ff7c4957115750d6802b9dee969be14a4b3057 2008-09-27T23:05:35-07:00 2008-09-24T18:58:52-07:00 capture returns return value of passed in block if it is not a template block Signed-off-by: Michael S. Klishin <michael@novemberain.com> ace4ba2fc9e4d656eed17a208a3aece8757d6aba Michael S. Klishin michael@novemberain.com