Merge master into here

Conflicts:
	lib/gon.rb

Author: gazay

README.md

@@ -240,8 +240,6 @@ gon.rabl :as => 'alias'
 
 Use gon with [Jbuilder](https://github.com/rails/jbuilder) as with [Rabl](https://guthub.com/nesquena/rabl):
 
-Jbuilder works now only on Ruby 1.9+, so Gon support for Jbuilder works on 1.9+ only
-
   0. Add jbuilder to your Gemfile (because of it depends on
      ActiveSuppurt '~> 3.0.0')
 
@@ -304,13 +302,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.2.2'
+gem 'gon', '2.3.0'
 ```
 
 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.2.2'
+config.gem 'gon', :version => '2.3.0'
 ```
 
 Or manually install gon gem: `$ gem install gon`

lib/gon.rb

@@ -1,4 +1,4 @@
-if RUBY_VERSION > '1.9' && defined?(Jbuilder)
+if defined?(Jbuilder)
   gem 'blankslate'
 end
 require 'action_view'
@@ -10,7 +10,7 @@
 if defined?(Rabl)
   require 'gon/rabl'
 end
-if RUBY_VERSION > '1.9' && defined?(Jbuilder)
+if defined?(Jbuilder)
   require 'gon/jbuilder'
 end
 

lib/gon/version.rb

@@ -1,3 +1,3 @@
 module Gon
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'
 end

spec/gon/gon_spec.rb

@@ -73,6 +73,7 @@
     Gon.clear
     lambda { Gon.all_variables = 123 }.should raise_error
     lambda { Gon.rabl = 123 }.should raise_error
+    lambda { Gon.request = 123 }.should raise_error
   end
 
   describe '.rabl' do
@@ -142,7 +143,6 @@
 
   end
 
-  if RUBY_VERSION > '1.9'
     require 'jbuilder'
     require 'gon/jbuilder'
 
@@ -170,14 +170,7 @@
 
       end
 
-      it 'should throw error if you use gon.jbuilder with ruby < 1.9+' do
-        RUBY_VERSION = '1.8.7'
-
-        expect { Gon.jbuilder 'some_path'}.to raise_error(NoMethodError, /1.9/)
-      end
-
       it 'should raise error if you use gon.jbuilder without requiring jbuilder gem' do
-        RUBY_VERSION = '1.9.2'
         Gon.send(:remove_const, :Jbuilder)
 
         expect { Gon.jbuilder 'some_path' }.to raise_error(NameError)
@@ -220,7 +213,6 @@
       end
     end
 
-  end
 
   def request
     @request ||= double 'request', :env => {}