openid_connect 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2af2e4660f3ed9164a97f9722aadcee31b453b9
-  data.tar.gz: d8dcc5d4d6ebf554d26de711bac82243b77b99a5
+  metadata.gz: 35d71b7a3743bd72c3f58f3ec42cb738154713ed
+  data.tar.gz: 5937a7527d73fb7a304da639aec619db2cbe3954
 SHA512:
-  metadata.gz: c621d84e01d50971427ca67ae17d2dbeb99469071a69e41648ab8e6c408014564ac761630daca14f39f694a6be2c930d1ac9012655409eb6f73bdebea461cc4e
-  data.tar.gz: 772e2c21bdfe671d5d882a7eb3c7b4878204d71be97a91e51738b68a21220d5c87982aa37f700f2171f94761893894e2654636769c1874d62b9034d6a7fd8f7d
+  metadata.gz: 9618737dec9685e33637aa65dad56f2b8d8392156459f93ae3f157bf54fe6332f07e9007778ebfe17b6279bd6e30a50ceea8ae56c2d75272b5cbcbb7cda24692
+  data.tar.gz: c5f72442ebc141bdbeaf8c7f1b0a1036a5b74d345411bf593cf2c9f21c79aecd44d56ef9df07e97dc1027495f6c0dbfbf54da191667013fb3d760133ec3111f9

data/.gitignore

@@ -17,5 +17,6 @@ tmtags
 coverage*
 rdoc
 pkg
+Gemfile.lock
 
 ## PROJECT::SPECIFIC

data/LICENSE

@@ -1,5 +1,7 @@
 Copyright (c) 2011 nov matake
 
+MIT License
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -17,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -4,16 +4,16 @@ Bundler::GemHelper.install_tasks
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-namespace :cover_me do
-  desc "Generates and opens code coverage report."
+namespace :coverage do
+  desc "Open coverage report"
   task :report do
-    require 'cover_me'
-    CoverMe.complete!
+    require 'simplecov'
+    `open "#{File.join SimpleCov.coverage_path, 'index.html'}"`
   end
 end
 
 task :spec do
-  Rake::Task['cover_me:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
+  Rake::Task[:'coverage:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
 end
 
-task default: :spec
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.0

data/lib/openid_connect.rb

@@ -11,7 +11,6 @@ require 'attr_optional'
 require 'rack/oauth2'
 require 'rack/oauth2/server/authorize/request_with_connect_params'
 require 'rack/oauth2/server/id_token_response'
-require 'rack/oauth2/server/resource/error_with_connect_ext'
 
 module OpenIDConnect
   VERSION = ::File.read(

data/lib/openid_connect/access_token.rb

@@ -8,11 +8,11 @@ module OpenIDConnect
       @token_type = :bearer
     end
 
-    def userinfo!(schema = :openid)
+    def userinfo!
       hash = resource_request do
-        get client.userinfo_uri, schema: schema
+        get client.userinfo_uri
       end
-      ResponseObject::UserInfo::OpenID.new hash
+      ResponseObject::UserInfo.new hash
     end
 
     private

data/lib/openid_connect/client/registrar.rb

@@ -18,21 +18,24 @@ module OpenIDConnect
       singular_attributes = [
         :application_type,
         :client_name,
-        :token_endpoint_auth_method,
+        :jwks,
         :subject_type,
-        :request_object_signing_alg,
-        :userinfo_signed_response_alg,
-        :userinfo_encrypted_response_alg,
-        :userinfo_encrypted_response_enc,
         :id_token_signed_response_alg,
         :id_token_encrypted_response_alg,
         :id_token_encrypted_response_enc,
+        :userinfo_signed_response_alg,
+        :userinfo_encrypted_response_alg,
+        :userinfo_encrypted_response_enc,
+        :request_object_signing_alg,
+        :request_object_encryption_alg,
+        :request_object_encryption_enc,
+        :token_endpoint_auth_method,
+        :token_endpoint_auth_signing_alg,
         :default_max_age,
         :require_auth_time
       ] + singular_uri_attributes
       self.plurar_uri_attributes = [
         :redirect_uris,
-        :post_logout_redirect_uris,
         :request_uris
       ]
       plurar_attributes = [

data/lib/openid_connect/discovery/provider.rb

@@ -11,8 +11,10 @@ module OpenIDConnect
 
       def self.discover!(identifier)
         resource = case identifier
-        when /^acct:/, /@/, /^https?:\/\//
+        when /^acct:/, /https?:\/\//
           identifier
+        when /@/
+          "acct:#{identifier}"
         else
           "https://#{identifier}"
         end

data/lib/openid_connect/discovery/provider/config/response.rb

@@ -16,8 +16,6 @@ module OpenIDConnect
               :authorization_endpoint,
               :token_endpoint,
               :userinfo_endpoint,
-              :check_session_endpoint,
-              :end_session_endpoint,
               :registration_endpoint,
               :service_documentation,
               :op_policy_uri,
@@ -31,13 +29,14 @@ module OpenIDConnect
           ])
           attr_optional *(uri_attributes[:optional] + [
             :scopes_supported,
+            :response_modes_supported,
             :grant_types_supported,
             :acr_values_supported,
+            :id_token_encryption_alg_values_supported,
+            :id_token_encryption_enc_values_supported,
             :userinfo_signing_alg_values_supported,
             :userinfo_encryption_alg_values_supported,
             :userinfo_encryption_enc_values_supported,
-            :id_token_encryption_alg_values_supported,
-            :id_token_encryption_enc_values_supported,
             :request_object_signing_alg_values_supported,
             :request_object_encryption_alg_values_supported,
             :request_object_encryption_enc_values_supported,

data/lib/openid_connect/request_object.rb

@@ -34,4 +34,4 @@ end
 
 require 'openid_connect/request_object/claimable'
 require 'openid_connect/request_object/id_token'
-require 'openid_connect/request_object/userinfo'
+require 'openid_connect/request_object/user_info'

data/lib/openid_connect/response_object/user_info.rb

@@ -0,0 +1,65 @@
+module OpenIDConnect
+  class ResponseObject
+    class UserInfo < ConnectObject
+      attr_optional(
+        :sub,
+        :name,
+        :given_name,
+        :family_name,
+        :middle_name,
+        :nickname,
+        :preferred_username,
+        :profile,
+        :picture,
+        :website,
+        :email,
+        :email_verified,
+        :gender,
+        :birthdate,
+        :zoneinfo,
+        :locale,
+        :phone_number,
+        :phone_number_verified,
+        :address,
+        :updated_at
+      )
+      alias_method :subject, :sub
+      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
+      validates :updated_at,                             allow_nil: true, numericality: {only_integer: true}
+      validate :validate_address
+      validate :require_at_least_one_attributes
+      # TODO: validate locale
+
+      def initialize(attributes = {})
+        super
+        (all_attributes - [:email_verified, :phone_number_verified, :address, :updated_at]).each do |key|
+          self.send "#{key}=", self.send(key).try(:to_s)
+        end
+        self.updated_at = updated_at.try(:to_i)
+      end
+
+      def validate_address
+        errors.add :address, address.errors.full_messages.join(', ') if address.present? && !address.valid?
+      end
+
+      def address=(hash_or_address)
+        @address = case hash_or_address
+        when Hash
+          Address.new hash_or_address
+        when Address
+          hash_or_address
+        end
+      end
+    end
+  end
+end
+
+Dir[File.dirname(__FILE__) + '/user_info/*.rb'].each do |file|
+  require file
+end

data/lib/openid_connect/response_object/user_info/address.rb

@@ -0,0 +1,10 @@
+module OpenIDConnect
+  class ResponseObject
+    class UserInfo
+      class Address < ConnectObject
+        attr_optional :formatted, :street_address, :locality, :region, :postal_code, :country
+        validate :require_at_least_one_attributes
+      end
+    end
+  end
+end

data/openid_connect.gemspec

@@ -6,6 +6,8 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/nov/openid_connect"
   s.summary     = %q{OpenID Connect Server & Client Library}
   s.description = %q{OpenID Connect Server & Client Library}
+  s.license     = 'MIT'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -23,5 +25,5 @@ Gem::Specification.new do |s|
   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 "cover_me", ">= 1.2.0"
+  s.add_development_dependency "simplecov"
 end

data/spec/mock_response/discovery/config.json

@@ -1,5 +1,4 @@
 {
-    "version": "3.0",
     "issuer": "https://connect-op.heroku.com",
     "authorization_endpoint": "https://connect-op.heroku.com/authorizations/new",
     "token_endpoint": "https://connect-op.heroku.com/access_tokens",

data/spec/openid_connect/access_token_spec.rb

@@ -53,9 +53,7 @@ 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'
-        } do
+        mock_json :get, endpoint, 'errors/invalid_request', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 400 do
           expect { request }.to raise_error OpenIDConnect::BadRequest
         end
       end
@@ -63,9 +61,7 @@ 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'
-        } do
+        mock_json :get, endpoint, 'errors/invalid_access_token', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 401 do
           expect { request }.to raise_error OpenIDConnect::Unauthorized
         end
       end
@@ -73,9 +69,7 @@ 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'
-        } do
+        mock_json :get, endpoint, 'errors/insufficient_scope', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 403 do
           expect { request }.to raise_error OpenIDConnect::Forbidden
         end
       end
@@ -83,9 +77,7 @@ 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'
-        } do
+        mock_json :get, endpoint, 'errors/unknown', :HTTP_AUTHORIZATION => 'Bearer access_token', status: 500 do
           expect { request }.to raise_error OpenIDConnect::HttpError
         end
       end
@@ -94,12 +86,10 @@ describe OpenIDConnect::AccessToken do
 
   describe '#userinfo!' do
     it do
-      userinfo = mock_json :get, client.userinfo_uri, 'userinfo/openid', :HTTP_AUTHORIZATION => 'Bearer access_token', params: {
-        schema: 'openid'
-      } do
+      userinfo = mock_json :get, client.userinfo_uri, 'userinfo/openid', :HTTP_AUTHORIZATION => 'Bearer access_token' do
         access_token.userinfo!
       end
-      userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo::OpenID
+      userinfo.should be_instance_of OpenIDConnect::ResponseObject::UserInfo
     end
 
     describe 'error handling' do

data/spec/openid_connect/discovery/provider/config_spec.rb

@@ -13,8 +13,6 @@ describe OpenIDConnect::Discovery::Provider::Config do
         config.authorization_endpoint.should == 'https://connect-op.heroku.com/authorizations/new'
         config.token_endpoint.should == 'https://connect-op.heroku.com/access_tokens'
         config.userinfo_endpoint.should == 'https://connect-op.heroku.com/userinfo'
-        config.check_session_endpoint.should be_nil
-        config.end_session_endpoint.should be_nil
         config.jwks_uri.should == 'https://connect-op.heroku.com/jwks.json'
         config.registration_endpoint.should == 'https://connect-op.heroku.com/connect/client'
         config.scopes_supported.should == ['openid', 'profile', 'email', 'address']

data/spec/openid_connect/discovery/provider_spec.rb

@@ -51,7 +51,7 @@ describe OpenIDConnect::Discovery::Provider do
 
     context 'when Email is given' do
       let(:identifier) { "nov@#{host}" }
-      let(:resource)   { identifier }
+      let(:resource)   { "acct:#{identifier}" }
       it_behaves_like :discover_provider
     end
 

data/spec/openid_connect/response_object/user_info/{open_id/address_spec.rb → address_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe OpenIDConnect::ResponseObject::UserInfo::OpenID::Address do
-  let(:klass) { OpenIDConnect::ResponseObject::UserInfo::OpenID::Address }
+describe OpenIDConnect::ResponseObject::UserInfo::Address do
+  let(:klass) { OpenIDConnect::ResponseObject::UserInfo::Address }
 
   describe 'attributes' do
     subject { klass }

data/spec/openid_connect/response_object/{user_info/open_id_spec.rb → user_info_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
-  let(:klass) { OpenIDConnect::ResponseObject::UserInfo::OpenID }
+describe OpenIDConnect::ResponseObject::UserInfo do
+  let(:klass) { OpenIDConnect::ResponseObject::UserInfo }
   let(:instance) { klass.new attributes }
   subject { instance }
 
@@ -29,7 +29,7 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
         :phone_number,
         :phone_number_verified,
         :address,
-        :updated_time
+        :updated_at
       ]
     end
   end
@@ -95,14 +95,14 @@ describe OpenIDConnect::ResponseObject::UserInfo::OpenID do
       let :attributes do
         {address: {}}
       end
-      its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID::Address }
+      its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::Address }
     end
 
     context 'when Address is given' do
       let :attributes do
-        {address: OpenIDConnect::ResponseObject::UserInfo::OpenID::Address.new}
+        {address: OpenIDConnect::ResponseObject::UserInfo::Address.new}
       end
-      its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::OpenID::Address }
+      its(:address) { should be_a OpenIDConnect::ResponseObject::UserInfo::Address }
     end
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
-require 'cover_me'
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'spec'
+end
 
 require 'rspec'
 require 'openid_connect'

metadata

@@ -1,211 +1,211 @@
 --- !ruby/object:Gem::Specification
 name: openid_connect
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: attr_required
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validate_url
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validate_email
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: swd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: webfinger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: rack-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.2
 - !ruby/object:Gem::Dependency
-  name: cover_me
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: OpenID Connect Server & Client Library
 email:
 - nov@matake.jp
@@ -213,9 +213,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -239,12 +239,11 @@ files:
 - lib/openid_connect/request_object.rb
 - lib/openid_connect/request_object/claimable.rb
 - lib/openid_connect/request_object/id_token.rb
-- lib/openid_connect/request_object/userinfo.rb
+- lib/openid_connect/request_object/user_info.rb
 - lib/openid_connect/response_object.rb
 - lib/openid_connect/response_object/id_token.rb
-- lib/openid_connect/response_object/userinfo.rb
-- lib/openid_connect/response_object/userinfo/open_id.rb
-- lib/openid_connect/response_object/userinfo/open_id/address.rb
+- lib/openid_connect/response_object/user_info.rb
+- lib/openid_connect/response_object/user_info/address.rb
 - lib/rack/oauth2/server/authorize/error_with_connect_ext.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token.rb
 - lib/rack/oauth2/server/authorize/extension/code_and_id_token_and_token.rb
@@ -252,7 +251,6 @@ files:
 - lib/rack/oauth2/server/authorize/extension/id_token_and_token.rb
 - lib/rack/oauth2/server/authorize/request_with_connect_params.rb
 - lib/rack/oauth2/server/id_token_response.rb
-- lib/rack/oauth2/server/resource/error_with_connect_ext.rb
 - openid_connect.gemspec
 - spec/helpers/crypto_spec_helper.rb
 - spec/helpers/webmock_helper.rb
@@ -286,19 +284,19 @@ files:
 - spec/openid_connect/exception_spec.rb
 - spec/openid_connect/request_object_spec.rb
 - spec/openid_connect/response_object/id_token_spec.rb
-- spec/openid_connect/response_object/user_info/open_id/address_spec.rb
-- spec/openid_connect/response_object/user_info/open_id_spec.rb
+- spec/openid_connect/response_object/user_info/address_spec.rb
+- spec/openid_connect/response_object/user_info_spec.rb
 - spec/openid_connect_spec.rb
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_spec.rb
-- spec/rack/oauth2/server/resource/error_with_connect_ext_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/nov/openid_connect
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -306,17 +304,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: OpenID Connect Server & Client Library
@@ -353,14 +351,13 @@ test_files:
 - spec/openid_connect/exception_spec.rb
 - spec/openid_connect/request_object_spec.rb
 - spec/openid_connect/response_object/id_token_spec.rb
-- spec/openid_connect/response_object/user_info/open_id/address_spec.rb
-- spec/openid_connect/response_object/user_info/open_id_spec.rb
+- spec/openid_connect/response_object/user_info/address_spec.rb
+- spec/openid_connect/response_object/user_info_spec.rb
 - spec/openid_connect_spec.rb
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/code_and_id_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_and_token_spec.rb
 - spec/rack/oauth2/server/authorize/extension/id_token_spec.rb
-- spec/rack/oauth2/server/resource/error_with_connect_ext_spec.rb
 - spec/rack/oauth2/server/token/authorization_code_spec.rb
 - spec/rack/oauth2/server/token/refresh_token_spec.rb
 - spec/spec_helper.rb

data/lib/openid_connect/response_object/userinfo.rb

@@ -1,3 +0,0 @@
-Dir[File.dirname(__FILE__) + '/userinfo/*.rb'].each do |file|
-  require file
-end

data/lib/openid_connect/response_object/userinfo/open_id.rb

@@ -1,65 +0,0 @@
-module OpenIDConnect
-  class ResponseObject
-    module UserInfo
-      class OpenID < ConnectObject
-        attr_optional(
-          :sub,
-          :name,
-          :given_name,
-          :family_name,
-          :middle_name,
-          :nickname,
-          :preferred_username,
-          :profile,
-          :picture,
-          :website,
-          :email,
-          :email_verified,
-          :gender,
-          :birthdate,
-          :zoneinfo,
-          :locale,
-          :phone_number,
-          :phone_number_verified,
-          :address,
-          :updated_time
-        )
-        alias_method :subject, :sub
-        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
-        validate :validate_address
-        validate :require_at_least_one_attributes
-        # TODO: validate locale
-
-        def initialize(attributes = {})
-          super
-          (all_attributes - [:email_verified, :phone_number_verified, :address]).each do |key|
-            self.send "#{key}=", self.send(key).try(:to_s)
-          end
-        end
-
-        def validate_address
-          errors.add :address, address.errors.full_messages.join(', ') if address.present? && !address.valid?
-        end
-
-        def address=(hash_or_address)
-          @address = case hash_or_address
-          when Hash
-            Address.new hash_or_address
-          when Address
-            hash_or_address
-          end
-        end
-      end
-    end
-  end
-end
-
-Dir[File.dirname(__FILE__) + '/open_id/*.rb'].each do |file|
-  require file
-end

data/lib/openid_connect/response_object/userinfo/open_id/address.rb

@@ -1,12 +0,0 @@
-module OpenIDConnect
-  class ResponseObject
-    module UserInfo
-      class OpenID
-        class Address < ConnectObject
-          attr_optional :formatted, :street_address, :locality, :region, :postal_code, :country
-          validate :require_at_least_one_attributes
-        end
-      end
-    end
-  end
-end

data/lib/rack/oauth2/server/resource/error_with_connect_ext.rb

@@ -1,14 +0,0 @@
-module Rack
-  module OAuth2
-    module Server
-      class Resource
-        module ErrorWithConnectExt
-          def invalid_schema!(description = 'The requested schema is invalid or unsupported', options = {})
-            bad_request! :invalid_schema, description, options
-          end
-        end
-        Request.send :include, ErrorWithConnectExt
-      end
-    end
-  end
-end

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

@@ -1,12 +0,0 @@
-require 'spec_helper.rb'
-
-describe Rack::OAuth2::Server::Resource::ErrorWithConnectExt do
-  let(:env)     { Rack::MockRequest.env_for("/authorize?client_id=client_id") }
-  let(:request) { Rack::OAuth2::Server::Resource::Request.new env }
-
-  describe 'invalid_schema!' do
-    it do
-      expect { request.invalid_schema! }.to raise_error Rack::OAuth2::Server::Resource::BadRequest
-    end
-  end
-end