signet 0.4.1 → 0.4.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.2
+
+* Backwards compatibility for MultiJson
+
 # 0.4.1
 
 * Updated Launchy dependency

data/lib/compat/multi_json.rb

@@ -0,0 +1,17 @@
+gem 'multi_json', '>= 1.0.0'
+require 'multi_json'
+
+unless MultiJson.respond_to?(:load)
+  module MultiJson
+    class <<self
+      alias :load :decode
+    end
+  end
+end
+unless MultiJson.respond_to?(:dump)
+  module MultiJson
+    class <<self
+      alias :dump :encode
+    end
+  end
+end

data/lib/signet/oauth_2.rb

@@ -15,6 +15,7 @@
 require 'base64'
 require 'signet'
 require 'multi_json'
+require 'compat/multi_json'
 require 'signet/ssl_config'
 
 module Signet #:nodoc:
@@ -77,7 +78,7 @@ module Signet #:nodoc:
       if !body.kind_of?(String)
         raise TypeError, "Expected String, got #{body.class}."
       end
-      return MultiJson.decode(body)
+      return MultiJson.load(body)
     end
 
     ##

data/lib/signet/version.rb

@@ -18,7 +18,7 @@ unless defined? Signet::VERSION
     module VERSION
       MAJOR = 0
       MINOR = 4
-      TINY  = 1
+      TINY  = 2
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/signet/oauth_2/client_spec.rb

@@ -309,7 +309,7 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     @client.redirect_uri = 'https://www.example.com/'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600'
@@ -335,7 +335,7 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     @client.password = 'incognito'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600'
@@ -360,7 +360,7 @@ describe Signet::OAuth2::Client, 'configured for Google userinfo API' do
     @client.refresh_token = '54321'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600'
@@ -546,7 +546,7 @@ JSON
     @client.client_secret = 'secret-12345'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600',
@@ -587,7 +587,7 @@ JSON
     @client.client_secret = 'secret-12345'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600',
@@ -622,7 +622,7 @@ JSON
     @client.client_secret = 'secret-12345'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600',
@@ -655,7 +655,7 @@ JSON
     @client.client_secret = 'secret-12345'
     stubs = Faraday::Adapter::Test::Stubs.new do |stub|
       stub.post('/o/oauth2/token') do
-        [200, {}, MultiJson.encode({
+        [200, {}, MultiJson.dump({
           'access_token' => '12345',
           'refresh_token' => '54321',
           'expires_in' => '3600',

metadata

@@ -2,7 +2,7 @@
 name: signet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bob Aman
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-31 00:00:00 Z
+date: 2012-08-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: addressable
@@ -101,6 +101,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - lib/compat/digest/hmac.rb
+- lib/compat/multi_json.rb
 - lib/compat/securerandom.rb
 - lib/signet/errors.rb
 - lib/signet/oauth_1/client.rb