sorcery 0.7.6 → 0.8.0

data/sorcery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sorcery"
-  s.version = "0.7.6"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Noam Ben Ari"]
-  s.date = "2012-01-03"
+  s.date = "2013-01-12"
   s.description = "Provides common authentication needs such as signing in/out, activating by email and resetting password."
   s.email = "nbenari@gmail.com"
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -46,8 +47,10 @@ Gem::Specification.new do |s|
     "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/vkontakte.rb",
     "lib/sorcery/controller/submodules/http_basic_auth.rb",
     "lib/sorcery/controller/submodules/remember_me.rb",
     "lib/sorcery/controller/submodules/session_timeout.rb",
@@ -99,6 +102,7 @@ Gem::Specification.new do |s|
     "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",
@@ -300,135 +304,17 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/NoamB/sorcery"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.21"
   s.summary = "Magical authentication for Rails 3 applications"
-  s.test_files = [
-    "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/integration_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/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/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/routes.rb",
-    "spec/rails3_mongo_mapper/db/schema.rb",
-    "spec/rails3_mongo_mapper/db/seeds.rb",
-    "spec/rails3_mongo_mapper/spec/controller_spec.rb",
-    "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_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/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/routes.rb",
-    "spec/rails3_mongoid/db/schema.rb",
-    "spec/rails3_mongoid/db/seeds.rb",
-    "spec/rails3_mongoid/spec/controller_activity_logging_spec.rb",
-    "spec/rails3_mongoid/spec/controller_spec.rb",
-    "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/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_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     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.5.1"])
+      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.5.1"])
       s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -436,16 +322,18 @@ Gem::Specification.new do |s|
       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<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_runtime_dependency(%q<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_runtime_dependency(%q<oauth2>, ["~> 0.5.1"])
+      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.5.1"])
+      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.5.1"])
       s.add_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -453,17 +341,19 @@ Gem::Specification.new do |s|
       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<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<bcrypt-ruby>, ["~> 3.0.0"])
-      s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-      s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+      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.5.1"])
+    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.5.1"])
     s.add_dependency(%q<rspec>, ["~> 2.5.0"])
@@ -471,13 +361,13 @@ Gem::Specification.new do |s|
     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<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<bcrypt-ruby>, ["~> 3.0.0"])
-    s.add_dependency(%q<oauth>, ["~> 0.4.4"])
-    s.add_dependency(%q<oauth2>, ["~> 0.5.1"])
+    s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<mongo_mapper>, [">= 0"])
+    s.add_dependency(%q<mongoid>, ["~> 2.4.4"])
   end
 end
 

data/spec/Gemfile

@@ -4,7 +4,7 @@ gem "rails", '3.0.3'
 gem 'bcrypt-ruby', :require => 'bcrypt'
 gem "sorcery", '>= 0.1.0', :path => '../'
 gem 'oauth', "~> 0.4.4"
-gem 'oauth2', "~> 0.5.1"
+gem 'oauth2', "~> 0.8.0"
 group :development do
   gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'

data/spec/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../
   specs:
-    sorcery (0.7.5)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,20 +36,20 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
     builder (2.1.2)
-    columnize (0.3.5)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
     mail (2.2.19)
@@ -60,14 +58,17 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.3)
-    multipart-post (1.1.4)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
     oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
     polyglot (0.3.3)
-    rack (1.2.4)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -104,8 +105,8 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     thor (0.14.6)
@@ -120,7 +121,7 @@ PLATFORMS
 DEPENDENCIES
   bcrypt-ruby
   oauth (~> 0.4.4)
-  oauth2 (~> 0.5.1)
+  oauth2 (~> 0.8.0)
   rails (= 3.0.3)
   rspec (~> 2.5.0)
   ruby-debug19

data/spec/README.md

@@ -7,25 +7,25 @@ Each sample app runs a set of shared specs ( `spec/shared_examples/*_example.rb`
 Sorcery has one set of specs (`sorcery_crypto_providers_spec.rb`) that can be run outside of any of the frameworks. To run it simply:
     
     cd spec/
-    bundle install
-    rake spec
+    bundle
+    bundle exec rake spec
 
 Running Framework Specs
 -----------------------
 To run framework specs, cd into each directory, bundle, and run the specs. For example, to run the rails3 specs you would:
 
     cd spec/rails3/
-    bundle install
-    rake spec
+    bundle
+    bundle exec rake spec
 
 **Note:** the rails3_mongoid and rails3_mongo_mapper sample apps do require, well, MongoDB. Installing MongoDB on mac osx is easy with homebrew. Seeing as you're reading the readme for running specs, I'll assume you can install MongoDB on your machine. For the purpose of running these tests, I put mongod in verbose mode and in the background so I can see it log to stdout. 
 
     cd spec/rails3_mongoid
-    bundle install
+    bundle
     mongod -v &
-    rake spec
+    bundle exec rake spec
     
     cd spec/rails3_mongo_mapper
-    bundle install
+    bundle
     mongod -v &
-    rake spec
+    bundle exec rake spec

data/spec/rails3/Gemfile

@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'rails', '3.0.3'
 gem 'sqlite3-ruby', :require => 'sqlite3'
 gem "sorcery", '>= 0.1.0', :path => '../../'

data/spec/rails3/Gemfile.lock

@@ -1,12 +1,10 @@
 PATH
   remote: ../../
   specs:
-    sorcery (0.7.5)
+    sorcery (0.7.13)
       bcrypt-ruby (~> 3.0.0)
       oauth (~> 0.4.4)
-      oauth (~> 0.4.4)
-      oauth2 (~> 0.5.1)
-      oauth2 (~> 0.5.1)
+      oauth2 (~> 0.8.0)
 
 GEM
   remote: http://rubygems.org/
@@ -38,7 +36,7 @@ GEM
       activemodel (= 3.0.3)
       activesupport (= 3.0.3)
     activesupport (3.0.3)
-    addressable (2.2.6)
+    addressable (2.2.7)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
     bcrypt-ruby (3.0.1)
@@ -50,18 +48,19 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.3)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     columnize (0.3.6)
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
     ffi (1.0.11)
+    httpauth (0.2.0)
     i18n (0.6.0)
+    jwt (0.1.5)
+      multi_json (>= 1.0)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     linecache19 (0.5.12)
@@ -72,15 +71,18 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
-    multi_json (1.0.4)
-    multipart-post (1.1.4)
+    multi_json (1.1.0)
+    multipart-post (1.1.5)
     nokogiri (1.5.0)
-    oauth (0.4.5)
-    oauth2 (0.5.1)
-      faraday (~> 0.7.4)
-      multi_json (~> 1.0.3)
+    oauth (0.4.7)
+    oauth2 (0.8.0)
+      faraday (~> 0.8)
+      httpauth (~> 0.1)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      rack (~> 1.2)
     polyglot (0.3.3)
-    rack (1.2.4)
+    rack (1.2.5)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -122,14 +124,14 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.15.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+    rubyzip (0.9.6.1)
+    selenium-webdriver (2.20.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
       rubyzip
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    simplecov (0.6.1)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
@@ -148,6 +150,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bcrypt-ruby (~> 3.0.0)
   capybara (~> 1.1.1)
   launchy (~> 2.0.5)
   rails (= 3.0.3)

data/spec/rails3/app/controllers/application_controller.rb

@@ -137,6 +137,46 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def test_return_to_with_external
+    if @user = login_from(:twitter)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external2
+    if @user = login_from(:facebook)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external3
+    if @user = login_from(:github)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external4
+    if @user = login_from(:google)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
+  def test_return_to_with_external5
+    if @user = login_from(:liveid)
+      redirect_back_or_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
+
   def test_create_from_provider
     provider = params[:provider]
     login_from(provider)
@@ -146,6 +186,20 @@ class ApplicationController < ActionController::Base
       redirect_to "blu", :alert => "Failed!"
     end
   end
+  
+  def test_create_from_provider_with_block
+    provider = params[:provider]
+    login_from(provider)
+    @user = create_from(provider) do |user|
+      # check uniqueness of username
+      User.where(:username => user.username).empty?
+    end
+    if @user 
+      redirect_to "bla", :notice => "Success!"
+    else
+      redirect_to "blu", :alert => "Failed!"
+    end
+  end
 
   protected
 

data/spec/rails3/app/mailers/sorcery_mailer.rb

@@ -22,4 +22,11 @@ class SorceryMailer < ActionMailer::Base
     mail(:to => user.email,
          :subject => "Your password has been reset")
   end
+
+  def send_unlock_token_email(user)
+    @user = user
+    @url = "http://example.com/unlock/#{user.unlock_token}"
+    mail(:to => user.email,
+         :subject => "Your account has been locked due to many wrong logins")
+  end
 end

data/spec/rails3/app/views/sorcery_mailer/send_unlock_token_email.text.erb

@@ -0,0 +1 @@
+Please visit <% @url %> for unlock your account.

data/spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb

@@ -2,9 +2,11 @@ class AddBruteForceProtectionToUsers < ActiveRecord::Migration
   def self.up
     add_column :users, :failed_logins_count, :integer, :default => 0
     add_column :users, :lock_expires_at, :datetime, :default => nil
+    add_column :users, :unlock_token, :string, :default => nil
   end
 
   def self.down
+    remove_column :users, :unlock_token
     remove_column :users, :lock_expires_at
     remove_column :users, :failed_logins_count
   end

data/spec/rails3/spec/controller_activity_logging_spec.rb

@@ -7,6 +7,9 @@ describe ApplicationController do
   
   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)
   end
   
   # ----------------- ACTIVITY LOGGING -----------------------

data/spec/rails3/spec/controller_brute_force_protection_spec.rb

@@ -21,12 +21,34 @@ describe ApplicationController do
       sorcery_controller_property_set(:user_class, User)
       Timecop.return
     end
-    
+
     it "should count login retries" do
       3.times {get :test_login, :username => 'gizmo', :password => 'blabla'}
       User.find_by_username('gizmo').failed_logins_count.should == 3
     end
     
+    it "should generate unlock token after user locked" do
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 2)
+      sorcery_model_property_set(:login_lock_time_period, 0)
+      sorcery_model_property_set(:unlock_token_mailer, SorceryMailer)
+      3.times {get :test_login, :username => "gizmo", :password => "blabla"}
+      User.find_by_username('gizmo').unlock_token.should_not be_nil
+    end
+
+    it "should unlock after entering unlock token" do
+      sorcery_model_property_set(:consecutive_login_retries_amount_limit, 2)
+      sorcery_model_property_set(:login_lock_time_period, 0)
+      sorcery_model_property_set(:unlock_token_mailer, SorceryMailer)
+      3.times {get :test_login, :username => "gizmo", :password => "blabla"}
+      User.find_by_username('gizmo').unlock_token.should_not be_nil
+      token = User.find_by_username('gizmo').unlock_token
+      user = User.load_from_unlock_token(token)
+      user.should_not be_nil
+      user.unlock!
+      User.load_from_unlock_token(token).should be_nil
+    end
+
+    
     it "should reset the counter on a good login" do
       sorcery_model_property_set(:consecutive_login_retries_amount_limit, 5)
       3.times {get :test_login, :username => 'gizmo', :password => 'blabla'}