rack-oauth2 0.6.0.alpha → 0.6.0

data/VERSION

@@ -1 +1 @@
-0.6.0.alpha
+0.6.0

data/lib/rack/oauth2/access_token/bearer.rb

@@ -21,7 +21,7 @@ module Rack
         private
 
         def authenticate(headers)
-          headers.merge(:HTTP_AUTHORIZATION => "Bearer #{access_token}")
+          headers.merge(:AUTHORIZATION => "Bearer #{access_token}")
         end
       end
     end

data/lib/rack/oauth2/access_token/mac.rb

@@ -84,7 +84,7 @@ module Rack
             :query     => Rack::Utils.parse_nested_query(_url_.query)
           )
           self.signature = _signature_.calculate
-          headers.merge(:HTTP_AUTHORIZATION => authorization_header)
+          headers.merge(:AUTHORIZATION => authorization_header)
         end
 
         def authorization_header

data/lib/rack/oauth2/server/authorize/token.rb

@@ -18,16 +18,10 @@ module Rack
           end
 
           class Response < Authorize::Response
-            attr_required :access_token, :token_type
-            attr_optional :expires_in, :scope
+            attr_required :access_token
 
             def protocol_params
-              super.merge(
-                :access_token => access_token,
-                :token_type => token_type,
-                :expires_in => expires_in,
-                :scope => Array(scope).join(' ')
-              )
+              super.merge access_token.token_response
             end
 
             def protocol_params_location

data/spec/rack/oauth2/access_token/bearer_spec.rb

@@ -17,7 +17,7 @@ describe Rack::OAuth2::AccessToken::Bearer do
       it 'should have Bearer Authorization header' do
         RestClient.should_receive(method).with(
           resource_endpoint,
-          :HTTP_AUTHORIZATION => 'Bearer access_token'
+          :AUTHORIZATION => 'Bearer access_token'
         )
         token.send method, resource_endpoint
       end
@@ -34,7 +34,7 @@ describe Rack::OAuth2::AccessToken::Bearer do
         RestClient.should_receive(method).with(
           resource_endpoint,
           {:key => :value},
-          {:HTTP_AUTHORIZATION => 'Bearer access_token'}
+          {:AUTHORIZATION => 'Bearer access_token'}
         )
         token.send method, resource_endpoint, {:key => :value}
       end

data/spec/rack/oauth2/access_token/mac_spec.rb

@@ -37,7 +37,7 @@ describe Rack::OAuth2::AccessToken::MAC do
         Time.fix(Time.at(1302361200)) do
           RestClient.should_receive(:get).with(
             resource_endpoint,
-            :HTTP_AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"yYDSkZMrEbOOqj0anHNLA9ougNA+lxU0zmPiMSPtmJ8=\""
+            :AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"yYDSkZMrEbOOqj0anHNLA9ougNA+lxU0zmPiMSPtmJ8=\""
           )
           token.get resource_endpoint
         end
@@ -50,7 +50,7 @@ describe Rack::OAuth2::AccessToken::MAC do
           RestClient.should_receive(:post).with(
             resource_endpoint,
             {:key => :value},
-            {:HTTP_AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"xRvIiA+rmjhPjULVpyCCgiHEsOkLEHZik4ZaB+cyqgk=\""}
+            {:AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"xRvIiA+rmjhPjULVpyCCgiHEsOkLEHZik4ZaB+cyqgk=\""}
           )
           token.post resource_endpoint, :key => :value
         end
@@ -63,7 +63,7 @@ describe Rack::OAuth2::AccessToken::MAC do
           RestClient.should_receive(:put).with(
             resource_endpoint,
             {:key => :value},
-            {:HTTP_AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"2lWgkUCtD9lNBlDi5fe9eVDwEwbxfLGAqjgykaSV1ww=\""}
+            {:AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" bodyhash=\"Vj8DVxGNBe8UXWvd8pZswj6Gyo8vAT+RXlZa/fCfeiM=\" signature=\"2lWgkUCtD9lNBlDi5fe9eVDwEwbxfLGAqjgykaSV1ww=\""}
           )
           token.put resource_endpoint, :key => :value
         end
@@ -75,7 +75,7 @@ describe Rack::OAuth2::AccessToken::MAC do
         Time.fix(Time.at(1302361200)) do
           RestClient.should_receive(:delete).with(
             resource_endpoint,
-            :HTTP_AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"PX2GhHuo5yYNEs51e4Zlllw8itQ4Te0v+6ZuRCK7k+s=\""
+            :AUTHORIZATION => "MAC token=\"access_token\" timestamp=\"1302361200\" nonce=\"51e74de734c05613f37520872e68db5f\" signature=\"PX2GhHuo5yYNEs51e4Zlllw8itQ4Te0v+6ZuRCK7k+s=\""
           )
           token.delete resource_endpoint
         end

data/spec/rack/oauth2/server/authorize/token_spec.rb

@@ -4,29 +4,26 @@ describe Rack::OAuth2::Server::Authorize::Token do
   let(:request)      { Rack::MockRequest.new app }
   let(:redirect_uri) { 'http://client.example.com/callback' }
   let(:access_token) { 'access_token' }
-  let(:token_type)   { 'bearer' }
   let(:response)     { request.get("/?response_type=token&client_id=client&redirect_uri=#{redirect_uri}") }
 
   context "when approved" do
     let :app do
       Rack::OAuth2::Server::Authorize.new do |request, response|
         response.redirect_uri = redirect_uri
-        response.access_token = access_token
-        response.token_type = token_type
+        response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token)
         response.approve!
       end
     end
 
     it 'should redirect with authorization code in fragment' do
       response.status.should == 302
-      response.location.should == "#{redirect_uri}#access_token=#{access_token}&token_type=#{token_type}"
+      response.location.should == "#{redirect_uri}#access_token=#{access_token}&token_type=bearer"
     end
 
     context 'when redirect_uri is missing' do
       let :app do
         Rack::OAuth2::Server::Authorize.new do |request, response|
-          response.access_token = access_token
-          response.token_type = token_type
+          response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => access_token)
           response.approve!
         end
       end
@@ -39,7 +36,6 @@ describe Rack::OAuth2::Server::Authorize::Token do
       let :app do
         Rack::OAuth2::Server::Authorize.new do |request, response|
           response.redirect_uri = redirect_uri
-          response.token_type = token_type
           response.approve!
         end
       end
@@ -47,20 +43,6 @@ describe Rack::OAuth2::Server::Authorize::Token do
         expect { response }.should raise_error AttrRequired::AttrMissing
       end
     end
-
-    context 'when token_type is missing' do
-      let :app do
-        Rack::OAuth2::Server::Authorize.new do |request, response|
-          response.redirect_uri = redirect_uri
-          response.access_token = access_token
-          response.approve!
-        end
-      end
-
-      it do
-        expect { response }.should raise_error AttrRequired::AttrMissing
-      end
-    end
   end
 
   context 'when denied' do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: -1851332210
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 6
   - 0
-  - alpha
-  version: 0.6.0.alpha
+  version: 0.6.0
 platform: ruby
 authors: 
 - nov matake