dinsley-markaby 0.0.7 → 0.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION.yml +1 -1
- data/lib/markaby/builder.rb +1 -2
- data/lib/markaby/rails/template_handler.rb +1 -1
- metadata +1 -1
data/VERSION.yml
CHANGED
data/lib/markaby/builder.rb
CHANGED
|
@@ -165,12 +165,11 @@ module Markaby
|
|
|
165
165
|
if @helpers.respond_to?(sym, true) && !self.class.ignored_helpers.include?(sym)
|
|
166
166
|
r = @helpers.send(sym, *args, &block)
|
|
167
167
|
if @output_helpers and r.respond_to? :to_str
|
|
168
|
+
@helpers.output_buffer = '' if @helpers.respond_to?(:output_buffer=)
|
|
168
169
|
fragment { @builder << r }
|
|
169
170
|
else
|
|
170
171
|
r
|
|
171
172
|
end
|
|
172
|
-
|
|
173
|
-
@helpers.output_buffer = '' if @helpers.respond_to?(:output_buffer=)
|
|
174
173
|
elsif @assigns.has_key?(sym)
|
|
175
174
|
@assigns[sym]
|
|
176
175
|
elsif @assigns.has_key?(stringy_key = sym.to_s)
|
|
@@ -7,7 +7,7 @@ module Markaby
|
|
|
7
7
|
<<-CODE
|
|
8
8
|
@output_buffer = '' if @output_buffer.blank?;
|
|
9
9
|
|
|
10
|
-
output = Markaby::Builder.new(assigns, self);
|
|
10
|
+
output = Markaby::Builder.new(assigns.merge(local_assigns), self);
|
|
11
11
|
output.copy_instance_variables_from(self, [:@helpers, :@assigns]);
|
|
12
12
|
output.instance_eval(#{template.source.dump});
|
|
13
13
|
output.to_s;
|