gon 6.2.0 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c19eee4ca6c0cff3ee98d241cec763d760538dde
-  data.tar.gz: e8a58a191ac62e622c5f172c879a693852fce131
+SHA256:
+  metadata.gz: d3011b64184a618203097a39e862d2003267b1cd01174fd10277036bd2bccf76
+  data.tar.gz: 4103a6703347a5c5cd35502d9a0655730e3889686346042dc702ba7bebe58dbf
 SHA512:
-  metadata.gz: bac0b2f0b276f6e22a0a4f5e1d7820d2789410f980b02f329a6e1a713ace8c18c85e9c1211eab634193b5e54cc0c54c3a2728b47ef7a3568866a5cfa92a5616e
-  data.tar.gz: 1fdd5df1b97870e96dfc7b357aa5af95406b7e8b574b9c811b7a43d79a8637af1fc9716e8e0ff1e45718b261b718dec8c3a18253a3f59e309b7465490b90c55e
+  metadata.gz: df7d4d73cebf80666e8a5f65c04fb8368c83fe53f600976c93f6c8136873add54e9af82df246440b851b18c1254d21f191498d2254cb537734ae8101f5277187
+  data.tar.gz: 0af70690d9acd62e3550ce7bea2142ddc9a518b41b921db60b70fa092fdf0344b6758adb24cbe90c7825b56e81edfb0ed987f88f73937c3191f5bd1af0041fb4

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 sudo: false
+env:
+  - "RABL_GEM=rabl"
+  - "RABL_GEM=rabl-rails"
+
 rvm:
-  - 2.3.3
-  - 2.4.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec

data/Gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in gon.gemspec
+gem ENV['RABL_GEM'] || 'rabl'
+
 gemspec

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011-2016 gazay
+Copyright (c) 2011-2019 Alexey Gaziev
 
 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:
 

data/README.md

@@ -40,7 +40,7 @@ you might be doing something like this:
   that) - you just use data from this js - OK.
   4. You can use your data in your js
 
-And everytime when you need to send some data from action to js you do this.
+And every time when you need to send some data from action to js you do this.
 
 With gon you configure it firstly - just put in layout one tag, and add
 gem line to your Gemfile and do the following:

data/gon.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '> 1.8.7'
+  s.required_ruby_version = '>= 2.2.0'
   s.add_dependency 'actionpack', '>= 3.0'
   s.add_dependency 'request_store', '>= 1.0'
   s.add_dependency 'multi_json'

data/lib/gon/base.rb

@@ -124,7 +124,7 @@ class Gon
 
       def convert_key(key, camelize)
         cache = RequestStore.store[:gon_keys_cache] ||= {}
-        cache[key] ||= camelize ? key.to_s.camelize(:lower) : key.to_s
+        cache["#{key}_#{camelize}"] ||= camelize ? key.to_s.camelize(:lower) : key.to_s
       end
 
     end

data/lib/gon/compatibility/old_rails.rb

@@ -1,9 +1,10 @@
 require 'securerandom'
 
 class Gon
-  module GonHelpers
+  module ControllerHelpers
     private
 
+    # override this since ActionDispatch::Request#uuid appears only in Rails 3.2.1
     def gon_request_uuid
       @gon_request_uuid ||= SecureRandom.uuid
     end

data/lib/gon/helpers.rb

@@ -52,5 +52,9 @@ class Gon
   end
 end
 
-ActionView::Base.send :include, Gon::ViewHelpers
-ActionController::Base.send :include, Gon::ControllerHelpers
+ActiveSupport.on_load :action_view do
+  ActionView::Base.send :include, Gon::ViewHelpers
+end
+ActiveSupport.on_load :action_controller do
+  ActionController::Base.send :include, Gon::ControllerHelpers
+end

data/lib/gon/spec_helpers.rb

@@ -24,7 +24,7 @@ class Gon
   end
 end
 
-if defined?(ActionController::TestCase::Behavior)
+if ENV['RAILS_ENV'] == 'test' && defined?(ActionController::TestCase::Behavior)
   ActionController::TestCase::Behavior.send :include, Gon::SpecHelper::Rails
 end
 

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '6.2.0'
+  VERSION = '6.3.1'
 end

data/spec/gon/basic_spec.rb

@@ -159,6 +159,16 @@ describe Gon do
       )
     end
 
+    it 'outputs correct key with camel_case option set alternately ' do
+      Gon.test_hash = 1
+      @base.include_gon(camel_case: true)
+
+      expect(@base.include_gon(camel_case: false)).to eq(
+                                 wrap_script('window.gon={};' +
+                                   'gon.test_hash=1;')
+      )
+    end
+
     it 'outputs correct js with an integer and without tag' do
       Gon.int = 1
       expect(@base.include_gon(need_tag: false)).to eq( \

data/spec/gon/{rabl_with_rabl_spec.rb → rabl_spec.rb}

@@ -1,9 +1,4 @@
 describe Gon do
-
-  before(:all) do
-    ensure_rabl_is_loaded
-  end
-
   describe '.rabl' do
 
     before :each do

data/spec/spec_helper.rb

@@ -14,50 +14,6 @@ end
 require 'gon'
 
 require 'jbuilder'
-require 'rabl'
-require 'rabl-rails'
-
-# rabl has a conflict with rabl-rails as rabl-rails causes Rails
-# to be defined. In order to run all specs at once, we'll need to
-# load/unload rabl and rabl-rails whenever we switch from testing
-# one to another.
-def ensure_rabl_is_loaded
-  Object.send(:remove_const, :RablRails) if defined? RablRails
-  Object.send(:remove_const, :Rails) if defined? Rails
-  unless defined? Rabl
-    load 'rabl.rb'
-    load 'rabl/version.rb'
-    load 'rabl/helpers.rb'
-    load 'rabl/sources.rb'
-    load 'rabl/partials.rb'
-    load 'rabl/multi_builder.rb'
-    load 'rabl/builder.rb'
-    load 'rabl/engine.rb'
-    load 'rabl/configuration.rb'
-    load 'rabl/renderer.rb'
-    load 'rabl/cache_engine.rb'
-  end
-end
-
-# Unloads rabl and loads rabl-rails.
-def ensure_rabl_rails_is_loaded
-  Object.send(:remove_const, :Rabl) if defined? Rabl
-  unless defined? RablRails
-    load 'rabl-rails/renderer.rb'
-    load 'rabl-rails/helpers.rb'
-    load 'rabl-rails/configuration.rb'
-    load 'rabl-rails/nodes/node.rb'
-    load 'rabl-rails/nodes/attribute.rb'
-    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'
-  end
-end
 
 RSpec.configure do |config|
   config.before(:each) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.1
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-04 00:00:00.000000000 Z
+date: 2019-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -189,8 +189,7 @@ 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/rabl_spec.rb
 - spec/gon/templates_spec.rb
 - spec/gon/thread_spec.rb
 - spec/gon/watch_spec.rb
@@ -216,17 +215,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Get your Rails variables in your JS

data/spec/gon/rabl_with_rabl_rails_spec.rb

@@ -1,63 +0,0 @@
-describe Gon do
-
-  before(:all) do
-    ensure_rabl_rails_is_loaded
-    RablRails.configuration.cache_templates = false
-  end
-
-  describe '.rabl with rabl-rails gem' do
-
-    before :each do
-      Gon.clear
-      controller.instance_variable_set('@objects', objects)
-      controller.request = ActionDispatch::TestRequest.create
-    end
-
-    let(:controller) { ActionController::Base.new }
-    let(:objects) { [1, 2] }
-
-    context 'render template with deprecation' do
-      it 'still works' do
-        Gon.rabl 'spec/test_data/sample_rabl_rails.rabl', :controller => controller
-        expect(Gon.objects.length).to eq(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
-        )
-        expect(Gon.objects.map { |it| it['inspect'] }).to eq(%w(1 2))
-      end
-
-      it 'works with different locals object' do
-        Gon.rabl(
-          :template => 'spec/test_data/sample_rabl_rails.rabl',
-          :controller => controller,
-          :locals => { :objects => [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
-      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
-      expect(Gon.objects.first['time_ago']).to eq('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(RuntimeError)
-      ensure_rabl_rails_is_loaded # load up rabl-rails again, we're not done testing
-    end
-
-  end
-
-end