gon 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef96285cbcd0c7f1cf74fe2ca0c0735dfcfb282
-  data.tar.gz: f01d459182fee2c6d24ed36295cf79a5770d6087
+  metadata.gz: 051e8aa58734e4cf43cc1ee84a6507fa0d6f69b1
+  data.tar.gz: 2a7cbbb9b8fa95b946977d69ddd4b8e7093be0bb
 SHA512:
-  metadata.gz: 2b314d4df0e993c5bb0de5b0b61541652201930f51305420e5f56bc621daf3a13d4479e4b1e819b298c06c07f7112fac8eecc9502a053d46477901bf67b9b9fd
-  data.tar.gz: 209002b52bdddf14de95f121434388bff62f6a17d571ca23577238a3c4e2180e30b3948f96a0bd3eab9754c6e372f34cfcd578cdc88dfcc07e2407cb874e1491
+  metadata.gz: e2e16546bba113eacdc27a966d4db2d27995409d9cdc3787db8d68ab00a960cdddd7a16b73f18777c168dd3ee371b7422f661571c04ad01a8e40968d2a21fe13
+  data.tar.gz: 2f9d67107a152d69fb9691617c9ac290b680c16c9f444c3f319a76739cf242e0daea283f0876e4c1467ddf0a57095133cb655eae6bbd6dc8fe1267ec3e9f2378

data/.gitignore

@@ -2,5 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
+tmp/*
 .rvmrc
 *.idea

data/lib/gon/helpers.rb

@@ -1,41 +1,31 @@
 class Gon
-  module Helpers
-
-    def self.included base
-      base.send(:include, InstanceMethods)
-    end
-
-    module InstanceMethods
-
-      def include_gon(options = {})
-        if variables_for_request_present?
-          Gon::Base.render_data(options)
-        elsif Gon.global.all_variables.present?
-          Gon.clear
-          Gon::Base.render_data(options)
-        elsif options[:init].present?
-          Gon.clear
-          Gon::Base.render_data(options)
-        else
-          ''
-        end
+  module ViewHelpers
+    def include_gon(options = {})
+      if variables_for_request_present?
+        Gon::Base.render_data(options)
+      elsif Gon.global.all_variables.present?
+        Gon.clear
+        Gon::Base.render_data(options)
+      elsif options[:init].present?
+        Gon.clear
+        Gon::Base.render_data(options)
+      else
+        ''
       end
+    end
 
-      private
-
-      def variables_for_request_present?
-        current_gon && current_gon.gon
-      end
+    private
 
-      def current_gon
-        RequestStore.store[:gon]
-      end
+    def variables_for_request_present?
+      current_gon && current_gon.gon
+    end
 
+    def current_gon
+      RequestStore.store[:gon]
     end
   end
 
-  module GonHelpers
-
+  module ControllerHelpers
     def gon
       if wrong_gon_request?
         gon_request = Request.new(env)
@@ -58,9 +48,8 @@ class Gon
     def gon_request_uuid
       request.uuid
     end
-
   end
 end
 
-ActionView::Base.send :include, Gon::Helpers
-ActionController::Base.send :include, Gon::GonHelpers
+ActionView::Base.send :include, Gon::ViewHelpers
+ActionController::Base.send :include, Gon::ControllerHelpers

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 end

data/lib/gon/watch.rb

@@ -46,7 +46,7 @@ class Gon
 
       def return_variable(value)
         controller = Gon::Base.get_controller
-        controller.render :json => value
+        controller.render json: Gon::Escaper.escape_unicode(Gon::JsonDumper.dump value)
       end
 
     end

data/spec/gon/thread_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class GonTestWorker
-  include Gon::GonHelpers
+  include Gon::ControllerHelpers
 
   def request
     @request ||= ActionDispatch::TestRequest.new

data/spec/gon/watch_spec.rb

@@ -43,20 +43,41 @@ describe Gon::Watch do
 
   end
 
-  it 'should return value of variable if called right request' do
-    env = Gon.send(:current_gon).instance_variable_get(:@request_env)
-    env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
-    request = ActionDispatch::Request.new env
-    controller.request = request
-    params = {}
-    params[:gon_return_variable] = true
-    params[:gon_watched_variable] = 'a'
-    controller.params = params
-    Gon.send(:current_gon).env['action_controller.instance'] = controller
+  describe 'Render concrete variable' do
+    before do
+      env = Gon.send(:current_gon).instance_variable_get(:@request_env)
+      env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
 
-    expect(controller).to receive('render').with(:json => 1)
+      controller.stub(request: ActionDispatch::Request.new(env))
+      Gon.send(:current_gon).env['action_controller.instance'] = controller
+    end
 
-    Gon.watch.a = 1
-  end
+    context 'when request variable is json safe content' do
+      before do
+        controller.stub(params: {
+          gon_return_variable: true,
+          gon_watched_variable: 'safety'})
+      end
+
+      it 'should return value of variable if called right request' do
+        expect(controller).to receive(:render).with(json: '12345')
+        Gon.watch.safety = 12345
+      end
+    end
+
+    context 'when request variable is json unsafe content' do
+      let(:expected) { %Q{"\\u003cscript\\u003e'\\"\\u003c/script\\u003e
Dangerous"} }
+
+      before do
+        controller.stub(params: {
+          gon_return_variable: true,
+          gon_watched_variable: 'danger'})
+      end
 
+      it 'should return value of variable if called right request' do
+        expect(controller).to receive(:render).with(json: expected)
+        Gon.watch.danger = %Q{<script>'"</script>\u2028Dangerous}
+      end
+    end
+  end
 end

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: gon
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-23 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: multi_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: 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
@@ -144,8 +144,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -199,17 +199,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.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Get your Rails variables in your JS