sorcery 0.8.2 → 0.8.6

data/lib/sorcery.rb

@@ -6,6 +6,7 @@ module Sorcery
       autoload :ActiveRecord, 'sorcery/model/adapters/active_record'
       autoload :Mongoid, 'sorcery/model/adapters/mongoid'
       autoload :MongoMapper, 'sorcery/model/adapters/mongo_mapper'
+      autoload :DataMapper, 'sorcery/model/adapters/datamapper'
     end
     module Submodules
       autoload :UserActivation, 'sorcery/model/submodules/user_activation'
@@ -25,25 +26,12 @@ module Sorcery
       autoload :HttpBasicAuth, 'sorcery/controller/submodules/http_basic_auth'
       autoload :ActivityLogging, 'sorcery/controller/submodules/activity_logging'
       autoload :External, 'sorcery/controller/submodules/external'
-      module External
-        module Protocols
-          autoload :Oauth1, 'sorcery/controller/submodules/external/protocols/oauth1'
-          autoload :Oauth2, 'sorcery/controller/submodules/external/protocols/oauth2'
-        end
-        module Providers
-          autoload :Base, 'sorcery/controller/submodules/external/providers/base'
-          autoload :Twitter, 'sorcery/controller/submodules/external/providers/twitter'
-          autoload :Facebook, 'sorcery/controller/submodules/external/providers/facebook'
-          autoload :Github, 'sorcery/controller/submodules/external/providers/github'
-          autoload :Google, 'sorcery/controller/submodules/external/providers/google'
-          autoload :Liveid, 'sorcery/controller/submodules/external/providers/liveid'
-          autoload :Linkedin, 'sorcery/controller/submodules/external/providers/linkedin'
-          autoload :Vk, 'sorcery/controller/submodules/external/providers/vk'
-          autoload :Xing, 'sorcery/controller/submodules/external/providers/xing'
-        end
-      end
     end
   end
+  module Protocols
+    autoload :Oauth, 'sorcery/protocols/oauth'
+    autoload :Oauth2, 'sorcery/protocols/oauth2'
+  end
   module CryptoProviders
     autoload :Common, 'sorcery/crypto_providers/common'
     autoload :AES256, 'sorcery/crypto_providers/aes256'
@@ -53,34 +41,38 @@ module Sorcery
     autoload :SHA256, 'sorcery/crypto_providers/sha256'
     autoload :SHA512, 'sorcery/crypto_providers/sha512'
   end
-  autoload :TestHelpers, 'sorcery/test_helpers'
   module TestHelpers
-    autoload :Rails, 'sorcery/test_helpers/rails'
     autoload :Internal, 'sorcery/test_helpers/internal'
     module Internal
       autoload :Rails, 'sorcery/test_helpers/internal/rails'
     end
+    autoload :Rails, 'sorcery/test_helpers/rails'
+    module Rails
+      autoload :Controller, 'sorcery/test_helpers/rails/controller'
+      autoload :Integration, 'sorcery/test_helpers/rails/integration'
+    end
 
   end
 
   if defined?(ActiveRecord)
-    ActiveRecord::Base.send(:include, Sorcery::Model)
-    ActiveRecord::Base.send(:include, Sorcery::Model::Adapters::ActiveRecord)
+    ActiveRecord::Base.extend Sorcery::Model
+    ActiveRecord::Base.send :include, Sorcery::Model::Adapters::ActiveRecord
   end
 
   if defined?(Mongoid)
-    Mongoid::Document.module_eval do
-      included do
-        attr_reader :new_record
-        include Sorcery::Model
-        include Sorcery::Model::Adapters::Mongoid
-      end
-    end
+    Mongoid::Document::ClassMethods.send :include, Sorcery::Model
+    Mongoid::Document::ClassMethods.send :include, Sorcery::Model::Adapters::Mongoid::ClassMethods
+    Mongoid::Document.send :include, Sorcery::Model::Adapters::Mongoid::InstanceMethods
   end
 
   if defined?(MongoMapper)
     MongoMapper::Document.send(:plugin, Sorcery::Model::Adapters::MongoMapper)
   end
 
+  if defined?(DataMapper)
+    DataMapper::Model.append_extensions(Sorcery::Model)
+    DataMapper::Model.append_inclusions(Sorcery::Model::Adapters::DataMapper)
+  end
+
   require 'sorcery/engine' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 end

data/sorcery.gemspec

@@ -1,372 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.8.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Noam Ben Ari"]
-  s.date = "2013-07-05"
-  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
+  s.version = "0.8.6"
+  s.authors = ["Noam Ben Ari", "Kir Shatrov", "Grzegorz Witek"]
   s.email = "nbenari@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lib/generators/sorcery/USAGE",
-    "lib/generators/sorcery/install_generator.rb",
-    "lib/generators/sorcery/templates/initializer.rb",
-    "lib/generators/sorcery/templates/migration/activity_logging.rb",
-    "lib/generators/sorcery/templates/migration/brute_force_protection.rb",
-    "lib/generators/sorcery/templates/migration/core.rb",
-    "lib/generators/sorcery/templates/migration/external.rb",
-    "lib/generators/sorcery/templates/migration/remember_me.rb",
-    "lib/generators/sorcery/templates/migration/reset_password.rb",
-    "lib/generators/sorcery/templates/migration/user_activation.rb",
-    "lib/sorcery.rb",
-    "lib/sorcery/controller.rb",
-    "lib/sorcery/controller/submodules/activity_logging.rb",
-    "lib/sorcery/controller/submodules/brute_force_protection.rb",
-    "lib/sorcery/controller/submodules/external.rb",
-    "lib/sorcery/controller/submodules/external/protocols/certs/ca-bundle.crt",
-    "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
-    "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
-    "lib/sorcery/controller/submodules/external/providers/base.rb",
-    "lib/sorcery/controller/submodules/external/providers/facebook.rb",
-    "lib/sorcery/controller/submodules/external/providers/github.rb",
-    "lib/sorcery/controller/submodules/external/providers/google.rb",
-    "lib/sorcery/controller/submodules/external/providers/linkedin.rb",
-    "lib/sorcery/controller/submodules/external/providers/liveid.rb",
-    "lib/sorcery/controller/submodules/external/providers/twitter.rb",
-    "lib/sorcery/controller/submodules/external/providers/vk.rb",
-    "lib/sorcery/controller/submodules/external/providers/xing.rb",
-    "lib/sorcery/controller/submodules/http_basic_auth.rb",
-    "lib/sorcery/controller/submodules/remember_me.rb",
-    "lib/sorcery/controller/submodules/session_timeout.rb",
-    "lib/sorcery/crypto_providers/aes256.rb",
-    "lib/sorcery/crypto_providers/bcrypt.rb",
-    "lib/sorcery/crypto_providers/common.rb",
-    "lib/sorcery/crypto_providers/md5.rb",
-    "lib/sorcery/crypto_providers/sha1.rb",
-    "lib/sorcery/crypto_providers/sha256.rb",
-    "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/mongo_mapper.rb",
-    "lib/sorcery/model/adapters/mongoid.rb",
-    "lib/sorcery/model/submodules/activity_logging.rb",
-    "lib/sorcery/model/submodules/brute_force_protection.rb",
-    "lib/sorcery/model/submodules/external.rb",
-    "lib/sorcery/model/submodules/remember_me.rb",
-    "lib/sorcery/model/submodules/reset_password.rb",
-    "lib/sorcery/model/submodules/user_activation.rb",
-    "lib/sorcery/model/temporary_token.rb",
-    "lib/sorcery/railties/tasks.rake",
-    "lib/sorcery/test_helpers.rb",
-    "lib/sorcery/test_helpers/internal.rb",
-    "lib/sorcery/test_helpers/internal/rails.rb",
-    "lib/sorcery/test_helpers/rails.rb",
-    "sorcery.gemspec",
-    "spec/Gemfile",
-    "spec/Gemfile.lock",
-    "spec/README.md",
-    "spec/Rakefile",
-    "spec/rails3/.gitignore",
-    "spec/rails3/.rspec",
-    "spec/rails3/Gemfile",
-    "spec/rails3/Gemfile.lock",
-    "spec/rails3/README",
-    "spec/rails3/Rakefile",
-    "spec/rails3/app/controllers/application_controller.rb",
-    "spec/rails3/app/helpers/application_helper.rb",
-    "spec/rails3/app/mailers/sorcery_mailer.rb",
-    "spec/rails3/app/models/authentication.rb",
-    "spec/rails3/app/models/user.rb",
-    "spec/rails3/app/views/application/index.html.erb",
-    "spec/rails3/app/views/layouts/application.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3/app/views/sorcery_mailer/send_unlock_token_email.text.erb",
-    "spec/rails3/config.ru",
-    "spec/rails3/config/application.rb",
-    "spec/rails3/config/boot.rb",
-    "spec/rails3/config/database.yml",
-    "spec/rails3/config/environment.rb",
-    "spec/rails3/config/environments/development.rb",
-    "spec/rails3/config/environments/in_memory.rb",
-    "spec/rails3/config/environments/production.rb",
-    "spec/rails3/config/environments/test.rb",
-    "spec/rails3/config/initializers/backtrace_silencers.rb",
-    "spec/rails3/config/initializers/inflections.rb",
-    "spec/rails3/config/initializers/mime_types.rb",
-    "spec/rails3/config/initializers/secret_token.rb",
-    "spec/rails3/config/initializers/session_store.rb",
-    "spec/rails3/config/locales/en.yml",
-    "spec/rails3/config/routes.rb",
-    "spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/rails3/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/rails3/db/schema.rb",
-    "spec/rails3/db/seeds.rb",
-    "spec/rails3/lib/tasks/.gitkeep",
-    "spec/rails3/public/404.html",
-    "spec/rails3/public/422.html",
-    "spec/rails3/public/500.html",
-    "spec/rails3/public/favicon.ico",
-    "spec/rails3/public/images/rails.png",
-    "spec/rails3/public/javascripts/application.js",
-    "spec/rails3/public/javascripts/controls.js",
-    "spec/rails3/public/javascripts/dragdrop.js",
-    "spec/rails3/public/javascripts/effects.js",
-    "spec/rails3/public/javascripts/prototype.js",
-    "spec/rails3/public/javascripts/rails.js",
-    "spec/rails3/public/robots.txt",
-    "spec/rails3/public/stylesheets/.gitkeep",
-    "spec/rails3/script/rails",
-    "spec/rails3/spec/controller_activity_logging_spec.rb",
-    "spec/rails3/spec/controller_brute_force_protection_spec.rb",
-    "spec/rails3/spec/controller_http_basic_auth_spec.rb",
-    "spec/rails3/spec/controller_oauth2_spec.rb",
-    "spec/rails3/spec/controller_oauth_spec.rb",
-    "spec/rails3/spec/controller_remember_me_spec.rb",
-    "spec/rails3/spec/controller_session_timeout_spec.rb",
-    "spec/rails3/spec/controller_spec.rb",
-    "spec/rails3/spec/integration_spec.rb",
-    "spec/rails3/spec/spec.opts",
-    "spec/rails3/spec/spec_helper.orig.rb",
-    "spec/rails3/spec/spec_helper.rb",
-    "spec/rails3/spec/user_activation_spec.rb",
-    "spec/rails3/spec/user_activity_logging_spec.rb",
-    "spec/rails3/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3/spec/user_oauth_spec.rb",
-    "spec/rails3/spec/user_remember_me_spec.rb",
-    "spec/rails3/spec/user_reset_password_spec.rb",
-    "spec/rails3/spec/user_spec.rb",
-    "spec/rails3/vendor/plugins/.gitkeep",
-    "spec/rails3_mongo_mapper/.gitignore",
-    "spec/rails3_mongo_mapper/.rspec",
-    "spec/rails3_mongo_mapper/Gemfile",
-    "spec/rails3_mongo_mapper/Gemfile.lock",
-    "spec/rails3_mongo_mapper/Rakefile",
-    "spec/rails3_mongo_mapper/app/controllers/application_controller.rb",
-    "spec/rails3_mongo_mapper/app/helpers/application_helper.rb",
-    "spec/rails3_mongo_mapper/app/mailers/sorcery_mailer.rb",
-    "spec/rails3_mongo_mapper/app/models/authentication.rb",
-    "spec/rails3_mongo_mapper/app/models/user.rb",
-    "spec/rails3_mongo_mapper/app/views/layouts/application.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3_mongo_mapper/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3_mongo_mapper/config.ru",
-    "spec/rails3_mongo_mapper/config/application.rb",
-    "spec/rails3_mongo_mapper/config/boot.rb",
-    "spec/rails3_mongo_mapper/config/environment.rb",
-    "spec/rails3_mongo_mapper/config/environments/development.rb",
-    "spec/rails3_mongo_mapper/config/environments/in_memory.rb",
-    "spec/rails3_mongo_mapper/config/environments/production.rb",
-    "spec/rails3_mongo_mapper/config/environments/test.rb",
-    "spec/rails3_mongo_mapper/config/initializers/backtrace_silencers.rb",
-    "spec/rails3_mongo_mapper/config/initializers/inflections.rb",
-    "spec/rails3_mongo_mapper/config/initializers/mime_types.rb",
-    "spec/rails3_mongo_mapper/config/initializers/mongo.rb",
-    "spec/rails3_mongo_mapper/config/initializers/secret_token.rb",
-    "spec/rails3_mongo_mapper/config/initializers/session_store.rb",
-    "spec/rails3_mongo_mapper/config/locales/en.yml",
-    "spec/rails3_mongo_mapper/config/routes.rb",
-    "spec/rails3_mongo_mapper/db/schema.rb",
-    "spec/rails3_mongo_mapper/db/seeds.rb",
-    "spec/rails3_mongo_mapper/lib/tasks/.gitkeep",
-    "spec/rails3_mongo_mapper/public/404.html",
-    "spec/rails3_mongo_mapper/public/422.html",
-    "spec/rails3_mongo_mapper/public/500.html",
-    "spec/rails3_mongo_mapper/public/favicon.ico",
-    "spec/rails3_mongo_mapper/public/images/rails.png",
-    "spec/rails3_mongo_mapper/public/javascripts/application.js",
-    "spec/rails3_mongo_mapper/public/javascripts/controls.js",
-    "spec/rails3_mongo_mapper/public/javascripts/dragdrop.js",
-    "spec/rails3_mongo_mapper/public/javascripts/effects.js",
-    "spec/rails3_mongo_mapper/public/javascripts/prototype.js",
-    "spec/rails3_mongo_mapper/public/javascripts/rails.js",
-    "spec/rails3_mongo_mapper/public/robots.txt",
-    "spec/rails3_mongo_mapper/public/stylesheets/.gitkeep",
-    "spec/rails3_mongo_mapper/script/rails",
-    "spec/rails3_mongo_mapper/spec/controller_spec.rb",
-    "spec/rails3_mongo_mapper/spec/spec.opts",
-    "spec/rails3_mongo_mapper/spec/spec_helper.orig.rb",
-    "spec/rails3_mongo_mapper/spec/spec_helper.rb",
-    "spec/rails3_mongo_mapper/spec/user_activation_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_activity_logging_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_oauth_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_remember_me_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_reset_password_spec.rb",
-    "spec/rails3_mongo_mapper/spec/user_spec.rb",
-    "spec/rails3_mongo_mapper/vendor/plugins/.gitkeep",
-    "spec/rails3_mongoid/.gitignore",
-    "spec/rails3_mongoid/.rspec",
-    "spec/rails3_mongoid/Gemfile",
-    "spec/rails3_mongoid/Gemfile.lock",
-    "spec/rails3_mongoid/Rakefile",
-    "spec/rails3_mongoid/app/controllers/application_controller.rb",
-    "spec/rails3_mongoid/app/helpers/application_helper.rb",
-    "spec/rails3_mongoid/app/mailers/sorcery_mailer.rb",
-    "spec/rails3_mongoid/app/models/authentication.rb",
-    "spec/rails3_mongoid/app/models/user.rb",
-    "spec/rails3_mongoid/app/views/layouts/application.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3_mongoid/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3_mongoid/config.ru",
-    "spec/rails3_mongoid/config/application.rb",
-    "spec/rails3_mongoid/config/boot.rb",
-    "spec/rails3_mongoid/config/environment.rb",
-    "spec/rails3_mongoid/config/environments/development.rb",
-    "spec/rails3_mongoid/config/environments/in_memory.rb",
-    "spec/rails3_mongoid/config/environments/production.rb",
-    "spec/rails3_mongoid/config/environments/test.rb",
-    "spec/rails3_mongoid/config/initializers/backtrace_silencers.rb",
-    "spec/rails3_mongoid/config/initializers/inflections.rb",
-    "spec/rails3_mongoid/config/initializers/mime_types.rb",
-    "spec/rails3_mongoid/config/initializers/secret_token.rb",
-    "spec/rails3_mongoid/config/initializers/session_store.rb",
-    "spec/rails3_mongoid/config/locales/en.yml",
-    "spec/rails3_mongoid/config/mongoid.yml",
-    "spec/rails3_mongoid/config/routes.rb",
-    "spec/rails3_mongoid/db/schema.rb",
-    "spec/rails3_mongoid/db/seeds.rb",
-    "spec/rails3_mongoid/lib/tasks/.gitkeep",
-    "spec/rails3_mongoid/public/404.html",
-    "spec/rails3_mongoid/public/422.html",
-    "spec/rails3_mongoid/public/500.html",
-    "spec/rails3_mongoid/public/favicon.ico",
-    "spec/rails3_mongoid/public/images/rails.png",
-    "spec/rails3_mongoid/public/javascripts/application.js",
-    "spec/rails3_mongoid/public/javascripts/controls.js",
-    "spec/rails3_mongoid/public/javascripts/dragdrop.js",
-    "spec/rails3_mongoid/public/javascripts/effects.js",
-    "spec/rails3_mongoid/public/javascripts/prototype.js",
-    "spec/rails3_mongoid/public/javascripts/rails.js",
-    "spec/rails3_mongoid/public/robots.txt",
-    "spec/rails3_mongoid/public/stylesheets/.gitkeep",
-    "spec/rails3_mongoid/script/rails",
-    "spec/rails3_mongoid/spec/controller_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/controller_spec.rb",
-    "spec/rails3_mongoid/spec/spec.opts",
-    "spec/rails3_mongoid/spec/spec_helper.orig.rb",
-    "spec/rails3_mongoid/spec/spec_helper.rb",
-    "spec/rails3_mongoid/spec/user_activation_spec.rb",
-    "spec/rails3_mongoid/spec/user_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3_mongoid/spec/user_oauth_spec.rb",
-    "spec/rails3_mongoid/spec/user_remember_me_spec.rb",
-    "spec/rails3_mongoid/spec/user_reset_password_spec.rb",
-    "spec/rails3_mongoid/spec/user_spec.rb",
-    "spec/rails3_mongoid/vendor/plugins/.gitkeep",
-    "spec/shared_examples/controller_oauth2_shared_examples.rb",
-    "spec/shared_examples/controller_oauth_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",
-    "spec/shared_examples/user_oauth_shared_examples.rb",
-    "spec/shared_examples/user_remember_me_shared_examples.rb",
-    "spec/shared_examples/user_reset_password_shared_examples.rb",
-    "spec/shared_examples/user_shared_examples.rb",
-    "spec/sorcery_crypto_providers_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
+  s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
+  s.summary = "Magical authentication for Rails 3 & 4 applications"
   s.homepage = "http://github.com/NoamB/sorcery"
-  s.licenses = ["MIT"]
+
+  s.files         = `git ls-files`.split($/)
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "Magical authentication for Rails 3 applications"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.licenses = ["MIT"]
+
+  s.required_ruby_version = '>= 1.9.3'
+
+  s.add_dependency "oauth", "~> 0.4", ">= 0.4.4"
+  s.add_dependency "oauth2", ">= 0.8.0", "< 1.0.0"
+  s.add_dependency "bcrypt", "~> 3.1"
+
+  s.add_development_dependency "abstract", ">= 1.0.0"
+  s.add_development_dependency "json", ">= 1.7.7"
+  s.add_development_dependency "yard", "~> 0.6.0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.8.0"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_development_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_development_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_development_dependency(%q<json>, [">= 1.7.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.1.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
-      s.add_development_dependency(%q<timecop>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, [">= 0"])
-      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_development_dependency(%q<mongoid>, ["~> 2.4.4"])
-    else
-      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_dependency(%q<abstract>, [">= 1.0.0"])
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
-      s.add_dependency(%q<json>, [">= 1.7.7"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, [">= 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, [">= 0.3.8"])
-      s.add_dependency(%q<timecop>, [">= 0"])
-      s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<mongo_mapper>, [">= 0"])
-      s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
-    end
-  else
-    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.8.0"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-    s.add_dependency(%q<abstract>, [">= 1.0.0"])
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
-    s.add_dependency(%q<json>, [">= 1.7.7"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, [">= 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, [">= 0.3.8"])
-    s.add_dependency(%q<timecop>, [">= 0"])
-    s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<mongo_mapper>, [">= 0"])
-    s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
-  end
+  s.add_development_dependency "timecop"
+  s.add_development_dependency "simplecov", ">= 0.3.8"
+  s.add_development_dependency "rspec", "~> 3.0.0"
+  s.add_development_dependency "rspec-rails", "~> 3.0.0"
 end
 

data/spec/active_record/controller_activity_logging_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+require 'shared_examples/controller_activity_logging_shared_examples'
+
+describe SorceryController, :active_record => true do
+  before(:all) do
+    ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/activity_logging")
+    User.reset_column_information
+  end
+
+  after(:all) do
+    ActiveRecord::Migrator.rollback("#{Rails.root}/db/migrate/activity_logging")
+
+    sorcery_controller_property_set(:register_login_time, true)
+    sorcery_controller_property_set(:register_logout_time, true)
+    sorcery_controller_property_set(:register_last_activity_time, true)
+    # sorcery_controller_property_set(:last_login_from_ip_address_name, true)
+  end
+
+  # ----------------- ACTIVITY LOGGING -----------------------
+  context "with activity logging features" do
+    after(:each) do
+      User.delete_all
+    end
+
+    it_behaves_like "controller_activity_logging"
+
+  end
+end