in_json 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/in_json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{in_json}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henry Hsu"]
-  s.date = %q{2011-05-23}
+  s.date = %q{2011-05-31}
   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 = [
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "in_json.gemspec",
     "lib/in_json.rb",
     "lib/in_json/ext/array.rb",
+    "lib/in_json/ext/hash.rb",
+    "spec/in_json/ext/hash_spec.rb",
     "spec/in_json_spec.rb",
     "spec/spec_helper.rb"
   ]
@@ -37,6 +39,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.5.0}
   s.summary = %q{Optimally straight-forward JSON serialization for Rails}
   s.test_files = [
+    "spec/in_json/ext/hash_spec.rb",
     "spec/in_json_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/in_json/ext/hash.rb

@@ -0,0 +1,21 @@
+module InJson
+  module HashExt
+    def self.included(base)
+      base.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      def recursively_reject(&blk)
+        reject(&blk).inject({}) do |result, k_v|
+          key, value = k_v
+          result[key] = value.is_a?(Hash) ? value.recursively_reject(&blk) : value
+          result
+        end
+      end
+    end
+  end
+end
+
+Hash.class_eval do
+  include InJson::HashExt
+end

data/lib/in_json.rb

@@ -1,4 +1,5 @@
 require 'in_json/ext/array'
+require 'in_json/ext/hash'
 
 module InJson
   def self.included(base)
@@ -38,7 +39,8 @@ module InJson
     # Stores any method calls as {Hash} keys
     # @return [Hash] the evaluated definition
     def method_missing(method, *args, &block)
-      method = method.to_s.sub(/^_/, '').to_sym if method.to_s =~ /^_.*/
+      method_s = method.to_s
+      method = method_s.sub(/^_/, '').to_sym if method_s =~ /^_.*/
       @hash[method] = block_given? ? Definition.new.instance_eval(&block) : args.first
       @hash
     end
@@ -55,6 +57,16 @@ module InJson
 
       write_inheritable_attribute :in_json_definitions, definitions
     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]
+      return unless definition
+      definition.recursively_reject { |key, value| value.nil? }
+    end
   end
 
   module InstanceMethods

data/spec/in_json/ext/hash_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Hash do
+  before do
+    @sample = {
+      1 => {1 => 'a'},
+      2 => {1 => 'b'},
+      3 => {2 => 'c'},
+      4 => {2 => 'd'},
+      5 => {3 => 'e'},
+      6 => {3 => 'f'}
+    }
+  end
+
+  it "rejects even keys" do
+    @sample.reject { |key, value| key % 2 == 0 }.should == {
+      1 => {1 => 'a'},
+      3 => {2 => 'c'},
+      5 => {3 => 'e'}
+    }
+  end
+
+  it "recursively rejects even keys" do
+    @sample.recursively_reject { |key, value| key % 2 == 0 }.should == {
+      1 => {1 => 'a'},
+      3 => {},
+      5 => {3 => 'e'}
+    }
+  end
+end

data/spec/in_json_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 class User < ActiveRecord::Base
   has_many :posts
@@ -263,6 +263,21 @@ describe InJson do
     }.should have_queries(0)
   end
 
+  it "should intelligently calculate eager-loading includes" do
+    User.include_in_json(:with_posts_and_comments).should == {
+      :posts => {
+        :comments => {}
+      }
+    }
+  end
+
+  it "should use calculated eager-loading includes" do
+    lambda {  @users = User.find(:all, :include => User.include_in_json(:with_posts_and_comments))  }.should have_queries(3)
+    lambda {
+      @users.in_json(:with_posts_and_comments)
+    }.should have_queries(0)
+  end
+
   it "should return model as json" do
     @user_hash = JSON.parse(@user.to_json)
     @user_hash['name'].should == 'John User'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: in_json
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Henry Hsu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -251,6 +251,8 @@ files:
 - in_json.gemspec
 - lib/in_json.rb
 - lib/in_json/ext/array.rb
+- lib/in_json/ext/hash.rb
+- spec/in_json/ext/hash_spec.rb
 - spec/in_json_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -288,5 +290,6 @@ signing_key:
 specification_version: 3
 summary: Optimally straight-forward JSON serialization for Rails
 test_files: 
+- spec/in_json/ext/hash_spec.rb
 - spec/in_json_spec.rb
 - spec/spec_helper.rb