gon 5.2.3 → 6.0.0

data/spec/gon/global_spec.rb

@@ -18,10 +18,10 @@ describe Gon::Global do
     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.symbol       = :symbol
       Gon.global.array        = [1, 'string']
       Gon.global.hash_var     = { :a => 1, :b => '2' }
       Gon.global.hash_w_array = { :a => [2, 3] }
@@ -34,18 +34,14 @@ describe Gon::Global do
 
     before(:each) do
       Gon.clear
-      Gon.global.clear
-      expect(ActionView::Base.
-        instance_methods.
-        map(&:to_s).
-        include?('include_gon')).to eq(true)
+      expect(ActionView::Base.instance_methods).to include(:include_gon)
       @base = ActionView::Base.new
       @base.request = request
     end
 
     it 'outputs correct js with an integer' do
       Gon.global.int = 1
-      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script>" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"int\":1};" +
@@ -56,7 +52,7 @@ describe Gon::Global do
     it 'outputs correct js with an integer and integer in Gon' do
       Gon.int = 1
       Gon.global.int = 1
-      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script>" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"int\":1};" +
@@ -67,7 +63,7 @@ describe Gon::Global do
 
     it 'outputs correct js with a string' do
       Gon.global.str = %q(a'b"c)
-      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script>" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"a'b\\\"c\"};" +
@@ -78,7 +74,7 @@ describe Gon::Global do
     it 'outputs correct js with a script string' do
       Gon.global.str = %q(</script><script>alert('!')</script>)
       escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
-      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script>" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"#{escaped_str}\"};" +
@@ -88,7 +84,7 @@ describe Gon::Global do
 
     it 'outputs correct js with a unicode line separator' do
       Gon.global.str = "\u2028"
-      expect(@base.include_gon).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon).to eq("<script>" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
                                     "gon.global={\"str\":\"&#x2028;\"};" +
@@ -99,7 +95,7 @@ describe Gon::Global do
     it 'outputs locally overridden value' do
       Gon.str = 'local value'
       Gon.global.str = 'global value'
-      expect(@base.include_gon(global_root: '')).to eq("<script type=\"text/javascript\">" +
+      expect(@base.include_gon(global_root: '')).to eq("<script>" +
                                      "\n//<![CDATA[\n" +
                                      "window.gon={};" +
                                      "gon.str=\"local value\";" +
@@ -107,18 +103,26 @@ describe Gon::Global do
                                      "</script>")
     end
 
+    it "includes the tag attributes in the script tag" do
+      Gon.global.int = 1
+      expect(@base.include_gon(nonce: 'test')).to eq("<script nonce=\"test\">" +
+                                    "\n//<![CDATA[\n" +
+                                    "window.gon={};" +
+                                    "gon.global={\"int\":1};" +
+                                    "\n//]]>\n" +
+                                  "</script>")
+    end
+
   end
 
   it 'returns exception if try to set public method as variable' do
-    Gon.global.clear
-    expect { Gon.global.all_variables = 123 }.to raise_error
-    expect { Gon.global.rabl = 123 }.to raise_error
+    expect { Gon.global.all_variables = 123 }.to raise_error(RuntimeError)
+    expect { Gon.global.rabl = 123 }.to raise_error(RuntimeError)
   end
 
   context 'with jbuilder and rabl' do
 
     before :each do
-      Gon.global.clear
       controller.instance_variable_set('@objects', objects)
     end
 
@@ -136,8 +140,8 @@ describe Gon::Global do
     end
 
     it 'should throw exception, if use rabl or jbuilder without :template' do
-      expect { Gon.global.rabl }.to raise_error
-      expect { Gon.global.jbuilder }.to raise_error
+      expect { Gon.global.rabl }.to raise_error(RuntimeError)
+      expect { Gon.global.jbuilder }.to raise_error(RuntimeError)
     end
 
   end

data/spec/gon/jbuilder_spec.rb

@@ -14,12 +14,12 @@ describe Gon do
       let(:objects) { [1, 2] }
 
       it 'render json from jbuilder template' do
-        Gon.jbuilder 'spec/test_data/sample.json.jbuilder', :controller => controller
+        Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller
         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',
+        Gon.jbuilder :template => 'spec/test_data/sample_with_locals.json.jbuilder',
                      :controller => controller,
                      :locals => { :some_local => 1234, :some_complex_local => OpenStruct.new(:id => 1234) }
         expect(Gon.some_local).to eq(1234)
@@ -27,7 +27,7 @@ describe Gon do
       end
 
       it 'render json from jbuilder template with locals' do
-        Gon.jbuilder 'spec/test_data/sample_with_helpers.json.jbuilder', :controller => controller
+        Gon.jbuilder :template => 'spec/test_data/sample_with_helpers.json.jbuilder', :controller => controller
         expect(Gon.date).to eq('about 6 hours')
       end
 
@@ -40,31 +40,38 @@ describe Gon do
           private :private_controller_method
         end
 
-        Gon.jbuilder 'spec/test_data/sample_with_controller_method.json.jbuilder', :controller => controller
+        Gon.jbuilder :template => 'spec/test_data/sample_with_controller_method.json.jbuilder', :controller => controller
         expect(Gon.data_from_method).to eq('gon test helper works')
       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.jbuilder :template => 'spec/test_data/sample_with_partial.json.jbuilder', :controller => controller
         expect(Gon.objects.length).to eq(2)
       end
 
-    end
+      context 'within Rails' do
+        before do
+          module ::Rails
+          end
 
-    it 'should raise error if you use gon.jbuilder without requiring jbuilder gem' do
-      Gon.send(:remove_const, :Jbuilder)
+          allow(Rails).to receive_message_chain("application.routes.url_helpers.instance_methods") { [:user_path] }
+          controller.instance_variable_set('@user_id', 1)
+        end
 
-      expect { Gon.jbuilder 'some_path' }.to raise_error
-      load 'jbuilder.rb'
-      load 'gon/jbuilder.rb'
-    end
+        after do
+          Object.send(:remove_const, :Rails)
+        end
 
-  end
+        it 'includes url_helpers' do
+          expect(controller).to receive(:user_path) { |id| "/users/#{id}" }
+          Gon.jbuilder :template => 'spec/test_data/sample_url_helpers.json.jbuilder', :controller => controller
+          expect(Gon.url).to eq '/users/1'
+        end
+      end
 
+    end
 
-  def request
-    @request ||= double 'request', :env => {}
   end
 
 end

data/spec/gon/rabl_with_rabl_rails_spec.rb

@@ -56,7 +56,7 @@ describe Gon do
 
     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(RuntimeError)
       ensure_rabl_rails_is_loaded # load up rabl-rails again, we're not done testing
     end
 

data/spec/gon/rabl_with_rabl_spec.rb

@@ -54,20 +54,20 @@ describe Gon do
 
     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(NameError)
       load 'rabl.rb'
       load 'gon/rabl.rb'
     end
 
-    context '.get_template_path' do
+    context '.template_path' do
       context 'template is specified' do
 
         it 'add the extension if not included in the template name' do
-          expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'rabl')).to eql('spec/test_data/sample.rabl')
+          expect(Gon::EnvFinder.send(:template_path, { :template => 'spec/test_data/sample' }, 'rabl')).to eql('spec/test_data/sample.rabl')
         end
 
         it 'return the specified template' do
-          expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.rabl' }, 'rabl')).to eql('spec/test_data/sample.rabl')
+          expect(Gon::EnvFinder.send(: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
-            expect(Gon::Base.send(:get_template_path, { :controller => controller }, 'rabl')).to eql('app/views/action_controller/base/show.json.rabl')
+            expect(Gon::EnvFinder.send(:template_path, { :controller => controller }, 'rabl')).to eql('app/views/action_controller/base/show.json.rabl')
           end
         end
 
@@ -94,8 +94,4 @@ describe Gon do
 
   end
 
-  def request
-    @request ||= double 'request', :env => {}
-  end
-
 end

data/spec/gon/templates_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 
 describe Gon do
 
-  describe '.get_template_path' do
+  describe '.template_path' do
     context 'template is specified' do
 
       it 'add the extension if not included in the template name' do
-        expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample' }, 'jbuilder')).to eql('spec/test_data/sample.jbuilder')
+        expect(Gon::EnvFinder.send(:template_path, { :template => 'spec/test_data/sample' }, 'jbuilder')).to eql('spec/test_data/sample.jbuilder')
       end
 
       it 'return the specified template' do
-        expect(Gon::Base.send(:get_template_path, { :template => 'spec/test_data/sample.jbuilder' }, 'jbuilder')).to eql('spec/test_data/sample.jbuilder')
+        expect(Gon::EnvFinder.send(:template_path, { :template => 'spec/test_data/sample.jbuilder' }, 'jbuilder')).to eql('spec/test_data/sample.jbuilder')
       end
 
     end
@@ -28,15 +28,11 @@ 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
-          expect(Gon::Base.send(:get_template_path, { :controller => controller }, 'jbuilder')).to eql('app/views/action_controller/base/show.json.jbuilder')
+          expect(Gon::EnvFinder.send(:template_path, { :controller => controller }, 'jbuilder')).to eql('app/views/action_controller/base/show.json.jbuilder')
         end
       end
 
     end
   end
 
-  def request
-    @request ||= double 'request', :env => {}
-  end
-
 end

data/spec/gon/thread_spec.rb

@@ -24,7 +24,7 @@ end
 
 describe 'threading behaviour' do
   before do
-    Gon.unstub(:current_gon)
+    allow(Gon).to receive(:current_gon).and_call_original
   end
 
   it 'is threadsafe' do

data/spec/gon/watch_spec.rb

@@ -48,13 +48,13 @@ describe Gon::Watch do
       env = Gon.send(:current_gon).instance_variable_get(:@request_env)
       env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
 
-      controller.stub(request: ActionDispatch::Request.new(env))
+      allow(controller).to receive_messages(request: ActionDispatch::Request.new(env))
       Gon.send(:current_gon).env['action_controller.instance'] = controller
     end
 
     context 'when request variable is json safe content' do
       before do
-        controller.stub(params: {
+        allow(controller).to receive_messages(params: {
           gon_return_variable: true,
           gon_watched_variable: 'safety'})
       end
@@ -69,7 +69,7 @@ describe Gon::Watch do
       let(:expected) { %Q{"\\u003cscript\\u003e'\\"\\u003c/script\\u003e
Dangerous"} }
 
       before do
-        controller.stub(params: {
+        allow(controller).to receive_messages(params: {
           gon_return_variable: true,
           gon_watched_variable: 'danger'})
       end

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
-require 'gon'
-
+require 'rails/railtie'
 # We don't require rails for specs, but jbuilder works only in rails.
 # And it checks version of rails. I've decided to configure jbuilder for rails v4
 module Rails
   module VERSION
     MAJOR = 4
   end
+
+  def self.version
+    '4.2.0'
+  end
 end
 
+require 'gon'
+
 require 'jbuilder'
 require 'rabl'
 require 'rabl-rails'
@@ -46,6 +51,8 @@ def ensure_rabl_rails_is_loaded
     load 'rabl-rails/compiler.rb'
     load 'rabl-rails/renderers/hash.rb'
     load 'rabl-rails/renderers/json.rb'
+    load 'rabl-rails/renderers/xml.rb'
+    load 'rabl-rails/renderers/plist.rb'
     load 'rabl-rails.rb'
     load 'rabl-rails/template.rb'
     load 'rabl-rails/library.rb'

data/spec/test_data/sample_url_helpers.json.jbuilder

@@ -0,0 +1 @@
+json.url user_path(@user_id)

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.2.3
+  version: 6.0.0
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2015-07-28 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
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   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: multi_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'
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
 - !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'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.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: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !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
@@ -160,10 +174,12 @@ files:
 - lib/gon.rb
 - lib/gon/base.rb
 - lib/gon/compatibility/old_rails.rb
+- lib/gon/env_finder.rb
 - lib/gon/escaper.rb
 - lib/gon/global.rb
 - lib/gon/helpers.rb
 - lib/gon/jbuilder.rb
+- lib/gon/jbuilder/parser.rb
 - lib/gon/json_dumper.rb
 - lib/gon/rabl.rb
 - lib/gon/request.rb
@@ -183,6 +199,7 @@ files:
 - spec/test_data/sample.json.jbuilder
 - spec/test_data/sample.rabl
 - spec/test_data/sample_rabl_rails.rabl
+- spec/test_data/sample_url_helpers.json.jbuilder
 - spec/test_data/sample_with_controller_method.json.jbuilder
 - spec/test_data/sample_with_helpers.json.jbuilder
 - spec/test_data/sample_with_helpers.rabl
@@ -199,38 +216,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: gon
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Get your Rails variables in your JS
-test_files:
-- spec/gon/basic_spec.rb
-- spec/gon/global_spec.rb
-- spec/gon/jbuilder_spec.rb
-- 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
-- spec/test_data/sample.json.jbuilder
-- spec/test_data/sample.rabl
-- spec/test_data/sample_rabl_rails.rabl
-- spec/test_data/sample_with_controller_method.json.jbuilder
-- spec/test_data/sample_with_helpers.json.jbuilder
-- spec/test_data/sample_with_helpers.rabl
-- spec/test_data/sample_with_helpers_rabl_rails.rabl
-- spec/test_data/sample_with_locals.json.jbuilder
-- spec/test_data/sample_with_partial.json.jbuilder
-has_rdoc: 
+test_files: []