gon 2.1.0 → 2.1.2

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  - rbx-18mode
+  - rbx-19mode
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/README.md

@@ -3,12 +3,16 @@
 ![Gon. You should try this. If you look closer - you will see an elephant.](https://github.com/gazay/gon/raw/master/doc/logo_small.png)
 
 
+### Build Status ![http://travis-ci.org/gazay/gon](https://secure.travis-ci.org/gazay/gon.png)
+
 If you need to send some data to your js files and you don't want to do this with long way through views and parsing - use this force!
 
 Now 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).
 
+For .Net MVC available port [NGon](https://github.com/brooklynDev/NGon).
+
 ## An example of typical use
 
 ### Very good and detailed example and reasons to use is considered in [railscast](http://railscasts.com/episodes/324-passing-data-to-javascript) by Ryan Bates
@@ -22,7 +26,7 @@ you might be doing something like this:
   3. Then there can be two ways in js:
     + if you previously wrote data in data
      attributes - you should parse this attributes and write data to some
-  js variable. 
+  js variable.
     + if you wrote js right in view (many frontenders would shame you for
   that) - you just use data from this js - OK.
   4. You can use your data in your js
@@ -283,13 +287,13 @@ wouldn't work. You can read about this in common usage above.
 Puts this line into `Gemfile` then run `$ bundle`:
 
 ``` ruby
-gem 'gon', '2.0.6'
+gem 'gon', '2.1.2'
 ```
 
 Or if you are old-school Rails 2 developer put this into `config/environment.rb` and run `$ rake gems:install`:
 
 ``` ruby
-config.gem 'gon', :version => '2.0.6'
+config.gem 'gon', :version => '2.1.2'
 ```
 
 Or manually install gon gem: `$ gem install gon`

data/lib/gon.rb

@@ -4,6 +4,7 @@ end
 require 'action_view'
 require 'action_controller'
 require 'gon/helpers'
+require 'gon/escaper'
 if defined?(Rabl)
   require 'gon/rabl'
 end
@@ -15,7 +16,7 @@ module Gon
   class << self
 
     def all_variables
-      @request_env[:gon]
+      @request_env['gon']
     end
 
     def all_variables=(values)
@@ -23,12 +24,12 @@ module Gon
     end
 
     def clear
-      @request_env[:gon] = {}
+      @request_env['gon'] = {}
     end
 
     def request_env=(environment)
       @request_env = environment
-      @request_env[:gon] ||= {}
+      @request_env['gon'] ||= {}
     end
 
     def request_env
@@ -57,11 +58,11 @@ module Gon
     end
 
     def get_variable(name)
-      @request_env[:gon][name]
+      @request_env['gon'][name]
     end
 
     def set_variable(name, value)
-      @request_env[:gon][name] = value
+      @request_env['gon'][name] = value
     end
 
     # TODO: Remove required argument view_path, and by default use current action

data/lib/gon/escaper.rb

@@ -0,0 +1,20 @@
+module Gon
+  module Escaper
+    class << self
+
+      GON_JS_ESCAPE_MAP = {
+        '</'    => '<\/'
+      }
+
+      def escape(javascript)
+        if javascript
+          result = javascript.gsub(/(<\/)/u) {|match| GON_JS_ESCAPE_MAP[match] }
+          javascript.html_safe? ? result.html_safe : result
+        else
+          ''
+        end
+      end
+
+    end
+  end
+end

data/lib/gon/helpers.rb

@@ -6,11 +6,13 @@ module Gon
     end
 
     module InstanceMethods
+
       def include_gon(options = {})
-        if Gon.request_env && Gon.all_variables.present?
+        if Gon.request_env && Gon.all_variables.present? && Gon.request == request.object_id
           data = Gon.all_variables
           namespace = options[:namespace] || 'gon'
-          script = '<script>window.' + namespace + ' = {};'
+          start = '<script>window.' + namespace + ' = {};'
+          script = ''
           if options[:camel_case]
             data.each do |key, val|
               script << namespace + '.' + key.to_s.camelize(:lower) + '=' + val.to_json + ';'
@@ -20,21 +22,24 @@ module Gon
               script << namespace + '.' + key.to_s + '=' + val.to_json + ';'
             end
           end
-          script << '</script>'
+          script = start + Gon::Escaper.escape(script) + '</script>'
           script.html_safe
         else
           ""
         end
       end
+
     end
   end
 
   module GonHelpers
+
     def self.included base
       base.send(:include, InstanceMethods)
     end
 
     module InstanceMethods
+
       def gon
         if !Gon.request_env || Gon.request != request.object_id
           Gon.request = request.object_id
@@ -42,9 +47,10 @@ module Gon
         end
         Gon
       end
+
     end
-  end
 
+  end
 end
 
 ActionView::Base.send :include, Gon::Helpers

data/lib/gon/version.rb

@@ -1,3 +1,3 @@
 module Gon
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

data/spec/gon/gon_spec.rb

@@ -26,14 +26,37 @@ describe Gon, '#all_variables' do
     Gon.klass = Hash
   end
 
-  it 'output as js correct' do
-    Gon.clear
-    Gon.int = 1
-    ActionView::Base.instance_methods.map(&:to_s).include?('include_gon').should == true
-    base = ActionView::Base.new
-    base.include_gon.should == "<script>window.gon = {};" +
-                                 "gon.int=1;" +
-                               "</script>"
+  describe '#include_gon' do
+
+    before(:each) do
+      Gon.clear
+      Gon.instance_variable_set(:@request_id, request.object_id)
+      ActionView::Base.instance_methods.map(&:to_s).include?('include_gon').should == true
+      @base = ActionView::Base.new
+      @base.request = request
+    end
+
+    it 'outputs correct js with an integer' do
+      Gon.int = 1
+      @base.include_gon.should == '<script>window.gon = {};' +
+                                    'gon.int=1;' +
+                                  '</script>'
+    end
+
+    it 'outputs correct js with a string' do
+      Gon.str = %q(a'b"c)
+      @base.include_gon.should == '<script>window.gon = {};' +
+                                    %q(gon.str="a'b\"c";) +
+                                  '</script>'
+    end
+
+    it 'outputs correct js with a script string' do
+      Gon.str = %q(</script><script>alert('!')</script>)
+      @base.include_gon.should == '<script>window.gon = {};' +
+                                    %q(gon.str="<\\/script><script>alert('!')<\\/script>";) +
+                                  '</script>'
+    end
+
   end
 
   it 'returns exception if try to set public method as variable' do

metadata

@@ -1,105 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gon
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.1.2
   prerelease: 
-  segments: 
-  - 2
-  - 1
-  - 0
-  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70100875330620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70100875330620
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70100875329900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rabl
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70100875329900
+- !ruby/object:Gem::Dependency
+  name: rabl
+  requirement: &70100875328820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70100875328820
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70100875328180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: jbuilder
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70100875328180
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: &70100875327400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-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: 
+  prerelease: false
+  version_requirements: *70100875327400
+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:
 - alex.gaziev@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -107,6 +83,7 @@ files:
 - doc/logo_small.png
 - gon.gemspec
 - lib/gon.rb
+- lib/gon/escaper.rb
 - lib/gon/helpers.rb
 - lib/gon/jbuilder.rb
 - lib/gon/rabl.rb
@@ -118,38 +95,29 @@ files:
 - spec/test_data/sample_with_partial.json.jbuilder
 homepage: https://github.com/gazay/gon
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gon
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Get your Rails variables in your JS
-test_files: 
+test_files:
 - spec/gon/gon_spec.rb
 - spec/test_data/_sample_partial.json.jbuilder
 - spec/test_data/sample.json.jbuilder