[builder] Only merge into a nameless node if result is a hash

glebtv · Feb 26, 2012 · 0e2c611 · 0e2c611
1 parent 3730213
commit 0e2c611
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/rabl/builder.rb b/lib/rabl/builder.rb
@@ -73,8 +73,8 @@ def node(name, options={}, &block)
       result = block.call(@_object)
       if name.present?
         @_result[name] = result
-      else
-        @_result.merge!(result) if result
+      else # merge into root hash
+        @_result.merge!(result) if result.respond_to?(:each_pair)
       end
     end
     alias_method :code, :node