gon 5.0.4 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c821696b6d4a8ba7c715ac87e8fc7e34e7696fa
-  data.tar.gz: 0cd052df88b75160786d86929a13d62947c5b10f
+  metadata.gz: c117fb1e03d8437b1cb22592a559d8c230bffdd6
+  data.tar.gz: e20b61c0441603d5328c54c00b7b16b69edba560
 SHA512:
-  metadata.gz: bf0d8b204ab3c103289c89338f7b98534f2c8da68fb18af90ebd9c69497afef02bddedca4865fdccea8cc32395f4464b41d475d37941143e76257285f8ab2e91
-  data.tar.gz: ba5a6cd137050b52b066261e756ff6176ba1285d393a0d1291a33e464e1928576897131ce8e9a1fdb29afb09c772aa22c0be7b821f57646dd36eced63fb13785
+  metadata.gz: eeb234b14c08b522304e7dc5578b9ac1b4d900f594dd64ad12b35475d8700132b81caec1b534250d41974b891773f32ed93af0cadcc08a781c78d8334946bbeb
+  data.tar.gz: a17e689b89609a7fd35202d3c3d9c306cc88792da71632c6b9423a651a1232652cd493d27760287b45f779fc123f459730434a283a0ed53967451f16b1490ff4

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.1.1
   - jruby-19mode # JRuby in 1.9 mode
   - rbx
 matrix:

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 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

data/README.md

@@ -59,10 +59,9 @@ gem line to your Gemfile and do the following:
 
   3. profit?
 
-With `gon.watch` feature you can easily renew data in gon variables!
-Just pass option `:watch => true` to `include_gon` method and call
-`gon.watch` from your js file. It's super useful in modern web
-applications!
+With the `gon.watch` feature you can easily renew data in gon variables!
+Simply call `gon.watch` from your js file. It's super useful
+in modern web applications!
 
 ## Usage
 
@@ -114,8 +113,7 @@ alert(gon.your_hash)
 ## gon.watch - renew your data easily!
 
 You can use gon for renewing your data without reloading pages and
-writing long js functions! It's really
-great for some live values.
+writing long js functions! It's really great for some live values.
 
 Supports `gon.watch.rabl` and `gon.watch.jbuilder` usage.
 

data/gon.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gon/version'
@@ -21,7 +20,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
   s.add_dependency 'actionpack', '>= 2.3.0'
+  s.add_dependency 'request_store', '>= 1.0.5'
   s.add_dependency 'json'
+  s.add_dependency 'oj' unless RUBY_PLATFORM =~ /java/
   s.add_development_dependency 'rabl'
   s.add_development_dependency 'rabl-rails'
   s.add_development_dependency 'rspec'

data/lib/gon.rb

@@ -1,5 +1,7 @@
+require 'request_store'
 require 'action_view'
 require 'action_controller'
+
 require 'gon/base'
 require 'gon/global'
 require 'gon/watch'
@@ -8,6 +10,19 @@ require 'gon/helpers'
 require 'gon/escaper'
 require 'gon/rabl'
 require 'gon/jbuilder'
+require 'gon/json_dumper'
+
+# NOTE : JRuby greater than 1.7 doesn't support C-extensions
+if RUBY_PLATFORM =~ /java/
+  require 'gon/json_dumper/active_support'
+else
+  require 'gon/json_dumper/oj'
+end
+
+# 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
 
 class Gon
   class << self
@@ -77,7 +92,7 @@ class Gon
     private
 
     def current_gon
-      Thread.current['gon']
+      RequestStore.store[:gon]
     end
 
     def store_builder_data(builder, data, options)

data/lib/gon/base.rb

@@ -41,7 +41,7 @@ class Gon
       private
 
       def current_gon
-        Thread.current[:gon]
+        RequestStore.store[:gon]
       end
 
       def parse_options(options)
@@ -49,7 +49,7 @@ class Gon
         need_tag    = options[:need_tag].nil? || options[:need_tag]
         cameled     = options[:camel_case]
         camel_depth = options[:camel_depth] || 1
-        watch       = options[:watch]
+        watch       = options[:watch] || !Gon.watch.all_variables.empty?
         tag         = need_tag
         type        = options[:type].nil? || options[:type]
         cdata       = options[:cdata].nil? || options[:cdata]
@@ -73,17 +73,23 @@ class Gon
       end
 
       def to_json(value, camel_depth)
-        # starts at two because 1 is the root key which is converted in the formatted_data method
-        convert_hash_keys(value, 2, camel_depth).to_json
+        # starts at 2 because 1 is the root key which is converted in the formatted_data method
+        Gon::JsonDumper.dump convert_hash_keys(value, 2, camel_depth)
       end
 
       def convert_hash_keys(value, current_depth, max_depth)
         return value if current_depth > (max_depth.is_a?(Symbol) ? 1000 : max_depth)
-        return value unless value.is_a? Hash
 
-        Hash[value.map { |k, v|
-          [ k.to_s.camelize(:lower), convert_hash_keys(v, current_depth + 1, max_depth) ]
-        }]
+        case value
+          when Hash
+            Hash[value.map { |k, v|
+              [ k.to_s.camelize(:lower), convert_hash_keys(v, current_depth + 1, max_depth) ]
+            }]
+          when Enumerable
+            value.map { |v| convert_hash_keys(v, current_depth + 1, max_depth) }
+          else
+            value
+        end
       end
 
       def gon_variables

data/lib/gon/compatibility/old_rails.rb

@@ -0,0 +1,11 @@
+require 'securerandom'
+
+class Gon
+  module GonHelpers
+    private
+
+    def gon_request_uuid
+      @gon_request_uuid ||= SecureRandom.uuid
+    end
+  end
+end

data/lib/gon/escaper.rb

@@ -7,7 +7,7 @@ class Gon
 
       def escape_unicode(javascript)
         if javascript
-          result = javascript.gsub(/\\u2028/u, '&#x2028;').gsub(/(<\/)/u, '\u003C/')
+          result = escape_line_separator(escape_special_chars javascript)
           javascript.html_safe? ? result.html_safe : result
         end
       end
@@ -25,6 +25,16 @@ class Gon
         end
       end
 
+      private
+
+      def escape_line_separator(javascript)
+        javascript.gsub(/\\u2028/u, '&#x2028;')
+      end
+
+      def escape_special_chars(javascript)
+        javascript.gsub(/(\<)/u, '\u003c').gsub(/(\>)/u, '\u003e')
+      end
+
     end
   end
 end

data/lib/gon/helpers.rb

@@ -28,7 +28,7 @@ class Gon
       end
 
       def current_gon
-        Thread.current['gon']
+        RequestStore.store[:gon]
       end
 
     end
@@ -36,32 +36,29 @@ class Gon
 
   module GonHelpers
 
-    def self.included base
-      base.send(:include, InstanceMethods)
+    def gon
+      if wrong_gon_request?
+        gon_request = Request.new(env)
+        gon_request.id = gon_request_uuid
+        RequestStore.store[:gon] = gon_request
+      end
+      Gon
     end
 
-    module InstanceMethods
-
-      def gon
-        if wrong_gon_request?
-          gon_request = Request.new(env)
-          gon_request.id = request.uuid
-          Thread.current['gon'] = gon_request
-        end
-        Gon
-      end
+    private
 
-      private
-
-      def wrong_gon_request?
-        current_gon.blank? || current_gon.id != request.uuid
-      end
+    def wrong_gon_request?
+      current_gon.blank? || current_gon.id != gon_request_uuid
+    end
 
-      def current_gon
-        Thread.current['gon']
-      end
+    def current_gon
+      RequestStore.store[:gon]
+    end
 
+    def gon_request_uuid
+      request.uuid
     end
+
   end
 end
 

data/lib/gon/json_dumper.rb

@@ -0,0 +1,7 @@
+class Gon
+  module JsonDumper
+    def self.dump(object)
+      raise NotImplementedError
+    end
+  end
+end

data/lib/gon/json_dumper/active_support.rb

@@ -0,0 +1,7 @@
+class Gon
+  module JsonDumper
+    def self.dump(object)
+      object.to_json
+    end
+  end
+end

data/lib/gon/json_dumper/oj.rb

@@ -0,0 +1,16 @@
+require 'oj'
+
+class Gon
+  module JsonDumper
+    def self.dump(object)
+      Oj.dump(object, mode: :compat, time_format: :ruby)
+    end
+  end
+
+  # NOTE : If we are using Oj, gsub works only with \u, not \\u
+  module Escaper
+    def self.escape_line_separator(javascript)
+      javascript.gsub(/\u2028/u, '
')
+    end
+  end
+end

data/lib/gon/rabl.rb

@@ -43,7 +43,7 @@ class Gon
         locals ||= {}
         source = File.read(rabl_path)
         include_helpers
-        rabl_engine = ::Rabl::Engine.new(source, :format => 'json')
+        rabl_engine = ::Rabl::Engine.new(source, :format => 'json', :template => rabl_path)
         output = rabl_engine.render(controller, locals)
         JSON.parse(output)
       end

data/lib/gon/request.rb

@@ -6,11 +6,11 @@ class Gon
     end
 
     def env
-      @request_env if defined? @request_env
+      @request_env
     end
 
     def id
-      @request_id if defined? @request_id
+      @request_id
     end
 
     def id=(request_id)

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '5.0.4'
+  VERSION = '5.1.0'
 end

data/lib/gon/watch.rb

@@ -5,7 +5,7 @@ class Gon
       JS_FUNCTION = File.read(File.expand_path('../../../js/watch.js', __FILE__))
 
       def render
-        JS_FUNCTION + "window.gon.watchedVariables=#{all_variables.to_json};"
+        JS_FUNCTION + "window.gon.watchedVariables=#{Gon::JsonDumper.dump all_variables};"
       end
 
       def all_variables

data/spec/gon/basic_spec.rb

@@ -98,10 +98,11 @@ describe Gon do
 
     it 'outputs correct js with a script string' do
       Gon.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">' +
                                     "\n//<![CDATA[\n" +
                                     'window.gon={};' +
-                                    %q(gon.str="\u003C/script><script>alert('!')\u003C/script>";) +
+                                    %Q(gon.str="#{escaped_str}";) +
                                     "\n//]]>\n" +
                                   '</script>')
     end
@@ -142,6 +143,18 @@ describe Gon do
       )
     end
 
+    it 'outputs correct js for an array with camel_depth = :recursive' do
+      Gon.test_hash = { test_depth_one: [{ test_depth_two: 1 }, { test_depth_two: 2 }] }
+      expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq( \
+                                  '<script type="text/javascript">' +
+                                    "\n//<![CDATA[\n" +
+                                    'window.gon={};' +
+                                    'gon.testHash={"testDepthOne":[{"testDepthTwo":1},{"testDepthTwo":2}]};' +
+                                    "\n//]]>\n" +
+                                  '</script>'
+      )
+    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/global_spec.rb

@@ -77,10 +77,11 @@ 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\">" +
                                     "\n//<![CDATA[\n" +
                                     "window.gon={};" +
-                                    "gon.global={\"str\":\"\\u003C/script><script>alert('!')\\u003C/script>\"};" +
+                                    "gon.global={\"str\":#{escaped_str}};" +
                                     "\n//]]>\n" +
                                   "</script>")
     end

data/spec/spec_helper.rb

@@ -40,7 +40,8 @@ end
 
 RSpec.configure do |config|
   config.before(:each) do
-    @request = Thread.current['gon'] = Gon::Request.new({})
+    RequestStore.store[:gon] = Gon::Request.new({})
+    @request = RequestStore.store[:gon]
     allow(Gon).to receive(:current_gon).and_return(@request)
   end
 end

metadata

@@ -1,111 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.1.0
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-06-30 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: request_store
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !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: oj
+  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'
   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
     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: 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: 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
@@ -116,8 +144,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -131,10 +159,14 @@ files:
 - js/watch.js
 - lib/gon.rb
 - lib/gon/base.rb
+- lib/gon/compatibility/old_rails.rb
 - lib/gon/escaper.rb
 - lib/gon/global.rb
 - lib/gon/helpers.rb
 - lib/gon/jbuilder.rb
+- lib/gon/json_dumper.rb
+- lib/gon/json_dumper/active_support.rb
+- lib/gon/json_dumper/oj.rb
 - lib/gon/rabl.rb
 - lib/gon/request.rb
 - lib/gon/version.rb
@@ -168,17 +200,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: gon
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Get your Rails variables in your JS