gon 6.1.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9d24de7434f197bf9f86ea9ef17bbcf9ec585647
-  data.tar.gz: 49a264791c39e669f5364b469c6c9c119372b504
+SHA256:
+  metadata.gz: 3bdd0446070acfd94f0e8ef48b57eb1bfdf82179dca4cdd7a6e230d43ee9551b
+  data.tar.gz: 3dea439ff1cefa4edef65a9c39f2d0e505114140fcbf1a9effda085f04741e64
 SHA512:
-  metadata.gz: f1f121380839a33259810a5c1a2e7a4a149b91521b6d7c9d6b4b5742bd02977ee33aec47e43f31c78adeabb1ba748f20fea0a786819d84ac6c6809e27c376d6d
-  data.tar.gz: 65d68f8c2e182d32be8191f164b86917bf33d8d08f16fddceab7361acd0a3afe894933014cdc35296686b990bc0e7648f23268fe1d376f6f42c84fc70def1d99
+  metadata.gz: af0597738e9196231399b4c15e77358bb4e3e90cbfe26fefae9da4d70ae5c20982c15c424e34b37ed58cd05cf8e867f6756cfa83f8621eda301df266ab5ff251
+  data.tar.gz: 37a2e08e06f44c863bfce115e99c9628f798347b2db2579b491d38aa959b5e5ee076b9207ae02405e303b94c8952198becef9f2d24fce8f79bd7a0b5cf001339

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+tidelift: "rubygems/gon"

data/.travis.yml

@@ -1,17 +1,14 @@
 language: ruby
 sudo: false
+env:
+  - "RABL_GEM=rabl"
+  - "RABL_GEM=rabl-rails"
+
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
   - ruby-head
-  - jruby-19mode # JRuby in 1.9 mode
-  - rbx
-matrix:
-  allow_failures:
-    - rvm: rbx
-    - rvm: ruby-head
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec

data/CHANGELOG.md

@@ -1,129 +1,264 @@
 # CHANGELOG
 
-## 6.0.1
-
-  * Free dependencies
-
-## 6.0.0
-
-  * Refactoring
-  * nonce option. Thanks to @joeljackson
-  * Included rails url_helpers into jbuilder. Thanks to @razum2um
-  * Welcome @takiy33 as contributor!
-
-## 5.2.3
-
-  * Coffescript implementation of watch.js. Thanks to @willcosgrove
-  * unwatchAll function in watch.js. Thanks to @willcosgrove
-
-## 5.2.2
-
-  * add support for controller helper methods in jbuilder
-
-## 5.2.1
-
-  * fix for jbuilder module. Thanks to @jankovy
-  * merge variable feature (for merge hash-like variables instead of overriding them). Thanks to @jalkoby
-
-## 5.2.0
-
-  * fix issue where include_gon would raise exception if the controller did not assign any gon variables. Thanks to @asalme
-  * namespace_check option. Thanks to @tommyh
-  * Only inject gon into ActionController::Base-like object in spec_helper. Thanks to @kevinoconnor7
-  * AMD compatible version of including gon. Thanks to @vijoc
-
-## 5.1.2
-
-  * Clarifying helpers, dump gon#watch content to safe json before render. Thanks to @Strech
-
-## 5.1.1
-
-  * global_root option. Thanks to @rafaelliu
-  * MultiJson support. Thanks to @Strech
-
-## 5.1.0
-
-  * Many fixes https://github.com/gazay/gon/compare/91845f3f0debd0cb8fa569aad65f5dc40a7e28e5...8dc7400fbb83ba5a086bd36c76342a393690d53f
-  * Thanks to @Silex, @kilefritz, @irobayna, @kyrylo, @randoum, @jackquack, @tuvistavie, @Strech for awesome commits and help!
-
-## 5.0.4
-
-  * Fix check for get and assign variables for Gon.global
-
-## 5.0.3
-
-  * Revert changes in gemspec
-
-## 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
-    rendering include_gon (#108 part)
-
-## 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)
-
-## 4.1.0
-
-  * Refactored script tag generation (@toothrot)
-  * Stop support for MRI 1.8.7
-  * Added rabl-rails support (@jtherrell)
-  * Accepting locals in jbuilder templates
-
-## 4.0.3
-
-  * Added new method `Gon#push` for assign variables through Hash-like
-    objects (@topdev)
-  * Fixes for 1.8.7 compatibility.
-  * !!!IMPORTANT!!! Last version with compatibility for MRI 1.8.7
-
-## 4.0.2
-
-  * Fixed gon.watch in JS without callback and options
-
-## 4.0.1
-
-  * Removed BlankSlate requirement *Peter Schröder*
-  * Gon#set_variable and Gon#get_variable moved to public scope
-  * Added option :locals to gon.rabl functionality
-
-## 4.0.0
-
-  * Added gon.watch functionality (thanks to @brainopia and @kossnocorp)
-  * Compatibility with jbuilder paths for partial! method
-  * Fixed some bugs
-  * Little bit refactoring - Gon now is a class
-
-## 3.0.3
-
-  * Include ActionView::Helpers into Gon::JBuilder
-  * Added init option (@torbjon)
-
-## 3.0.2
-
-  * Added need_tag option (@afa)
-
-## 3.0.0
-
-  * Almost all code refactored
-  * Added Gon.global for using gon everywhere
-  * Included ActionView::Helpers into Rabl::Engine
-
-## 2.3.0
-
-  * Don't really remember what was before this version
+## [Unreleased]
+
+## [6.4.0] - 2020-09-18
+### Security
+- CVE-2020-25739: Enforce HTML entities escaping in gon output
+
+## [6.3.2] - 2019-11-18
+### Security
+- Restrict possibility of vulnerable i18n legacy verision (0.3.6.pre)
+  installation
+
+## [6.3.1] - 2019-11-18
+### Changed
+- ActionView::Base and ActionController::Base should be loaded inside
+  ActiveSupport.on_load hook. Thanks to @amatsuda
+- Require Ruby >= 2.2.2 (activesupport). Thanks to @nicolasleger
+- Update old_rails.rb to reflect GonHelpers -> ControllerHelpers name change.
+  Thanks to @etipton
+
+## [6.2.1] - 2018-07-11
+### Changed
+- Update README: correct spelling mistake. Thanks to @EdwardBetts
+- Autoload test classes only in test env. Thanks to @wilddima
+
+### Fixed
+- Fix keys cache. Thanks to @ertrzyiks
+- fixing tests by running with rabl and rabl-rails separately. Thanks to
+  @dsalahutdinov
+
+## [6.2.0] - 2017-10-04
+### Added
+- Introduce keys cache. Thanks to @vlazar
+- Add possibleErrorCallback to watch params. Thanks to @etagwerker
+
+### Changed
+- Update readme with PhoenixGon hex link. Thanks to @khusnetdinov
+- Fix code highlighting in README. Thanks to @ojab
+- Refactoring: use attr_reader
+
+### Removed
+- Remove unnecessary json dependency.
+- Remove rubysl and rubinius-developer_tools gem.
+
+## [6.1.0] - 2016-07-11
+### Deprecated
+- env is deprecated and will be removed from Rails 5.0. Thanks to @dlupu
+
+### Fixed
+- fix merging routes bug. Thanks to @strikyflo
+- Show what method was used in public methods error.
+
+### Changed
+- Use 'need_tag' as option name to prevent calling 'tag' method. Thanks to
+  @june29
+- Update README; comment out gon.clear from sample code. Thanks to
+  @speee-nakajima
+- Update README; Replace the include_gon method with render_data method.
+- Refactoring: use attr_accessor method.
+- Refactoring: use attr_reader method.
+
+## [6.0.1] - 2015-07-22
+### Changed
+- Free dependencies
+
+## [6.0.0] - 2015-07-22
+### Added
+- nonce option. Thanks to @joeljackson
+
+### Changed
+- Refactoring
+- Included rails url_helpers into jbuilder. Thanks to @razum2um
+
+## [5.2.3] - 2014-11-03
+### Added
+- Coffescript implementation of watch.js. Thanks to @willcosgrove
+- unwatchAll function in watch.js. Thanks to @willcosgrove
+
+## [5.2.2] - 2014-10-31
+### Added
+- support for controller helper methods in jbuilder
+
+## [5.2.1] - 2014-10-28
+### Added
+- merge variable feature (for merge hash-like variables instead of overriding
+  them). Thanks to @jalkoby
+
+### Fixed
+- fix for jbuilder module. Thanks to @jankovy
+
+## [5.2.0] - 2014-08-26
+### Added
+- namespace_check option. Thanks to @tommyh
+- AMD compatible version of including gon. Thanks to @vijoc
+
+### Changed
+- Only inject gon into ActionController::Base-like object in spec_helper. Thanks
+  to @kevinoconnor7
+
+### Fixed
+- fix issue where include_gon would raise exception if the controller did not
+  assign any gon variables. Thanks to @asalme
+
+## [5.1.2] - 2014-07-22
+### Changed
+- Clarifying helpers, dump gon#watch content to safe json before render. Thanks
+  to @Strech
+
+## [5.1.1] - 2014-07-17
+### Added
+- global_root option. Thanks to @rafaelliu
+- MultiJson support. Thanks to @Strech
+
+## [5.1.0] - 2014-06-29
+### Fixed
+- Many fixes. Thanks to @Silex, @kilefritz, @irobayna, @kyrylo, @randoum,
+  @jackquack, @tuvistavie, @Strech for awesome commits and help!
+
+## [5.0.4] - 2014-02-13
+### Fixed
+- Fix check for get and assign variables for Gon.global
+
+## [5.0.3] - 2014-02-12
+### Removed
+- Revert changes in gemspec
+
+## [5.0.2] - 2014-02-12
+### Fixed
+- Fix issue when there is no gon object for current thread and rendering
+  include_gon (#108 part) (wasn't fixed) (@gregmolnar)
+
+## [5.0.1] - 2013-12-30
+### Fixed
+- Fix issue when there is no gon object for current thread and rendering
+  include_gon (#108 part)
+
+## [5.0.0] - 2013-12-26
+### Changed
+- 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] - 2013-06-04
+### Fixed
+- Fixed critical XSS vulnerability https://github.com/gazay/gon/issues/84
+  (@vadimr & @Hebo)
+
+## [4.1.0] - 2013-04-14
+### Added
+- rabl-rails support (@jtherrell)
+
+### Changed
+- Refactored script tag generation (@toothrot)
+- Stop support for MRI 1.8.7
+- Accepting locals in jbuilder templates
+
+## [4.0.3] - 2013-04-14
+!!!IMPORTANT!!! Last version with compatibility for MRI 1.8.7
+
+### Added
+- new method `Gon#push` for assign variables through Hash-like objects (@topdev)
+### Changed
+- Fixes for 1.8.7 compatibility.
+
+## [4.0.2] - 2012-12-17
+### Fixed
+- Fixed gon.watch in JS without callback and options
+
+## [4.0.1] - 2012-10-25
+### Added
+- option :locals to gon.rabl functionality
+
+### Changed
+- Gon#set_variable and Gon#get_variable moved to public scope
+
+### Removed
+- BlankSlate requirement (@phoet)
+
+## [4.0.0] - 2012-07-23
+### Added
+- gon.watch functionality (thanks to @brainopia and @kossnocorp)
+- Compatibility with jbuilder paths for partial! method
+
+### Changed
+- Little bit refactoring - Gon now is a class
+
+### Fixed
+- Fixed some bugs
+
+## [3.0.5] - 2012-06-22
+### Added
+- type text/javascript option (@torbjon)
+
+### Changed
+- A litlle bit refactoring
+- Made compatible with active support json encoding for escaping script tags
+
+### Fixed
+- bug for init option
+- clear if init true (@torbjon)
+
+## [3.0.4] - 2012-06-02
+### Fixed
+- Fix bug with gon clear with global variables, bump version
+
+## [3.0.3] - 2012-05-22
+### Added
+- init option (@torbjon)
+
+### Changed
+- Include ActionView::Helpers into Gon::JBuilder
+
+## [3.0.2] - 2012-04-28
+### Added
+- need_tag option (@afa)
+
+## [3.0.0] - 2012-04-17
+### Added
+- Added Gon.global for using gon everywhere
+
+### Changed
+- Almost all code refactored
+- Included ActionView::Helpers into Rabl::Engine
+
+## [2.3.0] - 2012-04-09
+### Changed
+- Don't really remember what was before this version
+
+[Unreleased]: https://github.com/gazay/gon/compare/v6.3.2...master
+[6.3.2]: https://github.com/gazay/gon/compare/v6.3.1...v6.3.2
+[6.3.1]: https://github.com/gazay/gon/compare/v6.2.1...v6.3.1
+[6.2.1]: https://github.com/gazay/gon/compare/v6.2.0...v6.2.1
+[6.2.0]: https://github.com/gazay/gon/compare/v6.1.0...v6.2.0
+[6.1.0]: https://github.com/gazay/gon/compare/v6.0.1...v6.1.0
+[6.0.1]: https://github.com/gazay/gon/compare/v6.0.0...v6.0.1
+[6.0.0]: https://github.com/gazay/gon/compare/v5.2.3...v6.0.0
+[5.2.3]: https://github.com/gazay/gon/compare/v5.2.2...v5.2.3
+[5.2.2]: https://github.com/gazay/gon/compare/v5.2.1...v5.2.2
+[5.2.1]: https://github.com/gazay/gon/compare/v5.2.0...v5.2.1
+[5.2.0]: https://github.com/gazay/gon/compare/v5.1.2...v5.2.0
+[5.1.2]: https://github.com/gazay/gon/compare/v5.1.1...v5.1.2
+[5.1.1]: https://github.com/gazay/gon/compare/v5.1.0...v5.1.1
+[5.1.0]: https://github.com/gazay/gon/compare/v5.0.4...v5.1.0
+[5.0.4]: https://github.com/gazay/gon/compare/v5.0.3...v5.0.4
+[5.0.3]: https://github.com/gazay/gon/compare/v5.0.2...v5.0.3
+[5.0.2]: https://github.com/gazay/gon/compare/v5.0.1...v5.0.2
+[5.0.1]: https://github.com/gazay/gon/compare/v5.0.0...v5.0.1
+[5.0.0]: https://github.com/gazay/gon/compare/v4.1.1...v5.0.0
+[4.1.1]: https://github.com/gazay/gon/compare/v4.1.0...v4.1.1
+[4.1.0]: https://github.com/gazay/gon/compare/v4.0.3...v4.1.0
+[4.0.3]: https://github.com/gazay/gon/compare/v4.0.2...v4.0.3
+[4.0.2]: https://github.com/gazay/gon/compare/v4.0.1...v4.0.2
+[4.0.1]: https://github.com/gazay/gon/compare/v4.0.0...v4.0.1
+[4.0.0]: https://github.com/gazay/gon/compare/v3.0.5...v4.0.0
+[3.0.5]: https://github.com/gazay/gon/compare/v3.0.4...v3.0.5
+[3.0.4]: https://github.com/gazay/gon/compare/v3.0.3...v3.0.4
+[3.0.3]: https://github.com/gazay/gon/compare/v3.0.2...v3.0.3
+[3.0.2]: https://github.com/gazay/gon/compare/v3.0.0...v3.0.2
+[3.0.0]: https://github.com/gazay/gon/compare/v2.3.0...v3.0.0
+[2.3.0]: https://github.com/gazay/gon/releases/tag/v2.3.0

data/Gemfile

@@ -1,9 +1,6 @@
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in gon.gemspec
-gemspec
+gem ENV['RABL_GEM'] || 'rabl'
 
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'rubinius-developer_tools'
-end
+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

@@ -16,6 +16,8 @@ For Sinatra available [gon-sinatra](https://github.com/gazay/gon-sinatra).
 
 For .Net MVC available port [NGon](https://github.com/brooklynDev/NGon).
 
+For elixir Phoenix available [PhoenixGon](https://github.com/khusnetdinov/phoenix_gon).
+
 <a href="https://evilmartians.com/?utm_source=gon">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
 </a>
@@ -38,14 +40,14 @@ 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:
 
   1. Write variables by
 
-    ``` ruby
+   ``` ruby
     gon.variable_name = variable_value
 
     # or new syntax
@@ -55,13 +57,13 @@ gem line to your Gemfile and do the following:
     })
 
     gon.push(any_object) # any_object with respond_to? :each_pair
-    ```
+   ```
 
   2. In your js you get this by
 
-    ``` js
+   ``` js
     gon.variable_name
-    ```
+   ```
 
   3. profit?
 
@@ -235,3 +237,7 @@ Special thanks to @brainopia, @kossnocorp and @ai.
 ## License
 
 The MIT License
+
+## Security Contact
+
+To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.

data/coffee/watch.coffee

@@ -1,6 +1,6 @@
 gon._timers = {}
 
-gon.watch = (name, possibleOptions, possibleCallback) ->
+gon.watch = (name, possibleOptions, possibleCallback, possibleErrorCallback) ->
   return unless $?
 
   if typeof possibleOptions == 'object'
@@ -10,9 +10,12 @@ gon.watch = (name, possibleOptions, possibleCallback) ->
     for key, value of possibleOptions
       options[key] = value
     callback = possibleCallback
+    errorCallback = possibleErrorCallback
   else
     options = gon.watchedVariables[name]
     callback = possibleOptions
+    errorCallback = possibleCallback
+
   performAjax = ->
     xhr = $.ajax
       type: options.type || 'GET'
@@ -21,7 +24,11 @@ gon.watch = (name, possibleOptions, possibleCallback) ->
         _method: options.method
         gon_return_variable: true
         gon_watched_variable: name
-    xhr.done(callback)
+
+    if errorCallback
+      xhr.done(callback).fail(errorCallback);
+    else
+      xhr.done(callback)
 
   if options.interval
     timer = setInterval(performAjax, options.interval)

data/gon.gemspec

@@ -15,16 +15,17 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.require_paths = ['lib']
-  s.required_ruby_version = '> 1.8.7'
-  s.add_dependency 'actionpack', '>= 3.0'
+  s.required_ruby_version = '>= 2.2.0'
+  s.add_dependency 'actionpack', '>= 3.0.20'
+  s.add_dependency 'i18n', '>= 0.7'
   s.add_dependency 'request_store', '>= 1.0'
-  s.add_dependency 'json'
   s.add_dependency 'multi_json'
   s.add_development_dependency 'rabl', '0.11.3'
   s.add_development_dependency 'rabl-rails'
   s.add_development_dependency 'rspec', '>= 3.0'
   s.add_development_dependency 'jbuilder'
-  s.add_development_dependency 'railties', '>= 3.0'
+  s.add_development_dependency 'railties', '>= 3.0.20'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-byebug'
 end

data/js/watch.js

@@ -1,8 +1,8 @@
 // Generated by CoffeeScript 1.7.1
 gon._timers = {};
 
-gon.watch = function(name, possibleOptions, possibleCallback) {
-  var callback, key, options, performAjax, timer, value, _base, _ref;
+gon.watch = function(name, possibleOptions, possibleCallback, possibleErrorCallback) {
+  var callback, errorCallback, key, options, performAjax, timer, value, _base, _ref;
   if (typeof $ === "undefined" || $ === null) {
     return;
   }
@@ -18,9 +18,11 @@ gon.watch = function(name, possibleOptions, possibleCallback) {
       options[key] = value;
     }
     callback = possibleCallback;
+    errorCallback = possibleErrorCallback;
   } else {
     options = gon.watchedVariables[name];
     callback = possibleOptions;
+    errorCallback = possibleCallback;
   }
   performAjax = function() {
     var xhr;
@@ -33,7 +35,11 @@ gon.watch = function(name, possibleOptions, possibleCallback) {
         gon_watched_variable: name
       }
     });
-    return xhr.done(callback);
+    if (errorCallback) {
+      return xhr.done(callback).fail(errorCallback);
+    } else {
+      return xhr.done(callback);
+    }
   };
   if (options.interval) {
     timer = setInterval(performAjax, options.interval);
@@ -50,7 +56,7 @@ gon.watch = function(name, possibleOptions, possibleCallback) {
 };
 
 gon.unwatch = function(name, fn) {
-  var index, timer, _i, _len, _ref;
+  var _i, index, _len, _ref, timer;
   _ref = gon._timers[name];
   for (index = _i = 0, _len = _ref.length; _i < _len; index = ++_i) {
     timer = _ref[index];
@@ -64,7 +70,7 @@ gon.unwatch = function(name, fn) {
 };
 
 gon.unwatchAll = function() {
-  var timer, timers, variable, _i, _len, _ref;
+  var _i, _len, _ref, timer, timers, variable;
   _ref = gon._timers;
   for (variable in _ref) {
     timers = _ref[variable];

data/lib/gon/base.rb

@@ -70,7 +70,7 @@ class Gon
       end
 
       def render_variable(_o, key, value)
-        js_key = _o.cameled ? key.to_s.camelize(:lower) : key.to_s
+        js_key = convert_key(key, _o.cameled)
         if _o.amd
           "gon['#{js_key}']=#{to_json(value, _o.camel_depth)};"
         else
@@ -99,7 +99,7 @@ class Gon
         case value
         when Hash
           Hash[value.map { |k, v|
-            [ k.to_s.camelize(:lower), convert_hash_keys(v, current_depth + 1, max_depth) ]
+            [ convert_key(k, true), convert_hash_keys(v, current_depth + 1, max_depth) ]
           }]
         when Enumerable
           value.map { |v| convert_hash_keys(v, current_depth + 1, max_depth) }
@@ -122,6 +122,11 @@ class Gon
         data.merge(Gon.all_variables)
       end
 
+      def convert_key(key, camelize)
+        cache = RequestStore.store[:gon_keys_cache] ||= {}
+        cache["#{key}_#{camelize}"] ||= camelize ? key.to_s.camelize(:lower) : key.to_s
+      end
+
     end
   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/json_dumper.rb

@@ -1,8 +1,23 @@
 class Gon
   module JsonDumper
+    # Taken from ERB::Util
+    JSON_ESCAPE_REGEXP	=	/[\u2028\u2029&><]/u
+    JSON_ESCAPE	=	{
+      "&" => '\u0026',
+      ">" => '\u003e',
+      "<" => '\u003c',
+      "\u2028" => '\u2028',
+      "\u2029" => '\u2029'
+    }
+
     def self.dump(object)
-      MultiJson.dump object,
+      dumped_json = MultiJson.dump object,
         mode: :compat, escape_mode: :xss_safe, time_format: :ruby
+      escape(dumped_json)
+    end
+
+    def self.escape(json)
+      json.gsub(JSON_ESCAPE_REGEXP, JSON_ESCAPE)
     end
   end
 end

data/lib/gon/request.rb

@@ -1,6 +1,6 @@
 class Gon
   class Request
-    attr_reader :env
+    attr_reader :env, :gon
     attr_accessor :id
 
     def initialize(environment)
@@ -8,10 +8,6 @@ class Gon
       @gon = {}
     end
 
-    def gon
-      @gon
-    end
-
     def clear
       @gon = {}
     end

data/lib/gon/spec_helpers.rb

@@ -5,7 +5,7 @@ class Gon
 
       module ClassMethods
         module GonSession
-          def process(*)
+          def process(*, **)
             # preload threadlocal & store controller instance
             if controller.is_a? ActionController::Base
               controller.gon
@@ -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.1.0'
+  VERSION = '6.4.0'
 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( \
@@ -291,17 +301,4 @@ describe Gon do
       expect { Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
   end
-
-  def request
-    @request ||= double 'request', :env => {}
-  end
-
-  def wrap_script(content, cdata=true)
-    script = "<script>"
-    script << "\n//<![CDATA[\n" if cdata
-    script << content
-    script << "\n//]]>\n" if cdata
-    script << '</script>'
-  end
-
 end

data/spec/gon/global_spec.rb

@@ -143,13 +143,4 @@ describe Gon::Global do
     end
 
   end
-
-  after(:all) do
-    Gon.global.clear
-  end
-
-  def request
-    @request ||= double 'request', :env => {}
-  end
-
 end

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/gon/thread_spec.rb

@@ -2,7 +2,7 @@ class GonTestWorker
   include Gon::ControllerHelpers
 
   def request
-    @request ||= ActionDispatch::TestRequest.new
+    @request ||= ActionDispatch::TestRequest.create
   end
 
   def env

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
@@ -66,3 +22,15 @@ RSpec.configure do |config|
     allow(Gon).to receive(:current_gon).and_return(@request)
   end
 end
+
+def request
+  @request ||= double 'request', :env => {}
+end
+
+def wrap_script(content, cdata=true)
+  script = "<script>"
+  script << "\n//<![CDATA[\n" if cdata
+  script << content
+  script << "\n//]]>\n" if cdata
+  script << '</script>'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.4.0
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.20
 - !ruby/object:Gem::Dependency
-  name: request_store
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.20
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.20
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  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
   do this with long way trough views and parsing - use this force!
 email:
@@ -172,6 +186,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/FUNDING.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -203,8 +218,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
@@ -230,17 +244,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.1
+rubygems_version: 3.1.2
 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.new
-    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