in_json 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/in_json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{in_json}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]
-  s.date = %q{2011-03-11}
+  s.date = %q{2011-05-23}
   s.description = %q{JSON serialization for Rails. Straight-forward attributes. Only serialize what you want. Optimally obeys eager-loaded associations}
   s.email = %q{henry.hsu@photomugs.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hsume2/in_json}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Optimally straight-forward JSON serialization for Rails}
   s.test_files = [
     "spec/in_json_spec.rb",
@@ -42,7 +42,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/in_json.rb

@@ -80,16 +80,27 @@ module InJson
 
     protected
 
+    # TODO move precedence to doc
     def in_json_definition(name, injected_definition)
       definitions = self.class.read_inheritable_attribute(:in_json_definitions)
+
+      # Try nested first (if I am nested)
+      return injected_definition if injected_definition.kind_of?(Hash)
+
+      # Try named second
+      injected_definition.kind_of?(Symbol) && definitions && result = definitions[injected_definition]
+      return result if result
+
+      # Try thread third
       thread_definition = Thread.current[:in_json_definition]
       thread_definition && definitions && result = definitions[thread_definition]
       return result if result # *yuck*
-      injected_definition.kind_of?(Symbol) && definitions && result = definitions[injected_definition]
-      return result if result
-      return injected_definition if injected_definition.kind_of?(Hash)
+
+      # Try given definitions fourth
       definitions && result = definitions[name]
       return result if result
+
+      # Try default last
       return definitions && definitions[:default]
     end
   end

data/spec/in_json_spec.rb

@@ -48,6 +48,15 @@ class User < ActiveRecord::Base
     end
   end
 
+  in_json(:with_posts_and_comments_nested) do
+    posts do
+      title
+      comments do
+        content
+      end
+    end
+  end
+
   in_json(:with_posts_and_comments_named) do
     posts do
       title
@@ -104,6 +113,14 @@ class Comment < ActiveRecord::Base
   in_json(:only_approved) do
     approved
   end
+
+  in_json(:with_posts_and_comments_nested) do
+    approved
+  end
+
+  in_json(:with_posts_and_comments_named) do # Just to counter-act collission
+    content
+  end
 end
 
 class Review < ActiveRecord::Base
@@ -184,6 +201,17 @@ describe InJson do
     }
   end
 
+  it "should return model in json with posts and comments nested via Thread" do
+    InJson.with(:with_posts_and_comments_nested) do
+      @user.in_json.should == {
+        :posts => [
+          { :title => 'Hello World!', :comments=>[{:content=>"Great blog!"}] },
+          { :title => 'Hello World!', :comments=>[] }
+        ]
+      }
+    end
+  end
+
   it "should return model in json with posts and comments named" do
     @user.in_json(:with_posts_and_comments_named).should == {
       :posts => [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: in_json
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
+  hash: 25
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Henry Hsu
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -08:00
+date: 2011-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
   name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,10 +31,10 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -49,10 +47,10 @@ dependencies:
         - 3
         - 8
         version: 2.3.8
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   name: json
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -63,10 +61,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :development
   name: rspec
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,10 +77,10 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   name: yard
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -95,10 +93,10 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: bundler
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -111,10 +109,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   name: jeweler
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -127,10 +125,10 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   name: rcov
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -141,10 +139,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   name: reek
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,10 +155,10 @@ dependencies:
         - 2
         - 8
         version: 1.2.8
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   name: roodi
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -173,10 +171,10 @@ dependencies:
         - 1
         - 0
         version: 2.1.0
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
   name: autotest
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -187,10 +185,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
   name: sqlite3
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -201,10 +199,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -215,10 +213,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
-- !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
   name: database_cleaner
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -229,6 +227,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id014
 description: JSON serialization for Rails. Straight-forward attributes. Only serialize what you want. Optimally obeys eager-loaded associations
 email: henry.hsu@photomugs.com
@@ -283,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Optimally straight-forward JSON serialization for Rails