omniauth-identity 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f63f80480a42c6089f050cae1a70ebe9195f925d
-  data.tar.gz: 3b229b38d48396559ac41f65712c931bc4f76590
+SHA256:
+  metadata.gz: 3ae0c6e9acba482e20f1284d42f157beb243b7efe00913b420e1d97ee158d0d2
+  data.tar.gz: c113d2a6e9f701ae8b7a524e7aede16bfce000f593f194e577b38a2cb02a10c0
 SHA512:
-  metadata.gz: 91cbf121086311eb85cf68345b58eeac85e165ce3119a58bc148ddf470e77050664efc986e40eb2099b7b1f306b7119457445535fa1d1512bae9c975e54fbae2
-  data.tar.gz: 729a821aa7e9cf31e847fe1f98e87ac04e2ffb031c45405e3421617edd3ac841412840670bbdb333c806fa9330adde986bbc28bf7ecd60a4aa5e45673d2907b9
+  metadata.gz: 4f8cbd06676c3b16661651bf161e4bf819e8b48529aec572d2a7ddb52e5a4dde87bf52e71933be86af22486f03b4a4d5710417db79803b1bba93357258122330
+  data.tar.gz: 36a5d520208b6d0754d5d3e7fb7990b27b9bd967b598039bf6d37bf0e8167e2e8c7689df79a8aeee9a6d9187b2a1d2653d02e99025444157183d0072323807ae

data/.gitignore

@@ -1,4 +1,6 @@
 /coverage
 /pkg
 /doc
-
+Gemfile.lock
+/.ruby-version
+/.ruby-gemset

data/.rspec

@@ -1,2 +1,3 @@
---format=nested
+--require spec_helper
+--format=documentation
 --colour

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [2.0] - 2020-09-01
+
+### Added 
+- CHANGELOG to maintain a history of changes.
+- Include mongoid-rspec gem.
+
+### Changed
+- Fix failing Specs
+- Update Spec syntax to RSpec 3
+- Fix deprecation Warnings
+- Updated mongoid_spec.rb to leverage mongoid-rspec features.
+- Fix security warning about missing secret in session cookie.
+- Dependency version limits so that the most up-to-date gem dependencies are used. (rspec 3+, mongo 2+, mongoid 7+, rake 13+, rack 2+, json 2+)
+- Updated copyright information.
+- Updated MongoMapper section of README to reflect its discontinued support.
+
+### Removed
+- Gemfile.lock file
+- MongoMapper support; unable to satisfy dependencies of both MongoMapper and Mongoig now that MongoMapper is no longer actively maintained.

data/Gemfile

@@ -1,8 +1,10 @@
 source "http://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 group :development, :test do
+  gem 'mongoid-rspec', github: 'mongoid/mongoid-rspec'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'

data/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2020- Andrew Roberts, and Jellybooks Ltd.
+Copyright (c) 2010-2015 Michael Bleigh and Intridea, Inc.
+
+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
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+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.

data/README.markdown

@@ -60,19 +60,12 @@ end
 
 ### MongoMapper
 
-Include the `OmniAuth::Identity::Models::MongoMapper` mixin and specify
-fields that you will need.
+Unfortunately MongoMapper is **not supported** in `omniauth-identity` from >= v2.0 as a result of it 
+not being maintained for several years.
 
-```ruby
-class Identity
-  include MongoMapper::Document
-  include OmniAuth::Identity::Models::MongoMapper
-
-  key :email, String
-  key :name, String
-  key :password_digest, String
-end
-```
+It wasn't possible to include Mongoid *and* MongoMapper due to incompatible gem version 
+requirements. Therefore precedence was given to Mongoid as it is significantly more 
+popular and actively maintained. 
 
 ### DataMapper
 
@@ -200,3 +193,12 @@ object as a parameter.  Note  that model.auth_key defaults to 'email', but is al
 Note: Be careful when customizing locate_conditions.  The best way to modify the conditions is
 to copy the default value, and then add to the hash.  Removing the default condition will almost
 always break things!
+
+## License
+
+MIT License. See LICENSE for details.
+
+## Copyright
+
+Copyright (c) 2020- Andrew Roberts, and Jellybooks Ltd.
+Copyright (c) 2010-2015 Michael Bleigh, and Intridea, Inc.

data/lib/omniauth-identity/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Identity
-    VERSION = '1.1.1'
+    VERSION = '2.0.0'
   end
 end

data/lib/omniauth/identity.rb

@@ -10,7 +10,6 @@ module OmniAuth
     autoload :SecurePassword,      'omniauth/identity/secure_password'
     module Models
       autoload :ActiveRecord,      'omniauth/identity/models/active_record'
-      autoload :MongoMapper,       'omniauth/identity/models/mongo_mapper'
       autoload :Mongoid,           'omniauth/identity/models/mongoid'
       autoload :DataMapper,        'omniauth/identity/models/data_mapper'
       autoload :CouchPotatoModule, 'omniauth/identity/models/couch_potato'

data/lib/omniauth/identity/model.rb

@@ -75,7 +75,7 @@ module OmniAuth
       #
       # @return [String] An identifier string unique to this identity.
       def uid
-        if respond_to?('id')
+        if respond_to?(:id)
           return nil if self.id.nil?
           self.id.to_s
         else
@@ -90,7 +90,7 @@ module OmniAuth
       # @return [String] An identifying string that will be entered by
       #   users upon sign in.
       def auth_key
-        if respond_to?(self.class.auth_key)
+        if respond_to?(self.class.auth_key.to_sym)
           send(self.class.auth_key)
         else
           raise NotImplementedError
@@ -104,8 +104,9 @@ module OmniAuth
       # @param [String] value The value to which the auth key should be
       #   set.
       def auth_key=(value)
-        if respond_to?(self.class.auth_key + '=')
-          send(self.class.auth_key + '=', value)
+        auth_key_setter = (self.class.auth_key + '=').to_sym
+        if respond_to?(auth_key_setter)
+          send(auth_key_setter, value)
         else
           raise NotImplementedError
         end

data/omniauth-identity.gemspec

@@ -2,28 +2,28 @@
 require File.dirname(__FILE__) + '/lib/omniauth-identity/version'
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'omniauth', '~> 1.0'
-  gem.add_runtime_dependency 'bcrypt-ruby', '~> 3.0'
+  gem.add_runtime_dependency 'omniauth'
+  gem.add_runtime_dependency 'bcrypt'
 
-  gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
-  gem.add_development_dependency 'rack-test', '~> 0.5'
-  gem.add_development_dependency 'rake', '~> 0.8'
-  gem.add_development_dependency 'rspec', '~> 2.7'
-  gem.add_development_dependency 'activerecord', '~> 3.1'
+  gem.add_development_dependency 'maruku'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'rack-test'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'activerecord'
   gem.add_development_dependency 'mongoid'
-  gem.add_development_dependency 'mongo_mapper'
   gem.add_development_dependency 'datamapper'
   gem.add_development_dependency 'bson_ext'
+  gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'couch_potato'
 
   gem.name = 'omniauth-identity'
   gem.version = OmniAuth::Identity::VERSION
   gem.description = %q{Internal authentication handlers for OmniAuth.}
   gem.summary = gem.description
-  gem.email = ['michael@intridea.com']
-  gem.homepage = 'http://github.com/intridea/omniauth-identity'
-  gem.authors = ['Michael Bleigh']
+  gem.homepage = 'http://github.com/omniauth/omniauth-identity'
+  gem.authors = ['Andrew Roberts', 'Michael Bleigh']
+  gem.license     = 'MIT'
   gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
   gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/omniauth/identity/model_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class ExampleModel
   include OmniAuth::Identity::Model
 end
@@ -9,25 +7,25 @@ describe OmniAuth::Identity::Model do
     subject{ ExampleModel }
 
     describe '.locate' do
-      it('should be abstract'){ lambda{ subject.locate('abc') }.should raise_error(NotImplementedError) }
+      it('should be abstract'){ expect{ subject.locate('abc') }.to raise_error(NotImplementedError) }
     end
 
     describe '.authenticate' do
       it 'should call locate and then authenticate' do
-        mocked_instance = mock('ExampleModel', :authenticate => 'abbadoo')
-        subject.should_receive(:locate).with('email' => 'example').and_return(mocked_instance)
-        subject.authenticate({'email' => 'example'},'pass').should == 'abbadoo'
+        mocked_instance = double('ExampleModel', :authenticate => 'abbadoo')
+        allow(subject).to receive(:locate).with('email' => 'example').and_return(mocked_instance)
+        expect(subject.authenticate({'email' => 'example'},'pass')).to eq('abbadoo')
       end
 
       it 'should call locate with additional scopes when provided' do
-        mocked_instance = mock('ExampleModel', :authenticate => 'abbadoo')
-        subject.should_receive(:locate).with('email' => 'example', 'user_type' => 'admin').and_return(mocked_instance)
-        subject.authenticate({'email' => 'example', 'user_type' => 'admin'}, 'pass').should == 'abbadoo'
+        mocked_instance = double('ExampleModel', :authenticate => 'abbadoo')
+        allow(subject).to receive(:locate).with('email' => 'example', 'user_type' => 'admin').and_return(mocked_instance)
+        expect(subject.authenticate({'email' => 'example', 'user_type' => 'admin'}, 'pass')).to eq('abbadoo')
       end
 
       it 'should recover gracefully if locate is nil' do
-        subject.stub!(:locate).and_return(nil)
-        subject.authenticate('blah','foo').should be_false
+        allow(subject).to receive(:locate).and_return(nil)
+        expect(subject.authenticate('blah','foo')).to be false
       end
     end
   end
@@ -36,87 +34,87 @@ describe OmniAuth::Identity::Model do
     subject{ ExampleModel.new }
 
     describe '#authenticate' do
-      it('should be abstract'){ lambda{ subject.authenticate('abc') }.should raise_error(NotImplementedError) }
+      it('should be abstract'){ expect{ subject.authenticate('abc') }.to raise_error(NotImplementedError) }
     end
 
     describe '#uid' do
       it 'should default to #id' do
-        subject.should_receive(:respond_to?).with('id').and_return(true)
-        subject.stub!(:id).and_return 'wakka-do'
-        subject.uid.should == 'wakka-do'
+        allow(subject).to receive(:respond_to?).with(:id).and_return(true)
+        allow(subject).to receive(:id).and_return 'wakka-do'
+        expect(subject.uid).to eq('wakka-do')
       end
 
       it 'should stringify it' do
-        subject.stub!(:id).and_return 123
-        subject.uid.should == '123'
+        allow(subject).to receive(:id).and_return 123
+        expect(subject.uid).to eq('123')
       end
 
       it 'should raise NotImplementedError if #id is not defined' do
-        subject.should_receive(:respond_to?).with('id').and_return(false)
-        lambda{ subject.uid }.should raise_error(NotImplementedError)
+        allow(subject).to receive(:respond_to?).with(:id).and_return(false)
+        expect{ subject.uid }.to raise_error(NotImplementedError)
       end
     end
 
     describe '#auth_key' do
       it 'should default to #email' do
-        subject.should_receive(:respond_to?).with('email').and_return(true)
-        subject.stub!(:email).and_return('bob@bob.com')
-        subject.auth_key.should == 'bob@bob.com'
+        allow(subject).to receive(:respond_to?).with(:email).and_return(true)
+        allow(subject).to receive(:email).and_return('bob@bob.com')
+        expect(subject.auth_key).to eq('bob@bob.com')
       end
 
       it 'should use the class .auth_key' do
         subject.class.auth_key 'login'
-        subject.stub!(:login).and_return 'bob'
-        subject.auth_key.should == 'bob'
+        allow(subject).to receive(:login).and_return 'bob'
+        expect(subject.auth_key).to eq('bob')
         subject.class.auth_key nil
       end
 
       it 'should raise a NotImplementedError if the auth_key method is not defined' do
-        lambda{ subject.auth_key }.should raise_error(NotImplementedError)
+        expect{ subject.auth_key }.to raise_error(NotImplementedError)
       end
     end
 
     describe '#auth_key=' do
       it 'should default to setting email' do
-        subject.should_receive(:respond_to?).with('email=').and_return(true)
-        subject.should_receive(:email=).with 'abc'
+        allow(subject).to receive(:respond_to?).with(:email=).and_return(true)
+        expect(subject).to receive(:email=).with 'abc'
         
         subject.auth_key = 'abc'
       end
 
       it 'should use a custom .auth_key if one is provided' do
         subject.class.auth_key 'login'
-        subject.should_receive(:respond_to?).with('login=').and_return(true)
-        subject.should_receive('login=').with('abc')
+        allow(subject).to receive(:respond_to?).with(:login=).and_return(true)
+        expect(subject).to receive(:login=).with('abc')
 
         subject.auth_key = 'abc'
       end
 
       it 'should raise a NotImplementedError if the autH_key method is not defined' do
-        lambda{ subject.auth_key = 'broken' }.should raise_error(NotImplementedError)
+        expect{ subject.auth_key = 'broken' }.to raise_error(NotImplementedError)
       end
     end
 
     describe '#info' do
       it 'should include attributes that are set' do
-        subject.stub!(:name).and_return('Bob Bobson')
-        subject.stub!(:nickname).and_return('bob')
+        allow(subject).to receive(:name).and_return('Bob Bobson')
+        allow(subject).to receive(:nickname).and_return('bob')
 
-        subject.info.should == {
+        expect(subject.info).to eq({
           'name' => 'Bob Bobson',
           'nickname' => 'bob'
-        }
+        })
       end
 
       it 'should automatically set name off of nickname' do
-        subject.stub!(:nickname).and_return('bob')
+        allow(subject).to receive(:nickname).and_return('bob')
         subject.info['name'] == 'bob'
       end
 
       it 'should not overwrite a provided name' do
-        subject.stub!(:name).and_return('Awesome Dude')
-        subject.stub!(:first_name).and_return('Frank')
-        subject.info['name'].should == 'Awesome Dude'
+        allow(subject).to receive(:name).and_return('Awesome Dude')
+        allow(subject).to receive(:first_name).and_return('Frank')
+        expect(subject.info['name']).to eq('Awesome Dude')
       end
     end
   end

data/spec/omniauth/identity/models/active_record_spec.rb

@@ -1,14 +1,16 @@
-require 'spec_helper'
-
 describe(OmniAuth::Identity::Models::ActiveRecord, :db => true) do
   class TestIdentity < OmniAuth::Identity::Models::ActiveRecord; end
 
-  it 'should delegate locate to the where query method' do
-    TestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
-    TestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
-  end
+  describe "model", type: :model do
+    subject { TestIdentity }
+
+    it 'should delegate locate to the where query method' do
+      allow(subject).to receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+      expect(subject.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches')).to eq('wakka')
+    end
 
-  it 'should not use STI rules for its table name' do
-    TestIdentity.table_name.should == 'test_identities'
+    it 'should not use STI rules for its table name' do
+      expect(subject.table_name).to eq('test_identities')
+    end
   end
 end

data/spec/omniauth/identity/models/couch_potato_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe(OmniAuth::Identity::Models::CouchPotatoModule, :db => true) do
   class CouchPotatoTestIdentity
     include CouchPotato::Persistence
@@ -7,9 +5,12 @@ describe(OmniAuth::Identity::Models::CouchPotatoModule, :db => true) do
     auth_key :ham_sandwich
   end
 
-  it 'should delegate locate to the where query method' do
-    CouchPotatoTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
-    CouchPotatoTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
-  end
+  describe 'model', type: :model do
+    subject { CouchPotatoTestIdentity }
 
+    it 'should delegate locate to the where query method' do
+      allow(subject).to receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+      expect(subject.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches')).to eq('wakka')
+    end
+  end
 end

data/spec/omniauth/identity/models/data_mapper_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe(OmniAuth::Identity::Models::DataMapper, :db => true) do
   class DataMapperTestIdentity
     include DataMapper::Resource
@@ -9,14 +7,18 @@ describe(OmniAuth::Identity::Models::DataMapper, :db => true) do
     auth_key :ham_sandwich
   end
 
-  DataMapper.finalize
 
   before :all do
+    DataMapper.finalize
     @resource = DataMapperTestIdentity.new
   end
 
-  it 'should delegate locate to the all query method' do
-    DataMapperTestIdentity.should_receive(:all).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
-    DataMapperTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
+  describe 'model', type: :model do
+    subject { DataMapperTestIdentity }
+
+    it 'should delegate locate to the all query method' do
+      allow(subject).to receive(:all).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+      expect(subject.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches')).to eq('wakka')
+    end
   end
 end

data/spec/omniauth/identity/models/mongoid_spec.rb

@@ -1,18 +1,23 @@
-require 'spec_helper'
-
 describe(OmniAuth::Identity::Models::Mongoid, :db => true) do
   class MongoidTestIdentity
     include Mongoid::Document
     include OmniAuth::Identity::Models::Mongoid
     auth_key :ham_sandwich
+    store_in database: 'db1', collection: 'mongoid_test_identities', client: 'secondary'
   end
 
-  it 'should delegate locate to the where query method' do
-    MongoidTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
-    MongoidTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
-  end
+  describe "model", type: :model do
+    subject { MongoidTestIdentity }
+
+    it { is_expected.to be_mongoid_document }
+
+    it 'does not munge collection name' do
+      is_expected.to be_stored_in(database: 'db1', collection: 'mongoid_test_identities', client: 'secondary')
+    end
 
-  it 'should not use STI rules for its collection name' do
-    MongoidTestIdentity.collection.name.should == 'mongoid_test_identities'
+    it 'should delegate locate to the where query method' do
+      allow(subject).to receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
+      expect(subject.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches')).to eq('wakka')
+    end
   end
 end

data/spec/omniauth/identity/secure_password_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class HasTheMethod
   def self.has_secure_password; end
 end
@@ -9,19 +7,19 @@ end
 
 describe OmniAuth::Identity::SecurePassword do
   it 'should extend with the class methods if it does not have the method' do
-    DoesNotHaveTheMethod.should_receive(:extend).with(OmniAuth::Identity::SecurePassword::ClassMethods)
+    expect(DoesNotHaveTheMethod).to receive(:extend).with(OmniAuth::Identity::SecurePassword::ClassMethods)
     DoesNotHaveTheMethod.send(:include, OmniAuth::Identity::SecurePassword)
   end
 
   it 'should not extend if the method is already defined' do
-    HasTheMethod.should_not_receive(:extend)
+    expect(HasTheMethod).not_to receive(:extend)
     HasTheMethod.send(:include, OmniAuth::Identity::SecurePassword)
   end
 
   it 'should respond to has_secure_password afterwards' do
     [HasTheMethod,DoesNotHaveTheMethod].each do |klass|
       klass.send(:include, OmniAuth::Identity::SecurePassword)
-      klass.should be_respond_to(:has_secure_password)
+      expect(klass).to be_respond_to(:has_secure_password)
     end
   end
 end

data/spec/omniauth/strategies/identity_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 class MockIdentity; end
 
 describe OmniAuth::Strategies::Identity do
@@ -14,7 +12,7 @@ describe OmniAuth::Strategies::Identity do
     identity_options = {:model => MockIdentity}.merge(identity_options)
     old_app = self.app
     self.app = Rack::Builder.app do
-      use Rack::Session::Cookie
+      use Rack::Session::Cookie, secret: '1234567890qwertyuiop'
       use OmniAuth::Strategies::Identity, identity_options
       run lambda{|env| [404, {'env' => env}, ["HELLO!"]]}
     end
@@ -32,52 +30,52 @@ describe OmniAuth::Strategies::Identity do
   describe '#request_phase' do
     it 'should display a form' do
       get '/auth/identity'
-      last_response.body.should be_include("<form")
+      expect(last_response.body).to be_include("<form")
     end
   end
 
   describe '#callback_phase' do
-    let(:user){ mock(:uid => 'user1', :info => {'name' => 'Rockefeller'})}
+    let(:user){ double(:uid => 'user1', :info => {'name' => 'Rockefeller'})}
 
     context 'with valid credentials' do
       before do
-        MockIdentity.stub('auth_key').and_return('email')
-        MockIdentity.should_receive('authenticate').with({'email' => 'john'},'awesome').and_return(user)
+        allow(MockIdentity).to receive('auth_key').and_return('email')
+        expect(MockIdentity).to receive('authenticate').with({'email' => 'john'},'awesome').and_return(user)
         post '/auth/identity/callback', :auth_key => 'john', :password => 'awesome'
       end
 
       it 'should populate the auth hash' do
-        auth_hash.should be_kind_of(Hash)
+        expect(auth_hash).to be_kind_of(Hash)
       end
 
       it 'should populate the uid' do
-        auth_hash['uid'].should == 'user1'
+        expect(auth_hash['uid']).to eq('user1')
       end
 
       it 'should populate the info hash' do
-        auth_hash['info'].should == {'name' => 'Rockefeller'}
+        expect(auth_hash['info']).to eq({'name' => 'Rockefeller'})
       end
     end
 
     context 'with invalid credentials' do
       before do
-        MockIdentity.stub('auth_key').and_return('email')
+        allow(MockIdentity).to receive('auth_key').and_return('email')
         OmniAuth.config.on_failure = lambda{|env| [401, {}, [env['omniauth.error.type'].inspect]]}
-        MockIdentity.should_receive(:authenticate).with({'email' => 'wrong'},'login').and_return(false)
+        expect(MockIdentity).to receive(:authenticate).with({'email' => 'wrong'},'login').and_return(false)
         post '/auth/identity/callback', :auth_key => 'wrong', :password => 'login'
       end
 
       it 'should fail with :invalid_credentials' do
-        last_response.body.should == ':invalid_credentials'
+        expect(last_response.body).to eq(':invalid_credentials')
       end
     end
 
     context 'with auth scopes' do
 
       it 'should evaluate and pass through conditions proc' do
-        MockIdentity.stub('auth_key').and_return('email')
+        allow(MockIdentity).to receive('auth_key').and_return('email')
         set_app!( :locate_conditions => lambda{|req| {model.auth_key => req['auth_key'], 'user_type' => 'admin'} } )
-        MockIdentity.should_receive('authenticate').with( {'email' => 'john', 'user_type' => 'admin'}, 'awesome' ).and_return(user)
+        expect(MockIdentity).to receive('authenticate').with( {'email' => 'john', 'user_type' => 'admin'}, 'awesome' ).and_return(user)
         post '/auth/identity/callback', :auth_key => 'john', :password => 'awesome'
       end
     end
@@ -86,7 +84,7 @@ describe OmniAuth::Strategies::Identity do
   describe '#registration_form' do
     it 'should trigger from /auth/identity/register by default' do
       get '/auth/identity/register'
-      last_response.body.should be_include("Register Identity")
+      expect(last_response.body).to be_include("Register Identity")
     end
   end
 
@@ -100,14 +98,14 @@ describe OmniAuth::Strategies::Identity do
       } }
 
       before do
-        MockIdentity.stub('auth_key').and_return('email')
-        m = mock(:uid => 'abc', :name => 'Awesome Dude', :email => 'awesome@example.com', :info => {:name => 'DUUUUDE!'}, :persisted? => true)
-        MockIdentity.should_receive(:create).with(properties).and_return(m)
+        allow(MockIdentity).to receive('auth_key').and_return('email')
+        m = double(:uid => 'abc', :name => 'Awesome Dude', :email => 'awesome@example.com', :info => {:name => 'DUUUUDE!'}, :persisted? => true)
+        expect(MockIdentity).to receive(:create).with(properties).and_return(m)
       end
 
       it 'should set the auth hash' do
         post '/auth/identity/register', properties
-        auth_hash['uid'].should == 'abc'
+        expect(auth_hash['uid']).to eq('abc')
       end
     end
 
@@ -120,13 +118,13 @@ describe OmniAuth::Strategies::Identity do
       } }
 
       before do
-        MockIdentity.should_receive(:create).with(properties).and_return(mock(:persisted? => false))
+        expect(MockIdentity).to receive(:create).with(properties).and_return(double(:persisted? => false))
       end
 
       context 'default' do
         it 'should show registration form' do
           post '/auth/identity/register', properties
-          last_response.body.should be_include("Register Identity")
+          expect(last_response.body).to be_include("Register Identity")
         end
       end
 
@@ -134,7 +132,7 @@ describe OmniAuth::Strategies::Identity do
         it 'should set the identity hash' do
           set_app!(:on_failed_registration => lambda{|env| [404, {'env' => env}, ["HELLO!"]]}) do
             post '/auth/identity/register', properties
-            identity_hash.should_not be_nil
+            expect(identity_hash).not_to be_nil
           end
         end
       end

data/spec/spec_helper.rb

@@ -2,13 +2,19 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup :default, :development, :test
 
+# Third party gems to help with testing
 require 'simplecov'
 SimpleCov.start
 
 require 'rack/test'
+require 'mongoid-rspec'
+require 'byebug'
+
+# This gem
 require 'omniauth/identity'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods
+  config.include Mongoid::Matchers, type: :model
 end
 

metadata

@@ -1,209 +1,210 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-identity
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
+- Andrew Roberts
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
+  name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     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.7'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   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: mongo_mapper
+  name: datamapper
   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: datamapper
+  name: bson_ext
   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: bson_ext
+  name: byebug
   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: couch_potato
   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'
 description: Internal authentication handlers for OmniAuth.
-email:
-- michael@intridea.com
+email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - Guardfile
+- LICENSE
 - README.markdown
 - Rakefile
 - lib/omniauth-identity.rb
@@ -213,7 +214,6 @@ files:
 - lib/omniauth/identity/models/active_record.rb
 - lib/omniauth/identity/models/couch_potato.rb
 - lib/omniauth/identity/models/data_mapper.rb
-- lib/omniauth/identity/models/mongo_mapper.rb
 - lib/omniauth/identity/models/mongoid.rb
 - lib/omniauth/identity/secure_password.rb
 - lib/omniauth/strategies/identity.rb
@@ -222,13 +222,13 @@ files:
 - spec/omniauth/identity/models/active_record_spec.rb
 - spec/omniauth/identity/models/couch_potato_spec.rb
 - spec/omniauth/identity/models/data_mapper_spec.rb
-- spec/omniauth/identity/models/mongo_mapper_spec.rb
 - spec/omniauth/identity/models/mongoid_spec.rb
 - spec/omniauth/identity/secure_password_spec.rb
 - spec/omniauth/strategies/identity_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/intridea/omniauth-identity
-licenses: []
+homepage: http://github.com/omniauth/omniauth-identity
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -236,19 +236,26 @@ 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: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Internal authentication handlers for OmniAuth.
-test_files: []
-has_rdoc: 
+test_files:
+- spec/omniauth/identity/model_spec.rb
+- spec/omniauth/identity/models/active_record_spec.rb
+- spec/omniauth/identity/models/couch_potato_spec.rb
+- spec/omniauth/identity/models/data_mapper_spec.rb
+- spec/omniauth/identity/models/mongoid_spec.rb
+- spec/omniauth/identity/secure_password_spec.rb
+- spec/omniauth/strategies/identity_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,179 +0,0 @@
-PATH
-  remote: .
-  specs:
-    omniauth-identity (1.1.1)
-      bcrypt-ruby (~> 3.0)
-      omniauth (~> 1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    bson (1.9.0)
-    bson_ext (1.9.0)
-      bson (~> 1.9.0)
-    builder (3.0.4)
-    coderay (1.0.9)
-    couch_potato (1.0.1)
-      activemodel
-      couchrest (~> 1.2.0)
-      json (~> 1.6)
-    couchrest (1.2.0)
-      mime-types (~> 1.15)
-      multi_json (~> 1.0)
-      rest-client (~> 1.6.1)
-    datamapper (1.2.0)
-      dm-aggregates (~> 1.2.0)
-      dm-constraints (~> 1.2.0)
-      dm-core (~> 1.2.0)
-      dm-migrations (~> 1.2.0)
-      dm-serializer (~> 1.2.0)
-      dm-timestamps (~> 1.2.0)
-      dm-transactions (~> 1.2.0)
-      dm-types (~> 1.2.0)
-      dm-validations (~> 1.2.0)
-    diff-lcs (1.2.4)
-    dm-aggregates (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-constraints (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-core (1.2.1)
-      addressable (~> 2.3)
-    dm-migrations (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-serializer (1.2.2)
-      dm-core (~> 1.2.0)
-      fastercsv (~> 1.5)
-      json (~> 1.6)
-      json_pure (~> 1.6)
-      multi_json (~> 1.0)
-    dm-timestamps (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-transactions (1.2.0)
-      dm-core (~> 1.2.0)
-    dm-types (1.2.2)
-      bcrypt-ruby (~> 3.0)
-      dm-core (~> 1.2.0)
-      fastercsv (~> 1.5)
-      json (~> 1.6)
-      multi_json (~> 1.0)
-      stringex (~> 1.4)
-      uuidtools (~> 2.1)
-    dm-validations (1.2.0)
-      dm-core (~> 1.2.0)
-    fastercsv (1.5.5)
-    ffi (1.9.0)
-    formatador (0.2.4)
-    growl (1.0.3)
-    guard (1.8.1)
-      formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-bundler (1.0.0)
-      bundler (~> 1.0)
-      guard (~> 1.1)
-    guard-rspec (3.0.2)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    hashie (2.0.5)
-    i18n (0.6.1)
-    json (1.8.0)
-    json_pure (1.8.0)
-    listen (1.2.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    lumberjack (1.0.4)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    method_source (0.8.1)
-    mime-types (1.23)
-    mongo (1.9.0)
-      bson (~> 1.9.0)
-    mongo_mapper (0.12.0)
-      activemodel (~> 3.0)
-      activesupport (~> 3.0)
-      plucky (~> 0.5.2)
-    mongoid (3.1.4)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.22)
-    moped (1.5.0)
-    multi_json (1.7.7)
-    omniauth (1.1.4)
-      hashie (>= 1.2, < 3)
-      rack
-    origin (1.1.0)
-    plucky (0.5.2)
-      mongo (~> 1.5)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    rack (1.5.2)
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rake (0.9.6)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.5)
-    stringex (1.5.1)
-    syntax (1.0.0)
-    thor (0.18.1)
-    tzinfo (0.3.37)
-    uuidtools (2.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 3.1)
-  bson_ext
-  couch_potato
-  datamapper
-  growl
-  guard
-  guard-bundler
-  guard-rspec
-  maruku (~> 0.6)
-  mongo_mapper
-  mongoid
-  omniauth-identity!
-  rack-test (~> 0.5)
-  rake (~> 0.8)
-  rb-fsevent
-  rspec (~> 2.7)
-  simplecov (~> 0.4)

data/lib/omniauth/identity/models/mongo_mapper.rb

@@ -1,28 +0,0 @@
-require 'mongo_mapper'
-
-module OmniAuth
-  module Identity
-    module Models
-      module MongoMapper
-        def self.included(base)
-          base.class_eval do
-            include ::OmniAuth::Identity::Model
-            include ::OmniAuth::Identity::SecurePassword
-
-            has_secure_password
-
-            def self.auth_key=(key)
-              super
-              validates_uniqueness_of key, :case_sensitive => false
-            end
-
-            def self.locate(search_hash)
-              where(search_hash).first
-            end
-          end
-        end
-      end
-    end
-  end
-end
-

data/spec/omniauth/identity/models/mongo_mapper_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe(OmniAuth::Identity::Models::MongoMapper, :db => true) do
-  class MongoMapperTestIdentity
-    include MongoMapper::Document
-    include OmniAuth::Identity::Models::MongoMapper
-    auth_key :ham_sandwich
-  end
-
-
-  it 'should delegate locate to the where query method' do
-    MongoMapperTestIdentity.should_receive(:where).with('ham_sandwich' => 'open faced', 'category' => 'sandwiches').and_return(['wakka'])
-    MongoMapperTestIdentity.locate('ham_sandwich' => 'open faced', 'category' => 'sandwiches').should == 'wakka'
-  end
-end