gon 4.1.1 → 5.0.0

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+*.idea

data/.travis.yml

@@ -5,7 +5,9 @@ rvm:
   - 2.0.0
   - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-18mode
-  - rbx-19mode
+  - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # CHANGELOG
 
+## 5.0.0
+
+  * Gon is threadsafe now! (@razum2um)
+  * Camelcasing with depth (@MaxSchmeling)
+  * Optional CDATA and style refactoring (@torbjon)
+  * jBuilder supports not only String and Hash types of locals
+    (@steakchaser)
+  * Using ActionDispatch::Request#uuid instead of
+    ActionDispatch::Request#id (@sharshenov)
+
 ## 4.1.1
 
   * Fixed critical XSS vulnerability https://github.com/gazay/gon/issues/84 (@vadimr & @Hebo)

data/README.md

@@ -27,7 +27,7 @@ you might be doing something like this:
   3. Then there can be two ways in js:
     + if you previously wrote data in data
      attributes - you should parse this attributes and write data to some
-  js variable.
+     js variable.
     + if you wrote js right in view (many frontenders would shame you for
   that) - you just use data from this js - OK.
   4. You can use your data in your js
@@ -102,7 +102,7 @@ gon.your_array # > [1, 2, 123]
 gon.clear # gon.all_variables now is {}
 ```
 
-Access the varaibles from your JavaScript file:
+Access the variables from your JavaScript file:
 
 ``` js
 alert(gon.your_int)

data/README_old.md

@@ -313,7 +313,7 @@ json.partial! 'app/views/posts/_part.json.jbuilder', :comments => @posts[0].comm
 `app/views/posts/_part.json.jbuilder`
 
 ``` jbuilder
-json.comments comments.map{ |it| 'comment#' + it.id }
+json.comments comments.map { |it| 'comment#' + it.id }
 ```
 
 ``` js

data/Rakefile

@@ -5,5 +5,5 @@ Bundler::GemHelper.install_tasks
 
 desc 'Run all tests by default'
 task :default do
-  system("rspec spec")
+  system('rspec spec')
 end

data/gon.gemspec

@@ -1,28 +1,29 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "gon/version"
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'gon/version'
 
 Gem::Specification.new do |s|
-  s.name        = "gon"
+  s.name        = 'gon'
   s.version     = Gon::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['gazay']
   s.email       = ['alex.gaziev@gmail.com']
-  s.homepage    = "https://github.com/gazay/gon"
+  s.homepage    = 'https://github.com/gazay/gon'
   s.summary     = %q{Get your Rails variables in your JS}
   s.description = %q{If you need to send some data to your js files and you don't want to do this with long way trough views and parsing - use this force!}
 
-  s.rubyforge_project = "gon"
+  s.rubyforge_project = 'gon'
 
   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 "actionpack", '>= 2.3.0'
-  s.add_dependency "json"
-  s.add_development_dependency "rabl"
-  s.add_development_dependency "rabl-rails"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "jbuilder"
-  s.add_development_dependency "rake"
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.add_dependency 'actionpack', '>= 2.3.0'
+  s.add_dependency 'json'
+  s.add_development_dependency 'rabl'
+  s.add_development_dependency 'rabl-rails'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'jbuilder'
+  s.add_development_dependency 'rake'
 end

data/lib/gon.rb

@@ -21,9 +21,9 @@ class Gon
     end
 
     def method_missing(method, *args, &block)
-      if ( method.to_s =~ /=$/ )
-        if public_method_name? method
-          raise "You can't use Gon public methods for storing data"
+      if method.to_s =~ /=$/
+        if public_method_name?(method)
+          raise 'You can\'t use Gon public methods for storing data'
         end
 
         set_variable(method.to_s.delete('='), args[0])
@@ -33,15 +33,15 @@ class Gon
     end
 
     def get_variable(name)
-      Request.gon[name]
+      current_gon.gon[name]
     end
 
     def set_variable(name, value)
-      Request.gon[name] = value
+      current_gon.gon[name] = value
     end
 
     def push(data = {})
-      raise "Object must have each_pair method" unless data.respond_to? :each_pair
+      raise 'Object must have each_pair method' unless data.respond_to? :each_pair
 
       data.each_pair do |name, value|
         set_variable(name.to_s, value)
@@ -49,11 +49,11 @@ class Gon
     end
 
     def all_variables
-      Request.gon
+      current_gon.gon
     end
 
     def clear
-      Request.clear
+      current_gon.clear
     end
 
     def rabl(*args)
@@ -73,13 +73,15 @@ class Gon
 
     private
 
+    def current_gon
+      Thread.current['gon']
+    end
+
     def store_builder_data(builder, data, options)
       if options[:as]
         set_variable(options[:as].to_s, data)
       elsif data.is_a? Hash
-        data.each do |key, value|
-          set_variable(key, value)
-        end
+        data.each { |k, v| set_variable(k, v) }
       else
         set_variable(builder, data)
       end

data/lib/gon/base.rb

@@ -3,20 +3,20 @@ class Gon
     class << self
 
       def render_data(options)
-        namespace, tag, cameled, watch = parse_options options
-        script    = "window.#{namespace} = {};"
+        namespace, tag, cameled, camel_depth, watch, type, cdata = parse_options(options)
+        script = "window.#{namespace}={};"
 
-        script << formatted_data(namespace, cameled, watch)
+        script << formatted_data(namespace, cameled, camel_depth, watch)
         script = Gon::Escaper.escape_unicode(script)
-        script = Gon::Escaper.javascript_tag(script) if tag
+        script = Gon::Escaper.javascript_tag(script, type, cdata) if tag
 
         script.html_safe
       end
 
       def get_controller(options = {})
         options[:controller] ||
-          Gon::Request.env['action_controller.instance'] ||
-          Gon::Request.env['action_controller.rescue.response'].
+          current_gon.env['action_controller.instance'] ||
+          current_gon.env['action_controller.rescue.response'].
           instance_variable_get('@template').
           instance_variable_get('@controller')
       end
@@ -37,22 +37,29 @@ class Gon
 
       private
 
-      def parse_options(options)
-        namespace  = options[:namespace] || 'gon'
-        need_tag   = options[:need_tag].nil? || options[:need_tag]
-        cameled    = options[:camel_case]
-        watch      = options[:watch]
-        tag        = need_tag
+      def current_gon
+        Thread.current[:gon]
+      end
 
-        [namespace, tag, cameled, watch]
+      def parse_options(options)
+        namespace   = options[:namespace] || 'gon'
+        need_tag    = options[:need_tag].nil? || options[:need_tag]
+        cameled     = options[:camel_case]
+        camel_depth = options[:camel_depth] || 1
+        watch       = options[:watch]
+        tag         = need_tag
+        type        = options[:type].nil? || options[:type]
+        cdata       = options[:cdata].nil? || options[:cdata]
+
+        [namespace, tag, cameled, camel_depth, watch, type, cdata]
       end
 
-      def formatted_data(namespace, keys_cameled, watch)
+      def formatted_data(namespace, keys_cameled, camel_depth, watch)
         script = ''
 
         gon_variables.each do |key, val|
           js_key = keys_cameled ? key.to_s.camelize(:lower) : key.to_s
-          script << "#{namespace}.#{js_key}=#{val.to_json};"
+          script << "#{namespace}.#{js_key}=#{to_json(val, camel_depth)};"
         end
 
         if watch and Gon::Watch.all_variables.present?
@@ -62,6 +69,20 @@ class Gon
         script
       end
 
+      def to_json(value, camel_depth)
+        # starts at two because 1 is the root key which is converted in the formatted_data method
+        convert_hash_keys(value, 2, camel_depth).to_json
+      end
+
+      def convert_hash_keys(value, current_depth, max_depth)
+        return value if current_depth > (max_depth.is_a?(Symbol) ? 1000 : max_depth)
+        return value unless value.is_a? Hash
+
+        Hash[value.map { |k, v|
+          [ k.to_s.camelize(:lower), convert_hash_keys(v, current_depth + 1, max_depth) ]
+        }]
+      end
+
       def gon_variables
         data = Gon.all_variables || {}
 

data/lib/gon/escaper.rb

@@ -9,8 +9,19 @@ class Gon
         if javascript
           result = javascript.gsub(/\342\200\250/u, '&#x2028;').gsub(/(<\/)/u, '\u003C/')
           javascript.html_safe? ? result.html_safe : result
+        end
+      end
+
+      def javascript_tag(content, type, cdata)
+        type = { type: 'text/javascript' } if type
+        content_tag(:script, javascript_cdata_section(content, cdata).html_safe, type)
+      end
+
+      def javascript_cdata_section(content, cdata)
+        if cdata
+          "\n//#{cdata_section("\n#{content}\n//")}\n"
         else
-          ''
+          "\n#{content}\n"
         end
       end
 

data/lib/gon/helpers.rb

@@ -17,16 +17,18 @@ class Gon
           Gon.clear if Gon.all_variables.present?
           Gon::Base.render_data(options)
         else
-          ""
+          ''
         end
       end
 
       private
 
       def variables_for_request_present?
-        Gon::Request.env &&
-        Gon::Request.id == request.object_id &&
-        Gon.all_variables.present?
+        current_gon.gon.present?
+      end
+
+      def current_gon
+        Thread.current['gon']
       end
 
     end
@@ -42,8 +44,9 @@ class Gon
 
       def gon
         if wrong_gon_request?
-          Gon::Request.id = request.object_id
-          Gon::Request.env = request.env
+          gon_request = Request.new(env)
+          gon_request.id = request.uuid
+          Thread.current['gon'] = gon_request
         end
         Gon
       end
@@ -51,12 +54,14 @@ class Gon
       private
 
       def wrong_gon_request?
-        Gon::Request.env.blank? ||
-        Gon::Request.id != request.object_id
+        current_gon.blank? || current_gon.id != request.uuid
       end
 
-    end
+      def current_gon
+        Thread.current['gon']
+      end
 
+    end
   end
 end
 

data/lib/gon/jbuilder.rb

@@ -13,7 +13,7 @@ class Gon
         include_helpers
 
         data = parse_jbuilder \
-          Gon::Base.get_template_path(options,'jbuilder'),
+          Gon::Base.get_template_path(options, 'jbuilder'),
           controller,
           options[:locals]
 
@@ -59,7 +59,11 @@ class Gon
         end
         locals ||= {}
         locals.each do |name, value|
-          eval "def #{name}; return #{value}; end"
+          self.class.class_eval do
+            define_method "#{name}" do
+              return value
+            end
+          end
         end
         lines = find_partials File.readlines(jbuilder_path)
         source = lines.join('')
@@ -100,7 +104,7 @@ class Gon
           tmp_path = construct_path(splitted[0], splitted[1])
           return tmp_path if tmp_path
         elsif splitted.size == 1
-          tmp_path = construct_path @_controller_name, splitted[0]
+          tmp_path = construct_path(@_controller_name, splitted[0])
           return tmp_path if tmp_path
         end
 

data/lib/gon/rabl.rb

@@ -1,11 +1,11 @@
 require 'action_view'
 
-begin 
+begin
   require 'rabl' # use rabl gem if it's available
 rescue LoadError
 end
-begin 
-  require 'rabl-rails' # use rabl-rails gem if it's available 
+begin
+  require 'rabl-rails' # use rabl-rails gem if it's available
 rescue LoadError
 end
 

data/lib/gon/request.rb

@@ -1,32 +1,29 @@
 class Gon
-  module Request
-    class << self
-
-      def env
-        @request_env if defined? @request_env
-      end
-
-      def env=(environment)
-        @request_env = environment
-        @request_env['gon'] ||= {}
-      end
+  class Request
+    def initialize(environment)
+      @request_env = environment
+      @gon = {}
+    end
 
-      def id
-        @request_id if defined? @request_id
-      end
+    def env
+      @request_env if defined? @request_env
+    end
 
-      def id=(request_id)
-        @request_id = request_id
-      end
+    def id
+      @request_id if defined? @request_id
+    end
 
-      def gon
-        env['gon'] if env
-      end
+    def id=(request_id)
+      @request_id = request_id
+    end
 
-      def clear
-        env && (env['gon'] = {})
-      end
+    def gon
+      @gon
+    end
 
+    def clear
+      @gon = {}
     end
+
   end
 end

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '4.1.1'
+  VERSION = '5.0.0'
 end

data/lib/gon/watch.rb

@@ -24,7 +24,7 @@ class Gon
         else
           variable = {}
           @watch_variables ||= {}
-          env = Gon::Request.env
+          env = Gon.send(:current_gon).env
           variable['url'] = env['ORIGINAL_FULLPATH'] || env['REQUEST_URI']
           variable['method'] = env['REQUEST_METHOD']
           variable['name'] = name
@@ -46,7 +46,6 @@ class Gon
 
       def return_variable(value)
         controller = Gon::Base.get_controller
-
         controller.render :json => value
       end
 

data/spec/gon/basic_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe Gon do
 
   before(:each) do
-    Gon::Request.env = {}
   end
 
   describe '#all_variables' do
@@ -13,18 +12,18 @@ describe Gon do
       Gon.b = 2
       Gon.c = Gon.a + Gon.b
       Gon.c.should == 3
-      Gon.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
+      Gon.all_variables.should == { 'a' => 1, 'b' => 2, 'c' => 3 }
     end
 
     it 'supports all data types' do
       Gon.clear
-      Gon.int           = 1
-      Gon.float         = 1.1
-      Gon.string        = 'string'
-      Gon.array         = [ 1, 'string' ]
-      Gon.hash_var      = { :a => 1, :b => '2'}
-      Gon.hash_w_array  = { :a => [ 2, 3 ] }
-      Gon.klass         = Hash
+      Gon.int          = 1
+      Gon.float        = 1.1
+      Gon.string       = 'string'
+      Gon.array        = [1, 'string']
+      Gon.hash_var     = { :a => 1, :b => '2' }
+      Gon.hash_w_array = { :a => [2, 3] }
+      Gon.klass        = Hash
     end
 
     it 'can be filled with dynamic named variables' do
@@ -43,7 +42,7 @@ describe Gon do
       Gon.clear
       var_name = "variable#{rand}"
 
-      Gon.set_variable var_name, 1
+      Gon.set_variable(var_name, 1)
       Gon.get_variable(var_name).should == 1
     end
 
@@ -57,8 +56,8 @@ describe Gon do
     it 'push with wrong object' do
       expect {
         Gon.clear
-        Gon.push(String.new("string object"))
-      }.to raise_error("Object must have each_pair method")
+        Gon.push(String.new('string object'))
+      }.to raise_error('Object must have each_pair method')
     end
 
   end
@@ -81,7 +80,7 @@ describe Gon do
       Gon.int = 1
       @base.include_gon.should == '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
-                                    'window.gon = {};' +
+                                    'window.gon={};' +
                                     'gon.int=1;' +
                                     "\n//]]>\n" +
                                   '</script>'
@@ -91,7 +90,7 @@ describe Gon do
       Gon.str = %q(a'b"c)
       @base.include_gon.should == '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
-                                    'window.gon = {};' +
+                                    'window.gon={};' +
                                     %q(gon.str="a'b\"c";) +
                                     "\n//]]>\n" +
                                   '</script>'
@@ -101,7 +100,7 @@ describe Gon do
       Gon.str = %q(</script><script>alert('!')</script>)
       @base.include_gon.should == '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
-                                    'window.gon = {};' +
+                                    'window.gon={};' +
                                     %q(gon.str="\u003C/script><script>alert('!')\u003C/script>";) +
                                     "\n//]]>\n" +
                                   '</script>'
@@ -112,16 +111,38 @@ describe Gon do
       @base.include_gon(camel_case: true, namespace: 'camel_cased').should == \
                                   '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
-                                    'window.camel_cased = {};' +
+                                    'window.camel_cased={};' +
                                     'camel_cased.intCased=1;' +
                                     "\n//]]>\n" +
                                   '</script>'
     end
 
+    it 'outputs correct js with camel_depth = :recursive' do
+      Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
+      @base.include_gon(camel_case: true, camel_depth: :recursive).should == \
+                                  '<script type="text/javascript">' +
+                                    "\n//<![CDATA[\n" +
+                                    'window.gon={};' +
+                                    'gon.testHash={"testDepthOne":{"testDepthTwo":1}};' +
+                                    "\n//]]>\n" +
+                                  '</script>'
+    end
+
+    it 'outputs correct js with camel_depth = 2' do
+      Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
+      @base.include_gon(camel_case: true, camel_depth: 2).should == \
+                                  '<script type="text/javascript">' +
+                                    "\n//<![CDATA[\n" +
+                                    'window.gon={};' +
+                                    'gon.testHash={"testDepthOne":{"test_depth_two":1}};' +
+                                    "\n//]]>\n" +
+                                  '</script>'
+    end
+
     it 'outputs correct js with an integer and without tag' do
       Gon.int = 1
       @base.include_gon(need_tag: false).should == \
-                                  'window.gon = {};' +
+                                  'window.gon={};' +
                                   'gon.int=1;'
     end
 
@@ -130,26 +151,37 @@ describe Gon do
         instance_variable_set(:@request_id, 123)
       Gon::Request.instance_variable_set(:@request_env, { 'gon' => { :a => 1 } })
       @base.include_gon(need_tag: false, init: true).should == \
-                                  'window.gon = {};'
+                                  'window.gon={};'
     end
 
     it 'outputs correct js without variables, without tag and gon init' do
       @base.include_gon(need_tag: false, init: true).should == \
-                                  'window.gon = {};'
+                                  'window.gon={};'
     end
 
     it 'outputs correct js without variables, without tag, gon init and an integer' do
       Gon.int = 1
       @base.include_gon(need_tag: false, init: true).should == \
-                                  'window.gon = {};' +
+                                  'window.gon={};' +
                                   'gon.int=1;'
     end
 
+    it 'outputs correct js without cdata, without type, gon init and an integer' do
+      Gon.int = 1
+      @base.include_gon(cdata: false, type: false).should == \
+                                  '<script>' +
+                                    "\n" +
+                                    'window.gon={};' +
+                                    'gon.int=1;' +
+                                    "\n" +
+                                  '</script>'
+    end
+
     it 'outputs correct js with type text/javascript' do
       @base.include_gon(need_type: true, init: true).should == \
                                   '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
-                                    'window.gon = {};'\
+                                    'window.gon={};'\
                                     "\n//]]>\n" +
                                   '</script>'
     end
@@ -162,7 +194,6 @@ describe Gon do
     lambda { Gon.rabl = 123 }.should raise_error
   end
 
-
   describe '#check_for_rabl_and_jbuilder' do
 
     let(:controller) { ActionController::Base.new }

data/spec/gon/global_spec.rb

@@ -14,18 +14,18 @@ describe Gon::Global do
       Gon.global.b = 2
       Gon.global.c = Gon.global.a + Gon.global.b
       Gon.global.c.should == 3
-      Gon.global.all_variables.should == {'a' => 1, 'b' => 2, 'c' => 3}
+      Gon.global.all_variables.should == { 'a' => 1, 'b' => 2, 'c' => 3 }
     end
 
     it 'supports all data types' do
       Gon.global.clear
-      Gon.global.int = 1
-      Gon.global.float = 1.1
-      Gon.global.string = 'string'
-      Gon.global.array = [ 1, 'string' ]
-      Gon.global.hash_var = { :a => 1, :b => '2'}
-      Gon.global.hash_w_array = { :a => [ 2, 3 ] }
-      Gon.global.klass = Hash
+      Gon.global.int          = 1
+      Gon.global.float        = 1.1
+      Gon.global.string       = 'string'
+      Gon.global.array        = [1, 'string']
+      Gon.global.hash_var     = { :a => 1, :b => '2' }
+      Gon.global.hash_w_array = { :a => [2, 3] }
+      Gon.global.klass        = Hash
     end
 
   end
@@ -47,21 +47,18 @@ describe Gon::Global do
       Gon.global.int = 1
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
                                   "</script>"
     end
 
     it 'outputs correct js with an integer and integer in Gon' do
-      Gon::Request.
-        instance_variable_set(:@request_id, request.object_id)
-      Gon::Request.env = {}
       Gon.int = 1
       Gon.global.int = 1
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.int=1;" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
@@ -72,7 +69,7 @@ describe Gon::Global do
       Gon.global.str = %q(a'b"c)
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"a'b\\\"c\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
@@ -82,7 +79,7 @@ describe Gon::Global do
       Gon.global.str = %q(</script><script>alert('!')</script>)
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"\\u003C/script><script>alert('!')\\u003C/script>\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
@@ -92,7 +89,7 @@ describe Gon::Global do
       Gon.global.str = "\u2028"
       @base.include_gon.should == "<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
-                                    "window.gon = {};" +
+                                    "window.gon={};" +
                                     "gon.global={\"str\":\"&#x2028;\"};" +
                                     "\n//]]>\n" +
                                   "</script>"
@@ -114,15 +111,15 @@ describe Gon::Global do
     end
 
     let(:controller) { ActionController::Base.new }
-    let(:objects) { [1,2] }
+    let(:objects) { [1, 2] }
 
     it 'works fine with rabl' do
-      Gon.global.rabl :template =>'spec/test_data/sample.rabl', :controller => controller
+      Gon.global.rabl :template => 'spec/test_data/sample.rabl', :controller => controller
       Gon.global.objects.length.should == 2
     end
 
     it 'works fine with jbuilder' do
-      Gon.global.jbuilder :template =>'spec/test_data/sample.json.jbuilder', :controller => controller
+      Gon.global.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller
       Gon.global.objects.length.should == 2
     end
 

data/spec/gon/jbuilder_spec.rb

@@ -2,10 +2,6 @@ require 'spec_helper'
 
 describe Gon do
 
-  before(:each) do
-    Gon::Request.env = {}
-  end
-
   describe '.jbuilder' do
     context 'render jbuilder templates' do
 
@@ -15,7 +11,7 @@ describe Gon do
       end
 
       let(:controller) { ActionController::Base.new }
-      let(:objects) { [1,2] }
+      let(:objects) { [1, 2] }
 
       it 'render json from jbuilder template' do
         Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
@@ -23,8 +19,11 @@ describe Gon do
       end
 
       it 'render json from jbuilder template with locals' do
-        Gon.jbuilder 'spec/test_data/sample_with_locals.json.jbuilder', :controller => controller, :locals => { :some_local => 1234 }
+        Gon.jbuilder 'spec/test_data/sample_with_locals.json.jbuilder',
+                     :controller => controller,
+                     :locals => { :some_local => 1234, :some_complex_local => OpenStruct.new(:id => 1234) }
         Gon.some_local.should == 1234
+        Gon.some_complex_local_id.should == 1234
       end
 
       it 'render json from jbuilder template with locals' do

data/spec/gon/rabl_with_rabl_rails_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
 describe Gon do
-  
+
   before(:all) do
     ensure_rabl_rails_is_loaded
   end
 
-  before(:each) do
-    Gon::Request.env = {}
-  end
-
   describe '.rabl with rabl-rails gem' do
 
     before :each do
@@ -17,9 +13,9 @@ describe Gon do
       controller.instance_variable_set('@objects', objects)
       controller.request = ActionDispatch::TestRequest.new
     end
-  
+
     let(:controller) { ActionController::Base.new }
-    let(:objects) { [1,2] }
+    let(:objects) { [1, 2] }
   
     context 'render template with deprecation' do
       it 'still works' do
@@ -27,39 +23,39 @@ describe Gon do
         Gon.objects.length.should == 2
       end
     end
-  
+
     context 'option locals' do
       it 'works without locals object properly' do
         Gon.rabl(
           :template =>'spec/test_data/sample_rabl_rails.rabl',
           :controller => controller
         )
-        Gon.objects.map { |it| it['inspect'] }.should == ['1', '2']
+        Gon.objects.map { |it| it['inspect'] }.should == %w(1 2)
       end
       
       it 'works with different locals object' do
         Gon.rabl(
-          :template =>'spec/test_data/sample_rabl_rails.rabl',
+          :template => 'spec/test_data/sample_rabl_rails.rabl',
           :controller => controller,
           :locals => { :objects => [3, 4] }
         )
-        Gon.objects.map { |it| it['inspect'] }.should == ['3', '4']
+        Gon.objects.map { |it| it['inspect'] }.should == %w(3 4)
       end
     end
-  
+
     it 'works if rabl-rails is included' do
-      Gon.rabl :template =>'spec/test_data/sample_rabl_rails.rabl', :controller => controller
+      Gon.rabl :template => 'spec/test_data/sample_rabl_rails.rabl', :controller => controller
       Gon.objects.length.should == 2
     end
-  
+
     it 'works with ActionView::Helpers' do
       Gon.rabl :template =>'spec/test_data/sample_with_helpers_rabl_rails.rabl', :controller => controller
       Gon.objects.first['time_ago'].should == 'about 6 hours'
     end
-  
+
     it 'raise exception if rabl or rabl-rails is not included' do
       Object.send :remove_const, :RablRails # ensure_rabl_rails_is_loaded method already removed Rabl
-      expect { Gon.rabl :template =>'spec/test_data/sample.rabl', :controller => controller}.to raise_error
+      expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller}.to raise_error
       ensure_rabl_rails_is_loaded # load up rabl-rails again, we're not done testing
     end
 

data/spec/gon/rabl_with_rabl_spec.rb

@@ -1,15 +1,11 @@
 require 'spec_helper'
 
 describe Gon do
-  
+
   before(:all) do
     ensure_rabl_is_loaded
   end
 
-  before(:each) do
-    Gon::Request.env = {}
-  end
-
   describe '.rabl' do
 
     before :each do
@@ -18,7 +14,7 @@ describe Gon do
     end
 
     let(:controller) { ActionController::Base.new }
-    let(:objects) { [1,2] }
+    let(:objects) { [1, 2] }
 
     context 'render template with deprecation' do
       it 'still works' do
@@ -30,35 +26,35 @@ describe Gon do
     context 'option locals' do
       it 'works without locals object properly' do
         Gon.rabl(
-          :template =>'spec/test_data/sample.rabl',
+          :template   => 'spec/test_data/sample.rabl',
           :controller => controller
         )
-        Gon.objects.map { |it| it['object']['inspect'] }.should == ['1', '2']
+        Gon.objects.map { |it| it['object']['inspect'] }.should == %w(1 2)
       end
 
       it 'works with different locals object' do
         Gon.rabl(
-          :template =>'spec/test_data/sample.rabl',
+          :template   => 'spec/test_data/sample.rabl',
           :controller => controller,
-          :locals => { :objects => [3, 4] }
+          :locals     => { :objects => [3, 4] }
         )
-        Gon.objects.map { |it| it['object']['inspect'] }.should == ['3', '4']
+        Gon.objects.map { |it| it['object']['inspect'] }.should == %w(3 4)
       end
     end
 
     it 'works if rabl is included' do
-      Gon.rabl :template =>'spec/test_data/sample.rabl', :controller => controller
+      Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller
       Gon.objects.length.should == 2
     end
 
     it 'works with ActionView::Helpers' do
-      Gon.rabl :template =>'spec/test_data/sample_with_helpers.rabl', :controller => controller
+      Gon.rabl :template => 'spec/test_data/sample_with_helpers.rabl', :controller => controller
       Gon.objects.first['object']['time_ago'].should == 'about 6 hours'
     end
 
     it 'raise exception if rabl is not included' do
       Gon.send :remove_const, 'Rabl'
-      expect { Gon.rabl :template =>'spec/test_data/sample.rabl', :controller => controller}.to raise_error
+      expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller }.to raise_error
       load 'rabl.rb'
       load 'gon/rabl.rb'
     end
@@ -67,11 +63,11 @@ describe Gon do
       context 'template is specified' do
 
         it 'add the extension if not included in the template name' do
-          Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample'}, 'rabl').should eql('spec/test_data/sample.rabl')
+          Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'rabl').should eql('spec/test_data/sample.rabl')
         end
 
         it 'return the specified template' do
-          Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.rabl'}, 'rabl').should eql('spec/test_data/sample.rabl')
+          Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.rabl' }, 'rabl').should eql('spec/test_data/sample.rabl')
         end
 
       end
@@ -85,11 +81,11 @@ describe Gon do
         end
 
         let(:controller) { ActionController::Base.new }
-        let(:objects) { [1,2] }
+        let(:objects) { [1, 2] }
 
         context 'the action doesn as a template at a different format' do
           it 'return the same template as the action with rabl extension' do
-            Gon::Base.send(:get_template_path, {:controller => controller}, 'rabl').should eql('app/views/action_controller/base/show.json.rabl')
+            Gon::Base.send(:get_template_path, { :controller => controller }, 'rabl').should eql('app/views/action_controller/base/show.json.rabl')
           end
         end
 

data/spec/gon/templates_spec.rb

@@ -2,19 +2,15 @@ require 'spec_helper'
 
 describe Gon do
 
-  before(:each) do
-    Gon::Request.env = {}
-  end
-
   describe '.get_template_path' do
     context 'template is specified' do
 
       it 'add the extension if not included in the template name' do
-        Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample'}, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
+        Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
       end
 
       it 'return the specified template' do
-        Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.jbuilder'}, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
+        Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.jbuilder' }, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
       end
 
     end
@@ -28,11 +24,11 @@ describe Gon do
       end
 
       let(:controller) { ActionController::Base.new }
-      let(:objects) { [1,2] }
+      let(:objects) { [1, 2] }
 
       context 'the action doesn as a template at a different format' do
         it 'return the same template as the action with rabl extension' do
-          Gon::Base.send(:get_template_path, {:controller => controller}, 'jbuilder').should eql('app/views/action_controller/base/show.json.jbuilder')
+          Gon::Base.send(:get_template_path, { :controller => controller }, 'jbuilder').should eql('app/views/action_controller/base/show.json.jbuilder')
         end
       end
 

data/spec/gon/thread_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe 'threading behaviour' do
+  it 'is threadsafe' do
+    threads = []
+    10.times do
+      threads << Thread.new do
+        Gon.clear
+        Gon.a ||= 1
+        Gon.a += 1
+        expect(Gon.a).to eq 2
+      end
+    end
+    threads.each(&:join)
+    expect(Gon.a).to eq 2
+  end
+end

data/spec/gon/watch_spec.rb

@@ -13,8 +13,8 @@ describe Gon::Watch do
     env['REQUEST_METHOD'] = 'GET'
 
     Gon::Watch.clear
-    Gon::Request.instance_variable_set(:@request_env, env)
-    Gon::Request.env['action_controller.instance'] = controller
+    Gon.send(:current_gon).instance_variable_set(:@request_env, env)
+    Gon.send(:current_gon).env['action_controller.instance'] = controller
     Gon.clear
   end
 
@@ -44,15 +44,15 @@ describe Gon::Watch do
   end
 
   it 'should return value of variable if called right request' do
-    env = Gon::Request.instance_variable_get :@request_env
-    env["HTTP_X_REQUESTED_WITH"] = "XMLHttpRequest"
+    env = Gon.send(:current_gon).instance_variable_get(:@request_env)
+    env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
     request = ActionDispatch::Request.new env
     controller.request = request
     params = {}
     params[:gon_return_variable] = true
     params[:gon_watched_variable] = 'a'
     controller.params = params
-    Gon::Request.env['action_controller.instance'] = controller
+    Gon.send(:current_gon).env['action_controller.instance'] = controller
 
     controller.should_receive('render').with(:json => 1)
 

data/spec/spec_helper.rb

@@ -37,3 +37,10 @@ def ensure_rabl_rails_is_loaded
     load 'rabl-rails.rb'
   end
 end
+
+RSpec.configure do |config|
+  config.before(:each) do
+    @request = Thread.current['gon'] = Gon::Request.new({})
+    Gon.stub(:current_gon).and_return(@request)
+  end
+end

data/spec/test_data/sample_with_locals.json.jbuilder

@@ -1 +1,2 @@
 json.some_local some_local
+json.some_complex_local_id some_complex_local.id

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 5.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -159,6 +159,7 @@ files:
 - spec/gon/rabl_with_rabl_rails_spec.rb
 - spec/gon/rabl_with_rabl_spec.rb
 - spec/gon/templates_spec.rb
+- spec/gon/thread_spec.rb
 - spec/gon/watch_spec.rb
 - spec/spec_helper.rb
 - spec/test_data/_sample_partial.json.jbuilder
@@ -202,6 +203,7 @@ test_files:
 - spec/gon/rabl_with_rabl_rails_spec.rb
 - spec/gon/rabl_with_rabl_spec.rb
 - spec/gon/templates_spec.rb
+- spec/gon/thread_spec.rb
 - spec/gon/watch_spec.rb
 - spec/spec_helper.rb
 - spec/test_data/_sample_partial.json.jbuilder