rabl 0.0.8 → 0.0.9

data/lib/rabl/builder.rb

@@ -74,7 +74,7 @@ module Rabl
       return false unless data.present?
       object = data_object(data)
       glued_attributes = self.object_to_hash(object, &block)
-      @_result.merge!(glued_attributes)
+      @_result.merge!(glued_attributes) if glued_attributes
     end
 
     # Extends an existing rabl template with additional attributes in the block
@@ -82,7 +82,7 @@ module Rabl
     def extends(file, options={}, &block)
       options = options.merge(:object => @_object)
       result = @options[:engine].partial(file, options, &block)
-      @_result.merge!(result)
+      @_result.merge!(result) if result
     end
 
     protected

data/lib/rabl/engine.rb

@@ -23,7 +23,7 @@ module Rabl
     # Sets the object to be used as the data source for this template
     # object(@user)
     def object(data)
-      @_object = data
+      @_object = data unless @_locals[:object]
     end
 
     # Indicates an attribute or method should be included in the json output

data/lib/rabl/version.rb

@@ -1,3 +1,3 @@
 module Rabl
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rabl
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Nathan Esquenazi