openid_connect 0.3.3 → 0.3.4

data/spec/openid_connect/access_token_spec.rb

@@ -4,14 +4,14 @@ describe OpenIDConnect::AccessToken do
   subject { access_token }
   let :client do
     OpenIDConnect::Client.new(
-      :identifier => 'client_id',
-      :host => 'server.example.com'
+      identifier:'client_id',
+      host: 'server.example.com'
     )
   end
   let :access_token do
     OpenIDConnect::AccessToken.new(
-      :access_token => 'access_token',
-      :client => client
+      access_token: 'access_token',
+      client: client
     )
   end
 
@@ -22,21 +22,21 @@ describe OpenIDConnect::AccessToken do
     subject { access_token }
     let :access_token do
       OpenIDConnect::AccessToken.new(
-        :access_token => 'access_token',
-        :id_token => id_token,
-        :client => client
+        access_token: 'access_token',
+        id_token: id_token,
+        client: client
       )
     end
 
     context 'when IdToken object' do
       let :id_token do
         OpenIDConnect::ResponseObject::IdToken.new(
-          :iss => 'https://server.example.com',
-          :user_id => 'user_id',
-          :aud => 'client_id',
-          :nonce => 'nonce',
-          :exp => 1.week.from_now,
-          :iat => Time.now
+          iss: 'https://server.example.com',
+          user_id: 'user_id',
+          aud: 'client_id',
+          nonce: 'nonce',
+          exp: 1.week.from_now,
+          iat: Time.now
         )
       end
       its(:id_token) { should be_a OpenIDConnect::ResponseObject::IdToken }
@@ -53,8 +53,8 @@ describe OpenIDConnect::AccessToken do
   shared_examples_for :access_token_error_handling do
     context 'when bad_request' do
       it 'should raise OpenIDConnect::Forbidden' do
-        mock_json :get, endpoint, 'errors/invalid_request', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 400, :params => {
-          :schema => 'openid'
+        mock_json :get, endpoint, 'errors/invalid_request', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 400, params: {
+          schema: 'openid'
         } do
           expect { request }.to raise_error OpenIDConnect::BadRequest
         end
@@ -63,8 +63,8 @@ describe OpenIDConnect::AccessToken do
 
     context 'when unauthorized' do
       it 'should raise OpenIDConnect::Unauthorized' do
-        mock_json :get, endpoint, 'errors/invalid_access_token', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 401, :params => {
-          :schema => 'openid'
+        mock_json :get, endpoint, 'errors/invalid_access_token', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 401, params: {
+          schema: 'openid'
         } do
           expect { request }.to raise_error OpenIDConnect::Unauthorized
         end
@@ -73,8 +73,8 @@ describe OpenIDConnect::AccessToken do
 
     context 'when forbidden' do
       it 'should raise OpenIDConnect::Forbidden' do
-        mock_json :get, endpoint, 'errors/insufficient_scope', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 403, :params => {
-          :schema => 'openid'
+        mock_json :get, endpoint, 'errors/insufficient_scope', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 403, params: {
+          schema: 'openid'
         } do
           expect { request }.to raise_error OpenIDConnect::Forbidden
         end
@@ -83,8 +83,8 @@ describe OpenIDConnect::AccessToken do
 
     context 'when unknown' do
       it 'should raise OpenIDConnect::HttpError' do
-        mock_json :get, endpoint, 'errors/unknown', :HTTP_AUTHORIZATION => 'Bearer access_token', :status => 500, :params => {
-          :schema => 'openid'
+        mock_json :get, endpoint, 'errors/unknown', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 500, params: {
+          schema: 'openid'
         } do
           expect { request }.to raise_error OpenIDConnect::HttpError
         end
@@ -94,8 +94,8 @@ describe OpenIDConnect::AccessToken do
 
   describe '#user_info!' do
     it 'should return OpenIDConnect::ResponseObject::UserInfo::OpenID' do
-      mock_json :get, client.user_info_uri, 'user_info/openid', :HTTP_AUTHORIZATION => 'Bearer access_token', :params => {
-        :schema => 'openid'
+      mock_json :get, client.user_info_uri, 'user_info/openid', :HTTP_AUTHORIZATION => 'Bearer access_token', params: {
+        schema: 'openid'
       } do
         access_token.user_info!.should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID
       end

data/spec/openid_connect/client/registrar_spec.rb

@@ -5,7 +5,7 @@ describe OpenIDConnect::Client::Registrar do
   let(:attributes) { minimum_attributes }
   let(:minimum_attributes) do
     {
-      :type => :client_associate
+      type: :client_associate
     }
   end
   let(:instance) { OpenIDConnect::Client::Registrar.new(endpoint, attributes) }
@@ -24,8 +24,8 @@ describe OpenIDConnect::Client::Registrar do
         context 'when client_id given' do
           let(:attributes) do
             {
-              :type => :client_update,
-              :client_id => 'client.example.com'
+              type: :client_update,
+              client_id: 'client.example.com'
             }
           end
           it { should be_valid }
@@ -34,7 +34,7 @@ describe OpenIDConnect::Client::Registrar do
         context 'otherwise' do
           let(:attributes) do
             {
-              :type => :client_update
+              type: :client_update
             }
           end
           it { should_not be_valid }
@@ -44,7 +44,7 @@ describe OpenIDConnect::Client::Registrar do
       context 'otherwise' do
         let(:attributes) do
           {
-            :type => :invalid_type
+            type: :invalid_type
           }
         end
         it { should_not be_valid }
@@ -77,7 +77,7 @@ describe OpenIDConnect::Client::Registrar do
     context 'when sector_identifier_url given' do
       let(:attributes) do
         minimum_attributes.merge(
-          :sector_identifier_url => 'https://client.example.com/sector_identifier.json'
+          sector_identifier_url: 'https://client.example.com/sector_identifier.json'
         )
       end
       its(:sector_identifier) { should == 'client.example.com' }
@@ -85,7 +85,7 @@ describe OpenIDConnect::Client::Registrar do
       context 'when sector_identifier_url is invalid URI' do
         let(:attributes) do
           minimum_attributes.merge(
-            :sector_identifier_url => ':invalid'
+            sector_identifier_url: ':invalid'
           )
         end
         its(:sector_identifier) { should be_nil }
@@ -94,8 +94,8 @@ describe OpenIDConnect::Client::Registrar do
       context 'when redirect_uris given' do
         let(:attributes) do
           minimum_attributes.merge(
-            :sector_identifier_url => 'https://client.example.com/sector_identifier.json',
-            :redirect_uris => 'https://client2.example.com/callback'
+            sector_identifier_url: 'https://client.example.com/sector_identifier.json',
+            redirect_uris: 'https://client2.example.com/callback'
           )
         end
         its(:sector_identifier) { should == 'client.example.com' }
@@ -107,7 +107,7 @@ describe OpenIDConnect::Client::Registrar do
         context 'when single host' do
           let(:attributes) do
             minimum_attributes.merge(
-              :redirect_uris => [
+              redirect_uris: [
                 'https://client.example.com/callback/op1',
                 'https://client.example.com/callback/op2'
               ].join(' ')
@@ -119,7 +119,7 @@ describe OpenIDConnect::Client::Registrar do
         context 'when multi host' do
           let(:attributes) do
             minimum_attributes.merge(
-              :redirect_uris => [
+              redirect_uris: [
                 'https://client1.example.com/callback',
                 'https://client2.example.com/callback'
               ].join(' ')
@@ -131,7 +131,7 @@ describe OpenIDConnect::Client::Registrar do
         context 'when invalid URI' do
           let(:attributes) do
             minimum_attributes.merge(
-              :redirect_uris => ':invalid'
+              redirect_uris: ':invalid'
             )
           end
           its(:sector_identifier) { should be_nil }
@@ -149,7 +149,7 @@ describe OpenIDConnect::Client::Registrar do
       context 'when invalid email included' do
         let(:attributes) do
           minimum_attributes.merge(
-            :contacts => [
+            contacts: [
               ':invalid',
               'nov@matake.jp'
             ].join(' ')
@@ -161,7 +161,7 @@ describe OpenIDConnect::Client::Registrar do
       context 'when localhost address included' do
         let(:attributes) do
           minimum_attributes.merge(
-            :contacts => [
+            contacts: [
               'nov@localhost',
               'nov@matake.jp'
             ].join(' ')
@@ -173,7 +173,7 @@ describe OpenIDConnect::Client::Registrar do
       context 'otherwise' do
         let(:attributes) do
           minimum_attributes.merge(
-            :contacts => 'nov@matake.jp'
+            contacts: 'nov@matake.jp'
           )
         end
         it { should be_valid }
@@ -185,7 +185,7 @@ describe OpenIDConnect::Client::Registrar do
     context 'when valid' do
       let(:attributes) do
         minimum_attributes.merge(
-          :redirect_uris => [
+          redirect_uris: [
             'https://client1.example.com/callback',
             'https://client2.example.com/callback'
           ].join(' ')
@@ -193,8 +193,8 @@ describe OpenIDConnect::Client::Registrar do
       end
       its(:as_json) do
         should == {
-          :type => 'client_associate',
-          :redirect_uris => 'https://client1.example.com/callback https://client2.example.com/callback'
+          type: 'client_associate',
+          redirect_uris: 'https://client1.example.com/callback https://client2.example.com/callback'
         }
       end
     end
@@ -202,7 +202,7 @@ describe OpenIDConnect::Client::Registrar do
     context 'otherwise' do
       let(:attributes) do
         {
-          :type => :client_update
+          type: :client_update
         }
       end
       it do
@@ -219,8 +219,8 @@ describe OpenIDConnect::Client::Registrar do
     end
 
     it 'should return OpenIDConnect::Client' do
-      mock_json :post, endpoint, 'client/registered', :params => {
-        :type => 'client_associate'
+      mock_json :post, endpoint, 'client/registered', params: {
+        type: 'client_associate'
       } do
         client = instance.associate!
         client.should be_instance_of OpenIDConnect::Client
@@ -232,9 +232,9 @@ describe OpenIDConnect::Client::Registrar do
 
     context 'when failed' do
       it 'should raise OpenIDConnect::Client::Registrar::RegistrationFailed' do
-        mock_json :post, endpoint, 'errors/unknown', :params => {
-          :type => 'client_associate'
-        }, :status => 400 do
+        mock_json :post, endpoint, 'errors/unknown', params: {
+          type: 'client_associate'
+        }, status: 400 do
           expect do
             instance.associate!
           end.to raise_error OpenIDConnect::Client::Registrar::RegistrationFailed
@@ -246,17 +246,17 @@ describe OpenIDConnect::Client::Registrar do
   describe '#update!' do
     let(:attributes) do
       {
-        :client_id => 'client.example.com',
-        :client_secret => 'client_secret'
+        client_id: 'client.example.com',
+        client_secret: 'client_secret'
       }
     end
 
     it 'should return OpenIDConnect::Client' do
-      mock_json :post, endpoint, 'client/updated', :params => {
-        :type => 'client_update',
-        :client_id => 'client.example.com',
-        :client_secret => 'client_secret',
-        :application_name => 'New Name'
+      mock_json :post, endpoint, 'client/updated', params: {
+        type: 'client_update',
+        client_id: 'client.example.com',
+        client_secret: 'client_secret',
+        application_name: 'New Name'
       } do
         instance.application_name = 'New Name'
         client = instance.update!
@@ -267,11 +267,11 @@ describe OpenIDConnect::Client::Registrar do
 
     context 'when failed' do
       it 'should raise OpenIDConnect::Client::Registrar::RegistrationFailed' do
-        mock_json :post, endpoint, 'errors/unknown', :params => {
-          :type => 'client_update',
-          :client_id => 'client.example.com',
-          :client_secret => 'client_secret'
-        }, :status => 400 do
+        mock_json :post, endpoint, 'errors/unknown', params: {
+          type: 'client_update',
+          client_id: 'client.example.com',
+          client_secret: 'client_secret'
+        }, status: 400 do
           expect do
             instance.update!
           end.to raise_error OpenIDConnect::Client::Registrar::RegistrationFailed
@@ -283,16 +283,16 @@ describe OpenIDConnect::Client::Registrar do
   describe '#rotate_secret!' do
     let(:attributes) do
       {
-        :client_id => 'client.example.com',
-        :client_secret => 'client_secret'
+        client_id: 'client.example.com',
+        client_secret: 'client_secret'
       }
     end
 
     it 'should return OpenIDConnect::Client' do
-      mock_json :post, endpoint, 'client/rotated', :params => {
-        :type => 'rotate_secret',
-        :client_id => 'client.example.com',
-        :client_secret => 'client_secret'
+      mock_json :post, endpoint, 'client/rotated', params: {
+        type: 'rotate_secret',
+        client_id: 'client.example.com',
+        client_secret: 'client_secret'
       } do
         client = instance.rotate_secret!
         client.should be_instance_of OpenIDConnect::Client
@@ -315,7 +315,7 @@ describe OpenIDConnect::Client::Registrar do
     context 'otherwise' do
       let(:attributes) do
         {
-          :type => :client_update
+          type: :client_update
         }
       end
       it do
@@ -332,13 +332,13 @@ describe OpenIDConnect::Client::Registrar do
     context 'when access_token given' do
       let(:attributes) do
         minimum_attributes.merge(
-          :access_token => access_token
+          access_token: access_token
         )
       end
 
       context 'when Rack::OAuth2::AccessToken::Bearer given' do
         let(:access_token) do
-          Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token')
+          Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token')
         end
         it { should be_instance_of Rack::OAuth2::AccessToken::Bearer }
         its(:access_token) { should == 'access_token' }

data/spec/openid_connect/client_spec.rb

@@ -6,7 +6,7 @@ describe OpenIDConnect::Client do
   let(:attributes) { required_attributes }
   let :required_attributes do
     {
-      :identifier => 'client_id'
+      identifier: 'client_id'
     }
   end
 
@@ -14,7 +14,7 @@ describe OpenIDConnect::Client do
     context 'when host info is given' do
       let :attributes do
         required_attributes.merge(
-          :host => 'server.example.com'
+          host: 'server.example.com'
         )
       end
       its(:authorization_uri) { should include 'https://server.example.com/oauth2/authorize' }
@@ -36,13 +36,13 @@ describe OpenIDConnect::Client do
   describe '#authorization_uri' do
     describe 'scope' do
       subject do
-        query = URI.parse(client.authorization_uri :scope => scope).query
+        query = URI.parse(client.authorization_uri scope: scope).query
         Rack::Utils.parse_query(query).with_indifferent_access[:scope]
       end
       let(:scope) { nil }
       let :attributes do
         required_attributes.merge(
-          :host => 'server.example.com'
+          host: 'server.example.com'
         )
       end
 
@@ -67,14 +67,14 @@ describe OpenIDConnect::Client do
   describe '#access_token!' do
     let :attributes do
       required_attributes.merge(
-        :secret => 'client_secret',
-        :token_endpoint => 'http://server.example.com/access_tokens'
+        secret: 'client_secret',
+        token_endpoint: 'http://server.example.com/access_tokens'
       )
     end
     let :protocol_params do
       {
-        :grant_type => 'authorization_code',
-        :code => 'code'
+        grant_type: 'authorization_code',
+        code: 'code'
       }
     end
     let :header_params do
@@ -90,14 +90,14 @@ describe OpenIDConnect::Client do
 
     context 'when bearer token is returned' do
       it 'should return OpenIDConnect::AccessToken' do
-        mock_json :post, client.token_endpoint, 'access_token/bearer', :request_header => header_params, :params => protocol_params do
+        mock_json :post, client.token_endpoint, 'access_token/bearer', request_header: header_params, params: protocol_params do
           access_token.should be_a OpenIDConnect::AccessToken
         end
       end
 
       context 'when id_token is returned' do
         it 'should include id_token' do
-          mock_json :post, client.token_endpoint, 'access_token/bearer_with_id_token', :request_header => header_params, :params => protocol_params do
+          mock_json :post, client.token_endpoint, 'access_token/bearer_with_id_token', request_header: header_params, params: protocol_params do
             access_token.id_token.should == 'id_token'
           end
         end
@@ -106,7 +106,7 @@ describe OpenIDConnect::Client do
 
     context 'when invalid JSON is returned' do
       it 'should raise OpenIDConnect::Exception' do
-        mock_json :post, client.token_endpoint, 'access_token/invalid_json', :request_header => header_params, :params => protocol_params do
+        mock_json :post, client.token_endpoint, 'access_token/invalid_json', request_header: header_params, params: protocol_params do
           expect do
             access_token
           end.to raise_error OpenIDConnect::Exception, 'Unknown Token Type'
@@ -116,7 +116,7 @@ describe OpenIDConnect::Client do
 
     context 'otherwise' do
       it 'should raise Unexpected Token Type exception' do
-        mock_json :post, client.token_endpoint, 'access_token/mac', :request_header => header_params, :params => protocol_params do
+        mock_json :post, client.token_endpoint, 'access_token/mac', request_header: header_params, params: protocol_params do
           expect { access_token }.to raise_error OpenIDConnect::Exception, 'Unexpected Token Type: mac'
         end
       end

data/spec/openid_connect/connect_object_spec.rb

@@ -4,14 +4,14 @@ describe OpenIDConnect::ConnectObject do
   class OpenIDConnect::ConnectObject::SubClass < OpenIDConnect::ConnectObject
     attr_required :required
     attr_optional :optional
-    validates :required, :inclusion => {:in => ['Required', 'required']}, :length => 1..10
+    validates :required, inclusion: {in: ['Required', 'required']}, length: 1..10
   end
 
   subject        { instance }
   let(:klass)    { OpenIDConnect::ConnectObject::SubClass }
   let(:instance) { klass.new attributes }
   let :attributes do
-    {:required => 'Required', :optional => 'Optional'}
+    {required: 'Required', optional: 'Optional'}
   end
 
   context 'when required attributes are given' do
@@ -22,7 +22,7 @@ describe OpenIDConnect::ConnectObject do
 
     context 'otherwise' do
       let :attributes do
-        {:required => 'Required'}
+        {required: 'Required'}
       end
       its(:required) { should == 'Required' }
       its(:optional) { should == nil }
@@ -32,7 +32,7 @@ describe OpenIDConnect::ConnectObject do
   context 'otherwise' do
     context 'when optional attributes are given' do
       let :attributes do
-        {:optional => 'Optional'}
+        {optional: 'Optional'}
       end
       it do
         expect { klass.new attributes }.to raise_error AttrRequired::AttrMissing
@@ -55,7 +55,7 @@ describe OpenIDConnect::ConnectObject do
 
     context 'otherwise' do
       let :attributes do
-        {:required => 'Out of List and Too Long'}
+        {required: 'Out of List and Too Long'}
       end
 
       it 'should raise OpenIDConnect::ValidationFailed with ActiveModel::Errors owner' do
@@ -76,7 +76,7 @@ describe OpenIDConnect::ConnectObject do
 
     context 'otherwise' do
       let :attributes do
-        {:required => 'Out of List and Too Long'}
+        {required: 'Out of List and Too Long'}
       end
 
       it 'should raise OpenIDConnect::ValidationFailed with ActiveModel::Errors owner' do