diff -Nru ruby-gon-6.0.1/debian/changelog ruby-gon-6.1.0/debian/changelog
--- ruby-gon-6.0.1/debian/changelog	2015-09-15 19:00:24.000000000 +0000
+++ ruby-gon-6.1.0/debian/changelog	2016-09-07 09:13:01.000000000 +0000
@@ -1,3 +1,14 @@
+ruby-gon (6.1.0-1) unstable; urgency=medium
+
+  * Team upload
+  * New upstream release
+
+  [ Pirate Praveen ]
+  * Refresh patches
+  * Update ruby-tests.rake to include spec.rspec_opts from Rakefile
+
+ -- Sruthi Chandran <srud@disroot.org>  Wed, 07 Sep 2016 14:24:08 +0530
+
 ruby-gon (6.0.1-1) unstable; urgency=medium
 
   * Team upload
diff -Nru ruby-gon-6.0.1/debian/compat ruby-gon-6.1.0/debian/compat
--- ruby-gon-6.0.1/debian/compat	2014-11-18 19:31:50.000000000 +0000
+++ ruby-gon-6.1.0/debian/compat	2016-09-07 09:13:01.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru ruby-gon-6.0.1/debian/control ruby-gon-6.1.0/debian/control
--- ruby-gon-6.0.1/debian/control	2014-11-18 20:03:35.000000000 +0000
+++ ruby-gon-6.1.0/debian/control	2016-09-07 09:14:51.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Cédric Boutillier <boutil@debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
-               gem2deb (>= 0.3.0~),
+Build-Depends: debhelper (>= 9~),
+               gem2deb,
                rake,
                ruby-actionpack | ruby-actionpack-3.2,
                ruby-jbuilder,
@@ -14,9 +14,9 @@
                ruby-rabl-rails (>= 0.4~),
                ruby-request-store,
                ruby-rspec
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-gon.git
-Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-gon.git;a=summary
+Standards-Version: 3.9.8
+Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-gon.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-gon.git
 Homepage: https://github.com/gazay/gon
 XS-Ruby-Versions: all
 
@@ -29,7 +29,9 @@
          ruby-request-store,
          ${misc:Depends},
          ${shlibs:Depends}
-Recommends: ruby-jbuilder, ruby-rabl, ruby-rabl-rails
+Recommends: ruby-jbuilder,
+            ruby-rabl,
+            ruby-rabl-rails
 Description: Ruby library to send data to JavaScript from a Ruby application
  Gon is a Ruby library allowing one to easily send the content of
  variables of a Ruby web application to JavaScript. It supports JBuilder,
diff -Nru ruby-gon-6.0.1/debian/patches/fix-json-scaping-on-tests-strings ruby-gon-6.1.0/debian/patches/fix-json-scaping-on-tests-strings
--- ruby-gon-6.0.1/debian/patches/fix-json-scaping-on-tests-strings	2015-09-01 10:46:00.000000000 +0000
+++ ruby-gon-6.1.0/debian/patches/fix-json-scaping-on-tests-strings	2016-09-07 09:13:01.000000000 +0000
@@ -6,11 +6,9 @@
 Bug-Debian: https://bugs.debian.org/759909
 Last-Update: 2014-10-11
 
-Index: ruby-gon/spec/gon/basic_spec.rb
-===================================================================
---- ruby-gon.orig/spec/gon/basic_spec.rb
-+++ ruby-gon/spec/gon/basic_spec.rb
-@@ -117,7 +117,11 @@ describe Gon do
+--- a/spec/gon/basic_spec.rb
++++ b/spec/gon/basic_spec.rb
+@@ -110,7 +110,11 @@
  
      it 'outputs correct js with a script string' do
        Gon.str = %q(</script><script>alert('!')</script>)
@@ -20,14 +18,12 @@
 +     else
 +        escaped_str = "\\u003c/script\\u003e\\u003cscript\\u003ealert('!')\\u003c/script\\u003e"
 +      end
-       expect(@base.include_gon).to eq('<script>' +
-                                     "\n//<![CDATA[\n" +
-                                     'window.gon={};' +
-Index: ruby-gon/spec/gon/global_spec.rb
-===================================================================
---- ruby-gon.orig/spec/gon/global_spec.rb
-+++ ruby-gon/spec/gon/global_spec.rb
-@@ -73,7 +73,11 @@ describe Gon::Global do
+       expect(@base.include_gon).to eq(wrap_script(
+                                 'window.gon={};' +
+                                 %Q(gon.str="#{escaped_str}";))
+--- a/spec/gon/global_spec.rb
++++ b/spec/gon/global_spec.rb
+@@ -71,7 +71,11 @@
  
      it 'outputs correct js with a script string' do
        Gon.global.str = %q(</script><script>alert('!')</script>)
@@ -40,11 +36,9 @@
        expect(@base.include_gon).to eq("<script>" +
                                      "\n//<![CDATA[\n" +
                                      "window.gon={};" +
-Index: ruby-gon/spec/gon/watch_spec.rb
-===================================================================
---- ruby-gon.orig/spec/gon/watch_spec.rb
-+++ ruby-gon/spec/gon/watch_spec.rb
-@@ -66,7 +66,11 @@ describe Gon::Watch do
+--- a/spec/gon/watch_spec.rb
++++ b/spec/gon/watch_spec.rb
+@@ -64,7 +64,11 @@
      end
  
      context 'when request variable is json unsafe content' do
diff -Nru ruby-gon-6.0.1/debian/ruby-tests.rake ruby-gon-6.1.0/debian/ruby-tests.rake
--- ruby-gon-6.0.1/debian/ruby-tests.rake	2014-11-18 19:31:50.000000000 +0000
+++ ruby-gon-6.1.0/debian/ruby-tests.rake	2016-09-07 09:13:01.000000000 +0000
@@ -2,6 +2,7 @@
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern      = './spec/**/*_spec.rb'
+    spec.rspec_opts = ["--color", '--format doc', '--require spec_helper']
 end
 
 task :default => :spec
diff -Nru ruby-gon-6.0.1/gon.gemspec ruby-gon-6.1.0/gon.gemspec
--- ruby-gon-6.0.1/gon.gemspec	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/gon.gemspec	2016-08-01 22:17:49.000000000 +0000
@@ -26,4 +26,5 @@
   s.add_development_dependency 'jbuilder'
   s.add_development_dependency 'railties', '>= 3.0'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
 end
diff -Nru ruby-gon-6.0.1/lib/gon/base.rb ruby-gon-6.1.0/lib/gon/base.rb
--- ruby-gon-6.0.1/lib/gon/base.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/base.rb	2016-08-01 22:17:49.000000000 +0000
@@ -23,7 +23,7 @@
 
         script = formatted_data(_o)
         script = Gon::Escaper.escape_unicode(script)
-        script = Gon::Escaper.javascript_tag(script, _o.type, _o.cdata, _o.nonce) if _o.tag
+        script = Gon::Escaper.javascript_tag(script, _o.type, _o.cdata, _o.nonce) if _o.need_tag
 
         script.html_safe
       end
@@ -36,9 +36,8 @@
         VALID_OPTION_DEFAULTS.each do |opt_name, default|
           _o.send("#{opt_name}=", options.fetch(opt_name, default))
         end
-        _o.watch     = options[:watch] || !Gon.watch.all_variables.empty?
-        _o.tag       = _o.need_tag
-        _o.cameled   = _o.camel_case
+        _o.watch   = options[:watch] || !Gon.watch.all_variables.empty?
+        _o.cameled = _o.camel_case
 
         _o
       end
diff -Nru ruby-gon-6.0.1/lib/gon/helpers.rb ruby-gon-6.1.0/lib/gon/helpers.rb
--- ruby-gon-6.0.1/lib/gon/helpers.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/helpers.rb	2016-08-01 22:17:49.000000000 +0000
@@ -29,7 +29,7 @@
   module ControllerHelpers
     def gon
       if wrong_gon_request?
-        gon_request = Request.new(env)
+        gon_request = Request.new(request.env)
         gon_request.id = gon_request_uuid
         RequestStore.store[:gon] = gon_request
       end
diff -Nru ruby-gon-6.0.1/lib/gon/jbuilder/parser.rb ruby-gon-6.1.0/lib/gon/jbuilder/parser.rb
--- ruby-gon-6.0.1/lib/gon/jbuilder/parser.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/jbuilder/parser.rb	2016-08-01 22:17:49.000000000 +0000
@@ -3,13 +3,13 @@
     class Parser
       include ::ActionView::Helpers
 
-      attr_accessor :template_path, :controller, :_controller_name, :locals
+      attr_accessor :template_location, :controller, :_controller_name, :locals
 
       def initialize(parse_params)
-        @template_path    = parse_params[:template_path]
-        @controller       = parse_params[:controller]
-        @_controller_name = parse_params[:controller_name]
-        @locals           = parse_params[:locals] || {}
+        @template_location = parse_params[:template_path]
+        @controller        = parse_params[:controller]
+        @_controller_name  = parse_params[:controller_name]
+        @locals            = parse_params[:locals] || {}
       end
 
       def parse!
@@ -19,7 +19,7 @@
         locals['__controller'] = controller
         wrap_locals_in_methods locals
 
-        partials = find_partials(File.readlines(template_path))
+        partials = find_partials(File.readlines(template_location))
         source = partials.join('')
 
         parse_source source, controller
diff -Nru ruby-gon-6.0.1/lib/gon/jbuilder.rb ruby-gon-6.1.0/lib/gon/jbuilder.rb
--- ruby-gon-6.0.1/lib/gon/jbuilder.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/jbuilder.rb	2016-08-01 22:17:49.000000000 +0000
@@ -24,7 +24,7 @@
 
       def valid_options?(options, global)
         if global && !options[:template]
-          raise 'You should provide :template when use rabl with global variables'
+          raise 'You should provide :template when use jbuilder with global variables'
         end
       end
 
diff -Nru ruby-gon-6.0.1/lib/gon/request.rb ruby-gon-6.1.0/lib/gon/request.rb
--- ruby-gon-6.0.1/lib/gon/request.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/request.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,22 +1,13 @@
 class Gon
   class Request
+    attr_reader :env
+    attr_accessor :id
+
     def initialize(environment)
-      @request_env = environment
+      @env = environment
       @gon = {}
     end
 
-    def env
-      @request_env
-    end
-
-    def id
-      @request_id
-    end
-
-    def id=(request_id)
-      @request_id = request_id
-    end
-
     def gon
       @gon
     end
diff -Nru ruby-gon-6.0.1/lib/gon/version.rb ruby-gon-6.1.0/lib/gon/version.rb
--- ruby-gon-6.0.1/lib/gon/version.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon/version.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,3 +1,3 @@
 class Gon
-  VERSION = '6.0.1'
+  VERSION = '6.1.0'
 end
diff -Nru ruby-gon-6.0.1/lib/gon.rb ruby-gon-6.1.0/lib/gon.rb
--- ruby-gon-6.0.1/lib/gon.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/lib/gon.rb	2016-08-01 22:17:49.000000000 +0000
@@ -36,7 +36,7 @@
     def method_missing(method, *args, &block)
       if method.to_s =~ /=$/
         if public_method_name?(method)
-          raise 'You can\'t use Gon public methods for storing data'
+          raise "You can't use Gon public methods for storing data: #{method}"
         end
         if self == Gon && !current_gon
           raise 'Assign request-specific gon variables only through `gon` helper, not through Gon constant'
diff -Nru ruby-gon-6.0.1/LICENSE ruby-gon-6.1.0/LICENSE
--- ruby-gon-6.0.1/LICENSE	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/LICENSE	2016-08-01 22:17:49.000000000 +0000
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2011-2015 gazay
+Copyright (c) 2011-2016 gazay
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff -Nru ruby-gon-6.0.1/metadata.yml ruby-gon-6.1.0/metadata.yml
--- ruby-gon-6.0.1/metadata.yml	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/metadata.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,233 +0,0 @@
---- !ruby/object:Gem::Specification
-name: gon
-version: !ruby/object:Gem::Version
-  version: 6.0.1
-platform: ruby
-authors:
-- gazay
-autorequire: 
-bindir: bin
-cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: request_store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !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.11.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.11.3
-- !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: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.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: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.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
-  do this with long way trough views and parsing - use this force!
-email:
-- alex.gaziev@gmail.com
-executables: []
-extensions: []
-extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".travis.yml"
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- coffee/watch.coffee
-- doc/logo.png
-- doc/logo_small.png
-- doc/top_sample.png
-- gon.gemspec
-- js/watch.js
-- lib/gon.rb
-- lib/gon/base.rb
-- lib/gon/compatibility/old_rails.rb
-- lib/gon/env_finder.rb
-- lib/gon/escaper.rb
-- lib/gon/global.rb
-- lib/gon/helpers.rb
-- lib/gon/jbuilder.rb
-- lib/gon/jbuilder/parser.rb
-- lib/gon/json_dumper.rb
-- lib/gon/rabl.rb
-- lib/gon/request.rb
-- lib/gon/spec_helpers.rb
-- lib/gon/version.rb
-- lib/gon/watch.rb
-- spec/gon/basic_spec.rb
-- spec/gon/global_spec.rb
-- spec/gon/jbuilder_spec.rb
-- spec/gon/rabl_with_rabl_rails_spec.rb
-- spec/gon/rabl_with_rabl_spec.rb
-- spec/gon/templates_spec.rb
-- spec/gon/thread_spec.rb
-- spec/gon/watch_spec.rb
-- spec/spec_helper.rb
-- spec/test_data/_sample_partial.json.jbuilder
-- spec/test_data/sample.json.jbuilder
-- spec/test_data/sample.rabl
-- spec/test_data/sample_rabl_rails.rabl
-- spec/test_data/sample_url_helpers.json.jbuilder
-- spec/test_data/sample_with_controller_method.json.jbuilder
-- spec/test_data/sample_with_helpers.json.jbuilder
-- spec/test_data/sample_with_helpers.rabl
-- spec/test_data/sample_with_helpers_rabl_rails.rabl
-- spec/test_data/sample_with_locals.json.jbuilder
-- spec/test_data/sample_with_partial.json.jbuilder
-homepage: https://github.com/gazay/gon
-licenses:
-- MIT
-metadata: {}
-post_install_message: 
-rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">"
-    - !ruby/object:Gem::Version
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
-specification_version: 4
-summary: Get your Rails variables in your JS
-test_files: []
diff -Nru ruby-gon-6.0.1/Rakefile ruby-gon-6.1.0/Rakefile
--- ruby-gon-6.0.1/Rakefile	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/Rakefile	2016-08-01 22:17:49.000000000 +0000
@@ -6,5 +6,5 @@
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ["--color", '--format doc']
+  t.rspec_opts = ["--color", '--format doc', '--require spec_helper']
 end
\ No newline at end of file
diff -Nru ruby-gon-6.0.1/README.md ruby-gon-6.1.0/README.md
--- ruby-gon-6.0.1/README.md	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/README.md	2016-08-01 22:17:49.000000000 +0000
@@ -4,7 +4,7 @@
 
 ![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](https://secure.travis-ci.org/gazay/gon.png)](http://travis-ci.org/gazay/gon) [![CodeClimate](https://codeclimate.com/github/gazay/gon/badges/gpa.svg)](https://codeclimate.com/github/gazay/gon)
+[![Build Status](https://travis-ci.org/gazay/gon.svg?branch=master)](https://travis-ci.org/gazay/gon) [![CodeClimate](https://codeclimate.com/github/gazay/gon/badges/gpa.svg)](https://codeclimate.com/github/gazay/gon)
 
 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!
 
@@ -78,21 +78,21 @@
 ``` erb
 <head>
   <title>some title</title>
-  <%= include_gon %>
+  <%= Gon::Base.render_data %>
   <!-- include your action js code -->
   ...
 ```
 
-For rails 4:
+For rails 3:
 ``` erb
-  <%= Gon::Base.render_data %>
+  <%= include_gon %>
   ...
 ```
 
 
 
 You can pass some [options](https://github.com/gazay/gon/wiki/Options)
-to `include_gon` method.
+to `render_data` method.
 
 You put something like this in the action of your controller:
 
@@ -109,7 +109,7 @@
 gon.all_variables # > {:your_int => 123, :your_other_int => 468, :your_array => [1, 2, 123], :your_hash => {'a' => 1, 'b' => 2}}
 gon.your_array # > [1, 2, 123]
 
-gon.clear # gon.all_variables now is {}
+# gon.clear # gon.all_variables now is {}
 ```
 
 Access the variables from your JavaScript file:
diff -Nru ruby-gon-6.0.1/spec/gon/basic_spec.rb ruby-gon-6.1.0/spec/gon/basic_spec.rb
--- ruby-gon-6.0.1/spec/gon/basic_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/basic_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon do
 
   before(:each) do
@@ -97,33 +95,26 @@
 
     it 'outputs correct js with an integer' do
       Gon.int = 1
-      expect(@base.include_gon).to eq('<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    'gon.int=1;' +
-                                    "\n//]]>\n" +
-                                  '</script>')
+      expect(@base.include_gon).to eq(wrap_script(
+                                'window.gon={};' +
+                                'gon.int=1;'))
     end
 
     it 'outputs correct js with a string' do
       Gon.str = %q(a'b"c)
-      expect(@base.include_gon).to eq('<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    %q(gon.str="a'b\"c";) +
-                                    "\n//]]>\n" +
-                                  '</script>')
+      expect(@base.include_gon).to eq(wrap_script(
+                                'window.gon={};' +
+                                %q(gon.str="a'b\"c";))
+      )
     end
 
     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>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    %Q(gon.str="#{escaped_str}";) +
-                                    "\n//]]>\n" +
-                                  '</script>')
+      expect(@base.include_gon).to eq(wrap_script(
+                                'window.gon={};' +
+                                %Q(gon.str="#{escaped_str}";))
+      )
     end
 
     it 'outputs correct js with an integer and type' do
@@ -138,49 +129,33 @@
 
     it 'outputs correct js with an integer, camel-case and namespace' do
       Gon.int_cased = 1
-      expect(@base.include_gon(camel_case: true, namespace: 'camel_cased')).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.camel_cased={};' +
-                                    'camel_cased.intCased=1;' +
-                                    "\n//]]>\n" +
-                                  '</script>'
+      expect(@base.include_gon(camel_case: true, namespace: 'camel_cased')).to eq(
+                                  wrap_script('window.camel_cased={};' +
+                                    'camel_cased.intCased=1;')
       )
     end
 
     it 'outputs correct js with camel_depth = :recursive' do
       Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
-      expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    'gon.testHash={"testDepthOne":{"testDepthTwo":1}};' +
-                                    "\n//]]>\n" +
-                                  '</script>'
+      expect(@base.include_gon(camel_case: true, camel_depth: :recursive)).to eq(
+                                  wrap_script('window.gon={};' +
+                                    'gon.testHash={"testDepthOne":{"testDepthTwo":1}};')
       )
     end
 
     it 'outputs correct js with camel_depth = 2' do
       Gon.test_hash = { test_depth_one: { test_depth_two: 1 } }
-      expect(@base.include_gon(camel_case: true, camel_depth: 2)).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    'gon.testHash={"testDepthOne":{"test_depth_two":1}};' +
-                                    "\n//]]>\n" +
-                                  '</script>'
+      expect(@base.include_gon(camel_case: true, camel_depth: 2)).to eq(
+                                  wrap_script('window.gon={};' +
+                                    'gon.testHash={"testDepthOne":{"test_depth_two":1}};')
       )
     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>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};' +
-                                    'gon.testHash={"testDepthOne":[{"testDepthTwo":1},{"testDepthTwo":2}]};' +
-                                    "\n//]]>\n" +
-                                  '</script>'
+                                  wrap_script('window.gon={};' +
+                                    'gon.testHash={"testDepthOne":[{"testDepthTwo":1},{"testDepthTwo":2}]};')
       )
     end
 
@@ -217,44 +192,25 @@
 
     it 'outputs correct js without cdata, without type, gon init and an integer' do
       Gon.int = 1
-      expect(@base.include_gon(cdata: false, type: false)).to eq( \
-                                  '<script>' +
+      expect(@base.include_gon(cdata: false, type: false)).to eq(
+                                  wrap_script(
                                     "\n" +
                                     'window.gon={};' +
                                     'gon.int=1;' +
-                                    "\n" +
-                                  '</script>'
+                                    "\n", false)
       )
     end
 
     it 'outputs correct js with type text/javascript' do
-      expect(@base.include_gon(need_type: true, init: true)).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};'\
-                                    "\n//]]>\n" +
-                                  '</script>'
-      )
+      expect(@base.include_gon(need_type: true, init: true)).to eq(wrap_script('window.gon={};'))
     end
 
     it 'outputs correct js with namespace check' do
-      expect(@base.include_gon(namespace_check: true)).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon=window.gon||{};'\
-                                    "\n//]]>\n" +
-                                  '</script>'
-      )
+      expect(@base.include_gon(namespace_check: true)).to eq(wrap_script('window.gon=window.gon||{};'))
     end
 
     it 'outputs correct js without namespace check' do
-      expect(@base.include_gon(namespace_check: false)).to eq( \
-                                  '<script>' +
-                                    "\n//<![CDATA[\n" +
-                                    'window.gon={};'\
-                                    "\n//]]>\n" +
-                                  '</script>'
-      )
+      expect(@base.include_gon(namespace_check: false)).to eq(wrap_script('window.gon={};'))
     end
 
     context "without a current_gon instance" do
@@ -273,18 +229,11 @@
       end
 
       it 'outputs correct js with init' do
-        expect(@base.include_gon(init: true)).to eq( \
-                                    '<script>' +
-                                      "\n//<![CDATA[\n" +
-                                      'window.gon={};'\
-                                      "\n//]]>\n" +
-                                    '</script>'
-        )
+        expect(@base.include_gon(init: true)).to eq(wrap_script('window.gon={};'))
       end
 
     end
 
-
   end
 
   describe '#include_gon_amd' do
@@ -336,16 +285,8 @@
 
     let(:controller) { ActionController::Base.new }
 
-    it 'should be able to handle ruby 1.8.7 style constants array (strings)' do
-      constants_as_strings = Gon.constants.map(&:to_s)
-      allow(Gon).to receive(:constants) { constants_as_strings }
-      expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
-      expect { Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
-    end
-
-    it 'should be able to handle ruby 1.9+ style constants array (symbols)' do
-      constants_as_symbols = Gon.constants.map(&:to_sym)
-      allow(Gon).to receive(:constants) { constants_as_symbols }
+    it 'should be able to handle constants array (symbols)' do
+      allow(Gon).to receive(:constants) { Gon.constants }
       expect { Gon.rabl :template => 'spec/test_data/sample.rabl', :controller => controller }.not_to raise_error
       expect { Gon.jbuilder :template => 'spec/test_data/sample.json.jbuilder', :controller => controller }.not_to raise_error
     end
diff -Nru ruby-gon-6.0.1/spec/gon/global_spec.rb ruby-gon-6.1.0/spec/gon/global_spec.rb
--- ruby-gon-6.0.1/spec/gon/global_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/global_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon::Global do
 
   before(:each) do
diff -Nru ruby-gon-6.0.1/spec/gon/jbuilder_spec.rb ruby-gon-6.1.0/spec/gon/jbuilder_spec.rb
--- ruby-gon-6.0.1/spec/gon/jbuilder_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/jbuilder_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon do
 
   describe '.jbuilder' do
diff -Nru ruby-gon-6.0.1/spec/gon/rabl_with_rabl_rails_spec.rb ruby-gon-6.1.0/spec/gon/rabl_with_rabl_rails_spec.rb
--- ruby-gon-6.0.1/spec/gon/rabl_with_rabl_rails_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/rabl_with_rabl_rails_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon do
 
   before(:all) do
diff -Nru ruby-gon-6.0.1/spec/gon/rabl_with_rabl_spec.rb ruby-gon-6.1.0/spec/gon/rabl_with_rabl_spec.rb
--- ruby-gon-6.0.1/spec/gon/rabl_with_rabl_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/rabl_with_rabl_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon do
 
   before(:all) do
diff -Nru ruby-gon-6.0.1/spec/gon/templates_spec.rb ruby-gon-6.1.0/spec/gon/templates_spec.rb
--- ruby-gon-6.0.1/spec/gon/templates_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/templates_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon do
 
   describe '.template_path' do
diff -Nru ruby-gon-6.0.1/spec/gon/thread_spec.rb ruby-gon-6.1.0/spec/gon/thread_spec.rb
--- ruby-gon-6.0.1/spec/gon/thread_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/thread_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class GonTestWorker
   include Gon::ControllerHelpers
 
diff -Nru ruby-gon-6.0.1/spec/gon/watch_spec.rb ruby-gon-6.1.0/spec/gon/watch_spec.rb
--- ruby-gon-6.0.1/spec/gon/watch_spec.rb	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/spec/gon/watch_spec.rb	2016-08-01 22:17:49.000000000 +0000
@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Gon::Watch do
 
   let(:controller) { ActionController::Base.new }
@@ -13,7 +11,7 @@
     env['REQUEST_METHOD'] = 'GET'
 
     Gon::Watch.clear
-    Gon.send(:current_gon).instance_variable_set(:@request_env, env)
+    Gon.send(:current_gon).instance_variable_set(:@env, env)
     Gon.send(:current_gon).env['action_controller.instance'] = controller
     Gon.clear
   end
@@ -45,7 +43,7 @@
 
   describe 'Render concrete variable' do
     before do
-      env = Gon.send(:current_gon).instance_variable_get(:@request_env)
+      env = Gon.send(:current_gon).env
       env['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest'
 
       allow(controller).to receive_messages(request: ActionDispatch::Request.new(env))
diff -Nru ruby-gon-6.0.1/.travis.yml ruby-gon-6.1.0/.travis.yml
--- ruby-gon-6.0.1/.travis.yml	2015-08-01 23:42:53.000000000 +0000
+++ ruby-gon-6.1.0/.travis.yml	2016-08-01 22:17:49.000000000 +0000
@@ -3,12 +3,15 @@
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.6
-  - 2.2.2
+  - 2.1
+  - 2.2
+  - 2.3.0
+  - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
   - rbx
 matrix:
   allow_failures:
     - rvm: rbx
+    - rvm: ruby-head
 # uncomment this line if your project needs to run something other than `rake`:
 # script: bundle exec rspec spec