in_json 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/in_json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{in_json}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-03-11}
   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 = [

data/lib/in_json.rb

@@ -81,14 +81,16 @@ module InJson
     protected
 
     def in_json_definition(name, injected_definition)
-      definitions = self.class.read_inheritable_attribute(:in_json_definitions)      
-      if Thread.current[:in_json_definition] || injected_definition.kind_of?(Symbol)
-        definitions && (definitions[Thread.current[:in_json_definition]] || definitions[injected_definition])
-      elsif injected_definition.kind_of?(Hash)
-        injected_definition
-      elsif definitions
-        definitions[name]        
-      end || (definitions && definitions[:default])
+      definitions = self.class.read_inheritable_attribute(:in_json_definitions)
+      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)
+      definitions && result = definitions[name]
+      return result if result
+      return definitions && definitions[:default]
     end
   end
 end

data/spec/in_json_spec.rb

@@ -4,6 +4,9 @@ class User < ActiveRecord::Base
   has_many :posts
   has_many :blog_posts
 
+  # =================================================================================================
+  # = All these examples need restructuring to be more direct in what functionality they're testing =
+  # =================================================================================================
   in_json do
     name
     email
@@ -296,6 +299,17 @@ describe InJson do
     end
   end
 
+  it "should return model in json with posts and comments named via Thread" do
+    InJson.with(:with_posts_and_comments_named) do
+      @user.in_json.should == {
+        :posts => [
+          { :title => 'Hello World!', :comments=>[{:approved=>true}] },
+          { :title => 'Hello World!', :comments=>[] }
+        ]
+      }
+    end
+  end
+
   it "should return model with user" do
     @post.in_json(:with_user).should == {
       :user => {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: in_json
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Henry Hsu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-10 00:00:00 -08:00
+date: 2011-03-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency