rack-oauth2 0.12.2 → 0.13.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.11.0)
+    rack-oauth2 (0.12.2)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.0.2)
@@ -31,7 +31,6 @@ GEM
     jruby-openssl (0.7.5)
       bouncy-castle-java (>= 1.5.0146.1)
     json (1.6.5)
-    json (1.6.5-java)
     multi_json (1.0.4)
     rack (1.4.1)
     rake (0.9.2.2)

data/VERSION

@@ -1 +1 @@
-0.12.2
+0.13.0

data/lib/rack/oauth2/server/resource.rb

@@ -14,8 +14,8 @@ module Rack
 
         def call(env)
           if request.oauth2?
-            authenticate! request.setup!
-            env[ACCESS_TOKEN] = request.access_token
+            access_token = authenticate! request.setup!
+            env[ACCESS_TOKEN] = access_token
           end
           @app.call(env)
         rescue Rack::OAuth2::Server::Abstract::Error => e

data/spec/rack/oauth2/server/resource/bearer_spec.rb

@@ -5,7 +5,7 @@ describe Rack::OAuth2::Server::Resource::Bearer do
     Rack::OAuth2::Server::Resource::Bearer.new(simple_app) do |request|
       case request.access_token
       when 'valid_token'
-        # nothing to do
+        bearer_token
       when 'insufficient_scope_token'
         request.insufficient_scope!
       else
@@ -13,6 +13,9 @@ describe Rack::OAuth2::Server::Resource::Bearer do
       end
     end
   end
+  let(:bearer_token) do
+    Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'valid_token')
+  end
   let(:access_token) { env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN] }
   let(:request) { app.call(env) }
   subject { app.call(env) }
@@ -21,7 +24,7 @@ describe Rack::OAuth2::Server::Resource::Bearer do
     it 'should be authenticated' do
       status, header, response = request
       status.should == 200
-      access_token.should == 'valid_token'
+      access_token.should == bearer_token
     end
   end
   shared_examples_for :unauthorized_bearer_request do

data/spec/rack/oauth2/server/resource/mac_spec.rb

@@ -5,11 +5,9 @@ describe Rack::OAuth2::Server::Resource::MAC do
     Rack::OAuth2::Server::Resource::MAC.new(simple_app) do |request|
       case request.access_token
       when 'valid_token'
-        Rack::OAuth2::AccessToken::MAC.new(
-          :access_token => 'valid_token',
-          :mac_key => 'secret',
-          :mac_algorithm => 'hmac-sha-256'
-        ).verify!(request)
+        token = mac_token
+        token.verify!(request)
+        token
       when 'insufficient_scope_token'
         request.insufficient_scope!
       else
@@ -17,6 +15,13 @@ describe Rack::OAuth2::Server::Resource::MAC do
       end
     end
   end
+  let(:mac_token) do
+    Rack::OAuth2::AccessToken::MAC.new(
+      :access_token => 'valid_token',
+      :mac_key => 'secret',
+      :mac_algorithm => 'hmac-sha-256'
+    )
+  end
   let(:access_token) { env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN] }
   let(:request) { app.call(env) }
   subject { app.call(env) }
@@ -32,7 +37,7 @@ describe Rack::OAuth2::Server::Resource::MAC do
     it 'should be authenticated' do
       status, header, response = request
       status.should == 200
-      access_token.should == 'valid_token'
+      access_token.should == mac_token
     end
   end
   shared_examples_for :unauthorized_mac_request do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70240383423520 !ruby/object:Gem::Requirement
+  requirement: &70115895469580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70240383423520
+  version_requirements: *70115895469580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70240383422440 !ruby/object:Gem::Requirement
+  requirement: &70115895468640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70240383422440
+  version_requirements: *70115895468640
 - !ruby/object:Gem::Dependency
   name: httpclient
-  requirement: &70240383421700 !ruby/object:Gem::Requirement
+  requirement: &70115895467660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70240383421700
+  version_requirements: *70115895467660
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70240383420980 !ruby/object:Gem::Requirement
+  requirement: &70115895466860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70240383420980
+  version_requirements: *70115895466860
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70240383412240 !ruby/object:Gem::Requirement
+  requirement: &70115895466100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240383412240
+  version_requirements: *70115895466100
 - !ruby/object:Gem::Dependency
   name: attr_required
-  requirement: &70240383411180 !ruby/object:Gem::Requirement
+  requirement: &70115895465300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70240383411180
+  version_requirements: *70115895465300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240383410500 !ruby/object:Gem::Requirement
+  requirement: &70115895450420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70240383410500
+  version_requirements: *70115895450420
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70240383409100 !ruby/object:Gem::Requirement
+  requirement: &70115895449520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70240383409100
+  version_requirements: *70115895449520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240383408040 !ruby/object:Gem::Requirement
+  requirement: &70115895448460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70240383408040
+  version_requirements: *70115895448460
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70240383406920 !ruby/object:Gem::Requirement
+  requirement: &70115895447420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 1.6.2
   type: :development
   prerelease: false
-  version_requirements: *70240383406920
+  version_requirements: *70115895447420
 description: OAuth 2.0 Server & Client Library. Both Bearer and MAC token type are
   supported.
 email: nov@matake.jp