rack-oauth2 1.1.1 → 1.2.0

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

@@ -59,7 +59,7 @@ describe Rack::OAuth2::Server::Resource::Unauthorized do
 
       context 'when realm is specified' do
         let(:realm) { 'server.example.com' }
-        let(:error) { Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:something, nil, :realm => realm) }
+        let(:error) { Rack::OAuth2::Server::Resource::Bearer::Unauthorized.new(:something, nil, realm: realm) }
 
         it 'should use given realm' do
           status, header, response = error_with_scheme.finish
@@ -86,7 +86,7 @@ describe Rack::OAuth2::Server::Resource::Forbidden do
   end
 
   context 'when scope option is given' do
-    let(:error) { Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(:insufficient_scope, 'Desc', :scope => [:scope1, :scope2]) }
+    let(:error) { Rack::OAuth2::Server::Resource::Bearer::Forbidden.new(:insufficient_scope, 'Desc', scope: [:scope1, :scope2]) }
 
     it 'should have blank WWW-Authenticate header' do
       status, header, response = error.finish
@@ -144,4 +144,4 @@ describe Rack::OAuth2::Server::Resource::Bearer::ErrorMethods do
       end
     end
   end
-end
+end

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

@@ -17,10 +17,10 @@ describe Rack::OAuth2::Server::Resource::MAC do
   end
   let(:mac_token) do
     Rack::OAuth2::AccessToken::MAC.new(
-      :access_token => 'valid_token',
-      :mac_key => 'secret',
-      :mac_algorithm => 'hmac-sha-256',
-      :ts => 1305820230 # fix verification time
+      access_token: 'valid_token',
+      mac_key: 'secret',
+      mac_algorithm: 'hmac-sha-256',
+      ts: 1305820230 # fix verification time
     )
   end
   let(:access_token) { env[Rack::OAuth2::Server::Resource::ACCESS_TOKEN] }

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

@@ -4,18 +4,18 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
   let(:request) { Rack::MockRequest.new app }
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
-      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
     end
   end
   let(:params) do
     {
-      :grant_type => 'authorization_code',
-      :client_id => 'client_id',
-      :code => 'authorization_code',
-      :redirect_uri => 'http://client.example.com/callback'
+      grant_type: 'authorization_code',
+      client_id: 'client_id',
+      code: 'authorization_code',
+      redirect_uri: 'http://client.example.com/callback'
     }
   end
-  let(:response) { request.post('/', :params => params) }
+  let(:response) { request.post('/', params: params) }
   subject { response }
 
   its(:status)       { should == 200 }
@@ -40,4 +40,4 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
       its(:body)         { should include '"error":"invalid_request"' }
     end
   end
-end
+end

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

@@ -4,20 +4,20 @@ describe Rack::OAuth2::Server::Token::ClientCredentials do
   let(:request) { Rack::MockRequest.new app }
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
-      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
     end
   end
   let(:params) do
     {
-      :grant_type => 'client_credentials',
-      :client_id => 'client_id',
-      :client_secret => 'client_secret'
+      grant_type: 'client_credentials',
+      client_id: 'client_id',
+      client_secret: 'client_secret'
     }
   end
-  subject { request.post('/', :params => params) }
+  subject { request.post('/', params: params) }
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }
   its(:body)         { should include '"access_token":"access_token"' }
   its(:body)         { should include '"token_type":"bearer"' }
-end
+end

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

@@ -4,18 +4,18 @@ describe Rack::OAuth2::Server::Token::Password do
   let(:request) { Rack::MockRequest.new app }
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
-      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
     end
   end
   let(:params) do
     {
-      :grant_type => 'password',
-      :client_id => 'client_id',
-      :username => 'nov',
-      :password => 'secret'
+      grant_type: 'password',
+      client_id: 'client_id',
+      username: 'nov',
+      password: 'secret'
     }
   end
-  subject { request.post('/', :params => params) }
+  subject { request.post('/', params: params) }
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }
@@ -34,4 +34,4 @@ describe Rack::OAuth2::Server::Token::Password do
       its(:body)         { should include '"error":"invalid_request"' }
     end
   end
-end
+end

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

@@ -4,17 +4,17 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
   let(:request) { Rack::MockRequest.new app }
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
-      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
     end
   end
   let(:params) do
     {
-      :grant_type => "refresh_token",
-      :client_id => "client_id",
-      :refresh_token => "refresh_token"
+      grant_type: "refresh_token",
+      client_id: "client_id",
+      refresh_token: "refresh_token"
     }
   end
-  subject { request.post('/', :params => params) }
+  subject { request.post('/', params: params) }
 
   its(:status)       { should == 200 }
   its(:content_type) { should == 'application/json' }

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

@@ -5,18 +5,18 @@ describe Rack::OAuth2::Server::Token do
   let(:request) { Rack::MockRequest.new app }
   let(:app) do
     Rack::OAuth2::Server::Token.new do |request, response|
-      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+      response.access_token = Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
     end
   end
   let(:params) do
     {
-      :grant_type => 'authorization_code',
-      :client_id => 'client_id',
-      :code => 'authorization_code',
-      :redirect_uri => 'http://client.example.com/callback'
+      grant_type: 'authorization_code',
+      client_id: 'client_id',
+      code: 'authorization_code',
+      redirect_uri: 'http://client.example.com/callback'
     }
   end
-  subject { request.post('/token', :params => params) }
+  subject { request.post('/token', params: params) }
 
   context 'when multiple client credentials are given' do
     context 'when different credentials are given' do
@@ -24,7 +24,7 @@ describe Rack::OAuth2::Server::Token do
         Rack::MockRequest.env_for(
           '/token',
           'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64('client_id2:client_secret')}",
-          :params => params
+          params: params
         )
       end
       it 'should fail with unsupported_grant_type' do
@@ -39,7 +39,7 @@ describe Rack::OAuth2::Server::Token do
         Rack::MockRequest.env_for(
           '/token',
           'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64('client_id:client_secret')}",
-          :params => params
+          params: params
         )
       end
       it 'should ignore duplicates' do
@@ -51,7 +51,7 @@ describe Rack::OAuth2::Server::Token do
 
   context 'when unsupported grant_type is given' do
     before do
-      params.merge!(:grant_type => 'unknown')
+      params.merge!(grant_type: 'unknown')
     end
     its(:status)       { should == 400 }
     its(:content_type) { should == 'application/json' }
@@ -96,7 +96,7 @@ describe Rack::OAuth2::Server::Token do
         Rack::OAuth2::Server::Token.new
       end
       it do
-        expect { request.post('/', :params => params) }.to raise_error AttrRequired::AttrMissing
+        expect { request.post('/', params: params) }.to raise_error AttrRequired::AttrMissing
       end
     end
   end
@@ -110,7 +110,7 @@ describe Rack::OAuth2::Server::Token do
     let(:env) do
       Rack::MockRequest.env_for(
         '/token',
-        :params => params
+        params: params
       )
     end
     let(:request) { Rack::OAuth2::Server::Token::Request.new env }
@@ -119,8 +119,8 @@ describe Rack::OAuth2::Server::Token do
     describe 'JWT assertion' do
       let(:params) do
         {
-          :grant_type => 'urn:ietf:params:oauth:grant-type:jwt-bearer',
-          :assertion => 'header.payload.signature'
+          grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+          assertion: 'header.payload.signature'
         }
       end
 
@@ -131,4 +131,4 @@ describe Rack::OAuth2::Server::Token do
       end
     end
   end
-end
+end

data/spec/rack/oauth2/util_spec.rb

@@ -20,8 +20,8 @@ describe Rack::OAuth2::Util do
   end
 
   describe '.compact_hash' do
-    subject { util.compact_hash :k1 => 'v1', :k2 => '', :k3 => nil }
-    it { should == {:k1 => 'v1'} }
+    subject { util.compact_hash k1: 'v1', k2: '', k3: nil }
+    it { should == {k1: 'v1'} }
   end
 
   describe '.parse_uri' do
@@ -55,7 +55,7 @@ describe Rack::OAuth2::Util do
   describe '.redirect_uri' do
     let(:base_uri) { 'http://client.example.com' }
     let(:params) do
-      {:k1 => :v1, :k2 => ''}
+      {k1: :v1, k2: ''}
     end
     subject { util.redirect_uri base_uri, location, params }
 
@@ -94,4 +94,4 @@ describe Rack::OAuth2::Util do
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-oauth2
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack