oauth2 0.7.0 → 0.7.1

data/lib/oauth2/response.rb

@@ -49,9 +49,11 @@ module OAuth2
     # Procs that, when called, will parse a response body according
     # to the specified format.
     PARSERS = {
-      :json => lambda{|body| MultiJson.load(body) rescue body },
-      :query => lambda{|body| Rack::Utils.parse_query(body) },
-      :text => lambda{|body| body}
+      # Can't reliably detect whether MultiJson responds to load, since it's
+      # a reserved word. Use adapter as a proxy for new features.
+      :json  => lambda{ |body| MultiJson.respond_to?(:adapter) ? MultiJson.load(body) : MultiJson.decode(body) rescue body },
+      :query => lambda{ |body| Rack::Utils.parse_query(body) },
+      :text  => lambda{ |body| body }
     }
 
     # Content type assignments for various potential HTTP content types.

data/lib/oauth2/version.rb

@@ -1,3 +1,3 @@
 module OAuth2
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/oauth2.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/oauth2/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.add_dependency 'faraday', '~> 0.8'
   gem.add_dependency 'httpauth', '~> 0.1'
-  gem.add_dependency 'multi_json', '~> 1.3'
+  gem.add_dependency 'multi_json', '~> 1.0'
   gem.add_dependency 'rack', '~> 1.4'
   gem.add_development_dependency 'addressable'
   gem.add_development_dependency 'multi_xml'

data/spec/helper.rb

@@ -1,6 +1,8 @@
 unless ENV['CI']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    add_filter 'spec'
+  end
 end
 require 'oauth2'
 require 'addressable/uri'

data/spec/oauth2/access_token_spec.rb

@@ -4,8 +4,8 @@ VERBS = [:get, :post, :put, :delete]
 
 describe AccessToken do
   let(:token) {'monkey'}
-  let(:token_body) {MultiJson.dump(:access_token => 'foo', :expires_in => 600, :refresh_token => 'bar')}
-  let(:refresh_body) {MultiJson.dump(:access_token => 'refreshed_foo', :expires_in => 600, :refresh_token => 'refresh_bar')}
+  let(:token_body) {MultiJson.encode(:access_token => 'foo', :expires_in => 600, :refresh_token => 'bar')}
+  let(:refresh_body) {MultiJson.encode(:access_token => 'refreshed_foo', :expires_in => 600, :refresh_token => 'refresh_bar')}
   let(:client) do
     Client.new('abc', 'def', :site => 'https://api.example.com') do |builder|
       builder.request :url_encoded

data/spec/oauth2/client_spec.rb

@@ -10,7 +10,7 @@ describe OAuth2::Client do
         stub.get('/success')      {|env| [200, {'Content-Type' => 'text/awesome'}, 'yay']}
         stub.get('/reflect')      {|env| [200, {}, env[:body]]}
         stub.post('/reflect')     {|env| [200, {}, env[:body]]}
-        stub.get('/unauthorized') {|env| [401, {'Content-Type' => 'application/json'}, MultiJson.dump(:error => error_value, :error_description => error_description_value)]}
+        stub.get('/unauthorized') {|env| [401, {'Content-Type' => 'application/json'}, MultiJson.encode(:error => error_value, :error_description => error_description_value)]}
         stub.get('/conflict')     {|env| [409, {'Content-Type' => 'text/plain'}, 'not authorized']}
         stub.get('/redirect')     {|env| [302, {'Content-Type' => 'text/plain', 'location' => '/success' }, '']}
         stub.post('/redirect')    {|env| [303, {'Content-Type' => 'text/plain', 'location' => '/reflect' }, '']}

data/spec/oauth2/response_spec.rb

@@ -52,7 +52,7 @@ describe OAuth2::Response do
 
     it "parses application/json body" do
       headers = {'Content-Type' => 'application/json'}
-      body = MultiJson.dump(:foo => 'bar', :answer => 42)
+      body = MultiJson.encode(:foo => 'bar', :answer => 42)
       response = double('response', :headers => headers, :body => body)
       subject = Response.new(response)
       subject.parsed.keys.size.should == 2
@@ -67,6 +67,7 @@ describe OAuth2::Response do
       response = double('response', :headers => headers, :body => body)
 
       MultiJson.should_not_receive(:decode)
+      MultiJson.should_not_receive(:load)
       Rack::Utils.should_not_receive(:parse_query)
 
       subject = Response.new(response)

data/spec/oauth2/strategy/auth_code_spec.rb

@@ -4,7 +4,7 @@ describe OAuth2::Strategy::AuthCode do
   let(:code) {'sushi'}
   let(:kvform_token) {'expires_in=600&access_token=salmon&refresh_token=trout&extra_param=steve'}
   let(:facebook_token) {kvform_token.gsub('_in', '')}
-  let(:json_token) {MultiJson.dump(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve')}
+  let(:json_token) {MultiJson.encode(:expires_in => 600, :access_token => 'salmon', :refresh_token => 'trout', :extra_param => 'steve')}
 
   let(:client) do
     OAuth2::Client.new('abc', 'def', :site => 'http://api.example.com') do |builder|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oauth2
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-24 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: faraday
@@ -56,11 +56,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency