rack-oauth2 0.14.6 → 0.14.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rack-oauth2 (0.14.5)
+    rack-oauth2 (0.14.6)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.2.0.2)

data/VERSION

@@ -1 +1 @@
-0.14.6
+0.14.7

data/lib/rack/oauth2.rb

@@ -39,17 +39,24 @@ module Rack
     end
     self.debugging = false
 
-    def self.http_client(agent_name = "Rack::OAuth2 (#{VERSION})")
+    def self.http_client(agent_name = "Rack::OAuth2 (#{VERSION})", &local_http_config)
       _http_client_ = HTTPClient.new(
         :agent_name => agent_name
       )
       http_config.try(:call, _http_client_)
+      local_http_config.try(:call, _http_client_) unless local_http_config.nil?
       _http_client_.request_filter << Debugger::RequestFilter.new if debugging?
       _http_client_
     end
+
     def self.http_config(&block)
       @@http_config ||= block
     end
+
+    def self.reset_http_config!
+      @@http_config = nil
+    end
+
   end
 end
 

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

@@ -3,12 +3,13 @@ module Rack
     class AccessToken
       class MAC < AccessToken
         attr_required :mac_key, :mac_algorithm
-        attr_optional :ts, :ext_verifier
+        attr_optional :ts, :ext_verifier, :ts_expires_in
         attr_reader :nonce, :signature, :ext
 
         def initialize(attributes = {})
           super(attributes)
-          @ts ||= Time.now.utc
+          @issued_at = Time.now.utc
+          @ts_expires_in ||= 5.minutes
         end
 
         def token_response
@@ -19,7 +20,6 @@ module Rack
         end
 
         def verify!(request)          
-
           body = request.body.read
           if self.ext_verifier.present?
             self.ext_verifier.new(
@@ -28,6 +28,11 @@ module Rack
             ).verify!(request.ext)
           end
 
+          now = Time.now.utc.to_i
+          now = @ts.to_i if @ts.present?
+                    
+          raise Rack::OAuth2::AccessToken::MAC::Verifier::VerificationFailed.new("Request ts expired") if now - request.ts.to_i > @ts_expires_in.to_i
+
           Signature.new(
             :secret      => self.mac_key,
             :algorithm   => self.mac_algorithm,
@@ -45,6 +50,7 @@ module Rack
 
         def authenticate(request)
           @nonce = generate_nonce
+          @ts_generated = @ts || Time.now.utc
 
           if self.ext_verifier.present?
             @ext = self.ext_verifier.new(
@@ -61,7 +67,7 @@ module Rack
             :request_uri => request.header.create_query_uri,
             :host        => request.header.request_uri.host,
             :port        => request.header.request_uri.port,
-            :ts          => self.ts,
+            :ts          => @ts_generated,
             :ext         => @ext
           ).calculate
 
@@ -73,7 +79,7 @@ module Rack
         def authorization_header
           header = "MAC id=\"#{access_token}\""
           header << ", nonce=\"#{nonce}\""
-          header << ", ts=\"#{ts.to_i}\""
+          header << ", ts=\"#{@ts_generated.to_i}\""
           header << ", mac=\"#{signature}\""
           header << ", ext=\"#{ext}\"" if @ext.present?
           header
@@ -81,7 +87,7 @@ module Rack
 
         def generate_nonce
           [
-            (Time.now.utc - @ts).to_i,
+            (Time.now.utc - @issued_at).to_i,
             SecureRandom.hex
           ].join(':')
         end

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

@@ -6,7 +6,7 @@ module Rack
           attr_optional :raw_body
 
           def calculate
-            return nil if raw_body.nil?
+            return nil unless raw_body.present?
             
             OpenSSL::Digest::SHA256.new.digest(raw_body).unpack('H*').first
           end

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

@@ -18,7 +18,6 @@ module Rack
           end
 
           def verify!(expected)
-            puts "verifying #{expected} = #{self.calculate}"
             if expected == self.calculate
               :verified
             else

data/spec/rack/oauth2/access_token/mac/sha256_hex_verifier_spec.rb

@@ -15,4 +15,14 @@ describe Rack::OAuth2::AccessToken::MAC::Sha256HexVerifier do
   end
 
 
+  context 'when raw_body is empty' do
+    subject do
+      Rack::OAuth2::AccessToken::MAC::Sha256HexVerifier.new(
+        :algorithm => 'hmac-sha-256',
+        :raw_body => ''
+      )
+    end
+    its(:calculate) { should be_nil }
+  end
+
 end

data/spec/rack/oauth2/access_token/mac/verifier_spec.rb

@@ -17,7 +17,7 @@ describe Rack::OAuth2::AccessToken::MAC::Verifier do
   context 'otherwise' do
     let(:algorithm) { 'invalid' }
     it do
-      expect { verifier.send(:hash_generator) }.should raise_error(StandardError, 'Unsupported Algorithm')
+      expect { verifier.send(:hash_generator) }.to raise_error(StandardError, 'Unsupported Algorithm')
     end
   end
 

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

@@ -60,7 +60,7 @@ describe Rack::OAuth2::AccessToken::MAC do
       context 'otherwise' do
         let(:signature) { 'invalid' }
         it do
-          expect { token.verify!(request.setup!) }.should raise_error(
+          expect { token.verify!(request.setup!) }.to raise_error(
             Rack::OAuth2::Server::Resource::MAC::Unauthorized,
             'invalid_token :: Signature Invalid'
           )
@@ -84,7 +84,7 @@ describe Rack::OAuth2::AccessToken::MAC do
       context 'when ext is invalid' do
         let(:ext) { 'invalid' }
         it do
-          expect { token_with_ext_verifier.verify!(request.setup!) }.should raise_error(
+          expect { token_with_ext_verifier.verify!(request.setup!) }.to raise_error(
             Rack::OAuth2::Server::Resource::MAC::Unauthorized,
             'invalid_token :: Sha256HexVerifier Invalid'
           )
@@ -98,7 +98,6 @@ describe Rack::OAuth2::AccessToken::MAC do
           let(:signature) { 'dZYR54n+Lym5qCRRmDqmRZ71rG+bkjSWmqrOv8OjYHk=' }
           it do
             Time.fix(Time.at(1302361200)) do
-
               token_with_ext_verifier.verify!(request.setup!).should == :verified
             end
           end
@@ -106,7 +105,7 @@ describe Rack::OAuth2::AccessToken::MAC do
 
         context 'otherwise' do
           it do
-            expect { token.verify!(request.setup!) }.should raise_error(
+            expect { token.verify!(request.setup!) }.to raise_error(
               Rack::OAuth2::Server::Resource::MAC::Unauthorized,
               'invalid_token :: Signature Invalid'
             )

data/spec/rack/oauth2/access_token_spec.rb

@@ -33,7 +33,7 @@ describe Rack::OAuth2::AccessToken do
           :expires_in => 3600,
           :scope => [:scope1, :scope2]
         )
-      end.should raise_error AttrRequired::AttrMissing
+      end.to raise_error AttrRequired::AttrMissing
     end
   end
 
@@ -43,7 +43,7 @@ describe Rack::OAuth2::AccessToken do
         Rack::OAuth2::AccessToken::Bearer.new(
           :access_token => 'access_token'
         )
-      end.should_not raise_error
+      end.not_to raise_error
     end
   end
 

data/spec/rack/oauth2/client/grant/authorization_code_spec.rb

@@ -31,7 +31,7 @@ describe Rack::OAuth2::Client::Grant::AuthorizationCode do
 
   context 'otherwise' do
     it do
-      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+      expect { grant.new }.to raise_error AttrRequired::AttrMissing
     end
   end
 end

data/spec/rack/oauth2/client/grant/password_spec.rb

@@ -20,14 +20,14 @@ describe Rack::OAuth2::Client::Grant::Password do
 
     context 'otherwise' do
       it do
-        expect { grant.new attributes }.should raise_error AttrRequired::AttrMissing
+        expect { grant.new attributes }.to raise_error AttrRequired::AttrMissing
       end
     end
   end
 
   context 'otherwise' do
     it do
-      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+      expect { grant.new }.to raise_error AttrRequired::AttrMissing
     end
   end
 end

data/spec/rack/oauth2/client/grant/refresh_token_spec.rb

@@ -15,7 +15,7 @@ describe Rack::OAuth2::Client::Grant::RefreshToken do
 
   context 'otherwise' do
     it do
-      expect { grant.new }.should raise_error AttrRequired::AttrMissing
+      expect { grant.new }.to raise_error AttrRequired::AttrMissing
     end
   end
 end

data/spec/rack/oauth2/client_spec.rb

@@ -18,7 +18,7 @@ describe Rack::OAuth2::Client do
 
   context 'when identifier is missing' do
     it do
-      expect { Rack::OAuth2::Client.new }.should raise_error AttrRequired::AttrMissing
+      expect { Rack::OAuth2::Client.new }.to raise_error AttrRequired::AttrMissing
     end
   end
 
@@ -211,7 +211,7 @@ describe Rack::OAuth2::Client do
         )
       end
       it do
-        expect { client.access_token! }.should raise_error(StandardError, 'Unknown Token Type')
+        expect { client.access_token! }.to raise_error(StandardError, 'Unknown Token Type')
       end
     end
 
@@ -225,7 +225,7 @@ describe Rack::OAuth2::Client do
         )
       end
       it do
-        expect { client.access_token! }.should raise_error Rack::OAuth2::Client::Error
+        expect { client.access_token! }.to raise_error Rack::OAuth2::Client::Error
       end
     end
   end
@@ -241,13 +241,13 @@ describe Rack::OAuth2::Client do
 
     describe '#authorization_uri' do
       it do
-        expect { client.authorization_uri }.should raise_error 'No Host Info'
+        expect { client.authorization_uri }.to raise_error 'No Host Info'
       end
     end
 
     describe '#access_token!' do
       it do
-        expect { client.access_token! }.should raise_error 'No Host Info'
+        expect { client.access_token! }.to raise_error 'No Host Info'
       end
     end
   end

data/spec/rack/oauth2/oauth2_spec.rb

@@ -32,6 +32,8 @@ describe Rack::OAuth2 do
   describe '.http_config' do
     context 'when request_filter added' do
       context 'when "debug!" is called' do
+        after { Rack::OAuth2.reset_http_config! }
+  
         it 'should put Debugger::RequestFilter at last' do
           Rack::OAuth2.debug!
           Rack::OAuth2.http_config do |config|
@@ -39,6 +41,33 @@ describe Rack::OAuth2 do
           end
           Rack::OAuth2.http_client.request_filter.last.should be_instance_of Rack::OAuth2::Debugger::RequestFilter
         end
+
+        it 'should reset_http_config' do
+          Rack::OAuth2.debug!
+          Rack::OAuth2.http_config do |config|
+            config.request_filter << Proc.new {}
+          end
+          size = Rack::OAuth2.http_client.request_filter.size
+          Rack::OAuth2.reset_http_config!
+          Rack::OAuth2.http_client.request_filter.size.should == size - 1
+        end
+
+      end
+    end
+  end
+
+  describe ".http_client" do
+    context "when local_http_config is used" do
+      it "should correctly set request_filter" do
+        clnt1 = Rack::OAuth2.http_client
+        clnt2 = Rack::OAuth2.http_client("my client") do |config|
+          config.request_filter << Proc.new {}
+        end
+        clnt3 = Rack::OAuth2.http_client
+
+        clnt1.request_filter.size.should == clnt3.request_filter.size
+        clnt1.request_filter.size.should == clnt2.request_filter.size - 1
+
       end
     end
   end

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

@@ -26,14 +26,14 @@ describe Rack::OAuth2::Server::Authorize::Code do
     context 'when redirect_uri is missing' do
       let(:redirect_uri) { nil }
       it do
-        expect { response }.should raise_error AttrRequired::AttrMissing
+        expect { response }.to raise_error AttrRequired::AttrMissing
       end
     end
 
     context 'when code is missing' do
       let(:authorization_code) { nil }
       it do
-        expect { response }.should raise_error AttrRequired::AttrMissing
+        expect { response }.to raise_error AttrRequired::AttrMissing
       end
     end
   end

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

@@ -50,7 +50,7 @@ describe Rack::OAuth2::Server::Authorize::BadRequest do
 
     context 'otherwise' do
       it 'should raise itself' do
-        expect { error.finish }.should raise_error(klass) { |e|
+        expect { error.finish }.to raise_error(klass) { |e|
           e.should == error
         }
       end
@@ -69,12 +69,12 @@ describe Rack::OAuth2::Server::Authorize::ErrorMethods do
 
   describe 'bad_request!' do
     it do
-      expect { request.bad_request! }.should raise_error klass
+      expect { request.bad_request! }.to raise_error klass
     end
 
     context 'when response_type = :code' do
       it 'should set protocol_params_location = :query' do
-        expect { request_for_code.bad_request! }.should raise_error(klass) { |e|
+        expect { request_for_code.bad_request! }.to raise_error(klass) { |e|
           e.protocol_params_location.should == :query
         }
       end
@@ -82,7 +82,7 @@ describe Rack::OAuth2::Server::Authorize::ErrorMethods do
 
     context 'when response_type = :token' do
       it 'should set protocol_params_location = :fragment' do
-        expect { request_for_token.bad_request! }.should raise_error(klass) { |e|
+        expect { request_for_token.bad_request! }.to raise_error(klass) { |e|
           e.protocol_params_location.should == :fragment
         }
       end
@@ -93,7 +93,7 @@ describe Rack::OAuth2::Server::Authorize::ErrorMethods do
     method = "#{error_code}!"
     describe method do
       it "should raise Rack::OAuth2::Server::Authorize::BadRequest with error = :#{error_code}" do
-        expect { request.send method }.should raise_error(klass) { |error|
+        expect { request.send method }.to raise_error(klass) { |error|
           error.error.should       == error_code
           error.description.should == default_description[error_code]
         }

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

@@ -37,7 +37,7 @@ describe Rack::OAuth2::Server::Authorize::Token do
         end
       end
       it do
-        expect { response }.should raise_error AttrRequired::AttrMissing
+        expect { response }.to raise_error AttrRequired::AttrMissing
       end
     end
 
@@ -49,7 +49,7 @@ describe Rack::OAuth2::Server::Authorize::Token do
         end
       end
       it do
-        expect { response }.should raise_error AttrRequired::AttrMissing
+        expect { response }.to raise_error AttrRequired::AttrMissing
       end
     end
   end

data/spec/rack/oauth2/server/authorize_spec.rb

@@ -8,25 +8,25 @@ describe Rack::OAuth2::Server::Authorize do
 
   context 'when response_type is missing' do
     it do
-      expect { request.get "/?client_id=client&redirect_uri=#{redirect_uri}" }.should raise_error bad_request
+      expect { request.get "/?client_id=client&redirect_uri=#{redirect_uri}" }.to raise_error bad_request
     end
   end
 
   context 'when redirect_uri is missing' do
     it do
-      expect { request.get "/?response_type=code&client_id=client" }.should_not raise_error
+      expect { request.get "/?response_type=code&client_id=client" }.not_to raise_error
     end
   end
 
   context 'when client_id is missing' do
     it do
-      expect { request.get "/?response_type=code&redirect_uri=#{redirect_uri}" }.should raise_error bad_request
+      expect { request.get "/?response_type=code&redirect_uri=#{redirect_uri}" }.to raise_error bad_request
     end
   end
 
   context 'when unknown response_type is given' do
     it do
-      expect { request.get "/?response_type=unknown&client_id=client&redirect_uri=#{redirect_uri}" }.should raise_error bad_request
+      expect { request.get "/?response_type=unknown&client_id=client&redirect_uri=#{redirect_uri}" }.to raise_error bad_request
     end
   end
 
@@ -40,8 +40,8 @@ describe Rack::OAuth2::Server::Authorize do
   end
 
   describe Rack::OAuth2::Server::Authorize::Request do
-    let(:env)            { Rack::MockRequest.env_for("/authorize?client_id=client&redirect_uri=#{redirect_uri}") }
-    let(:request)        { Rack::OAuth2::Server::Authorize::Request.new env }
+    let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client&redirect_uri=#{redirect_uri}") }
+    let(:request) { Rack::OAuth2::Server::Authorize::Request.new env }
 
     describe '#varified_redirect_uri' do
       context 'when an Array of pre-registered URIs are given' do
@@ -68,7 +68,7 @@ describe Rack::OAuth2::Server::Authorize do
           it do
             expect do
               request.verify_redirect_uri!(pre_registered)
-            end.should raise_error Rack::OAuth2::Server::Authorize::BadRequest
+            end.to raise_error Rack::OAuth2::Server::Authorize::BadRequest
           end
         end
       end
@@ -93,7 +93,7 @@ describe Rack::OAuth2::Server::Authorize do
           it do
             expect do
               request.verify_redirect_uri!(pre_registered)
-            end.should raise_error Rack::OAuth2::Server::Authorize::BadRequest
+            end.to raise_error Rack::OAuth2::Server::Authorize::BadRequest
           end
         end
       end
@@ -103,7 +103,7 @@ describe Rack::OAuth2::Server::Authorize do
         it do
           expect do
             request.verify_redirect_uri!(pre_registered)
-          end.should raise_error Rack::OAuth2::Server::Authorize::BadRequest
+          end.to raise_error Rack::OAuth2::Server::Authorize::BadRequest
         end
       end
 
@@ -151,7 +151,7 @@ describe Rack::OAuth2::Server::Authorize do
       it do
         expect do
           app.send(:response_type_for, request)
-        end.should raise_error bad_request
+        end.to raise_error bad_request
       end
     end
 

data/spec/rack/oauth2/server/resource/bearer/error_spec.rb

@@ -27,7 +27,7 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
 
   describe 'unauthorized!' do
     it do
-      expect { request.unauthorized! :invalid_client }.should raise_error unauthorized
+      expect { request.unauthorized! :invalid_client }.to raise_error unauthorized
     end
   end
 
@@ -41,7 +41,7 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
     else
       describe method do
         it "should raise Rack::OAuth2::Server::Resource::Bearer::Unauthorized with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(unauthorized) { |error|
+          expect { request.send method }.to raise_error(unauthorized) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }

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

@@ -23,7 +23,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
 
   describe '#scheme' do
     it do
-      expect { error.scheme }.should raise_error(RuntimeError, 'Define me!')
+      expect { error.scheme }.to raise_error(RuntimeError, 'Define me!')
     end
   end
 
@@ -105,13 +105,13 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
 
   describe 'bad_request!' do
     it do
-      expect { request.bad_request! :invalid_request }.should raise_error bad_request
+      expect { request.bad_request! :invalid_request }.to raise_error bad_request
     end
   end
 
   describe 'unauthorized!' do
     it do
-      expect { request.unauthorized! :invalid_client }.should raise_error(RuntimeError, 'Define me!')
+      expect { request.unauthorized! :invalid_client }.to raise_error(RuntimeError, 'Define me!')
     end
   end
 
@@ -121,7 +121,7 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
     when :invalid_request
       describe method do
         it "should raise Rack::OAuth2::Server::Resource::BadRequest with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(bad_request) { |error|
+          expect { request.send method }.to raise_error(bad_request) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }
@@ -130,7 +130,7 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
     when :insufficient_scope
       describe method do
         it "should raise Rack::OAuth2::Server::Resource::Forbidden with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(forbidden) { |error|
+          expect { request.send method }.to raise_error(forbidden) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }
@@ -139,7 +139,7 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
     else
       describe method do
         it do
-          expect { request.send method }.should raise_error(RuntimeError, 'Define me!')
+          expect { request.send method }.to raise_error(RuntimeError, 'Define me!')
         end
       end
     end

data/spec/rack/oauth2/server/resource/mac/error_spec.rb

@@ -27,7 +27,7 @@ describe Rack::OAuth2::Server::Resource::MAC::ErrorMethods do
 
   describe 'unauthorized!' do
     it do
-      expect { request.unauthorized! :invalid_client }.should raise_error unauthorized
+      expect { request.unauthorized! :invalid_client }.to raise_error unauthorized
     end
   end
 
@@ -41,7 +41,7 @@ describe Rack::OAuth2::Server::Resource::MAC::ErrorMethods do
     else
       describe method do
         it "should raise Rack::OAuth2::Server::Resource::Bearer::Unauthorized with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(unauthorized) { |error|
+          expect { request.send method }.to raise_error(unauthorized) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }

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

@@ -19,7 +19,8 @@ describe Rack::OAuth2::Server::Resource::MAC do
     Rack::OAuth2::AccessToken::MAC.new(
       :access_token => 'valid_token',
       :mac_key => 'secret',
-      :mac_algorithm => 'hmac-sha-256'
+      :mac_algorithm => 'hmac-sha-256',
+      :ts => 1305820230 # fix verification time
     )
   end
   let(:access_token) { env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN] }
@@ -80,6 +81,11 @@ describe Rack::OAuth2::Server::Resource::MAC do
       let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC id="valid_token", nonce="51e74de734c05613f37520872e68db5f", ts="1305820234", mac="26JP6MMZyAHLHeMU8+m+NbVJgZbikp5SlT86/a62pwg="') }
       it_behaves_like :authenticated_mac_request
     end
+
+    context 'when all required params are valid and ts is expired' do
+      let(:env) { Rack::MockRequest.env_for('/protected_resource', 'HTTP_AUTHORIZATION' => 'MAC id="valid_token", nonce="51e74de734c05613f37520872e68db5f", ts="1305819234", mac="nuo4765MZrVL/qMsAtuTczhqZAE5y02ChaLCyOiVU68="') }
+      it_behaves_like :unauthorized_mac_request
+    end
   end
 
   context 'when invalid_token is given' do

data/spec/rack/oauth2/server/resource_spec.rb

@@ -11,13 +11,13 @@ describe Rack::OAuth2::Server::Resource::Request do
 
   describe '#setup!' do
     it do
-      expect { request.setup! }.should raise_error(RuntimeError, 'Define me!')
+      expect { request.setup! }.to raise_error(RuntimeError, 'Define me!')
     end
   end
 
   describe '#oauth2?' do
     it do
-      expect { request.oauth2? }.should raise_error(RuntimeError, 'Define me!')
+      expect { request.oauth2? }.to raise_error(RuntimeError, 'Define me!')
     end
   end
 end

data/spec/rack/oauth2/server/token/error_spec.rb

@@ -41,13 +41,13 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
 
   describe 'bad_request!' do
     it do
-      expect { request.bad_request! :invalid_request }.should raise_error bad_request
+      expect { request.bad_request! :invalid_request }.to raise_error bad_request
     end
   end
 
   describe 'unauthorized!' do
     it do
-      expect { request.unauthorized! :invalid_client }.should raise_error unauthorized
+      expect { request.unauthorized! :invalid_client }.to raise_error unauthorized
     end
   end
 
@@ -57,7 +57,7 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
     when :invalid_client
       describe method do
         it "should raise Rack::OAuth2::Server::Token::Unauthorized with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(unauthorized) { |error|
+          expect { request.send method }.to raise_error(unauthorized) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }
@@ -66,7 +66,7 @@ describe Rack::OAuth2::Server::Token::ErrorMethods do
     else
       describe method do
         it "should raise Rack::OAuth2::Server::Token::BadRequest with error = :#{error_code}" do
-          expect { request.send method }.should raise_error(bad_request) { |error|
+          expect { request.send method }.to raise_error(bad_request) { |error|
             error.error.should       == error_code
             error.description.should == default_description[error_code]
           }

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

@@ -96,7 +96,7 @@ describe Rack::OAuth2::Server::Token do
         Rack::OAuth2::Server::Token.new
       end
       it do
-        expect { request.post('/', :params => params) }.should raise_error AttrRequired::AttrMissing
+        expect { request.post('/', :params => params) }.to raise_error AttrRequired::AttrMissing
       end
     end
   end

data/spec/rack/oauth2/util_spec.rb

@@ -40,14 +40,14 @@ describe Rack::OAuth2::Util do
       it do
         expect do
           util.parse_uri '::'
-        end.should raise_error URI::InvalidURIError
+        end.to raise_error URI::InvalidURIError
       end
     end
 
     context 'otherwise' do
       it do
-        expect { util.parse_uri nil }.should raise_error StandardError
-        expect { util.parse_uri 123 }.should raise_error StandardError
+        expect { util.parse_uri nil }.to raise_error StandardError
+        expect { util.parse_uri 123 }.to raise_error StandardError
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.14.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack