in_json 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/in_json.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{in_json}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]

data/lib/in_json.rb

@@ -58,19 +58,47 @@ module InJson
       write_inheritable_attribute :in_json_definitions, definitions
     end
 
+    # TODO move precedence to doc
+    def in_json_definition(name, injected_definition)
+      definitions = 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*
+
+      # Try given definitions fourth
+      definitions && result = definitions[name]
+      return result if result
+
+      # Try default last
+      return definitions && definitions[:default]
+    end
+
     # Calculates associations to be load alongside based on an {InJson} definition
     # @param [Symbol] name the definition to calculate from
     # @return [Hash] the associations
-    def include_in_json(name = :default)
-      definitions = read_inheritable_attribute(:in_json_definitions) || {}
-      definition = definitions[name]
+    def include_in_json(name = :default, injected_definition = nil)
+      definition = in_json_definition(name, injected_definition)
       return unless definition
-
       reflexions = reflections
 
-      definition.recursively_reject({}) { |key, value|
-        !(reflexions && reflexions.respond_to?(:has_key?) && reflexions.has_key?(key)) && value.nil?
-      }
+      definition.inject({}) do |result, attr_dfn|
+        attr, definition = attr_dfn
+
+        klass = reflexions[attr].klass if reflexions.has_key?(attr) && reflexions[attr]
+        def_at = (klass.include_in_json(name, definition) || {}) if klass
+
+        result[attr] = def_at if def_at
+        result
+      end
     end
   end
 
@@ -80,7 +108,7 @@ module InJson
     # @param [Symbol, Hash, nil] injected_definition a named {InJson} definition, a full Hash definition, or nil
     # @return [Hash] the JSON-ready Hash
     def in_json(name = :default, injected_definition = nil)
-      definition = in_json_definition(name, injected_definition)
+      definition = self.class.in_json_definition(name, injected_definition)
       attrs = attributes.freeze.symbolize_keys
       return attrs unless definition
       definition.inject({}) do |result, attr_dfn|
@@ -94,32 +122,6 @@ module InJson
       end
     end
     alias_method :as_json, :in_json
-
-    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*
-
-      # Try given definitions fourth
-      definitions && result = definitions[name]
-      return result if result
-
-      # Try default last
-      return definitions && definitions[:default]
-    end
   end
 end
 

data/lib/in_json/ext/hash.rb

@@ -6,11 +6,11 @@ module InJson
 
     module InstanceMethods
       def recursively_reject(default = nil, &blk)
-        reject(&blk).inject({}) do |result, k_v|
+        inject({}) do |result, k_v|
           key, value = k_v
           result[key] = value.is_a?(Hash) ? value.recursively_reject(&blk) : (value || default)
           result
-        end
+        end.reject(&blk)
       end
     end
   end

data/spec/in_json/ext/hash_spec.rb

@@ -19,7 +19,7 @@ describe Hash do
       5 => {3 => 'e'}
     }
   end
-
+  
   it "recursively rejects even keys" do
     @sample.recursively_reject { |key, value| key % 2 == 0 }.should == {
       1 => {1 => 'a'},

data/spec/in_json_spec.rb

@@ -64,6 +64,11 @@ class User < ActiveRecord::Base
     end
   end
 
+  in_json(:with_posts_and_all_named) do
+    posts :with_all
+  end
+
+
   in_json(:with_posts_and_comments_missing) do
     posts do
       title
@@ -98,6 +103,11 @@ class Post < ActiveRecord::Base
       score
     end
   end
+
+  in_json(:with_all) do
+    reviews
+    comments :with_votes
+  end
 end
 
 class BlogPost < Post
@@ -105,6 +115,7 @@ end
 
 class Comment < ActiveRecord::Base
   belongs_to :post
+  has_many :votes
 
   in_json do
     content
@@ -121,6 +132,19 @@ class Comment < ActiveRecord::Base
   in_json(:with_posts_and_comments_named) do # Just to counter-act collission
     content
   end
+
+  in_json (:with_votes) do
+    votes
+  end
+end
+
+class Comment::Vote < ActiveRecord::Base
+  belongs_to :comment
+  belongs_to :user
+
+  in_json do
+    rating
+  end
 end
 
 class Review < ActiveRecord::Base
@@ -273,6 +297,15 @@ describe InJson do
     User.include_in_json(:with_posts).should == {
       :posts => {}
     }
+
+    User.include_in_json(:with_posts_and_all_named).should == {
+      :posts => {
+        :reviews => {},
+        :comments => {
+          :votes => {}
+        }
+      }
+    }
   end
 
   it "should use calculated eager-loading includes" do

data/spec/spec_helper.rb

@@ -35,6 +35,12 @@ ActiveRecord::Base.connection.create_table :comments do |t|
   t.integer :post_id
 end
 
+ActiveRecord::Base.connection.create_table :comment_votes do |t|
+  t.integer :rating
+  t.integer :comment_id
+  t.integer :user_id
+end
+
 ActiveRecord::Base.connection.create_table :reviews do |t|
   t.integer :score
   t.integer :post_id

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: in_json
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Henry Hsu