openid_connect 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35d71b7a3743bd72c3f58f3ec42cb738154713ed
-  data.tar.gz: 5937a7527d73fb7a304da639aec619db2cbe3954
+  metadata.gz: 5e37ffd0520ec832d81226c3bb752af77b099c5a
+  data.tar.gz: 3159b95aa6e9a6b26951464af00cf0eaf0cf4eff
 SHA512:
-  metadata.gz: 9618737dec9685e33637aa65dad56f2b8d8392156459f93ae3f157bf54fe6332f07e9007778ebfe17b6279bd6e30a50ceea8ae56c2d75272b5cbcbb7cda24692
-  data.tar.gz: c5f72442ebc141bdbeaf8c7f1b0a1036a5b74d345411bf593cf2c9f21c79aecd44d56ef9df07e97dc1027495f6c0dbfbf54da191667013fb3d760133ec3111f9
+  metadata.gz: d3ff447fd53557c27c760d6d5d9428173d6aac275a326738e4cb339769ad4d8f4e27b138e48fb543006f952719bc7c734601a1645f867773a07259e59176d3df
+  data.tar.gz: b306bc902f3da7901216861a3e55affaa3a8855d45781ef04b00b64d1f1b0a309a1c7f4e258dd6efed256e7e257e77dfaa0057ddfb62933e078037aeb61afaba

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/openid_connect.rb

@@ -15,7 +15,7 @@ require 'rack/oauth2/server/id_token_response'
 module OpenIDConnect
   VERSION = ::File.read(
     ::File.join(::File.dirname(__FILE__), '../VERSION')
-  )
+  ).chomp
 
   def self.logger
     @@logger
@@ -83,4 +83,4 @@ require 'openid_connect/access_token'
 require 'openid_connect/jwtnizable'
 require 'openid_connect/connect_object'
 require 'openid_connect/discovery'
-require 'openid_connect/debugger'
+require 'openid_connect/debugger'

data/lib/openid_connect/client/registrar.rb

@@ -5,7 +5,7 @@ module OpenIDConnect
 
       class RegistrationFailed < HttpError; end
 
-      cattr_accessor :plurar_uri_attributes, :metadata_attributes
+      cattr_accessor :plural_uri_attributes, :metadata_attributes
       singular_uri_attributes = [
         :logo_uri,
         :client_uri,
@@ -34,17 +34,17 @@ module OpenIDConnect
         :default_max_age,
         :require_auth_time
       ] + singular_uri_attributes
-      self.plurar_uri_attributes = [
+      self.plural_uri_attributes = [
         :redirect_uris,
         :request_uris
       ]
-      plurar_attributes = [
+      plural_attributes = [
         :response_types,
         :grant_types,
         :contacts,
         :default_acr_values,
-      ] + plurar_uri_attributes
-      self.metadata_attributes = singular_attributes + plurar_attributes
+      ] + plural_uri_attributes
+      self.metadata_attributes = singular_attributes + plural_attributes
       required_metadata_attributes = [
         :redirect_uris
       ]
@@ -56,7 +56,7 @@ module OpenIDConnect
       validates *required_attributes,   presence: true
       validates :sector_identifier_uri, presence: {if: :sector_identifier_required?}
       validates *singular_uri_attributes, url: true, allow_nil: true
-      validate :validate_plurar_uri_attributes
+      validate :validate_plural_uri_attributes
       validate :validate_contacts
 
       def initialize(endpoint, attributes = {})
@@ -135,8 +135,8 @@ module OpenIDConnect
         end
       end
 
-      def validate_plurar_uri_attributes
-        self.class.plurar_uri_attributes.each do |_attr_|
+      def validate_plural_uri_attributes
+        self.class.plural_uri_attributes.each do |_attr_|
           if (uris = self.send(_attr_))
             include_invalid = uris.any? do |uri|
               !valid_uri?(uri, nil)
@@ -183,4 +183,4 @@ module OpenIDConnect
       end
     end
   end
-end
+end

data/lib/openid_connect/jwtnizable.rb

@@ -1,12 +1,14 @@
 module OpenIDConnect
   module JWTnizable
     def to_jwt(key, algorithm = :RS256, &block)
+      as_jwt(key, algorithm, &block).to_s
+    end
+
+    def as_jwt(key, algorithm = :RS256, &block)
       token = JSON::JWT.new as_json
       yield token if block_given?
-      if algorithm != :none
-        token = token.sign key, algorithm
-      end
-      token.to_s
+      token = token.sign key, algorithm if algorithm != :none
+      token
     end
   end
 end

data/lib/openid_connect/response_object/id_token.rb

@@ -48,7 +48,7 @@ module OpenIDConnect
       private
 
       def left_half_hash_of(string, hash_length)
-        digest = OpenSSL::Digest::Digest.new("SHA#{hash_length}").digest string
+        digest = OpenSSL::Digest.new("SHA#{hash_length}").digest string
         UrlSafeBase64.encode64 digest[0, hash_length / (2 * 8)]
       end
 

data/lib/openid_connect/response_object/user_info.rb

@@ -27,7 +27,6 @@ module OpenIDConnect
       alias_method :subject=, :sub=
 
       validates :email_verified, :phone_number_verified, allow_nil: true, inclusion: {in: [true, false]}
-      validates :gender,                                 allow_nil: true, inclusion: {in: ['male', 'female']}
       validates :zoneinfo,                               allow_nil: true, inclusion: {in: TZInfo::TimezoneProxy.all.collect(&:name)}
       validates :profile, :picture, :website,            allow_nil: true, url: true
       validates :email,                                  allow_nil: true, email: true

data/openid_connect.gemspec

@@ -22,8 +22,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "swd", ">= 0.1.2"
   s.add_runtime_dependency "webfinger", ">= 0.0.2"
   s.add_runtime_dependency "rack-oauth2", ">= 1.0.0"
-  s.add_development_dependency "rake", ">= 0.8"
-  s.add_development_dependency "rspec", ">= 2"
-  s.add_development_dependency "webmock", ">= 1.6.2"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-its"
+  s.add_development_dependency "webmock"
   s.add_development_dependency "simplecov"
 end

data/spec/helpers/crypto_spec_helper.rb

@@ -12,7 +12,7 @@ module CryptoSpecHelper
   end
 
   def ec_key
-    @ec_key ||= OpenSSL::PKey::EC.new('secp256k1').generate_key
+    @ec_key ||= OpenSSL::PKey::EC.new('prime256v1').generate_key
   end
 
   def ec_public_key

data/spec/openid_connect/client/registrar_spec.rb

@@ -30,6 +30,14 @@ describe OpenIDConnect::Client::Registrar do
     it { should_not be_valid }
   end
 
+  describe '#initialize' do
+    it 'creates attribute writers for all attributes' do
+      described_class.metadata_attributes.each do |attr|
+        expect(subject).to respond_to("#{attr}=")
+      end
+    end
+  end
+
   describe '#sector_identifier' do
     context 'when sector_identifier_uri given' do
       let(:attributes) do
@@ -198,7 +206,9 @@ describe OpenIDConnect::Client::Registrar do
       it do
         expect do
           instance.validate!
-        end.not_to raise_error OpenIDConnect::ValidationFailed
+        end.not_to raise_error { |e|
+          e.should be_a OpenIDConnect::ValidationFailed
+        }
       end
     end
 
@@ -246,4 +256,4 @@ describe OpenIDConnect::Client::Registrar do
       it { should be_instance_of HTTPClient }
     end
   end
-end
+end

data/spec/openid_connect/connect_object_spec.rb

@@ -71,7 +71,7 @@ describe OpenIDConnect::ConnectObject do
   describe '#validate!' do
     context 'when valid' do
       subject { instance.validate! }
-      it { should be_true }
+      it { should == true }
     end
 
     context 'otherwise' do

data/spec/openid_connect/debugger/request_filter_spec.rb

@@ -12,7 +12,7 @@ describe OpenIDConnect::Debugger::RequestFilter do
         "======= [OpenIDConnect] HTTP REQUEST STARTED =======",
         request.dump
       ].each do |output|
-        OpenIDConnect.logger.should_receive(:info).with output
+        expect(OpenIDConnect.logger).to receive(:info).with output
       end
       request_filter.filter_request(request)
     end
@@ -25,7 +25,7 @@ describe OpenIDConnect::Debugger::RequestFilter do
         response.dump,
         "======= [OpenIDConnect] HTTP REQUEST FINISHED ======="
       ].each do |output|
-        OpenIDConnect.logger.should_receive(:info).with output
+        expect(OpenIDConnect.logger).to receive(:info).with output
       end
       request_filter.filter_response(request, response)
     end

data/spec/openid_connect/discovery/provider/config/response_spec.rb

@@ -55,7 +55,9 @@ describe OpenIDConnect::Discovery::Provider::Config::Response do
       it do
         expect do
           instance.validate!
-        end.not_to raise_error OpenIDConnect::ValidationFailed
+        end.not_to raise_error{ |e|
+          e.should be_a OpenIDConnect::ValidationFailed
+        }
       end
     end
   end

data/spec/openid_connect/request_object_spec.rb

@@ -93,15 +93,15 @@ describe OpenIDConnect::RequestObject do
 
     describe '#required?' do
       it do
-        request_object.userinfo.required?(:name).should be_true
-        request_object.userinfo.optional?(:name).should be_false
+        request_object.userinfo.required?(:name).should == true
+        request_object.userinfo.optional?(:name).should == false
       end
     end
 
     describe '#optional' do
       it do
-        request_object.userinfo.required?(:email).should be_false
-        request_object.userinfo.optional?(:email).should be_true
+        request_object.userinfo.required?(:email).should == false
+        request_object.userinfo.optional?(:email).should == true
       end
     end
   end

data/spec/openid_connect/response_object/id_token_spec.rb

@@ -28,7 +28,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
         id_token.verify!(
           issuer: attributes[:iss],
           client_id: attributes[:aud]
-        ).should be_true
+        ).should == true
       end
 
       context 'when aud(ience) is an array of identifiers' do
@@ -38,7 +38,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
           id_token.verify!(
             issuer: attributes[:iss],
             client_id: client_id
-          ).should be_true
+          ).should == true
         end
       end
 
@@ -106,7 +106,7 @@ describe OpenIDConnect::ResponseObject::IdToken do
             issuer: attributes[:iss],
             client_id: attributes[:aud],
             nonce: attributes[:nonce]
-          ).should be_true
+          ).should == true
         end
       end
 

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

@@ -20,7 +20,7 @@ describe OpenIDConnect::ResponseObject::UserInfo::Address do
       let :attributes do
         {}
       end
-      its(:valid?) { should be_false }
+      its(:valid?) { should == false }
       its(:errors) { should include :base }
     end
   end

data/spec/openid_connect/response_object/user_info_spec.rb

@@ -45,7 +45,7 @@ describe OpenIDConnect::ResponseObject::UserInfo do
       let :attributes do
         {}
       end
-      its(:valid?) { should be_false }
+      its(:valid?) { should == false }
       its(:errors) { should include :base }
     end
 
@@ -53,16 +53,16 @@ describe OpenIDConnect::ResponseObject::UserInfo do
       let :attributes do
         {email: 'nov@localhost'}
       end
-      its(:valid?) { should be_false }
+      its(:valid?) { should == false }
       its(:errors) { should include :email }
     end
 
-    [:email_verified, :gender, :zoneinfo].each do |one_of_list|
+    [:email_verified, :zoneinfo].each do |one_of_list|
       context "when #{one_of_list} is invalid" do
         let :attributes do
           {one_of_list => 'Out of List'}
         end
-        its(:valid?) { should be_false }
+        its(:valid?) { should == false }
         its(:errors) { should include one_of_list }
       end
     end
@@ -76,7 +76,7 @@ describe OpenIDConnect::ResponseObject::UserInfo do
         let :attributes do
           {url => 'Invalid'}
         end
-        its(:valid?) { should be_false }
+        its(:valid?) { should == false }
         its(:errors) { should include url }
       end
     end
@@ -85,7 +85,7 @@ describe OpenIDConnect::ResponseObject::UserInfo do
       let :attributes do
         {address: {}}
       end
-      its(:valid?) { should be_false }
+      its(:valid?) { should == false }
       its(:errors) { should include :address }
     end
   end

data/spec/openid_connect_spec.rb

@@ -4,24 +4,24 @@ describe OpenIDConnect do
   after { OpenIDConnect.debugging = false }
 
   its(:logger) { should be_a Logger }
-  its(:debugging?) { should be_false }
+  its(:debugging?) { should == false }
 
   describe '.debug!' do
     before { OpenIDConnect.debug! }
-    its(:debugging?) { should be_true }
+    its(:debugging?) { should == true }
   end
 
   describe '.debug' do
     it 'should enable debugging within given block' do
       OpenIDConnect.debug do
-        SWD.debugging?.should be_true
-        WebFinger.debugging?.should be_true
-        Rack::OAuth2.debugging?.should be_true
-        OpenIDConnect.debugging?.should be_true
+        SWD.debugging?.should == true
+        WebFinger.debugging?.should == true
+        Rack::OAuth2.debugging?.should == true
+        OpenIDConnect.debugging?.should == true
       end
-      SWD.debugging?.should be_false
-      Rack::OAuth2.debugging?.should be_false
-      OpenIDConnect.debugging?.should be_false
+      SWD.debugging?.should == false
+      Rack::OAuth2.debugging?.should == false
+      OpenIDConnect.debugging?.should == false
     end
 
     it 'should not force disable debugging' do
@@ -30,15 +30,15 @@ describe OpenIDConnect do
       Rack::OAuth2.debug!
       OpenIDConnect.debug!
       OpenIDConnect.debug do
-        SWD.debugging?.should be_true
-        WebFinger.debugging?.should be_true
-        Rack::OAuth2.debugging?.should be_true
-        OpenIDConnect.debugging?.should be_true
+        SWD.debugging?.should == true
+        WebFinger.debugging?.should == true
+        Rack::OAuth2.debugging?.should == true
+        OpenIDConnect.debugging?.should == true
       end
-      SWD.debugging?.should be_true
-      WebFinger.debugging?.should be_true
-      Rack::OAuth2.debugging?.should be_true
-      OpenIDConnect.debugging?.should be_true
+      SWD.debugging?.should == true
+      WebFinger.debugging?.should == true
+      Rack::OAuth2.debugging?.should == true
+      OpenIDConnect.debugging?.should == true
     end
   end
 

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

@@ -62,7 +62,7 @@ describe Rack::OAuth2::Server::Authorize::Extension::IdToken do
     let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client_id&scope=openid") }
     let(:request) { Rack::OAuth2::Server::Authorize::Extension::IdToken::Request.new env }
     it do
-      request.openid_connect_request?.should be_true
+      request.openid_connect_request?.should == true
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,7 +5,14 @@ SimpleCov.start do
 end
 
 require 'rspec'
+require 'rspec/its'
 require 'openid_connect'
 
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
 require 'helpers/crypto_spec_helper'
 require 'helpers/webmock_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -156,42 +156,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +328,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenID Connect Server & Client Library