rack-oauth2 0.14.2 → 0.14.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.14.1)
+    rack-oauth2 (0.14.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)
@@ -15,7 +15,7 @@ GEM
     activesupport (3.2.1)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.2.7)
     attr_required (0.0.5)
     bouncy-castle-java (1.5.0146.1)
     configatron (2.9.0)
@@ -31,7 +31,8 @@ GEM
     jruby-openssl (0.7.6.1)
       bouncy-castle-java (>= 1.5.0146.1)
     json (1.6.5)
-    multi_json (1.0.4)
+    json (1.6.5-java)
+    multi_json (1.1.0)
     rack (1.4.1)
     rake (0.9.2.2)
     rspec (2.8.0)
@@ -42,8 +43,8 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    webmock (1.7.10)
-      addressable (~> 2.2, > 2.2.5)
+    webmock (1.8.0)
+      addressable (>= 2.2.7)
       crack (>= 0.1.7)
     yamler (0.1.0)
 

data/Rakefile

@@ -5,9 +5,15 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
 if RUBY_VERSION >= '1.9'
-  require 'cover_me'
-  CoverMe.config do |c|
-    c.file_pattern = /(#{CoverMe.config.project.root}\/lib\/.+\.rb)/i
+  namespace :cover_me do
+    desc "Generates and opens code coverage report."
+    task :report do
+      require 'cover_me'
+      CoverMe.complete!
+    end
+  end
+  task :spec do
+    Rake::Task['cover_me:report'].invoke
   end
 else
   RSpec::Core::RakeTask.new(:rcov) do |spec|

data/VERSION

@@ -1 +1 @@
-0.14.2
+0.14.3

data/lib/rack/oauth2/client.rb

@@ -45,14 +45,25 @@ module Rack
         )
       end
 
-      def access_token!
-        params = @grant.as_json
-        params.merge!(
-          :client_id => self.identifier,
-          :client_secret => self.secret
-        )
+      def access_token!(client_auth_method = :basic)
+        headers, params = {}, @grant.as_json
+        if secret && client_auth_method == :basic
+          cred = ["#{identifier}:#{secret}"].pack('m').tr("\n", '')
+          headers.merge!(
+            :Authorization => "Basic #{cred}"
+          )
+        else
+          params.merge!(
+            :client_id => identifier,
+            :client_secret => secret
+          )
+        end
         handle_response do
-          Rack::OAuth2.http_client.post absolute_uri_for(token_endpoint), Util.compact_hash(params)
+          Rack::OAuth2.http_client.post(
+            absolute_uri_for(token_endpoint),
+            Util.compact_hash(params),
+            headers
+          )
         end
       end
 

data/spec/helpers/webmock_helper.rb

@@ -21,6 +21,9 @@ module WebMockHelper
         request[:query] = options[:params]
       end
     end
+    if options[:request_header]
+      request[:headers] = options[:request_header]
+    end
     request
   end
 

data/spec/rack/oauth2/client_spec.rb

@@ -79,6 +79,42 @@ describe Rack::OAuth2::Client do
   describe '#access_token!' do
     subject { client.access_token! }
 
+    describe 'client authentication method' do
+      before do
+        client.authorization_code = 'code'
+      end
+
+      it 'should be Basic auth as default' do
+        mock_response(
+          :post,
+          'https://server.example.com/oauth2/token',
+          'tokens/bearer.json',
+          :request_header => {
+            'Authorization' => 'Basic Y2xpZW50X2lkOmNsaWVudF9zZWNyZXQ='
+          }
+        )
+        client.access_token!
+      end
+
+      context 'when' do
+        it do
+          mock_response(
+            :post,
+            'https://server.example.com/oauth2/token',
+            'tokens/bearer.json',
+            :params => {
+              :client_id => 'client_id',
+              :client_secret => 'client_secret',
+              :code => 'code',
+              :grant_type => 'authorization_code',
+              :redirect_uri => 'https://client.example.com/callback'
+            }
+          )
+          client.access_token! :client_auth_body
+        end
+      end
+    end
+
     context 'when bearer token is given' do
       before  do
         client.authorization_code = 'code'

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 if RUBY_VERSION >= '1.9'
   require 'cover_me'
-  at_exit do
-    CoverMe.complete!
-  end
 end
 
 require 'rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-02-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70209520442160 !ruby/object:Gem::Requirement
+  requirement: &70126969125120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70209520442160
+  version_requirements: *70126969125120
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70209520436320 !ruby/object:Gem::Requirement
+  requirement: &70126969115760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70209520436320
+  version_requirements: *70126969115760
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70209520434120 !ruby/object:Gem::Requirement
+  requirement: &70126969114580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70209520434120
+  version_requirements: *70126969114580
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70209520432320 !ruby/object:Gem::Requirement
+  requirement: &70126969112160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70209520432320
+  version_requirements: *70126969112160
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70209520427100 !ruby/object:Gem::Requirement
+  requirement: &70126969106220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70209520427100
+  version_requirements: *70126969106220
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70209520425760 !ruby/object:Gem::Requirement
+  requirement: &70126969103920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70209520425760
+  version_requirements: *70126969103920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70209520424520 !ruby/object:Gem::Requirement
+  requirement: &70126969102540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70209520424520
+  version_requirements: *70126969102540
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70209520422400 !ruby/object:Gem::Requirement
+  requirement: &70126969101760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70209520422400
+  version_requirements: *70126969101760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70209520420720 !ruby/object:Gem::Requirement
+  requirement: &70126969100840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70209520420720
+  version_requirements: *70126969100840
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70209520417720 !ruby/object:Gem::Requirement
+  requirement: &70126969100320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70209520417720
+  version_requirements: *70126969100320
 description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are
   supported.
 email: nov@matake.jp