sorcery 0.3.1 → 0.4.2

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sorcery}
-  s.version = "0.3.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = %q{2011-04-17}
+  s.date = %q{2011-04-30}
   s.description = %q{Provides common authentication needs such as signing in/out, activating by email and resetting password.}
   s.email = %q{nbenari@gmail.com}
   s.extra_rdoc_files = [
@@ -38,23 +38,23 @@ Gem::Specification.new do |s|
     "lib/sorcery/controller/adapters/sinatra.rb",
     "lib/sorcery/controller/submodules/activity_logging.rb",
     "lib/sorcery/controller/submodules/brute_force_protection.rb",
-    "lib/sorcery/controller/submodules/email.rb",
     "lib/sorcery/controller/submodules/external.rb",
     "lib/sorcery/controller/submodules/external/protocols/oauth1.rb",
     "lib/sorcery/controller/submodules/external/protocols/oauth2.rb",
     "lib/sorcery/controller/submodules/external/providers/facebook.rb",
     "lib/sorcery/controller/submodules/external/providers/twitter.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
-    "lib/sorcery/controller/submodules/oauth.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/initializers/initializer.rb",
     "lib/sorcery/model.rb",
     "lib/sorcery/model/submodules/activity_logging.rb",
     "lib/sorcery/model/submodules/brute_force_protection.rb",
@@ -63,93 +63,97 @@ Gem::Specification.new do |s|
     "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/sinatra.rb",
     "lib/sorcery/test_helpers.rb",
+    "lib/sorcery/test_helpers/internal.rb",
+    "lib/sorcery/test_helpers/internal/rails.rb",
+    "lib/sorcery/test_helpers/internal/sinatra.rb",
     "lib/sorcery/test_helpers/rails.rb",
     "lib/sorcery/test_helpers/sinatra.rb",
     "sorcery.gemspec",
     "spec/Gemfile",
     "spec/Gemfile.lock",
     "spec/Rakefile",
+    "spec/rails3/.gitignore",
     "spec/rails3/.rspec",
-    "spec/rails3/app_root/.gitignore",
-    "spec/rails3/app_root/.rspec",
-    "spec/rails3/app_root/Gemfile",
-    "spec/rails3/app_root/Gemfile.lock",
-    "spec/rails3/app_root/README",
-    "spec/rails3/app_root/Rakefile",
-    "spec/rails3/app_root/Rakefile.unused",
-    "spec/rails3/app_root/app/controllers/application_controller.rb",
-    "spec/rails3/app_root/app/helpers/application_helper.rb",
-    "spec/rails3/app_root/app/mailers/sorcery_mailer.rb",
-    "spec/rails3/app_root/app/models/authentication.rb",
-    "spec/rails3/app_root/app/models/user.rb",
-    "spec/rails3/app_root/app/views/layouts/application.html.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/activation_email.html.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/activation_email.text.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.html.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.text.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.html.erb",
-    "spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.text.erb",
-    "spec/rails3/app_root/config.ru",
-    "spec/rails3/app_root/config/application.rb",
-    "spec/rails3/app_root/config/boot.rb",
-    "spec/rails3/app_root/config/database.yml",
-    "spec/rails3/app_root/config/environment.rb",
-    "spec/rails3/app_root/config/environments/development.rb",
-    "spec/rails3/app_root/config/environments/in_memory.rb",
-    "spec/rails3/app_root/config/environments/production.rb",
-    "spec/rails3/app_root/config/environments/test.rb",
-    "spec/rails3/app_root/config/initializers/backtrace_silencers.rb",
-    "spec/rails3/app_root/config/initializers/inflections.rb",
-    "spec/rails3/app_root/config/initializers/mime_types.rb",
-    "spec/rails3/app_root/config/initializers/secret_token.rb",
-    "spec/rails3/app_root/config/initializers/session_store.rb",
-    "spec/rails3/app_root/config/locales/en.yml",
-    "spec/rails3/app_root/config/routes.rb",
-    "spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/rails3/app_root/db/schema.rb",
-    "spec/rails3/app_root/db/seeds.rb",
-    "spec/rails3/app_root/lib/tasks/.gitkeep",
-    "spec/rails3/app_root/public/404.html",
-    "spec/rails3/app_root/public/422.html",
-    "spec/rails3/app_root/public/500.html",
-    "spec/rails3/app_root/public/favicon.ico",
-    "spec/rails3/app_root/public/images/rails.png",
-    "spec/rails3/app_root/public/index.html",
-    "spec/rails3/app_root/public/javascripts/application.js",
-    "spec/rails3/app_root/public/javascripts/controls.js",
-    "spec/rails3/app_root/public/javascripts/dragdrop.js",
-    "spec/rails3/app_root/public/javascripts/effects.js",
-    "spec/rails3/app_root/public/javascripts/prototype.js",
-    "spec/rails3/app_root/public/javascripts/rails.js",
-    "spec/rails3/app_root/public/robots.txt",
-    "spec/rails3/app_root/public/stylesheets/.gitkeep",
-    "spec/rails3/app_root/script/rails",
-    "spec/rails3/app_root/spec/controller_activity_logging_spec.rb",
-    "spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb",
-    "spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb",
-    "spec/rails3/app_root/spec/controller_oauth2_spec.rb",
-    "spec/rails3/app_root/spec/controller_oauth_spec.rb",
-    "spec/rails3/app_root/spec/controller_remember_me_spec.rb",
-    "spec/rails3/app_root/spec/controller_session_timeout_spec.rb",
-    "spec/rails3/app_root/spec/controller_spec.rb",
-    "spec/rails3/app_root/spec/spec_helper.orig.rb",
-    "spec/rails3/app_root/spec/spec_helper.rb",
-    "spec/rails3/app_root/spec/user_activation_spec.rb",
-    "spec/rails3/app_root/spec/user_activity_logging_spec.rb",
-    "spec/rails3/app_root/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3/app_root/spec/user_oauth_spec.rb",
-    "spec/rails3/app_root/spec/user_remember_me_spec.rb",
-    "spec/rails3/app_root/spec/user_reset_password_spec.rb",
-    "spec/rails3/app_root/spec/user_spec.rb",
-    "spec/rails3/app_root/vendor/plugins/.gitkeep",
+    "spec/rails3/Gemfile",
+    "spec/rails3/Gemfile.lock",
+    "spec/rails3/README",
+    "spec/rails3/Rakefile",
+    "spec/rails3/Rakefile.unused",
+    "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/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/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/index.html",
+    "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/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/sinatra/Gemfile",
     "spec/sinatra/Gemfile.lock",
     "spec/sinatra/Rakefile",
@@ -174,16 +178,10 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/controller_spec.rb",
     "spec/sinatra/spec/spec.opts",
     "spec/sinatra/spec/spec_helper.rb",
-    "spec/sinatra/spec/user_activation_spec.rb",
-    "spec/sinatra/spec/user_activity_logging_spec.rb",
-    "spec/sinatra/spec/user_brute_force_protection_spec.rb",
-    "spec/sinatra/spec/user_oauth_spec.rb",
-    "spec/sinatra/spec/user_remember_me_spec.rb",
-    "spec/sinatra/spec/user_reset_password_spec.rb",
-    "spec/sinatra/spec/user_spec.rb",
     "spec/sinatra/user.rb",
     "spec/sinatra/views/test_login.erb",
     "spec/sorcery_crypto_providers_spec.rb",
+    "spec/spec.opts",
     "spec/spec_helper.rb",
     "spec/untitled folder"
   ]
@@ -193,50 +191,50 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.6.2}
   s.summary = %q{Magical authentication for Rails 3 applications}
   s.test_files = [
-    "spec/rails3/app_root/app/controllers/application_controller.rb",
-    "spec/rails3/app_root/app/helpers/application_helper.rb",
-    "spec/rails3/app_root/app/mailers/sorcery_mailer.rb",
-    "spec/rails3/app_root/app/models/authentication.rb",
-    "spec/rails3/app_root/app/models/user.rb",
-    "spec/rails3/app_root/config/application.rb",
-    "spec/rails3/app_root/config/boot.rb",
-    "spec/rails3/app_root/config/environment.rb",
-    "spec/rails3/app_root/config/environments/development.rb",
-    "spec/rails3/app_root/config/environments/in_memory.rb",
-    "spec/rails3/app_root/config/environments/production.rb",
-    "spec/rails3/app_root/config/environments/test.rb",
-    "spec/rails3/app_root/config/initializers/backtrace_silencers.rb",
-    "spec/rails3/app_root/config/initializers/inflections.rb",
-    "spec/rails3/app_root/config/initializers/mime_types.rb",
-    "spec/rails3/app_root/config/initializers/secret_token.rb",
-    "spec/rails3/app_root/config/initializers/session_store.rb",
-    "spec/rails3/app_root/config/routes.rb",
-    "spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb",
-    "spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
-    "spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb",
-    "spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb",
-    "spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb",
-    "spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb",
-    "spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb",
-    "spec/rails3/app_root/db/schema.rb",
-    "spec/rails3/app_root/db/seeds.rb",
-    "spec/rails3/app_root/spec/controller_activity_logging_spec.rb",
-    "spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb",
-    "spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb",
-    "spec/rails3/app_root/spec/controller_oauth2_spec.rb",
-    "spec/rails3/app_root/spec/controller_oauth_spec.rb",
-    "spec/rails3/app_root/spec/controller_remember_me_spec.rb",
-    "spec/rails3/app_root/spec/controller_session_timeout_spec.rb",
-    "spec/rails3/app_root/spec/controller_spec.rb",
-    "spec/rails3/app_root/spec/spec_helper.orig.rb",
-    "spec/rails3/app_root/spec/spec_helper.rb",
-    "spec/rails3/app_root/spec/user_activation_spec.rb",
-    "spec/rails3/app_root/spec/user_activity_logging_spec.rb",
-    "spec/rails3/app_root/spec/user_brute_force_protection_spec.rb",
-    "spec/rails3/app_root/spec/user_oauth_spec.rb",
-    "spec/rails3/app_root/spec/user_remember_me_spec.rb",
-    "spec/rails3/app_root/spec/user_reset_password_spec.rb",
-    "spec/rails3/app_root/spec/user_spec.rb",
+    "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/config/application.rb",
+    "spec/rails3/config/boot.rb",
+    "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/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/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/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/sinatra/authentication.rb",
     "spec/sinatra/db/migrate/activation/20101224223622_add_activation_to_users.rb",
     "spec/sinatra/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb",
@@ -257,13 +255,6 @@ Gem::Specification.new do |s|
     "spec/sinatra/spec/controller_session_timeout_spec.rb",
     "spec/sinatra/spec/controller_spec.rb",
     "spec/sinatra/spec/spec_helper.rb",
-    "spec/sinatra/spec/user_activation_spec.rb",
-    "spec/sinatra/spec/user_activity_logging_spec.rb",
-    "spec/sinatra/spec/user_brute_force_protection_spec.rb",
-    "spec/sinatra/spec/user_oauth_spec.rb",
-    "spec/sinatra/spec/user_remember_me_spec.rb",
-    "spec/sinatra/spec/user_reset_password_spec.rb",
-    "spec/sinatra/spec/user_spec.rb",
     "spec/sinatra/user.rb",
     "spec/sorcery_crypto_providers_spec.rb",
     "spec/spec_helper.rb"
@@ -277,14 +268,15 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.5.1"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
@@ -293,14 +285,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 1.5.1"])
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_dependency(%q<oauth2>, [">= 0.1.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<rspec-rails>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+      s.add_dependency(%q<timecop>, [">= 0"])
       s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
       s.add_dependency(%q<oauth>, [">= 0.4.4"])
       s.add_dependency(%q<oauth2>, [">= 0.1.1"])
@@ -310,14 +303,15 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 1.5.1"])
     s.add_dependency(%q<oauth>, [">= 0.4.4"])
     s.add_dependency(%q<oauth2>, [">= 0.1.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<rspec-rails>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 2.5.0"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<simplecov>, [">= 0.3.8"])
+    s.add_dependency(%q<timecop>, [">= 0"])
     s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.4"])
     s.add_dependency(%q<oauth>, [">= 0.4.4"])
     s.add_dependency(%q<oauth2>, [">= 0.1.1"])

data/spec/Gemfile

@@ -2,11 +2,11 @@ source 'http://rubygems.org'
 
 gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
-gem "sorcery", '0.3.1', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"
 group :development do
-  gem 'rspec'
+  gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
 end

data/spec/Gemfile.lock

@@ -1,7 +1,14 @@
 PATH
-  remote: ../../../
+  remote: ../
   specs:
-    sorcery (0.3.1)
+    sorcery (0.4.2)
+      bcrypt-ruby (~> 2.1.4)
+      json (>= 1.5.1)
+      oauth (>= 0.4.4)
+      oauth (>= 0.4.4)
+      oauth2 (>= 0.1.1)
+      oauth2 (>= 0.1.1)
+      rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
@@ -36,7 +43,7 @@ GEM
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
-    bcrypt-ruby (2.1.3)
+    bcrypt-ruby (2.1.4)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
@@ -47,6 +54,7 @@ GEM
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     i18n (0.5.0)
+    json (1.5.1)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
     mail (2.2.13)
@@ -81,14 +89,14 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -115,7 +123,7 @@ DEPENDENCIES
   oauth (>= 0.4.4)
   oauth2 (>= 0.1.1)
   rails (= 3.0.3)
-  rspec
+  rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.3.1)!
+  sorcery (>= 0.1.0)!

data/spec/Rakefile

@@ -8,4 +8,5 @@ task :default => :spec
 desc "Run all specs for a specific rails version"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec.opts"]
 end

data/spec/rails3/.rspec

@@ -1 +1 @@
---color
+--colour

data/spec/rails3/{app_root/Gemfile → Gemfile}

@@ -2,12 +2,12 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "sorcery", '0.3.1', :path => '../../../'
+gem "sorcery", '>= 0.1.0', :path => '../../../'
 
 group :development, :test do
-  gem 'rspec'
-  gem 'rspec-rails'
+  gem "rspec", "~> 2.5.0"
+  gem 'rspec-rails', "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
-  gem 'spork', '~> 0.9.0.rc'
+  gem 'timecop'
 end

data/spec/rails3/{app_root/Gemfile.lock → Gemfile.lock}

@@ -1,7 +1,8 @@
 PATH
   remote: ../../../
   specs:
-    sorcery (0.3.1)
+    oauth (0.4.4)
+    sorcery (0.4.2)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
       oauth (>= 0.4.4)
@@ -40,7 +41,7 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.4)
+    addressable (2.2.5)
     archive-tar-minitar (0.5.2)
     arel (2.0.6)
     bcrypt-ruby (2.1.4)
@@ -49,7 +50,7 @@ GEM
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.5.5)
+    faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
@@ -65,9 +66,8 @@ GEM
     mime-types (1.16)
     multi_json (0.0.5)
     multipart-post (1.1.0)
-    oauth (0.4.4)
-    oauth2 (0.1.1)
-      faraday (~> 0.5.0)
+    oauth2 (0.4.0)
+      faraday (~> 0.6.0)
       multi_json (~> 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -89,19 +89,19 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
+      rspec (~> 2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -115,9 +115,9 @@ GEM
     simplecov (0.3.9)
       simplecov-html (>= 0.3.7)
     simplecov-html (0.3.9)
-    spork (0.9.0.rc3)
     sqlite3-ruby (1.3.2)
     thor (0.14.6)
+    timecop (0.3.5)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -127,10 +127,10 @@ PLATFORMS
 
 DEPENDENCIES
   rails (= 3.0.3)
-  rspec
-  rspec-rails
+  rspec (~> 2.5.0)
+  rspec-rails (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
-  sorcery (= 0.3.1)!
-  spork (~> 0.9.0.rc)
+  sorcery (>= 0.1.0)!
   sqlite3-ruby
+  timecop

data/spec/rails3/{app_root/Rakefile → Rakefile}

@@ -7,4 +7,5 @@ task :default => :spec
 desc "Run all specs for a specific rails version"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '**/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec/spec.opts"]
 end