sorcery 0.8.6 → 0.9.0

data/spec/spec_helper.rb

@@ -15,6 +15,9 @@ require 'rails/all'
 require 'rspec/rails'
 require 'timecop'
 
+def setup_orm; end
+def teardown_orm; end
+
 require "orm/#{SORCERY_ORM}"
 
 require "rails_app/config/environment"
@@ -27,33 +30,15 @@ RSpec.configure do |config|
   config.include RSpec::Rails::ControllerExampleGroup, :file_path => /controller(.)*_spec.rb$/
   config.filter_run_excluding :active_record => SORCERY_ORM.to_sym != :active_record
   config.filter_run_excluding :mongo_mapper => SORCERY_ORM.to_sym != :mongo_mapper
-  config.filter_run_excluding :datamapper => SORCERY_ORM.to_sym != :datamapper
+  config.filter_run_excluding :data_mapper => SORCERY_ORM.to_sym != :data_mapper
   config.filter_run_excluding :mongoid => SORCERY_ORM.to_sym != :mongoid
   config.mock_with :rspec
 
   config.use_transactional_fixtures = true
 
-  migrations_path = Rails.root.join("db", "migrate", "core")
-
-  config.before(:suite) do
-    if SORCERY_ORM.to_sym == :active_record
-      ActiveRecord::Migrator.migrate(migrations_path)
-    end
-    if SORCERY_ORM.to_sym == :datamapper
-      DataMapper.auto_migrate!
-      DataMapper.finalize
-    end
-
-    if defined?(Mongoid)
-      Mongoid.purge!
-    end
-  end
-
-  config.after(:suite) do
-    if SORCERY_ORM.to_sym == :active_record
-      ActiveRecord::Migrator.rollback(migrations_path)
-    end
-  end
+  config.before(:suite) { setup_orm }
+  config.after(:suite) { teardown_orm }
+  config.before(:each) { ActionMailer::Base.deliveries.clear }
 
   config.include ::Sorcery::TestHelpers::Internal
   config.include ::Sorcery::TestHelpers::Internal::Rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sorcery
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Noam Ben Ari
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2015-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -39,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,9 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -177,14 +171,16 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.rails4
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
+- gemfiles/active_record-rails40.gemfile
 - gemfiles/active_record-rails41.gemfile
+- gemfiles/mongo_mapper-rails40.gemfile
 - gemfiles/mongo_mapper-rails41.gemfile
+- gemfiles/mongoid-rails40.gemfile
 - gemfiles/mongoid-rails41.gemfile
+- gemfiles/mongoid3-rails32.gemfile
 - lib/generators/sorcery/USAGE
 - lib/generators/sorcery/helpers.rb
 - lib/generators/sorcery/install_generator.rb
@@ -197,7 +193,13 @@ files:
 - lib/generators/sorcery/templates/migration/reset_password.rb
 - lib/generators/sorcery/templates/migration/user_activation.rb
 - lib/sorcery.rb
+- lib/sorcery/adapters/active_record_adapter.rb
+- lib/sorcery/adapters/base_adapter.rb
+- lib/sorcery/adapters/data_mapper_adapter.rb
+- lib/sorcery/adapters/mongo_mapper_adapter.rb
+- lib/sorcery/adapters/mongoid_adapter.rb
 - lib/sorcery/controller.rb
+- lib/sorcery/controller/config.rb
 - lib/sorcery/controller/submodules/activity_logging.rb
 - lib/sorcery/controller/submodules/brute_force_protection.rb
 - lib/sorcery/controller/submodules/external.rb
@@ -213,10 +215,7 @@ files:
 - lib/sorcery/crypto_providers/sha512.rb
 - lib/sorcery/engine.rb
 - lib/sorcery/model.rb
-- lib/sorcery/model/adapters/active_record.rb
-- lib/sorcery/model/adapters/datamapper.rb
-- lib/sorcery/model/adapters/mongo_mapper.rb
-- lib/sorcery/model/adapters/mongoid.rb
+- lib/sorcery/model/config.rb
 - lib/sorcery/model/submodules/activity_logging.rb
 - lib/sorcery/model/submodules/brute_force_protection.rb
 - lib/sorcery/model/submodules/external.rb
@@ -231,27 +230,21 @@ files:
 - lib/sorcery/providers/facebook.rb
 - lib/sorcery/providers/github.rb
 - lib/sorcery/providers/google.rb
+- lib/sorcery/providers/heroku.rb
+- lib/sorcery/providers/jira.rb
 - lib/sorcery/providers/linkedin.rb
 - lib/sorcery/providers/liveid.rb
+- lib/sorcery/providers/salesforce.rb
 - lib/sorcery/providers/twitter.rb
 - lib/sorcery/providers/vk.rb
 - lib/sorcery/providers/xing.rb
 - lib/sorcery/railties/tasks.rake
 - lib/sorcery/test_helpers/internal.rb
 - lib/sorcery/test_helpers/internal/rails.rb
-- lib/sorcery/test_helpers/rails.rb
 - lib/sorcery/test_helpers/rails/controller.rb
 - lib/sorcery/test_helpers/rails/integration.rb
+- lib/sorcery/version.rb
 - sorcery.gemspec
-- spec/active_record/controller_activity_logging_spec.rb
-- spec/active_record/controller_brute_force_protection_spec.rb
-- spec/active_record/controller_http_basic_auth_spec.rb
-- spec/active_record/controller_oauth2_spec.rb
-- spec/active_record/controller_oauth_spec.rb
-- spec/active_record/controller_remember_me_spec.rb
-- spec/active_record/controller_session_timeout_spec.rb
-- spec/active_record/controller_spec.rb
-- spec/active_record/integration_spec.rb
 - spec/active_record/user_activation_spec.rb
 - spec/active_record/user_activity_logging_spec.rb
 - spec/active_record/user_brute_force_protection_spec.rb
@@ -259,16 +252,21 @@ files:
 - spec/active_record/user_remember_me_spec.rb
 - spec/active_record/user_reset_password_spec.rb
 - spec/active_record/user_spec.rb
-- spec/datamapper/controller_activity_logging_spec.rb
-- spec/datamapper/controller_spec.rb
-- spec/datamapper/user_activation_spec.rb
-- spec/datamapper/user_activity_logging_spec.rb
-- spec/datamapper/user_brute_force_protection_spec.rb
-- spec/datamapper/user_oauth_spec.rb
-- spec/datamapper/user_remember_me_spec.rb
-- spec/datamapper/user_reset_password_spec.rb
-- spec/datamapper/user_spec.rb
-- spec/mongo_mapper/controller_spec.rb
+- spec/controllers/controller_activity_logging_spec.rb
+- spec/controllers/controller_brute_force_protection_spec.rb
+- spec/controllers/controller_http_basic_auth_spec.rb
+- spec/controllers/controller_oauth2_spec.rb
+- spec/controllers/controller_oauth_spec.rb
+- spec/controllers/controller_remember_me_spec.rb
+- spec/controllers/controller_session_timeout_spec.rb
+- spec/controllers/controller_spec.rb
+- spec/data_mapper/user_activation_spec.rb
+- spec/data_mapper/user_activity_logging_spec.rb
+- spec/data_mapper/user_brute_force_protection_spec.rb
+- spec/data_mapper/user_oauth_spec.rb
+- spec/data_mapper/user_remember_me_spec.rb
+- spec/data_mapper/user_reset_password_spec.rb
+- spec/data_mapper/user_spec.rb
 - spec/mongo_mapper/user_activation_spec.rb
 - spec/mongo_mapper/user_activity_logging_spec.rb
 - spec/mongo_mapper/user_brute_force_protection_spec.rb
@@ -276,8 +274,6 @@ files:
 - spec/mongo_mapper/user_remember_me_spec.rb
 - spec/mongo_mapper/user_reset_password_spec.rb
 - spec/mongo_mapper/user_spec.rb
-- spec/mongoid/controller_activity_logging_spec.rb
-- spec/mongoid/controller_spec.rb
 - spec/mongoid/user_activation_spec.rb
 - spec/mongoid/user_activity_logging_spec.rb
 - spec/mongoid/user_brute_force_protection_spec.rb
@@ -286,15 +282,15 @@ files:
 - spec/mongoid/user_reset_password_spec.rb
 - spec/mongoid/user_spec.rb
 - spec/orm/active_record.rb
-- spec/orm/datamapper.rb
+- spec/orm/data_mapper.rb
 - spec/orm/mongo_mapper.rb
 - spec/orm/mongoid.rb
 - spec/rails_app/app/active_record/authentication.rb
 - spec/rails_app/app/active_record/user.rb
 - spec/rails_app/app/active_record/user_provider.rb
 - spec/rails_app/app/controllers/sorcery_controller.rb
-- spec/rails_app/app/datamapper/authentication.rb
-- spec/rails_app/app/datamapper/user.rb
+- spec/rails_app/app/data_mapper/authentication.rb
+- spec/rails_app/app/data_mapper/user.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mailers/sorcery_mailer.rb
 - spec/rails_app/app/mongo_mapper/authentication.rb
@@ -334,23 +330,6 @@ files:
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/log/development.log
-- spec/rails_app/public/404.html
-- spec/rails_app/public/422.html
-- spec/rails_app/public/500.html
-- spec/rails_app/public/favicon.ico
-- spec/rails_app/public/images/rails.png
-- spec/rails_app/public/javascripts/application.js
-- spec/rails_app/public/javascripts/controls.js
-- spec/rails_app/public/javascripts/dragdrop.js
-- spec/rails_app/public/javascripts/effects.js
-- spec/rails_app/public/javascripts/prototype.js
-- spec/rails_app/public/javascripts/rails.js
-- spec/rails_app/public/robots.txt
-- spec/rails_app/public/stylesheets/.gitkeep
-- spec/shared_examples/controller_activity_logging_shared_examples.rb
-- spec/shared_examples/controller_oauth2_shared_examples.rb
-- spec/shared_examples/controller_oauth_shared_examples.rb
-- spec/shared_examples/controller_shared_examples.rb
 - spec/shared_examples/user_activation_shared_examples.rb
 - spec/shared_examples/user_activity_logging_shared_examples.rb
 - spec/shared_examples/user_brute_force_protection_shared_examples.rb
@@ -381,9 +360,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Magical authentication for Rails 3 & 4 applications
 test_files: []
-has_rdoc: 

data/Gemfile.rails4

@@ -1,22 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'sqlite3'
-
-group :mongomapper do
-  gem 'mongo_mapper', github: 'jnunemaker/mongomapper'
-end
-
-group :mongoid do
-  gem 'mongoid', github: 'mongoid/mongoid', ref: 'f91feef0a0c6b83a1b878e154f1014536aa1c298'
-  gem 'bson_ext'
-end
-
-group :datamapper do
-  gem 'mysql2'
-  gem 'data_mapper'
-  gem 'dm-mysql-adapter'
-end
-
-gem 'rails', '~> 4.0.1'
-
-gemspec

data/VERSION

@@ -1 +0,0 @@
-0.8.5

data/lib/sorcery/model/adapters/active_record.rb

@@ -1,54 +0,0 @@
-module Sorcery
-  module Model
-    module Adapters
-      module ActiveRecord
-        def self.included(klass)
-          klass.extend ClassMethods
-          klass.send(:include, InstanceMethods)
-        end
-
-        module InstanceMethods
-          def update_many_attributes(attrs)
-            attrs.each do |name, value|
-              self.send(:"#{name}=", value)
-            end
-            primary_key = self.class.primary_key
-            self.class.where(:"#{primary_key}" => self.send(:"#{primary_key}")).update_all(attrs)
-          end
-
-          def update_single_attribute(name, value)
-            update_many_attributes(name => value)
-          end
-
-          def sorcery_save(options = {})
-            mthd = options.delete(:raise_on_failure) ? :save! : :save
-            self.send(mthd, options)
-          end
-        end
-        
-        module ClassMethods
-          def column_name(attribute)
-            return "LOWER(#{attribute})" if (@sorcery_config.downcase_username_before_authenticating)
-            attribute.to_s
-          end
-
-          def find_by_credentials(credentials)
-             sql = @sorcery_config.username_attribute_names.map{|attribute| column_name(attribute) + " = :login"}
-             where(sql.join(' OR '), :login => credentials[0]).first
-          end
-
-          def find_by_sorcery_token(token_attr_name, token)
-            where("#{token_attr_name} = ?", token).first
-          end
-
-          def get_current_users
-            config = @sorcery_config
-            where("#{config.last_activity_at_attribute_name} IS NOT NULL") \
-            .where("#{config.last_logout_at_attribute_name} IS NULL OR #{config.last_activity_at_attribute_name} > #{config.last_logout_at_attribute_name}") \
-            .where("#{config.last_activity_at_attribute_name} > ? ", config.activity_timeout.seconds.ago.utc.to_s(:db))
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sorcery/model/adapters/datamapper.rb

@@ -1,123 +0,0 @@
-module Sorcery
-  module Model
-    module Adapters
-      module DataMapper
-        def self.included(klass)
-          klass.extend ClassMethods
-          klass.send(:include, InstanceMethods)
-        end
-
-        module InstanceMethods
-          def increment(attr)
-            self[attr] ||= 0
-            self[attr] += 1
-            self
-          end
-
-          def update_many_attributes(attrs)
-            attrs.each do |name, value|
-              value = value.utc if value.is_a?(ActiveSupport::TimeWithZone)
-              self.send(:"#{name}=", value)
-            end
-            self.class.get(self.id).update(attrs)
-          end
-
-          def update_single_attribute(name, value)
-            update_many_attributes(name => value)
-          end
-
-          def sorcery_save(options = {})
-            if options.key?(:validate) && ! options[:validate]
-              save!
-            else
-              save
-            end
-          end
-        end
-
-        module ClassMethods
-          def find(id)
-            get(id)
-          end
-
-          def delete_all
-            destroy
-          end
-
-          # NOTE
-          # DM Adapter dependent
-          # DM creates MySQL tables case insensitive by default
-          # http://datamapper.lighthouseapp.com/projects/20609-datamapper/tickets/1105
-          def find_by_credentials(credentials)
-            credential = credentials[0].dup
-            credential.downcase! if @sorcery_config.downcase_username_before_authenticating
-            @sorcery_config.username_attribute_names.each do |name|
-              @user = first(name => credential)
-              break if @user
-            end
-            !!@user ? get(@user.id) : nil
-          end
-
-          def find_by_provider_and_uid(provider, uid)
-            @user_klass ||= ::Sorcery::Controller::Config.user_class.to_s.constantize
-            user = first(@user_klass.sorcery_config.provider_attribute_name => provider, @user_klass.sorcery_config.provider_uid_attribute_name => uid)
-            !!user ? get(user.id) : nil
-          end
-
-          def find_by_id(id)
-            find(id)
-          rescue ::DataMapper::ObjectNotFoundError
-            nil
-          end
-
-          def find_by_activation_token(token)
-            user = first(sorcery_config.activation_token_attribute_name => token)
-            !!user ? get(user.id) : nil
-          end
-
-          def find_by_remember_me_token(token)
-            user = first(sorcery_config.remember_me_token_attribute_name => token)
-            !!user ? get(user.id) : nil
-          end
-
-          def find_by_username(username)
-            user = nil
-            sorcery_config.username_attribute_names.each do |name|
-              user = first(name => username)
-              break if user
-            end
-            !!user ? get(user.id) : nil
-          end
-
-          def transaction(&blk)
-            tap(&blk)
-          end
-
-          def find_by_sorcery_token(token_attr_name, token)
-            user = first(token_attr_name => token)
-            !!user ? get(user.id) : nil
-          end
-
-          def find_by_email(email)
-            user = first(sorcery_config.email_attribute_name => email)
-            !!user ? get(user.id) : nil
-          end
-
-          # NOTE
-          # DM Adapter dependent
-          def get_current_users
-            unless self.repository.adapter.is_a?(::DataMapper::Adapters::MysqlAdapter)
-              raise 'Unsupported DataMapper Adapter'
-            end
-            config = sorcery_config
-            ret = all(config.last_logout_at_attribute_name => nil) |
-                  all(config.last_activity_at_attribute_name.gt => config.last_logout_at_attribute_name)
-            ret = ret.all(config.last_activity_at_attribute_name.not => nil)
-            ret = ret.all(config.last_activity_at_attribute_name.gt => config.activity_timeout.seconds.ago.utc)
-            ret
-          end
-        end
-      end
-    end
-  end
-end