json_builder 3.0.1 → 3.0.2

data/Gemfile.lock

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

data/lib/json_builder/compiler.rb

@@ -1,4 +1,4 @@
-require 'blankslate' unless defined? BlankSlate
+require 'blankslate' unless defined?(BlankSlate)
 require 'json_builder/member'
 
 module JSONBuilder
@@ -24,7 +24,8 @@ module JSONBuilder
       @_callback = options[:callback] || true
       @_pretty_print = options[:pretty] || false
       
-      copy_instance_variables_from(@_scope, [:@assigns, :@helpers])
+      # Only copy instance variables if there is a scope and presence of Rails
+      copy_instance_variables_from(@_scope) if @_scope
     end
     
     def compile(*args, &block)
@@ -32,14 +33,18 @@ module JSONBuilder
     end
     
     def array(items, &block)
-      @_array = Elements.new(items, &block)
+      @_array = Elements.new(@_scope, 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
-      member
+      if @_scope.respond_to?(key)
+        @_scope.send(key, *args, &block)
+      else
+        member = Member.new(key, @_scope, *args, &block)
+        @_members << member
+        member
+      end
     end
     alias_method :key, :method_missing
     

data/lib/json_builder/elements.rb

@@ -2,11 +2,11 @@ module JSONBuilder
   class Elements
     attr_accessor :compilers
     
-    def initialize(items, &block)
+    def initialize(scope, items, &block)
       @compilers = []
       
       items.each do |item|
-        @compilers << Value.new(item, &block)
+        @compilers << Value.new(scope, item, &block)
       end
     end
     

data/lib/json_builder/member.rb

@@ -6,14 +6,14 @@ module JSONBuilder
     attr_accessor :key
     attr_accessor :value
     
-    def initialize(key, *args, &block)
+    def initialize(key, scope, *args, &block)
       @key = key
-
+      
       argument = args.shift
       if argument.is_a?(Array)
-        @value = Elements.new(argument, &block)
+        @value = Elements.new(scope, argument, &block)
       else
-        @value = Value.new(argument, &block)
+        @value = Value.new(scope, argument, &block)
       end
     end
     

data/lib/json_builder/value.rb

@@ -4,10 +4,10 @@ module JSONBuilder
   class Value
     attr_accessor :value
     
-    def initialize(arg, &block)
+    def initialize(scope, arg, &block)
       if block_given?
-        @value = Compiler.new
-        compiled = @value.compile(*arg, &block)
+        @value = Compiler.new(:scope => scope)
+        compiled = @value.compile(arg, &block)
         
         # For the use case that the passed in block returns a non-member object
         # or normal Ruby object

data/lib/json_builder/version.rb

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

data/spec/dummy/app/helpers/users_helper.rb

@@ -1,2 +1,5 @@
 module UsersHelper
+  def included_helper
+    "yes"
+  end
 end

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

@@ -1,4 +1,15 @@
+id 1
 testing ["1", 2, true] do |t|
+  id t
   variable t
+  url users_path
+  help included_helper
+  name @user.name
+  code { root_path }
+  deep do
+    node included_helper
+    url root_path
+  end
 end
-name @user.name
+url users_path
+name @user.name

data/spec/dummy/config/routes.rb

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

metadata

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