json_builder 3.0.0 → 3.0.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_builder (3.0.0)
+    json_builder (3.0.1)
       activesupport (>= 2.0.0)
 
 GEM

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Garrett Bjerkhoel
+Copyright (c) 2011 Garrett Bjerkhoel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -226,10 +226,6 @@ end
 ActionView::Base.pretty_print_json = false
 ```
 
-## Conversions
-
-Time - [ISO-8601](http://en.wikipedia.org/wiki/ISO_8601)
-
 ## Speed
 JSON Builder is very fast, it's roughly 3.6 times faster than the core XML Builder based on the [speed benchmark](http://github.com/dewski/json_builder/blob/master/spec/benchmarks/builder.rb).
 
@@ -237,9 +233,6 @@ JSON Builder is very fast, it's roughly 3.6 times faster than the core XML Build
     JSONBuilder  2.950000   0.010000    2.960000    (2.968790)
         Builder  10.820000  0.040000    10.860000   (10.930497)
 
-## Examples
-See the [examples](http://github.com/dewski/json_builder/tree/master/examples) directory.
-
 ## Note on Patches/Pull Requests
 
 - Fork the project.

data/lib/json_builder/compiler.rb

@@ -19,10 +19,12 @@ module JSONBuilder
     attr_accessor :pretty_print
     
     def initialize(options={})
-      @members = []
-      @scope = options[:scope]
-      @callback = options[:callback]
-      @pretty_print = options[:pretty]
+      @_members = []
+      @_scope = options[:scope]
+      @_callback = options[:callback] || true
+      @_pretty_print = options[:pretty] || false
+      
+      copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
     end
     
     def compile(*args, &block)
@@ -30,34 +32,39 @@ module JSONBuilder
     end
     
     def array(items, &block)
-      @array = Elements.new(items, &block)
+      @_array = Elements.new(items, &block)
     end
     
     # Need to return a Key instance to allow for arrays to be handled appropriately
     def method_missing(key, *args, &block)
       member = Member.new(key, *args, &block)
-      @members << member
+      @_members << member
       member
     end
     alias_method :key, :method_missing
     
     # Once all nodes are compiled, build the string
     def to_s
-      include_callback @array ? @array.to_s : "{#{@members.collect(&:to_s).join(', ')}}"
+      include_callback @_array ? @_array.to_s : "{#{@_members.collect(&:to_s).join(', ')}}"
     end
     
     private
     
     def include_callback(json)
-      @callback && request_params[:callback] ? "#{request_params[:callback]}(#{pretty_print(json)})" : pretty_print(json)
+      @_callback && request_params[:callback] ? "#{request_params[:callback]}(#{pretty_print(json)})" : pretty_print(json)
     end
     
     def pretty_print(json)
-      @pretty_print ? JSON.pretty_generate(JSON[json]) : json
+      @_pretty_print ? JSON.pretty_generate(JSON[json]) : json
     end
     
     def request_params
-      @scope.respond_to?(:params) ? @scope.params : {}
+      @_scope.respond_to?(:params) ? @_scope.params : {}
+    end
+    
+    def copy_instance_variables_from(object, exclude = []) #:nodoc:
+      vars = object.instance_variables.map(&:to_s) - exclude.map(&:to_s)
+      vars.each { |name| instance_variable_set(name, object.instance_variable_get(name)) }
     end
   end
 end

data/lib/json_builder/elements.rb

@@ -5,7 +5,7 @@ module JSONBuilder
     def initialize(items, &block)
       @compilers = []
       
-      items.compact.each do |item|
+      items.each do |item|
         @compilers << Value.new(item, &block)
       end
     end

data/lib/json_builder/version.rb

@@ -1,3 +1,3 @@
 module JSONBuilder
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/spec/benchmarks/builder.rb

@@ -1,8 +1,7 @@
-$:.push File.expand_path('../../../lib', __FILE__)
 require 'rubygems'
 require 'benchmark'
 require 'builder'
-require 'json_builder/compiler'
+require 'json_builder'
 
 Benchmark.bm do |b|
   b.report('JSONBuilder') do

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

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

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

@@ -1,3 +1,4 @@
 testing ["1", 2, true] do |t|
   variable t
-end
+end
+name @user.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_builder
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-27 00:00:00.000000000Z
+date: 2011-11-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70289633146840 !ruby/object:Gem::Requirement
+  requirement: &70225675808800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70289633146840
+  version_requirements: *70225675808800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289633146020 !ruby/object:Gem::Requirement
+  requirement: &70225675808340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289633146020
+  version_requirements: *70225675808340
 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
@@ -119,7 +119,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3090005321848718837
+      hash: 1941851873589060852
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3090005321848718837
+      hash: 1941851873589060852
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10