json_builder 3.0.2 → 3.0.3

data/.gitignore

@@ -1,4 +1,3 @@
-json_builder.gemspec
 pkg/*
 .DS_Store
 *.log

data/Gemfile

@@ -1,13 +1,3 @@
 source "http://rubygems.org"
 
 gemspec
-
-gem "rails", "3.0.10"
-gem "capybara", ">= 0.4.0"
-gem "sqlite3"
-
-gem "rspec-rails", ">= 2.0.0.beta"
-
-# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
-# gem 'ruby-debug'
-# gem 'ruby-debug19'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_builder (3.0.2)
+    json_builder (3.0.3)
       activesupport (>= 2.0.0)
 
 GEM
@@ -117,6 +117,5 @@ DEPENDENCIES
   capybara (>= 0.4.0)
   json_builder!
   rails (= 3.0.10)
-  rspec
   rspec-rails (>= 2.0.0.beta)
   sqlite3

data/README.md

@@ -1,4 +1,5 @@
-# JSON Builder
+JSON Builder
+============
 Rails provides an excellent XML Builder by default to build RSS and ATOM feeds, but nothing to help you build complex and custom JSON data structures. The standard `to_json` works just fine, but can get very verbose when you need full control of what is generated and performance is a factor. JSON Builder hopes to solve that problem.
 
 ## Sample Usage
@@ -9,6 +10,7 @@ require 'json_builder'
 json = JSONBuilder::Compiler.generate do
   name "Garrett Bjerkhoel"
   email "spam@garrettbjerkhoel.com"
+  url root_path
   address do
     street "1234 1st Ave"
     street2 "Apt 1"
@@ -34,6 +36,7 @@ Which will generate:
 {
   "name": "Garrett Bjerkhoel",
   "email": "spam@garrettbjerkhoel.com",
+  "url": "/",
   "address": {
     "street": "1234 1st Ave",
     "street2": "Apt 1",
@@ -108,6 +111,7 @@ results @users do |user|
   id user.id
   name user.name
   body user.body
+  url user_url(url)
   links user.links do |link|
     url link.url
     visits link.visits
@@ -129,6 +133,7 @@ You will get something like:
       "id": 1,
       "name": "Garrett Bjerkhoel",
       "body": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod.",
+      "url": "http://example.com/users/garrett-bjerkhoel",
       "links": [
         {
           "url": "http://github.com/",
@@ -145,6 +150,7 @@ You will get something like:
       "id": 2,
       "name": "John Doe",
       "body": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod.",
+      "url": "http://example.com/users/john-doe",
       "links": [
         {
           "url": "http://google.com/",

data/json_builder.gemspec

@@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)  
+require "json_builder/version"
+
+Gem::Specification.new do |s|
+  s.name = "json_builder"
+  s.version = JSONBuilder::VERSION
+  s.summary = "Rails provides an excellent XML Builder by default to build RSS and ATOM feeds, but nothing to help you build complex and custom JSON data structures. The standard to_json works well, but can get very verbose when you need full control of what is generated. JSON Builder hopes to solve that problem."
+  s.description = "Rails provides an excellent XML Builder by default to build RSS and ATOM feeds, but nothing to help you build complex and custom JSON data structures. The standard to_json works well, but can get very verbose when you need full control of what is generated. JSON Builder hopes to solve that problem."
+  s.authors     = ["Garrett Bjerkhoel"]
+  s.email       = ["me@garrettbjerkhoel.com"]
+  s.platform    = Gem::Platform::RUBY
+  
+  s.files         = `git ls-files`.split("\n")  
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")  
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }  
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "activesupport", ">= 2.0.0"
+  s.add_development_dependency "rspec-rails", ">= 2.0.0.beta"
+  s.add_development_dependency "rails", "3.0.10"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "capybara", ">= 0.4.0"
+end

data/lib/json_builder/compiler.rb

@@ -37,16 +37,19 @@ module JSONBuilder
     end
     
     # Need to return a Key instance to allow for arrays to be handled appropriately
-    def method_missing(key, *args, &block)
-      if @_scope.respond_to?(key)
-        @_scope.send(key, *args, &block)
+    def method_missing(key_name, *args, &block)
+      if @_scope.respond_to?(key_name) && !ignore_scope_methods.include?(key_name)
+        @_scope.send(key_name, *args, &block)
       else
-        member = Member.new(key, @_scope, *args, &block)
-        @_members << member
-        member
+        key(key_name, *args, &block)
       end
     end
-    alias_method :key, :method_missing
+    
+    def key(key_name, *args, &block)
+      member = Member.new(key_name, @_scope, *args, &block)
+      @_members << member
+      member
+    end
     
     # Once all nodes are compiled, build the string
     def to_s
@@ -71,5 +74,10 @@ module JSONBuilder
       vars = object.instance_variables.map(&:to_s) - exclude.map(&:to_s)
       vars.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
     end
+    
+    # There are some special methods that need to be ignored that may be matched within +@_scope+.
+    def ignore_scope_methods
+      [:id]
+    end
   end
 end

data/lib/json_builder/member.rb

@@ -10,7 +10,7 @@ module JSONBuilder
       @key = key
       
       argument = args.shift
-      if argument.is_a?(Array)
+      if argument.is_a?(Array) || defined?(ActiveRecord::Relation) && argument.is_a?(ActiveRecord::Relation)
         @value = Elements.new(scope, argument, &block)
       else
         @value = Value.new(scope, argument, &block)

data/lib/json_builder/template.rb

@@ -18,9 +18,11 @@ if defined?(Rails) && Rails.version =~ /^2/
       class JSONBuilder < TemplateHandler
         include Compilable
 
-        def compile(template)
-          "::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {#{template.source}};"
-        end
+        def compile(template) %{
+          ::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {
+            #{template.source}
+          }
+        } end
       end
     end
   end
@@ -43,7 +45,11 @@ if defined?(Rails) && Rails.version =~ /^3/
             template.source
           end
 
-          "::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {#{source}};"
+          %{
+            ::JSONBuilder::Compiler.generate(:scope => self, :pretty => ActionView::Base.pretty_print_json, :callback => ActionView::Base.json_callback) {
+              #{template.source}
+            }
+          }
         end
       end
     end

data/lib/json_builder/version.rb

@@ -1,3 +1,3 @@
 module JSONBuilder
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/spec/dummy/app/controllers/users_controller.rb

@@ -1,6 +1,6 @@
 class UsersController < ApplicationController
   def index
     require 'ostruct'
-    @user = OpenStruct.new(:name => 'Garrett Bjerkhoel')
+    @users = User.old
   end
 end

data/spec/dummy/app/models/user.rb

@@ -1,4 +1,6 @@
 class User < ActiveRecord::Base
+  scope :old, where('id < 5')
+  
   def disabled?
     false
   end

data/spec/dummy/app/views/users/index.json_builder

@@ -1,15 +1,15 @@
-id 1
-testing ["1", 2, true] do |t|
-  id t
-  variable t
-  url users_path
+array @users do |user|
+  id user.id
+  name user.name
+  email { user.email }
+  url user_path(user)
   help included_helper
-  name @user.name
-  code { root_path }
+  created_at user.created_at
+  updated_at user.updated_at
   deep do
+    key :included_helper, included_helper
     node included_helper
     url root_path
   end
 end
-url users_path
-name @user.name
+# last line comment without \n

data/spec/dummy/config/routes.rb

@@ -1,5 +1,5 @@
 Dummy::Application.routes.draw do
-  resources :users, :only => [:index]
+  resources :users, :only => [:index, :show]
   
   root :to => 'users#index'
 end

data/spec/unit/json_builder_spec.rb

@@ -36,7 +36,7 @@ describe "JSONBuilder" do
       date Date.new(2011, 11, 23)
       date_time DateTime.new(2001, 2, 3, 4, 5, 6)
       timed Time.at(1322427883)
-    end.should == '{"date": "2011-11-23", "date_time": "2001-02-03T04:05:06+00:00", "timed": "2011-11-27T21:04:43+00:00"}'
+    end.should == '{"date": "2011-11-23", "date_time": "2001-02-03T04:05:06+00:00", "timed": "2011-11-27T13:04:43-08:00"}'
   end
   
   it "should support multiple nestings" do
@@ -60,12 +60,13 @@ describe "JSONBuilder" do
       end
       
       key :custom_key, 1
+      key :with_method, with_method
       key 'as_string', true
       nested do
         key "deep_down", -1
       end
       key with_method, "chuck"
-    end.should == '{"custom_key": 1, "as_string": true, "nested": {"deep_down": -1}, "nope": "chuck"}'
+    end.should == '{"custom_key": 1, "with_method": "nope", "as_string": true, "nested": {"deep_down": -1}, "nope": "chuck"}'
   end
   
   it "should support adding hash objects" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_builder
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-29 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70301327866900 !ruby/object:Gem::Requirement
+  requirement: &70325733616220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,32 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301327866900
+  version_requirements: *70325733616220
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70301327866480 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  requirement: &70325733615700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0.beta
+  type: :development
+  prerelease: false
+  version_requirements: *70325733615700
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &70325733615220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.0.10
+  type: :development
+  prerelease: false
+  version_requirements: *70325733615220
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70325733614800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301327866480
+  version_requirements: *70325733614800
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70325733614140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :development
+  prerelease: false
+  version_requirements: *70325733614140
 description: Rails provides an excellent XML Builder by default to build RSS and ATOM
   feeds, but nothing to help you build complex and custom JSON data structures. The
   standard to_json works well, but can get very verbose when you need full control
@@ -49,6 +82,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- json_builder.gemspec
 - lib/blankslate.rb
 - lib/json_builder.rb
 - lib/json_builder/compiler.rb
@@ -119,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1953175025481135618
+      hash: 3125274407060127813
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1953175025481135618
+      hash: 3125274407060127813
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10