in_json 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/in_json.gemspec

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

data/lib/in_json/ext/hash.rb

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

data/lib/in_json.rb

@@ -65,7 +65,12 @@ module InJson
       definitions = read_inheritable_attribute(:in_json_definitions) || {}
       definition = definitions[name]
       return unless definition
-      definition.recursively_reject { |key, value| value.nil? }
+
+      reflexions = reflections
+
+      definition.recursively_reject({}) { |key, value|
+        !(reflexions && reflexions.respond_to?(:has_key?) && reflexions.has_key?(key)) && value.nil?
+      }
     end
   end
 

data/spec/in_json_spec.rb

@@ -63,7 +63,7 @@ class User < ActiveRecord::Base
       comments :only_approved
     end
   end
-  
+
   in_json(:with_posts_and_comments_missing) do
     posts do
       title
@@ -220,7 +220,7 @@ describe InJson do
       ]
     }
   end
-  
+
   it "should return model in json with posts and comments missing" do
     @user.in_json(:with_posts_and_comments_missing).should == {
       :posts => [
@@ -269,6 +269,10 @@ describe InJson do
         :comments => {}
       }
     }
+
+    User.include_in_json(:with_posts).should == {
+      :posts => {}
+    }
   end
 
   it "should use calculated eager-loading includes" do

metadata

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