@@ -165,12 +165,11 @@ module Markaby if @helpers.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym) r = @helpers.send(sym, *args, &block) if @output_helpers and r.respond_to? :to_str + @helpers.output_buffer = '' if @helpers.respond_to?(:output_buffer=) fragment { @builder << r } else r end - - @helpers.output_buffer = '' if @helpers.respond_to?(:output_buffer=) elsif @assigns.has_key?(sym) @assigns[sym] elsif @assigns.has_key?(stringy_key = sym.to_s) lib/markaby/builder.rb @@ -7,7 +7,7 @@ module Markaby <<-CODE @output_buffer = '' if @output_buffer.blank?; - output = Markaby::Builder.new(assigns, self); + output = Markaby::Builder.new(assigns.merge(local_assigns), self); output.copy_instance_variables_from(self, [:@helpers, :@assigns]); output.instance_eval(#{template.source.dump}); output.to_s; lib/markaby/rails/template_handler.rb 73f639d361323dbca43f4b40317507178c3646e2 Daniel Insley dan@viviti.com http://github.com/dinsley/markaby/commit/bba5a7200a45e92d6c3595ddc07e1684218825e4 bba5a7200a45e92d6c3595ddc07e1684218825e4 2009-04-28T11:27:51-07:00 2009-04-28T11:27:51-07:00 oops, fixed a minor bug with output buffer in builder 7175e91cad292918e6c7166f0fcb98cc78803a68 Daniel Insley dan@viviti.com