lib/rabl/builder.rb in rabl-0.6.13 vs lib/rabl/builder.rb in rabl-0.6.14
- old
+ new
@@ -106,10 +106,10 @@
end
# Extends an existing rabl template with additional attributes in the block
# extends("users/show") { attribute :full_name }
def extends(file, options={}, &block)
- options = @options.slice(:child_root).merge(options).merge(:object => @_object)
+ options = @options.slice(:child_root).merge(:object => @_object).merge(options)
result = self.partial(file, options, &block)
@_result.merge!(result) if result
end
# resolve_condition(:if => true) => true