dinsley-markaby 0.0.7 → 0.0.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 8
+:patch: 9

data/lib/markaby/builder.rb

@@ -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)

data/lib/markaby/rails/template_handler.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;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dinsley-markaby
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors: 
 - Tim Fletcher