oauth2-rack 1.0.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oauth2-rack (1.0.0)
+    oauth2-rack (1.1.1)
       multi_json
       rack
 

data/lib/oauth2/rack/authentication/access_token/bearer_header.rb

@@ -16,21 +16,21 @@ class OAuth2::Rack::Authentication::AccessToken::BearerHeader
     auth_string = env[key]
 
     if auth_string.nil?
-      return @required ? error_response(:code => 400, :error => :invalid_request) : @app.call(env)
+      return @required ? error_response('code' => 400, 'error' => 'invalid_request') : @app.call(env)
     end
 
     schema, credentials = auth_string.split(' ', 2)
     if schema.downcase != 'bearer'
-      return error_response(:code => 400,
-                            :error => :invalid_request)
+      return error_response('code' => 400,
+                            'error' => 'invalid_request')
     end
 
-    access_token = @authenticator.call(:access_token => credentials)
+    access_grant = @authenticator.call(:access_token => credentials)
 
-    if access_token.nil? || (access_token.is_a?(Hash) && access_token[:error])
-      error_response(access_token)
+    if access_grant.nil? || (access_grant.is_a?(Hash) && access_grant[:error])
+      error_response(access_grant)
     else
-      env['oauth2.access_token'] = access_token
+      env['oauth2.access_grant'] = access_grant
       @app.call(env)
     end
   end
@@ -42,10 +42,10 @@ class OAuth2::Rack::Authentication::AccessToken::BearerHeader
 
   def error_response(opts)
     opts ||= {}
-    code = opts.delete(:code) || 401
-    
-    opts[:realm] = @realm if @realm
-    opts[:error] ||= 'invalid_token'
+    code = opts.delete('code') || 401
+
+    opts['realm'] = @realm if @realm
+    opts['error'] ||= 'invalid_token'
 
     [ code,
       { 'Content-Type' => 'text/plain',

data/lib/oauth2/rack/version.rb

@@ -1,5 +1,5 @@
 module OAuth2
   module Rack
-    VERSION = "1.0.0"
+    VERSION = "1.1.1"
   end
 end

data/spec/oauth2/rack/authentication/access_token/bearer_header_spec.rb

@@ -12,7 +12,7 @@ describe OAuth2::Rack::Authentication::AccessToken::BearerHeader do
 
   context 'when auth header is not specified' do
     context 'and bearer auth is required' do
-      it 'responds with 401 unauthorized' do
+      it 'responds with 400 unauthorized' do
         do_request
         response.status.should eq(400)
       end
@@ -47,7 +47,7 @@ describe OAuth2::Rack::Authentication::AccessToken::BearerHeader do
     context 'and credentials are valid' do
       it 'sets oauth2.client in env' do
         authenticator.should_receive(:call).with(:access_token => access_token).and_return(access_token)
-        chained_app.should_receive(:call).with(hash_including('oauth2.access_token' => access_token)).and_return(chained_app_response)
+        chained_app.should_receive(:call).with(hash_including('oauth2.access_grant' => access_token)).and_return(chained_app_response)
 
         do_request
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth2-rack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152919700 !ruby/object:Gem::Requirement
+  requirement: &2152842420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152919700
+  version_requirements: *2152842420
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152919200 !ruby/object:Gem::Requirement
+  requirement: &2152841960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152919200
+  version_requirements: *2152841960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152918600 !ruby/object:Gem::Requirement
+  requirement: &2152841420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152918600
+  version_requirements: *2152841420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152918080 !ruby/object:Gem::Requirement
+  requirement: &2152840840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152918080
+  version_requirements: *2152840840
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152917440 !ruby/object:Gem::Requirement
+  requirement: &2152840200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152917440
+  version_requirements: *2152840200
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &2152917000 !ruby/object:Gem::Requirement
+  requirement: &2152839640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152917000
+  version_requirements: *2152839640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152916540 !ruby/object:Gem::Requirement
+  requirement: &2152839040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152916540
+  version_requirements: *2152839040
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &2152916060 !ruby/object:Gem::Requirement
+  requirement: &2152838480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152916060
+  version_requirements: *2152838480
 description: Rack middlewares for OAuth2 authorization server and resource server
 email:
 - me@iany.me
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -744756891435917136
+      hash: -2093427120029872269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -169,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -744756891435917136
+      hash: -2093427120029872269
 requirements: []
 rubyforge_project: oauth2-rack
 rubygems_version: 1.8.10