gon 7.1.0 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f6c1ea562fb5905e119179a42c8f98a33dd59b163ba23fb6cad4cb14233e5a4
-  data.tar.gz: d72eafdc9044dc21514354608f309fb6ffb312ee57aeb0849fea680f7f37212a
+  metadata.gz: 3f0c0df899115e3ec1c09be0ce2db0e5b4b56e486f14c9d1b2e75ab01beb90d5
+  data.tar.gz: 5d1bfc691aa203e67ce96aed85cf5c885e01d25649d98cba690a81e7cdf1f2de
 SHA512:
-  metadata.gz: 69f8734f5979ab7409c979490754a467ef1506eef1f13e5502b6ae00feea8faf17067b6a97c799243c7eddc3730d46453c762b9b523a83cd5df16f2288bc2116
-  data.tar.gz: 509bcaa61b4953ed76521be600a62865e3ef3918fea97a78c4cc889b026979cda435ffe96b04a6343ad70badfd0eafe193951ab3f38e96afc03e3cc803d06f63
+  metadata.gz: 1987b4f6e3dfc27b6f35909228fc1b013919b0265796c9323eaafaa4b5972ab31d173f3abbbd38749fa6a578125564576fc3e77355f723c371f5380fe031106e
+  data.tar.gz: e182033d36b2db82d9de4cff42f3cf4569a1d84ec547a7ede568c1d271e3294bb4f45fd3cd4e32fad1e15c99f846215c7b8261a9755fcf2c036db5374427145b

data/README.md

@@ -6,7 +6,7 @@ If you need to send some data to your js files and you don't want to do this wit
 
 Now you can easily renew data in your variables through ajax with [gon.watch](https://github.com/gazay/gon/wiki/Usage-gon-watch)!
 
-With [Jbuilder](https://github.com/rails/jbuilder), [Rabl](https://github.com/nesquena/rabl), and [Rabl-Rails](https://github.com/ccocchi/rabl-rails) support!
+With [Jbuilder](https://github.com/rails/jbuilder) and [Rabl](https://github.com/nesquena/rabl) support!
 
 For Sinatra available [gon-sinatra](https://github.com/gazay/gon-sinatra).
 
@@ -179,30 +179,6 @@ Profit of using Rabl with gon:
 [Instruction](https://github.com/gazay/gon/wiki/Usage-with-rabl) for
 usage gon with Rabl.
 
-## Usage with Rabl-Rails
-`gon.rabl` works with [rabl-rails](https://github.com/ccocchi/rabl-rails). Learn to write RABL the rabl-rails way [here](https://github.com/ccocchi/rabl-rails).
-
-Add gon and rabl-rails to your environment:
-```ruby
-gem 'gon'
-gem 'rabl-rails'
-```
-Define a rabl template using rabl-rails syntax:
-```rabl
-#app/views/users/show.rabl
-object :@user
-attributes :id, :name, :email, :location
-```
-Call gon.rabl in your controller
-
-```ruby
-#app/controllers/users_controller.rb
-def show
-  @user = User.find(params[:id])
-  gon.rabl
-end
-```
-
 ## Usage with Jbuilder
 
 Use gon with [Jbuilder](https://github.com/rails/jbuilder) as with [Rabl](https://guthub.com/nesquena/rabl):

data/lib/gon/base.rb

@@ -3,24 +3,23 @@
 class Gon
   module Base
     VALID_OPTION_DEFAULTS = {
-        namespace: 'gon',
-        camel_case: false,
-        camel_depth: 1,
-        watch: false,
-        need_tag: true,
-        type: false,
-        cdata: true,
-        global_root: 'global',
-        namespace_check: false,
-        amd: false,
-        nonce: nil
+      namespace: 'gon',
+      camel_case: false,
+      camel_depth: 1,
+      watch: false,
+      need_tag: true,
+      type: false,
+      cdata: true,
+      global_root: 'global',
+      namespace_check: false,
+      amd: false,
+      nonce: nil
     }
 
     Option = Struct.new(:cameled, *VALID_OPTION_DEFAULTS.keys)
     private_constant :Option
 
     class << self
-
       def render_data(options = {})
         _o = define_options(options)
 
@@ -50,8 +49,8 @@ class Gon
         before, after = render_wrap(_o)
         script << before
 
-        script << gon_variables(_o.global_root).
-                    map { |key, val| render_variable(_o, key, val) }.join
+        script << gon_variables(_o.global_root)
+                  .map { |key, val| render_variable(_o, key, val) }.join
         script << (render_watch(_o) || '')
 
         script << after
@@ -62,7 +61,7 @@ class Gon
         if _o.amd
           ["define('#{_o.namespace}',[],function(){var gon={};", 'return gon;});']
         else
-          before = \
+          before =
             if _o.namespace_check
               "window.#{_o.namespace}=window.#{_o.namespace}||{};"
             else
@@ -82,12 +81,12 @@ class Gon
       end
 
       def render_watch(_o)
-        if _o.watch and Gon::Watch.all_variables.present?
-          if _o.amd
-            Gon.watch.render_amd
-          else
-            Gon.watch.render
-          end
+        return unless _o.watch and Gon::Watch.all_variables.present?
+
+        if _o.amd
+          Gon.watch.render_amd
+        else
+          Gon.watch.render
         end
       end
 
@@ -101,9 +100,9 @@ class Gon
 
         case value
         when Hash
-          Hash[value.map { |k, v|
-            [ convert_key(k, true), convert_hash_keys(v, current_depth + 1, max_depth) ]
-          }]
+          Hash[value.map do |k, v|
+            [convert_key(k, true), convert_hash_keys(v, current_depth + 1, max_depth)]
+          end]
         when Enumerable
           value.map { |v| convert_hash_keys(v, current_depth + 1, max_depth) }
         else
@@ -129,7 +128,6 @@ class Gon
         cache = Current.gon_keys_cache ||= {}
         cache["#{key}_#{camelize}"] ||= camelize ? key.to_s.camelize(:lower) : key.to_s
       end
-
     end
   end
 end

data/lib/gon/env_finder.rb

@@ -6,15 +6,14 @@ class Gon
     ENV_RESPONSE_KEY = 'action_controller.rescue.response'
 
     class << self
-
       def controller_env(options = {})
         options[:controller] ||
           (
-            current_gon &&
-            current_gon.env[ENV_CONTROLLER_KEY] ||
-            current_gon.env[ENV_RESPONSE_KEY].
-              instance_variable_get('@template').
-              instance_variable_get('@controller')
+            (current_gon &&
+            current_gon.env[ENV_CONTROLLER_KEY]) ||
+            current_gon.env[ENV_RESPONSE_KEY]
+              .instance_variable_get('@template')
+              .instance_variable_get('@controller')
           )
       end
 
@@ -41,8 +40,6 @@ class Gon
       def current_gon
         Current.gon
       end
-
     end
-
   end
 end

data/lib/gon/escaper.rb

@@ -6,18 +6,17 @@ class Gon
     extend ActionView::Helpers::TagHelper
 
     class << self
-
       def escape_unicode(javascript)
-        if javascript
-          result = escape_line_separator(javascript)
-          javascript.html_safe? ? result.html_safe : result
-        end
+        return unless javascript
+
+        result = escape_line_separator(javascript)
+        javascript.html_safe? ? result.html_safe : result
       end
 
       def javascript_tag(content, type, cdata, nonce)
         options = {}
-        options.merge!( { type: 'text/javascript' } ) if type
-        options.merge!( { nonce: nonce } ) if nonce
+        options.merge!({ type: 'text/javascript' }) if type
+        options.merge!({ nonce: nonce }) if nonce
 
         content_tag(:script, javascript_cdata_section(content, cdata).html_safe, options)
       end
@@ -35,7 +34,6 @@ class Gon
       def escape_line_separator(javascript)
         javascript.gsub(/\\u2028/u, '&#x2028;')
       end
-
     end
   end
 end

data/lib/gon/helpers.rb

@@ -13,8 +13,8 @@ class Gon
       end
     end
 
-    def include_gon_amd(options={})
-      Gon::Base.render_data(options.merge({amd: true}))
+    def include_gon_amd(options = {})
+      Gon::Base.render_data(options.merge({ amd: true }))
     end
 
     private
@@ -55,8 +55,8 @@ class Gon
 end
 
 ActiveSupport.on_load :action_view do
-  ActionView::Base.send :include, Gon::ViewHelpers
+  ActionView::Base.include Gon::ViewHelpers
 end
 ActiveSupport.on_load :action_controller do
-  ActionController::Base.send :include, Gon::ControllerHelpers
+  ActionController::Base.include Gon::ControllerHelpers
 end

data/lib/gon/jbuilder/parser.rb

@@ -29,7 +29,7 @@ class Gon
 
       def assign_controller_variables(controller)
         controller.instance_variables.each do |name|
-          self.instance_variable_set \
+          instance_variable_set \
             name,
             controller.instance_variable_get(name)
         end
@@ -37,23 +37,23 @@ class Gon
 
       def eval_controller_helpers(controller)
         controller._helper_methods.each do |meth|
-          self.class.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
+          self.class.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
               def #{meth}(*args, &blk)                               # def current_user(*args, &blk)
                 __controller.send(%(#{meth}), *args, &blk)             #   controller.send(:current_user, *args, &blk)
               end                                                    # end
-            ruby_eval
+          RUBY_EVAL
         end
       end
 
-      def eval_controller_url_helpers(controller)
-        if defined?(Rails) && Rails.respond_to?(:application)
-          Rails.application.routes.url_helpers.instance_methods.each do |meth|
-            self.class.class_eval <<-ruby_eval, __FILE__, __LINE__ + 1
+      def eval_controller_url_helpers(_controller)
+        return unless defined?(Rails) && Rails.respond_to?(:application)
+
+        Rails.application.routes.url_helpers.instance_methods.each do |meth|
+          self.class.class_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
               def #{meth}(*args, &blk)                                         # def user_path(*args, &blk)
                 __controller.send(%(#{meth}), *args, &blk)                     #   controller.send(:user_path, *args, &blk)
               end                                                              # end
-            ruby_eval
-          end
+          RUBY_EVAL
         end
       end
 
@@ -61,7 +61,7 @@ class Gon
         locals.each do |name, value|
           self.class.class_eval do
             define_method "#{name}" do
-              return value
+              value
             end
           end
         end
@@ -87,18 +87,19 @@ class Gon
       def set_options_from_hash(options_hash)
         options = eval "{#{options_hash}}"
         options.each do |name, val|
-          self.instance_variable_set("@#{name.to_s}", val)
-          eval "def #{name}; self.instance_variable_get('@' + '#{name.to_s}'); end"
+          instance_variable_set("@#{name}", val)
+          eval "def #{name}; self.instance_variable_get('@' + '#{name}'); end"
         end
       end
 
       def parse_path(path)
         return path if File.exist?(path)
         if (splitted = path.split('/')).blank?
-            raise 'Something wrong with partial path in your jbuilder templates'
+          raise 'Something wrong with partial path in your jbuilder templates'
         elsif splitted.size == 1
-            splitted.shift(@_controller_name)
+          splitted.shift(@_controller_name)
         end
+
         construct_path(splitted)
       end
 
@@ -112,7 +113,8 @@ class Gon
       def path_with_ext(path)
         return path if File.exist?(path)
         return "#{path}.jbuilder" if File.exist?("#{path}.jbuilder")
-        return "#{path}.json.jbuilder" if File.exist?("#{path}.json.jbuilder")
+
+        "#{path}.json.jbuilder" if File.exist?("#{path}.json.jbuilder")
       end
 
       def find_partials(lines = [])
@@ -124,7 +126,6 @@ class Gon
           end
         end.flatten
       end
-
     end
   end
 end

data/lib/gon/jbuilder.rb

@@ -3,7 +3,6 @@
 class Gon
   module Jbuilder
     class << self
-
       def handler(args, global = false)
         options = parse_options_from args
         valid_options? options, global
@@ -25,19 +24,19 @@ class Gon
       private
 
       def valid_options?(options, global)
-        if global && !options[:template]
-          raise 'You should provide :template when use jbuilder with global variables'
-        end
+        return unless global && !options[:template]
+
+        raise 'You should provide :template when use jbuilder with global variables'
       end
 
       def parse_options_from(args)
         if old_api? args
-          text =  +"[DEPRECATION] view_path argument is now optional. "
-          text << "If you need to specify it, "
+          text =  +'[DEPRECATION] view_path argument is now optional. '
+          text << 'If you need to specify it, '
           text << "please use gon.jbuilder(:template => 'path')"
           warn text
 
-          args.extract_options!.merge(:template => args[0])
+          args.extract_options!.merge(template: args[0])
         elsif new_api? args
           args.first
         else
@@ -52,7 +51,6 @@ class Gon
       def new_api?(args)
         args.first.is_a? Hash
       end
-
     end
   end
 end

data/lib/gon/json_dumper.rb

@@ -5,20 +5,26 @@ class Gon
     # Taken from ERB::Util
     JSON_ESCAPE_REGEXP	=	/[\u2028\u2029&><]/u
     JSON_ESCAPE	=	{
-      "&" => '\u0026',
-      ">" => '\u003e',
-      "<" => '\u003c',
+      '&' => '\u0026',
+      '>' => '\u003e',
+      '<' => '\u003c',
       "\u2028" => '\u2028',
       "\u2029" => '\u2029'
     }
 
     def self.dump(object)
-      options = { mode: :compat, escape_mode: :xss_safe, time_format: :ruby }
+      multi_json = defined?(MultiJSON) ? MultiJSON : MultiJson
+      adapter = multi_json.adapter
+      options = if defined?(multi_json::Adapters::Oj) && adapter == multi_json::Adapters::Oj
+                  { mode: :compat, escape_mode: :xss_safe, time_format: :ruby }
+                else
+                  {}
+                end
       dumped_json = if defined?(MultiJSON)
-        MultiJSON.generate(object, options)
-      else
-        MultiJson.dump(object, options)
-      end
+                      MultiJSON.generate(object, options)
+                    else
+                      MultiJson.dump(object, options)
+                    end
 
       escape(dumped_json)
     end

data/lib/gon/rabl.rb

@@ -6,20 +6,13 @@ begin
   require 'rabl' # use rabl gem if it's available
 rescue LoadError
 end
-begin
-  require 'rabl-rails' # use rabl-rails gem if it's available
-rescue LoadError
-end
 
 class Gon
   module Rabl
     class << self
-
       def handler(args, global = false)
         options = parse_options_from args, global
-        if global && !options[:template]
-          raise 'You should provide :template when use rabl with global variables'
-        end
+        raise 'You should provide :template when use rabl with global variables' if global && !options[:template]
 
         data = parse_rabl \
           Gon::EnvFinder.template_path(options, 'rabl'),
@@ -32,46 +25,26 @@ class Gon
       private
 
       def parse_rabl(rabl_path, controller, locals)
-        if defined? ::Rabl
-          parse_with_rabl rabl_path, controller, locals
-        elsif defined? ::RablRails
-          parse_with_rabl_rails rabl_path, controller, locals
-        else
-          raise 'rabl or rabl-rails must be required in order to use gon.rabl'
-        end
-      end
+        raise 'rabl must be required in order to use gon.rabl' unless defined? ::Rabl
 
-      def parse_with_rabl(rabl_path, controller, locals)
         locals ||= {}
         source = File.read(rabl_path)
         include_helpers
-        rabl_engine = ::Rabl::Engine.new(source, :format => 'json', :template => rabl_path)
+        rabl_engine = ::Rabl::Engine.new(source, format: 'json', template: rabl_path)
         output = rabl_engine.render(controller, locals)
         JSON.parse(output)
       end
 
-      def parse_with_rabl_rails(rabl_path, controller, locals)
-        locals ||= {}
-        source = File.read(rabl_path)
-        original_formats = controller.formats
-        controller.formats = [:json]
-        view_context = controller.send(:view_context)
-        locals.each { |k, v| view_context.assigns[k.to_s] = v }
-        output = RablRails::Library.instance.get_rendered_template(source, view_context)
-        controller.formats = original_formats
-        JSON.parse(output)
-      end
-
       def parse_options_from(args, global)
         if old_api? args
           unless global
-            text =  +"[DEPRECATION] view_path argument is now optional. "
-            text << "If you need to specify it, "
+            text =  +'[DEPRECATION] view_path argument is now optional. '
+            text << 'If you need to specify it, '
             text << "please use gon.rabl(:template => 'path')"
             warn text
           end
 
-          args.extract_options!.merge(:template => args[0])
+          args.extract_options!.merge(template: args[0])
         elsif new_api? args
           args.first
         else
@@ -80,9 +53,9 @@ class Gon
       end
 
       def include_helpers
-        unless ::Rabl::Engine.include? ::ActionView::Helpers
-          ::Rabl::Engine.send(:include, ::ActionView::Helpers)
-        end
+        return if ::Rabl::Engine.include? ::ActionView::Helpers
+
+        ::Rabl::Engine.include ::ActionView::Helpers
       end
 
       def old_api?(args)
@@ -92,7 +65,6 @@ class Gon
       def new_api?(args)
         args.first.is_a? Hash
       end
-
     end
   end
 end

data/lib/gon/spec_helpers.rb

@@ -12,7 +12,7 @@ class Gon
             if controller.is_a? ActionController::Base
               controller.gon
               Gon.send(:current_gon).env[Gon::EnvFinder::ENV_CONTROLLER_KEY] =
-               controller
+                controller
             end
             super
           end
@@ -27,6 +27,5 @@ class Gon
 end
 
 if ENV['RAILS_ENV'] == 'test' && defined?(ActionController::TestCase::Behavior)
-  ActionController::TestCase::Behavior.send :include, Gon::SpecHelper::Rails
+  ActionController::TestCase::Behavior.include Gon::SpecHelper::Rails
 end
-

data/lib/gon/version.rb

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

data/lib/gon/watch.rb

@@ -3,8 +3,7 @@
 class Gon
   class Watch < Gon
     class << self
-
-      JS_FUNCTION = File.read(File.expand_path('../../../js/watch.js', __FILE__))
+      JS_FUNCTION = File.read(File.expand_path('../../js/watch.js', __dir__))
 
       def render
         JS_FUNCTION + "window.gon.watchedVariables=#{Gon::JsonDumper.dump all_variables};"
@@ -52,9 +51,8 @@ class Gon
 
       def return_variable(value)
         controller = Gon::EnvFinder.controller_env
-        controller.render json: Gon::Escaper.escape_unicode(Gon::JsonDumper.dump value)
+        controller.render json: Gon::Escaper.escape_unicode(Gon::JsonDumper.dump(value))
       end
-
     end
   end
 end

data/lib/gon.rb

@@ -18,15 +18,12 @@ require 'gon/jbuilder/parser'
 require 'gon/json_dumper'
 
 # NOTE : ActionDispatch::Request#uuid appears only in Rails 3.2.1
-unless ActionDispatch::Request.public_instance_methods.include?(:uuid)
-  require 'gon/compatibility/old_rails'
-end
+require 'gon/compatibility/old_rails' unless ActionDispatch::Request.public_method_defined?(:uuid)
 
 require 'gon/spec_helpers'
 
 class Gon
   class << self
-
     def global
       Gon::Global
     end
@@ -35,11 +32,9 @@ class Gon
       Gon::Watch
     end
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, *args)
       if method.to_s =~ /=$/
-        if public_method_name?(method)
-          raise "You can't use Gon public methods for storing data: #{method}"
-        end
+        raise "You can't use Gon public methods for storing data: #{method}" if public_method_name?(method)
         if self == Gon && !current_gon
           raise 'Assign request-specific gon variables only through `gon` helper, not through Gon constant'
         end
@@ -60,9 +55,7 @@ class Gon
 
     def merge_variable(name, value)
       old_value = all_variables[name]
-      if value.is_a?(Hash) && old_value.is_a?(Hash)
-        value = old_value.deep_merge(value)
-      end
+      value = old_value.deep_merge(value) if value.is_a?(Hash) && old_value.is_a?(Hash)
       set_variable(name, value)
     end
 
@@ -129,6 +122,5 @@ class Gon
     def ensure_template_handler_is_defined
       load 'jbuilder.rb' unless defined?(JbuilderTemplate)
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.0.0
 platform: ruby
 authors:
 - gazay
@@ -66,21 +66,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jbuilder
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,7 +122,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,19 +136,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  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'
 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:
@@ -181,7 +181,8 @@ files:
 homepage: https://github.com/gazay/gon
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -196,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Get your Rails variables in your JS
 test_files: []