rack-oauth2 1.0.1 → 1.0.2

data/.gitignore

@@ -17,5 +17,6 @@ tmtags
 coverage*
 rdoc
 pkg
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/rack/oauth2/client.rb

@@ -89,7 +89,7 @@ module Rack
       end
 
       def handle_success_response(response)
-        token_hash = MultiJson.load(response.body).with_indifferent_access
+        token_hash = parse_json response.body
         case token_hash[:token_type].try(:downcase)
         when 'bearer'
           AccessToken::Bearer.new(token_hash)
@@ -100,17 +100,22 @@ module Rack
         else
           raise 'Unknown Token Type'
         end
-      rescue MultiJson::DecodeError
+      rescue MultiJson::LoadError
         # NOTE: Facebook support (They don't use JSON as token response)
         AccessToken::Legacy.new Rack::Utils.parse_nested_query(response.body).with_indifferent_access
       end
 
       def handle_error_response(response)
-        error = MultiJson.load(response.body).with_indifferent_access
+        error = parse_json response.body
         raise Error.new(response.status, error)
-      rescue MultiJson::DecodeError
+      rescue MultiJson::LoadError
         raise Error.new(response.status, :error => 'Unknown', :error_description => response.body)
       end
+
+      def parse_json(raw_json)
+        # MultiJson.parse('') returns nil when using MultiJson::Adapters::JsonGem
+        MultiJson.load(raw_json).try(:with_indifferent_access) || {}
+      end
     end
   end
 end

data/spec/rack/oauth2/client_spec.rb

@@ -228,6 +228,22 @@ describe Rack::OAuth2::Client do
         expect { client.access_token! }.to raise_error Rack::OAuth2::Client::Error
       end
     end
+
+    context 'when no body given' do
+      context 'when error given' do
+        before do
+          mock_response(
+            :post,
+            'https://server.example.com/oauth2/token',
+            'blank',
+            :status => 400
+          )
+        end
+        it do
+          expect { client.access_token! }.to raise_error Rack::OAuth2::Client::Error
+        end
+      end
+    end
   end
 
   context 'when no host info' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-08 00:00:00.000000000 Z
+date: 2013-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -185,7 +185,6 @@ files:
 - .rspec
 - .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -238,6 +237,7 @@ files:
 - rack-oauth2.gemspec
 - spec/helpers/time.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_response/blank
 - spec/mock_response/errors/invalid_request.json
 - spec/mock_response/resources/fake.txt
 - spec/mock_response/tokens/_Bearer.json
@@ -296,9 +296,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1898578761038848884
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -307,13 +304,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: OAuth 2.0 Server & Client Library - Both Bearer and MAC token type are supported
 test_files:
 - spec/helpers/time.rb
 - spec/helpers/webmock_helper.rb
+- spec/mock_response/blank
 - spec/mock_response/errors/invalid_request.json
 - spec/mock_response/resources/fake.txt
 - spec/mock_response/tokens/_Bearer.json

data/Gemfile.lock

@@ -1,59 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rack-oauth2 (1.0.1)
-      activesupport (>= 2.3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.2.0.2)
-      i18n
-      multi_json (>= 1.3.6)
-      rack (>= 1.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.2)
-    attr_required (0.0.5)
-    bouncy-castle-java (1.5.0146.1)
-    configatron (2.9.1)
-      yamler (>= 0.1.0)
-    cover_me (1.2.0)
-      configatron
-      hashie
-    crack (0.3.2)
-    diff-lcs (1.1.3)
-    hashie (1.2.0)
-    httpclient (2.3.2)
-    i18n (0.6.1)
-    jruby-openssl (0.8.2)
-      bouncy-castle-java (>= 1.5.0146.1)
-    multi_json (1.5.0)
-    rack (1.5.1)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
-    webmock (1.9.0)
-      addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yamler (0.1.0)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  cover_me (>= 1.2.0)
-  jruby-openssl (>= 0.7)
-  rack-oauth2!
-  rake (>= 0.8)
-  rspec (>= 2)
-  webmock (>= 1.6.2)