wrest 1.4.6 → 1.4.7

data/CHANGELOG

@@ -2,6 +2,9 @@ Features under the section marked 'Current' are completed but pending release as
 
 Features under a numbered section are complete and available in the Wrest gem.
 
+== 1.4.7
+ * Switch to using multi_json to manage Json backend to play nice with Rails 3.1.
+
 == 1.4.6
  * Bump Builder dependency to allow both Builder 2.x and 3.x to be used
 

data/README.rdoc

@@ -1,4 +1,4 @@
-= Wrest 1.4.6
+= Wrest 1.4.7
 
 (c) Copyright 2009-2011 {Sidu Ponnappa}[http://blog.sidu.in]. All Rights Reserved.
 
@@ -224,6 +224,13 @@ in your Gemfile. You can now do <tt>Uri.new('http://localhost')</tt> to build Ur
 The Wrest logger can be set and accessed through Wrest.logger and is configured by default to log to STDOUT. If you're using Wrest in a Rails application, you can configure logging by adding a config/initializers/wrest.rb file with the following contents :
   Wrest.logger = Rails.logger
 
+=== Json Backend
+
+Wrest uses the multi_json gem to manage Json backends, allowing it to play nice with Rails 3.1. To change the backend used, you can do the following:
+  MultiJson.engine = :json_gem
+  
+For more information, look up the {multi_json}[http://github.com/intridea/multi_json] documentation.
+
 === Build
 
 Standard options are available and can be listed using <tt>rake -T</tt>. Use rake:rcov for coverage and rake:rdoc to generate documentation. The link to the continuous integration build is over at the C42 Engineering {open source}[http://c42.in/open_source] page.

data/lib/wrest.rb

@@ -7,7 +7,6 @@
 # See the License for the specific language governing permissions and limitations under the License.
 
 require 'rubygems'
-gem 'activesupport', '~> 3.0'
 
 require 'net/http'
 require 'net/https'
@@ -17,6 +16,7 @@ require 'cgi'
 require 'base64'
 require 'logger'
 require 'benchmark'
+require 'multi_json'
 require 'active_support'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/hash'
@@ -55,9 +55,6 @@ end
 Wrest.logger = ActiveSupport::BufferedLogger.new(STDOUT)
 Wrest.logger.level = Logger::DEBUG
 
-gem('json', '~> 1.5')
-ActiveSupport::JSON.backend = "JSONGem"
-
 require "#{Wrest::Root}/wrest/core_ext/string"
 require "#{Wrest::Root}/wrest/hash_with_case_insensitive_access"
 

data/lib/wrest/version.rb

@@ -8,5 +8,5 @@
 # See the License for the specific language governing permissions and limitations under the License. 
 
 module Wrest
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wrest
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &2165959240 !ruby/object:Gem::Requirement
+  requirement: &2168950960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165959240
+  version_requirements: *2168950960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168591920 !ruby/object:Gem::Requirement
+  requirement: &2168950380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2168591920
+  version_requirements: *2168950380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2168590500 !ruby/object:Gem::Requirement
+  requirement: &2168949860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2168590500
+  version_requirements: *2168949860
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &2168589400 !ruby/object:Gem::Requirement
+  requirement: &2168949420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,21 +56,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168589400
+  version_requirements: *2168949420
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168588340 !ruby/object:Gem::Requirement
+  requirement: &2168948820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *2168588340
+  version_requirements: *2168948820
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2168587440 !ruby/object:Gem::Requirement
+  requirement: &2168948260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -78,29 +78,18 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168587440
+  version_requirements: *2168948260
 - !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: &2168586540 !ruby/object:Gem::Requirement
+  name: multi_json
+  requirement: &2168947660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2168586540
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2168585280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2168585280
+  version_requirements: *2168947660
 description: Wrest is a fluent, easy-to-use, object oriented Ruby HTTP/REST client
   library with support for RFC2616 HTTP caching, multiple HTTP backends and async
   calls using EventMachine. It runs on CRuby, JRuby and Rubinius.