spec/public/abstract_controller/controllers/views/helpers/capture_with_args/index.erb @@ -60,9 +60,15 @@ module Merb def run subklasses = subclasses.dup until subclasses.empty? + time = Time.now.to_i bootloader = subclasses.shift - Merb.logger.debug!("Loading: #{bootloader}") if ENV['DEBUG'] + if ENV['DEBUG'] && Merb.logger + Merb.logger.debug!("Loading: #{bootloader}") + end Object.full_const_get(bootloader).run + if ENV['DEBUG'] && Merb.logger + Merb.logger.debug!("It took: #{Time.now.to_i - time}") + end self.finished << bootloader end self.subclasses = subklasses lib/merb-core/bootloader.rb @@ -159,6 +159,7 @@ module Merb::Template template = ::Erubis::BlockAwareEruby.new(io.read) _old_verbose, $VERBOSE = $VERBOSE, nil + Merb.logger.fatal template.src template.def_method(mod, name, File.expand_path(io.path)) $VERBOSE = _old_verbose @@ -182,7 +183,7 @@ module Merb::Template # <% end %> def capture_erb(*args, &block) _old_buf, @_erb_buf = @_erb_buf, "" - block.call + block.call(*args) ret = @_erb_buf @_erb_buf = _old_buf ret lib/merb-core/controller/template.rb @@ -15,6 +15,9 @@ module Merb::Test::Fixtures class Capture < HelperTesting end + + class CaptureWithArgs < HelperTesting + end class CaptureEq < HelperTesting def helper_using_capture(&blk) spec/public/abstract_controller/controllers/helpers.rb @@ -6,6 +6,10 @@ describe Merb::AbstractController, " with capture and concat" do dispatch_should_make_body("Capture", "Capture") end + it "should support capture with arguments" do + dispatch_should_make_body("CaptureWithArgs", "Capture: one, two") + 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 c019974cb103ca21722fe18c12872c50669a2ea3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/509851b02f2bcb7936f3a122b499e69253280ce5 509851b02f2bcb7936f3a122b499e69253280ce5 2008-07-19T19:44:00-07:00 2008-07-19T19:44:00-07:00 Add support for argument capture and fix $DEBUG bootloader stuff [#390 state:resolved] b39ac3003c130aacf1eab8fa38d585fdc3f01e84 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local