openid_connect 0.3.3 → 0.3.4

data/spec/openid_connect/response_object/user_info/open_id_spec.rb

@@ -50,7 +50,7 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
 
     context 'when email is invalid' do
       let :attributes do
-        {:email => 'nov@localhost'}
+        {email: 'nov@localhost'}
       end
       its(:valid?) { should be_false }
       its(:errors) { should include :email }
@@ -82,7 +82,7 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
 
     context 'when address is blank' do
       let :attributes do
-        {:address => {}}
+        {address: {}}
       end
       its(:valid?) { should be_false }
       its(:errors) { should include :address }
@@ -92,14 +92,14 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
   describe '#address=' do
     context 'when Hash is given' do
       let :attributes do
-        {:address => {}}
+        {address: {}}
       end
       its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID::Address }
     end
 
     context 'when Address is given' do
       let :attributes do
-        {:address => OpenIDConnect::ResponseObject::UserInfo::OpenID::Address.new}
+        {address: OpenIDConnect::ResponseObject::UserInfo::OpenID::Address.new}
       end
       its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID::Address }
     end
@@ -108,9 +108,9 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
   describe '#to_json' do
     let :attributes do
       {
-        :user_id => 'nov.matake#12345',
-        :address => {
-          :formatted => 'Tokyo, Japan'
+        user_id: 'nov.matake#12345',
+        address: {
+          formatted: 'Tokyo, Japan'
         }
       }
     end

data/spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb

@@ -5,16 +5,16 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndIdTokenAndToken do
   let(:request)      { Rack::MockRequest.new app }
   let(:response)     { request.get('/?response_type=code%20id_token%20token&client_id=client&state=state') }
   let(:redirect_uri) { 'http://client.example.com/callback' }
-  let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token') }
+  let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token') }
   let(:code)         { 'authorization_code' }
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :nonce => 'nonce',
-      :exp => 1313424327,
-      :iat => 1313420327
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      nonce: 'nonce',
+      exp: 1313424327,
+      iat: 1313420327
     ).to_jwt private_key
   end
 

data/spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb

@@ -8,12 +8,12 @@ describe Rack::OAuth2::Server::Authorize::Extension::CodeAndIdToken do
   let(:code)         { 'authorization_code' }
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :nonce => 'nonce',
-      :exp => 1313424327,
-      :iat => 1313420327
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      nonce: 'nonce',
+      exp: 1313424327,
+      iat: 1313420327
     ).to_jwt private_key
   end
 

data/spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb

@@ -5,15 +5,15 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdTokenAndToken do
   let(:request)      { Rack::MockRequest.new app }
   let(:response)     { request.get('/?response_type=token%20id_token&client_id=client&state=state') }
   let(:redirect_uri) { 'http://client.example.com/callback' }
-  let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(:access_token => 'access_token') }
+  let(:bearer_token) { Rack::OAuth2::AccessToken::Bearer.new(access_token: 'access_token') }
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :nonce => 'nonce',
-      :exp => 1313424327,
-      :iat => 1313420327
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      nonce: 'nonce',
+      exp: 1313424327,
+      iat: 1313420327
     ).to_jwt private_key
   end
 

data/spec/rack/oauth2/server/authorize/extension/id_token_spec.rb

@@ -7,12 +7,12 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdToken do
   let(:redirect_uri) { 'http://client.example.com/callback' }
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :nonce => 'nonce',
-      :exp => 1313424327,
-      :iat => 1313420327
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      nonce: 'nonce',
+      exp: 1313424327,
+      iat: 1313420327
     ).to_jwt private_key
   end
 

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

@@ -4,29 +4,29 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
   subject { response }
   let(:request) { Rack::MockRequest.new app }
   let :response do
-    request.post('/', :params => {
-      :grant_type => 'authorization_code',
-      :client_id => 'client_id',
-      :code => 'authorization_code',
-      :redirect_uri => 'http://client.example.com/callback'
+    request.post('/', params: {
+      grant_type: 'authorization_code',
+      client_id: 'client_id',
+      code: 'authorization_code',
+      redirect_uri: 'http://client.example.com/callback'
     })
   end
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :exp => 1313424327,
-      :iat => 1313420327,
-      :nonce => 'nonce',
-      :secret => 'secret'
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      exp: 1313424327,
+      iat: 1313420327,
+      nonce: 'nonce',
+      secret: 'secret'
     ).to_jwt private_key
   end
 
   context "when id_token is given" do
     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')
         response.id_token = id_token
       end
     end
@@ -42,7 +42,7 @@ describe Rack::OAuth2::Server::Token::AuthorizationCode do
   context "otherwise" do
     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
     its(:status) { should == 200 }

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

@@ -4,28 +4,28 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
   subject { response }
   let(:request) { Rack::MockRequest.new app }
   let :response do
-    request.post('/', :params => {
-      :grant_type => "refresh_token",
-      :client_id => "client_id",
-      :refresh_token => "refresh_token"
+    request.post('/', params: {
+      grant_type: "refresh_token",
+      client_id: "client_id",
+      refresh_token: "refresh_token"
     })
   end
   let :id_token do
     OpenIDConnect::ResponseObject::IdToken.new(
-      :iss => 'https://server.example.com',
-      :user_id => 'user_id',
-      :aud => 'client_id',
-      :exp => 1313424327,
-      :iat => 1313420327,
-      :nonce => 'nonce',
-      :secret => 'secret'
+      iss: 'https://server.example.com',
+      user_id: 'user_id',
+      aud: 'client_id',
+      exp: 1313424327,
+      iat: 1313420327,
+      nonce: 'nonce',
+      secret: 'secret'
     ).to_jwt private_key
   end
 
   context "when id_token is given" do
     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')
         response.id_token = id_token
       end
     end
@@ -41,7 +41,7 @@ describe Rack::OAuth2::Server::Token::RefreshToken do
   context "otherwise" do
     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
     its(:status) { should == 200 }

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
-if RUBY_VERSION >= '1.9'
-  require 'cover_me'
-end
+require 'cover_me'
 
 require 'rspec'
 require 'openid_connect'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -172,13 +172,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: cover_me
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,15 +186,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,15 +202,15 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: cover_me
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +218,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.2.0
 description: OpenID Connect Server & Client Library
 email:
 - nov@matake.jp
@@ -285,6 +285,8 @@ files:
 - spec/mock_response/errors/invalid_request.json
 - spec/mock_response/errors/unknown.json
 - spec/mock_response/id_token.json
+- spec/mock_response/public_keys/jwk.json
+- spec/mock_response/public_keys/x509.pem
 - spec/mock_response/user_info/openid.json
 - spec/openid_connect/access_token_spec.rb
 - spec/openid_connect/client/registrar_spec.rb
@@ -351,6 +353,8 @@ test_files:
 - spec/mock_response/errors/invalid_request.json
 - spec/mock_response/errors/unknown.json
 - spec/mock_response/id_token.json
+- spec/mock_response/public_keys/jwk.json
+- spec/mock_response/public_keys/x509.pem
 - spec/mock_response/user_info/openid.json
 - spec/openid_connect/access_token_spec.rb
 - spec/openid_connect/client/registrar_spec.rb