gon 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433e0b5aaba27657199f00d90ee17a9c68a8f319
-  data.tar.gz: 21e99404fb2852a9f00a0c27bdd5fd8e1794207e
+  metadata.gz: 8e6e422d6bc49363eaa72a3d1edf4a45bcffca9d
+  data.tar.gz: 37181b539c628bf961165ae89e96dc5d93c9871c
 SHA512:
-  metadata.gz: c91f601c056db00171a9fe2db144c0c42e25d03874cb3b2c571edeb64c2550eb282567ec68197681f306ee217d0b32a3f14e872b779db9f14394c777e0a72f66
-  data.tar.gz: 9beef1f22711018f058160e486f919523868432e579b26cf55e5a4f247ff9ce8b7c05a1259264a0d02772dcf7a5b5c09d467bdf2fb301e3ddf0129d55266ddcd
+  metadata.gz: 0e7e96329caa65c2cdb52c86c7258ab8584fb315b497b12aac3bcdc7b19ec90e63078166fdf34465538169d5d175beede8fda51152b07ad7a6b4bc784d7ae571
+  data.tar.gz: 7f2003f997c30c86f1ff7863b962e5e5d3a181bd171c04d2d67f881db9f38e0fa7aa52f4c0721be0e17e1f670c419a590a0bc67cce4354c52e989f0f622c5027

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - jruby-19mode # JRuby in 1.9 mode
   - rbx
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 5.0.2
+
+  * Fix issue when there is no gon object for current thread and
+    rendering include_gon (#108 part) (wasn't fixed) (@gregmolnar)
+
 ## 5.0.1
 
   * Fix issue when there is no gon object for current thread and

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in gon.gemspec
 gemspec
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end

data/LICENSE

@@ -0,0 +1,9 @@
+The MIT License
+
+Copyright (c) 2011-2014 gazay
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -186,11 +186,3 @@ Special thanks to @brainopia, @kossnocorp and @ai.
 ## License
 
 The MIT License
-
-Copyright (c) 2011-2012 gazay
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -4,6 +4,9 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 desc 'Run all tests by default'
-task :default do
-  system('rspec spec')
-end
+task :default => :spec
+
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["--color", '--format doc']
+end

data/gon.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.version     = Gon::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['gazay']
+  s.licenses    = ['MIT']
   s.email       = ['alex.gaziev@gmail.com']
   s.homepage    = 'https://github.com/gazay/gon'
   s.summary     = %q{Get your Rails variables in your JS}
@@ -19,11 +20,11 @@ Gem::Specification.new do |s|
   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.add_runtime_dependency 'actionpack', '~> 2.3.0', '>= 2.3.0'
+  s.add_runtime_dependency 'json', '~> 0'
+  s.add_development_dependency 'rabl', '~> 0'
+  s.add_development_dependency 'rabl-rails', '~> 0'
+  s.add_development_dependency 'rspec', '~> 0'
+  s.add_development_dependency 'jbuilder', '~> 0'
+  s.add_development_dependency 'rake', '~> 0'
 end

data/lib/gon.rb

@@ -25,6 +25,9 @@ class Gon
         if public_method_name?(method)
           raise 'You can\'t use Gon public methods for storing data'
         end
+        unless current_gon
+          raise 'Assign request-specific gon variables only through `gon` helper, not through Gon constant'
+        end
 
         set_variable(method.to_s.delete('='), args[0])
       else
@@ -49,11 +52,11 @@ class Gon
     end
 
     def all_variables
-      current_gon.gon
+      current_gon.gon if current_gon
     end
 
     def clear
-      current_gon.clear
+      current_gon.clear if current_gon
     end
 
     def rabl(*args)

data/lib/gon/base.rb

@@ -15,10 +15,13 @@ class Gon
 
       def get_controller(options = {})
         options[:controller] ||
-          current_gon.env['action_controller.instance'] ||
-          current_gon.env['action_controller.rescue.response'].
-          instance_variable_get('@template').
-          instance_variable_get('@controller')
+          (
+            current_gon &&
+            current_gon.env['action_controller.instance'] ||
+            current_gon.env['action_controller.rescue.response'].
+              instance_variable_get('@template').
+              instance_variable_get('@controller')
+          )
       end
 
       def get_template_path(options, extension)

data/lib/gon/escaper.rb

@@ -7,7 +7,7 @@ class Gon
 
       def escape_unicode(javascript)
         if javascript
-          result = javascript.gsub(/\342\200\250/u, '&#x2028;').gsub(/(<\/)/u, '\u003C/')
+          result = javascript.gsub(/\\u2028/u, '&#x2028;').gsub(/(<\/)/u, '\u003C/')
           javascript.html_safe? ? result.html_safe : result
         end
       end

data/lib/gon/helpers.rb

@@ -14,7 +14,7 @@ class Gon
           Gon.clear
           Gon::Base.render_data(options)
         elsif options[:init].present?
-          Gon.clear if Gon.all_variables.present?
+          Gon.clear
           Gon::Base.render_data(options)
         else
           ''

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '5.0.1'
+  VERSION = '5.0.2'
 end

data/lib/gon/watch.rb

@@ -21,7 +21,7 @@ class Gon
       def set_variable(name, value)
         if return_variable?(name)
           return_variable value
-        else
+        elsif Gon.send(:current_gon)
           variable = {}
           @watch_variables ||= {}
           env = Gon.send(:current_gon).env

data/spec/gon/basic_spec.rb

@@ -11,8 +11,8 @@ describe Gon do
       Gon.a = 1
       Gon.b = 2
       Gon.c = Gon.a + Gon.b
-      Gon.c.should == 3
-      Gon.all_variables.should == { 'a' => 1, 'b' => 2, 'c' => 3 }
+      expect(Gon.c).to eq(3)
+      expect(Gon.all_variables).to eq({ 'a' => 1, 'b' => 2, 'c' => 3 })
     end
 
     it 'supports all data types' do
@@ -35,7 +35,7 @@ describe Gon do
         check["variable#{i}"] = i
       end
 
-      Gon.all_variables.should == check
+      expect(Gon.all_variables).to eq(check)
     end
 
     it 'can set and get variable with dynamic name' do
@@ -43,14 +43,14 @@ describe Gon do
       var_name = "variable#{rand}"
 
       Gon.set_variable(var_name, 1)
-      Gon.get_variable(var_name).should == 1
+      expect(Gon.get_variable(var_name)).to eq(1)
     end
 
     it 'can be support new push syntax' do
       Gon.clear
 
       Gon.push({ :int => 1, :string => 'string' })
-      Gon.all_variables.should == { 'int' => 1, 'string' => 'string' }
+      expect(Gon.all_variables).to eq({ 'int' => 1, 'string' => 'string' })
     end
 
     it 'push with wrong object' do
@@ -68,130 +68,139 @@ describe Gon do
       Gon.clear
       Gon::Request.
         instance_variable_set(:@request_id, request.object_id)
-      ActionView::Base.
+      expect(ActionView::Base.
         instance_methods.
         map(&:to_s).
-        include?('include_gon').should == true
+        include?('include_gon')).to eq(true)
       @base = ActionView::Base.new
       @base.request = request
     end
 
     it 'outputs correct js with an integer' do
       Gon.int = 1
-      @base.include_gon.should == '<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     'gon.int=1;' +
                                     "\n//]]>\n" +
-                                  '</script>'
+                                  '</script>')
     end
 
     it 'outputs correct js with a string' do
       Gon.str = %q(a'b"c)
-      @base.include_gon.should == '<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     %q(gon.str="a'b\"c";) +
                                     "\n//]]>\n" +
-                                  '</script>'
+                                  '</script>')
     end
 
     it 'outputs correct js with a script string' do
       Gon.str = %q(</script><script>alert('!')</script>)
-      @base.include_gon.should == '<script type="text/javascript">' +
+      expect(@base.include_gon).to eq('<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
                                     %q(gon.str="\u003C/script><script>alert('!')\u003C/script>";) +
                                     "\n//]]>\n" +
-                                  '</script>'
+                                  '</script>')
     end
 
     it 'outputs correct js with an integer, camel-case and namespace' do
       Gon.int_cased = 1
-      @base.include_gon(camel_case: true, namespace: 'camel_cased').should == \
+      expect(@base.include_gon(camel_case: true, namespace: 'camel_cased')).to eq( \
                                   '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
                                     '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 == \
+      expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq( \
                                   '<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 == \
+      expect(@base.include_gon(camel_case: true, camel_depth: 2)).to eq( \
                                   '<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 == \
+      expect(@base.include_gon(need_tag: false)).to eq( \
                                   'window.gon={};' +
                                   'gon.int=1;'
+      )
     end
 
     it 'outputs correct js without variables, without tag and gon init if before there was data' do
       Gon::Request.
         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 == \
+      expect(@base.include_gon(need_tag: false, init: true)).to eq( \
                                   'window.gon={};'
+      )
     end
 
     it 'outputs correct js without variables, without tag and gon init' do
-      @base.include_gon(need_tag: false, init: true).should == \
+      expect(@base.include_gon(need_tag: false, init: true)).to eq( \
                                   '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 == \
+      expect(@base.include_gon(need_tag: false, init: true)).to eq( \
                                   '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 == \
+      expect(@base.include_gon(cdata: false, type: false)).to eq( \
                                   '<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 == \
+      expect(@base.include_gon(need_type: true, init: true)).to eq( \
                                   '<script type="text/javascript">' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};'\
                                     "\n//]]>\n" +
                                   '</script>'
+      )
     end
 
   end
 
   it 'returns exception if try to set public method as variable' do
     Gon.clear
-    lambda { Gon.all_variables = 123 }.should raise_error
-    lambda { Gon.rabl = 123 }.should raise_error
+    expect { Gon.all_variables = 123 }.to raise_error
+    expect { Gon.rabl = 123 }.to raise_error
   end
 
   describe '#check_for_rabl_and_jbuilder' do
@@ -200,16 +209,16 @@ describe Gon do
 
     it 'should be able to handle ruby 1.8.7 style constants array (strings)' do
       constants_as_strings = Gon.constants.map(&:to_s)
-      Gon.stub(:constants) { constants_as_strings }
-      lambda { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.should_not raise_error
-      lambda { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.should_not raise_error
+      allow(Gon).to receive(:constants) { constants_as_strings }
+      expect { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
+      expect { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
 
     it 'should be able to handle ruby 1.9+ style constants array (symbols)' do
       constants_as_symbols = Gon.constants.map(&:to_sym)
-      Gon.stub(:constants) { constants_as_symbols }
-      lambda { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.should_not raise_error
-      lambda { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.should_not raise_error
+      allow(Gon).to receive(:constants) { constants_as_symbols }
+      expect { Gon.rabl 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
+      expect { Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
   end
 

data/spec/gon/global_spec.rb

@@ -13,8 +13,8 @@ describe Gon::Global do
       Gon.global.a = 1
       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 }
+      expect(Gon.global.c).to eq(3)
+      expect(Gon.global.all_variables).to eq({ 'a' => 1, 'b' => 2, 'c' => 3 })
     end
 
     it 'supports all data types' do
@@ -35,72 +35,72 @@ describe Gon::Global do
     before(:each) do
       Gon.clear
       Gon.global.clear
-      ActionView::Base.
+      expect(ActionView::Base.
         instance_methods.
         map(&:to_s).
-        include?('include_gon').should == true
+        include?('include_gon')).to eq(true)
       @base = ActionView::Base.new
       @base.request = request
     end
 
     it 'outputs correct js with an integer' do
       Gon.global.int = 1
-      @base.include_gon.should == "<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
-                                  "</script>"
+                                  "</script>")
     end
 
     it 'outputs correct js with an integer and integer in Gon' do
       Gon.int = 1
       Gon.global.int = 1
-      @base.include_gon.should == "<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.int=1;" +
                                     "gon.global={\"int\":1};" +
                                     "\n//]]>\n" +
-                                  "</script>"
+                                  "</script>")
     end
 
     it 'outputs correct js with a string' do
       Gon.global.str = %q(a'b"c)
-      @base.include_gon.should == "<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"a'b\\\"c\"};" +
                                     "\n//]]>\n" +
-                                  "</script>"
+                                  "</script>")
     end
 
     it 'outputs correct js with a script string' do
       Gon.global.str = %q(</script><script>alert('!')</script>)
-      @base.include_gon.should == "<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"\\u003C/script><script>alert('!')\\u003C/script>\"};" +
                                     "\n//]]>\n" +
-                                  "</script>"
+                                  "</script>")
     end
 
     it 'outputs correct js with a unicode line separator' do
       Gon.global.str = "\u2028"
-      @base.include_gon.should == "<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"&#x2028;\"};" +
                                     "\n//]]>\n" +
-                                  "</script>"
+                                  "</script>")
     end
 
   end
 
   it 'returns exception if try to set public method as variable' do
     Gon.global.clear
-    lambda { Gon.global.all_variables = 123 }.should raise_error
-    lambda { Gon.global.rabl = 123 }.should raise_error
+    expect { Gon.global.all_variables = 123 }.to raise_error
+    expect { Gon.global.rabl = 123 }.to raise_error
   end
 
   context 'with jbuilder and rabl' do
@@ -115,17 +115,17 @@ describe Gon::Global do
 
     it 'works fine with rabl' do
       Gon.global.rabl :template => 'spec/test_data/sample.rabl', :controller => controller
-      Gon.global.objects.length.should == 2
+      expect(Gon.global.objects.length).to eq(2)
     end
 
     it 'works fine with jbuilder' do
       Gon.global.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller
-      Gon.global.objects.length.should == 2
+      expect(Gon.global.objects.length).to eq(2)
     end
 
     it 'should throw exception, if use rabl or jbuilder without :template' do
-      lambda { Gon.global.rabl }.should raise_error
-      lambda { Gon.global.jbuilder }.should raise_error
+      expect { Gon.global.rabl }.to raise_error
+      expect { Gon.global.jbuilder }.to raise_error
     end
 
   end

data/spec/gon/jbuilder_spec.rb

@@ -15,20 +15,20 @@ describe Gon do
 
       it 'render json from jbuilder template' do
         Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
-        Gon.objects.length.should == 2
+        expect(Gon.objects.length).to eq(2)
       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, :some_complex_local => OpenStruct.new(:id => 1234) }
-        Gon.some_local.should == 1234
-        Gon.some_complex_local_id.should == 1234
+        expect(Gon.some_local).to eq(1234)
+        expect(Gon.some_complex_local_id).to eq(1234)
       end
 
       it 'render json from jbuilder template with locals' do
         Gon.jbuilder 'spec/test_data/sample_with_helpers.json.jbuilder', :controller => controller
-        Gon.date.should == 'about 6 hours'
+        expect(Gon.date).to eq('about 6 hours')
       end
 
       it 'render json from jbuilder template with controller methods' do
@@ -41,13 +41,13 @@ describe Gon do
         }
 
         Gon.jbuilder 'spec/test_data/sample_with_controller_method.json.jbuilder', :controller => controller
-        Gon.date.should == 'about 6 hours'
+        expect(Gon.date).to eq('about 6 hours')
       end
 
       it 'render json from jbuilder template with a partial' do
         controller.view_paths << 'spec/test_data'
         Gon.jbuilder 'spec/test_data/sample_with_partial.json.jbuilder', :controller => controller
-        Gon.objects.length.should == 2
+        expect(Gon.objects.length).to eq(2)
       end
 
     end

data/spec/gon/rabl_with_rabl_rails_spec.rb

@@ -20,7 +20,7 @@ describe Gon do
     context 'render template with deprecation' do
       it 'still works' do
         Gon.rabl 'spec/test_data/sample_rabl_rails.rabl', :controller => controller
-        Gon.objects.length.should == 2
+        expect(Gon.objects.length).to eq(2)
       end
     end
 
@@ -30,7 +30,7 @@ describe Gon do
           :template =>'spec/test_data/sample_rabl_rails.rabl',
           :controller => controller
         )
-        Gon.objects.map { |it| it['inspect'] }.should == %w(1 2)
+        expect(Gon.objects.map { |it| it['inspect'] }).to eq(%w(1 2))
       end
       
       it 'works with different locals object' do
@@ -39,18 +39,18 @@ describe Gon do
           :controller => controller,
           :locals => { :objects => [3, 4] }
         )
-        Gon.objects.map { |it| it['inspect'] }.should == %w(3 4)
+        expect(Gon.objects.map { |it| it['inspect'] }).to eq(%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.objects.length.should == 2
+      expect(Gon.objects.length).to eq(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'
+      expect(Gon.objects.first['time_ago']).to eq('about 6 hours')
     end
 
     it 'raise exception if rabl or rabl-rails is not included' do

data/spec/gon/rabl_with_rabl_spec.rb

@@ -19,7 +19,7 @@ describe Gon do
     context 'render template with deprecation' do
       it 'still works' do
         Gon.rabl 'spec/test_data/sample.rabl', :controller => controller
-        Gon.objects.length.should == 2
+        expect(Gon.objects.length).to eq(2)
       end
     end
 
@@ -29,7 +29,7 @@ describe Gon do
           :template   => 'spec/test_data/sample.rabl',
           :controller => controller
         )
-        Gon.objects.map { |it| it['object']['inspect'] }.should == %w(1 2)
+        expect(Gon.objects.map { |it| it['object']['inspect'] }).to eq(%w(1 2))
       end
 
       it 'works with different locals object' do
@@ -38,18 +38,18 @@ describe Gon do
           :controller => controller,
           :locals     => { :objects => [3, 4] }
         )
-        Gon.objects.map { |it| it['object']['inspect'] }.should == %w(3 4)
+        expect(Gon.objects.map { |it| it['object']['inspect'] }).to eq(%w(3 4))
       end
     end
 
     it 'works if rabl is included' do
       Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller
-      Gon.objects.length.should == 2
+      expect(Gon.objects.length).to eq(2)
     end
 
     it 'works with ActionView::Helpers' do
       Gon.rabl :template => 'spec/test_data/sample_with_helpers.rabl', :controller => controller
-      Gon.objects.first['object']['time_ago'].should == 'about 6 hours'
+      expect(Gon.objects.first['object']['time_ago']).to eq('about 6 hours')
     end
 
     it 'raise exception if rabl is not included' do
@@ -63,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')
+          expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'rabl')).to 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')
+          expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.rabl' }, 'rabl')).to eql('spec/test_data/sample.rabl')
         end
 
       end
@@ -85,7 +85,7 @@ describe Gon do
 
         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')
+            expect(Gon::Base.send(:get_template_path, { :controller => controller }, 'rabl')).to eql('app/views/action_controller/base/show.json.rabl')
           end
         end
 

data/spec/gon/templates_spec.rb

@@ -6,11 +6,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' }, 'jbuilder').should eql('spec/test_data/sample.jbuilder')
+        expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'jbuilder')).to 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')
+        expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.jbuilder' }, 'jbuilder')).to eql('spec/test_data/sample.jbuilder')
       end
 
     end
@@ -28,7 +28,7 @@ describe Gon do
 
       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')
+          expect(Gon::Base.send(:get_template_path, { :controller => controller }, 'jbuilder')).to eql('app/views/action_controller/base/show.json.jbuilder')
         end
       end
 

data/spec/gon/thread_spec.rb

@@ -1,17 +1,41 @@
 require 'spec_helper'
 
+class GonTestWorker
+  include Gon::GonHelpers
+
+  def request
+    @request ||= ActionDispatch::TestRequest.new
+  end
+
+  def env
+    request.env
+  end
+
+  def execute
+    gon.clear
+    gon.a ||= 1
+    gon.a += 1
+  end
+
+  def value
+    gon.a
+  end
+end
+
 describe 'threading behaviour' do
+  before do
+    Gon.unstub(:current_gon)
+  end
+
   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
+        gtw = GonTestWorker.new
+        gtw.execute
+        expect(gtw.value).to eq 2
       end
     end
     threads.each(&:join)
-    expect(Gon.a).to eq 2
   end
 end

data/spec/gon/watch_spec.rb

@@ -21,14 +21,14 @@ describe Gon::Watch do
   it 'should add variables to Gon#all_variables hash' do
     Gon.a = 1
     Gon.watch.b = 2
-    Gon.all_variables.should == { 'a' => 1, 'b' => 2 }
+    expect(Gon.all_variables).to eq({ 'a' => 1, 'b' => 2 })
   end
 
   describe '#all_variables' do
 
     it 'should generate array with current request url, method type and variable names' do
       Gon.watch.a = 1
-      Gon.watch.all_variables.should == { 'a' => { 'url' => '/foo', 'method' => 'GET', 'name' => 'a' } }
+      expect(Gon.watch.all_variables).to eq({ 'a' => { 'url' => '/foo', 'method' => 'GET', 'name' => 'a' } })
     end
 
   end
@@ -37,8 +37,8 @@ describe Gon::Watch do
 
     it 'should render function with variables in gon namespace' do
       Gon.watch.a = 1
-      Gon.watch.render.should =~ /gon\.watch\s=/
-      Gon.watch.render.should =~ /gon\.watchedVariables/
+      expect(Gon.watch.render).to match(/gon\.watch\s=/)
+      expect(Gon.watch.render).to match(/gon\.watchedVariables/)
     end
 
   end
@@ -54,7 +54,7 @@ describe Gon::Watch do
     controller.params = params
     Gon.send(:current_gon).env['action_controller.instance'] = controller
 
-    controller.should_receive('render').with(:json => 1)
+    expect(controller).to receive('render').with(:json => 1)
 
     Gon.watch.a = 1
   end

data/spec/spec_helper.rb

@@ -41,6 +41,6 @@ end
 RSpec.configure do |config|
   config.before(:each) do
     @request = Thread.current['gon'] = Gon::Request.new({})
-    Gon.stub(:current_gon).and_return(@request)
+    allow(Gon).to receive(:current_gon).and_return(@request)
   end
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
     - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
@@ -28,84 +34,84 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rabl-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: If you need to send some data to your js files and you don't want to
@@ -120,6 +126,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- LICENSE
 - README.md
 - README_old.md
 - Rakefile
@@ -158,7 +165,8 @@ files:
 - spec/test_data/sample_with_locals.json.jbuilder
 - spec/test_data/sample_with_partial.json.jbuilder
 homepage: https://github.com/gazay/gon
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -176,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: gon
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Get your Rails variables in your JS