warden-oauth2-strategies 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b19bf4bebd18153ebe1cca675986f8792d62101
-  data.tar.gz: b38ed60cfdcb9735f42de0f202ca4ca87aee8123
+  metadata.gz: 0df4f6d65b46e8d81c518dd75a1fe96556fdd753
+  data.tar.gz: 0e2d53987f68527aaaa9a4eb7a85fd68b2570d29
 SHA512:
-  metadata.gz: df28174f8ac1d2935ade911f23e965953d8101891c33ae1d70e7118c6ad2092a1856118b2be2f99470a197949845df77386cd0bdd494f475e28fa34bb5a6d971
-  data.tar.gz: 3b410cf14da8fe3a3b9c322f98d08df551a60685830c998972ef39b9867e66f9cf9a2d998ee9147714f10a7043dde218aaf523935f468f73a70e176ac4b880c4
+  metadata.gz: e8f08fc873bf11a9c781f5d714c31d02e132fdaf06345e59a9752b9e0971adff7256ff2567837ede5aa564d8f8db3044c29107a49644a4b045d94c51d6b0170b
+  data.tar.gz: 4e14388e4bbfe21b1938a8f7172e37736f983e08190b4217ce1d7455324a1a8b92da1b51606ec638b331b301bddbed1e296b419f68cf117b03097361b71314b1

data/lib/warden/oauth2/strategies/token.rb

@@ -10,11 +10,11 @@ module Warden
 
         def authenticate!
           if token
-            fail! "invalid_token" and return if token.respond_to?(:expired?) && token.expired?
-            fail! "invalid_scope" and return if scope && token.respond_to?(:scope?) && !token.scope?(scope)
+            fail! 'invalid_token' and return if token.respond_to?(:expired?) && token.expired?
+            fail! 'invalid_scope' and return if scope && token.respond_to?(:scope?) && !token.scope?(scope)
             success! token
           else
-            fail! "invalid_request" and return unless token
+            fail! 'invalid_token' and return unless token
           end
         end
 
@@ -28,9 +28,8 @@ module Warden
 
         def error_status
           case message
-            when "invalid_token" then 401
-            when "invalid_scope" then 403
-            when "invalid_request" then 400
+            when 'invalid_token' then 401
+            when 'invalid_scope' then 403
             else 400
           end
         end

data/lib/warden/oauth2/version.rb

@@ -1,5 +1,5 @@
 module Warden
   module OAuth2
-    VERSION = '0.1.0'
+    VERSION = '0.1.1'
   end
 end

data/spec/warden/oauth2/strategies/token_spec.rb

@@ -18,38 +18,42 @@ describe Warden::OAuth2::Strategies::Token do
   end
 
   describe '#authenticate!' do
+    before do
+      subject.stub(token_string: nil)
+    end
     it 'should be successful if there is a token' do
       token_instance = double
-      subject.stub(:token).and_return(token_instance)
+      subject.stub(token_string: 'token_string')
+      token_model.stub(:locate).with('token_string').and_return(token_instance)
       subject._run!
       subject.result.should == :success
       subject.user.should == token_instance
     end
 
-    it 'should fail if there is not a token' do
-      subject.stub(token: nil)
+    it 'should fail if there is no token located' do
+      token_model.stub(locate: nil)
       subject._run!
       subject.result.should == :failure
-      subject.message.should == "invalid_request"
-      subject.error_status.should == 400
+      subject.message.should == 'invalid_token'
+      subject.error_status.should == 401
     end
 
     it 'should fail if the access token is expired' do
       token_instance = double(:respond_to? => true, :expired? => true, :scope? => true)
-      subject.stub(:token).and_return(token_instance)
+      token_model.stub(locate: token_instance)
       subject._run!
       subject.result.should == :failure
-      subject.message.should == "invalid_token"
+      subject.message.should == 'invalid_token'
       subject.error_status.should == 401
     end
 
     it 'should fail if there is insufficient scope' do
       token_instance = double(:respond_to? => true, :expired? => false, :scope? => false)
-      subject.stub(:token).and_return(token_instance)
+      token_model.stub(locate: token_instance)
       subject.stub(:scope).and_return(:secret)
       subject._run!
       subject.result.should == :failure
-      subject.message.should == "invalid_scope"
+      subject.message.should == 'invalid_scope'
       subject.error_status.should == 403
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-oauth2-strategies
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - AirService
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: OAuth 2.0 strategies for Warden