gon 6.5.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 764e0fdc60fe7b018d593c4f10ac5da1b27c117b6c2f0bcd62eea6d04a91a571
-  data.tar.gz: 037f1aa29e3e2865c576dfd3dc70e4931b96ca59732d1067ef1c72bad53d8006
+  metadata.gz: a1f213a83073d4b73d4a732ad6c08dd46bdc76f288f9501a59fd573654161029
+  data.tar.gz: 24c735289aca21c4946ee2a7b7ae46347b02f00bbce78aa9f2a1efa8c3cb74ac
 SHA512:
-  metadata.gz: c1de2c9a8f8c3d571fe8d9eff0cf742e23b8f5be0ff133e59fbd3dc1157ec108c1cf4ea0a00b486e6f2be4e883cb5405af1857ba345002b4c647222698e5471f
-  data.tar.gz: ac19fa38ca794c863ede248e6a6a581f9417f5a59f5f4d836760280933c2f656a43e8048cd801f3fb1587c4d79bf86a7f00c21c711f264cd83d09aa05d9a3405
+  metadata.gz: ade05ffde11f213b5fb94961ed24185dfaede24e8e04db90970fae561bb15730866d6d205161d23b130e49d8bcb9218ef4a007554a0aa478472a0799d50ca879
+  data.tar.gz: a1adcea362385383cae266310055a237fb5f00bc0895f6089958b2e76e7de7b3d84c33378d13ca87772c8a35dfdc453a5cc70ce3c9def15ab0b83b80d84da2c7

data/CHANGELOG.md

@@ -1,6 +1,8 @@
 # CHANGELOG
 
-## [Unreleased]
+## 6.5.0 and later
+
+For changes from version 6.5.0 onwards, please check the [GitHub Releases page](https://github.com/gazay/gon/releases).
 
 ## [6.4.0] - 2020-09-18
 ### Security

data/README.md

@@ -223,12 +223,20 @@ usage gon.global.
 You can use any [JSON Engine](https://github.com/sferik/multi_json#supported-json-engines) you want.
 Gon uses `MultiJson` with autodetect mode, so all you need is just require your JSON library.
 
-## Contributors
+## Current Maintainers
+
+* [@willnet](https://github.com/willnet)
+
+## Special thanks
 
-* @gazay
 * @takiy33
+* @brainopia
+* @kossnocorp
+* @ai
+
+## Original Author
 
-Special thanks to @brainopia, @kossnocorp and @ai.
+* [@gazay](https://github.com/gazay)
 
 ## License
 

data/lib/gon/base.rb

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

data/lib/gon/current.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+begin
+  require 'active_support/current_attributes'
+rescue LoadError
+  begin
+    require 'request_store'
+  rescue LoadError => e
+    message = "#{e.message}\n" \
+              "If you want to use gon with Rails versions prior to 5.2, please add `gem 'request_store'` to your Gemfile."
+    raise LoadError, message
+  end
+end
+
+class Gon
+  if defined?(ActiveSupport::CurrentAttributes)
+    class Current < ActiveSupport::CurrentAttributes
+      attribute :gon
+      attribute :gon_keys_cache
+    end
+  else
+    class Current
+      def self.gon
+        RequestStore.store[:gon]
+      end
+
+      def self.gon=(value)
+        RequestStore.store[:gon] = value
+      end
+
+      def self.gon_keys_cache
+        RequestStore.store[:gon_keys_cache]
+      end
+
+      def self.gon_keys_cache=(value)
+        RequestStore.store[:gon_keys_cache] = value
+      end
+    end
+  end
+
+  private_constant :Current
+end

data/lib/gon/env_finder.rb

@@ -39,7 +39,7 @@ class Gon
       end
 
       def current_gon
-        RequestStore.store[:gon]
+        Current.gon
       end
 
     end

data/lib/gon/global.rb

@@ -3,7 +3,6 @@
 class Gon
   class Global < Gon
     class << self
-
       def all_variables
         @global_vars || {}
       end
@@ -38,7 +37,6 @@ class Gon
         @global_vars ||= {}
         @global_vars[name] = value
       end
-
     end
   end
 end

data/lib/gon/helpers.rb

@@ -24,7 +24,7 @@ class Gon
     end
 
     def current_gon
-      RequestStore.store[:gon]
+      Current.gon
     end
   end
 
@@ -33,7 +33,7 @@ class Gon
       if wrong_gon_request?
         gon_request = Request.new(request.env)
         gon_request.id = gon_request_uuid
-        RequestStore.store[:gon] = gon_request
+        Current.gon = gon_request
       end
       Gon
     end
@@ -45,7 +45,7 @@ class Gon
     end
 
     def current_gon
-      RequestStore.store[:gon]
+      Current.gon
     end
 
     def gon_request_uuid

data/lib/gon/request.rb

@@ -13,6 +13,5 @@ class Gon
     def clear
       @gon = {}
     end
-
   end
 end

data/lib/gon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Gon
-  VERSION = '6.5.0'
+  VERSION = '7.0.0'
 end

data/lib/gon.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'request_store'
 require 'action_view'
 require 'action_controller'
 require 'multi_json'
 
 require 'gon/base'
+require 'gon/current'
 require 'gon/env_finder'
 require 'gon/global'
 require 'gon/watch'
@@ -106,7 +106,7 @@ class Gon
     private
 
     def current_gon
-      RequestStore.store[:gon]
+      Current.gon
     end
 
     def store_builder_data(builder, data, options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 6.5.0
+  version: 7.0.0
 platform: ruby
 authors:
 - gazay
@@ -24,33 +24,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.20
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !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: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -65,34 +65,6 @@ dependencies:
     - - ">="
       - !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
@@ -127,14 +99,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.20
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.20
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +165,7 @@ files:
 - lib/gon.rb
 - lib/gon/base.rb
 - lib/gon/compatibility/old_rails.rb
+- lib/gon/current.rb
 - lib/gon/env_finder.rb
 - lib/gon/escaper.rb
 - lib/gon/global.rb
@@ -223,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Get your Rails variables in your JS
 test_files: []