jam-ruby 0.0.7 → 0.0.8

data/README.rdoc

@@ -69,16 +69,16 @@ Works like in Rails to_json:
 
   object @post, :root => :bost
 
-[Other examples](https://github.com/edtsech/jam/tree/master/examples)
+Other examples[link:https://github.com/edtsech/jam/tree/master/examples]
 
 == Contributions
 
-We open for you contributions, sugesstions and ideas.
+We open for you contributions, suggestions and ideas.
 
 == Inspired by
 
-- Tequila
-- Rabl
+- Tequila[link:https://github.com/inem/tequila]
+- Rabl[link:https://github.com/nesquena/rabl]
 
 Some of code was borrowed from RABL.
 

data/lib/jam/builder.rb

@@ -45,12 +45,21 @@ module Jam
 
       result = {}
 
-      result.merge!(obj.as_json(options))
-
       if block
+        options[:only] ||= [:id]
+
         blk = block.call(obj).stringify_keys
         result.merge!(blk) unless root
-        result[root].merge!(blk) if root
+        result[root] = blk if root
+      end
+
+      as_json_res = obj.as_json(options)
+
+      if root
+        result[root] ||= {}
+        result[root].reverse_merge! as_json_res[root]
+      else
+        result.reverse_merge! as_json_res
       end
 
       result.stringify_keys

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jam-ruby
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Edward Tsech
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-17 00:00:00 +07:00
+date: 2011-07-19 00:00:00 +07:00
 default_executable: 
 dependencies: []