Release 2.1.4

Yes we still support Ruby 1.8 😢

Conflicts:
	Gemfile.lock

.travis.yml

@@ -1,35 +1,15 @@
-language: ruby
 script: "bundle exec rake test"
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-env:
-  - DEVISE_ORM=mongoid
-  - DEVISE_ORM=active_record
-matrix:
-  exclude:
-    - rvm: 1.8.7
-      env: DEVISE_ORM=mongoid
-      gemfile: Gemfile
-    - rvm: 1.8.7
-      env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-3.1.x
-    - rvm: 1.9.2
-      env: DEVISE_ORM=mongoid
-      gemfile: Gemfile
-    - rvm: 1.9.2
-      env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-3.1.x
+  - ree
 gemfile:
   - gemfiles/Gemfile.rails-3.1.x
   - Gemfile
-services:
-  - mongodb
 notifications:
-  email: false
-  campfire:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: "TRiqvuM4i/QmRDWjUSNitE5/P91BOzDkNl53+bZjjtxcISCswZtmECWBR7n9\n3xwqCOU1o2lfohxZ32OHOj/Nj7o+90zWJfWxcv+if0hIXRiil62M5pg0lZUd\nyJ4M5VQ0lSWo5he1OUrXhSabPJeaK3B8yT/tdh+qO5yzR+vb/jc="
+  recipients:
+    - jose.valim@plataformatec.com.br
+    - carlos@plataformatec.com.br
+    - rodrigo.flores@plataformatec.com.br
+    - rafael.franca@plataformatec.com.br

.yardopts

@@ -1,9 +0,0 @@
---protected
---no-private
---embed-mixin ClassMethods
--
-README.md
-CHANGELOG.rdoc
-CONTRIBUTING.md
-MIT-LICENSE
-

CHANGELOG.rdoc

@@ -1,93 +1,16 @@
-== 2.2.8
-
-Security announcement: http://blog.plataformatec.com.br/2013/11/e-mail-enumeration-in-devise-in-paranoid-mode
-
-* bug fix
-  * Avoid e-mail enumeration on sign in when in paranoid mode
-
-== 2.2.7
+== 2.1.4
 
 * bug fix
   * Do not confirm account after reset password
 
-== 2.2.6
-
-* bug fix
-  * Skip storage for cookies on unverified requests
-
-== 2.2.5
-
-* bug fix
-  * Clean up CSRF token after authentication (by @homakov). Notice this change will clean up the CSRF Token after authentication (sign in, sign up, etc). So if you are using AJAX for such features, you will need to fetch a new CSRF token from the server.
-
-== 2.2.4
-
-* enhancements
-  * Add `destroy_with_password` to `DatabaseAuthenticatable`. Allows destroying a record when `:current_password` matches, similarly to how `update_with_password` works. (by @michiel3)
-  * Allow to override path after password resetting (by @worker8)
-  * Add `#skip_confirmation_notification!` method to `Confirmable`. Allows skipping confirmation email without auto-confirming. (by @gregates)
-  * allow_unconfirmed_access_for config from `:confirmable` module can be set to `nil` that means unconfirmed access for unlimited time. (by @nashby)
-  * Support Rails' token strategy on authentication (by @robhurring)
-  * Support explicitly setting the http authentication key via `config.http_authentication_key` (by @neo)
-
-* bug fix
-  * Do not redirect when accessing devise API via JSON. (by @sebastianwr)
-  * Generating scoped devise views now uses the correct scoped shared links partial instead of the default devise one (by @nashby)
-  * Fix inheriting mailer templates from `Devise::Mailer`
-  * Fix a bug when procs are used as default mailer in Devise (by @tomasv)
-
-== 2.2.3
-
-Security announcement: http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
+== 2.1.3
 
 * bug fix
   * Require string conversion for all values
 
-== 2.2.2
-
-* bug fix
-  * Fix bug when checking for reconfirmable in templates
-
-== 2.2.1
-
-* bug fix
-  * Fix regression with case_insensitive_keys
-  * Fix regression when password is blank when it is invalid
-
-== 2.2.0
-
-* backwards incompatible changes
-  * `headers_for` is deprecated, customize the mailer directly instead
-  * All mailer methods now expect a second argument with delivery options
-  * Default minimum password length is now 8 (by @carlosgaldino)
-  * Support alternate sign in error message when email record does not exist (this adds a new I18n key to the locale file) (by @gabetax)
-  * DeviseController responds only to HTML requests by default (call `DeviseController.respond_to` or `ApplicationController.respond_to` to add new formats)
-  * Support Mongoid 3 onwards (by @durran)
-
-* enhancements
-  * Fix unlockable which could leak account existence on paranoid mode (by @latortuga)
-  * Confirmable now has a confirm_within option to set a period while the confirmation token is still valid (by @promisedlandt)
-  * Flash messages in controller now respects `resource_name` (by @latortuga)
-  * Separate `sign_in` and `sign_up` on RegistrationsController (by @rubynortheast)
-  * Add autofocus to default views (by @Radagaisus)
-  * Unlock user on password reset (by @marcinb)
-  * Allow validation callbacks to apply to virtual attributes (by @latortuga)
-
-* bug fix
-  * unconfirmed_email now uses the proper e-mail on salutation
-  * Fix default email_regexp config to not allow spaces (by @kukula)
-  * Fix a regression introduced on warden 1.2.1 (by @ejfinneran)
-  * Properly camelize omniauth strategies (by @saizai)
-  * Do not set flash messages for non navigational requests on session sign out (by @mathieul)
-  * Set the proper fields as required on the lockable module (by @nickhoffman)
-  * Respects Devise mailer default's reply_to (by @mrchrisadams)
-  * Properly assign resource on `sign_in` related action (by @adammcnamara)
-  * `update_with_password` doesn't change encrypted password when it is invalid (by @nashby)
-  * Properly handle namespaced models on Active Record generator (by @nashby)
-
 == 2.1.2
 
-* enhancements
+* Enhancements
   * Handle backwards incompatibility between Rails 3.2.6 and Thor 0.15.x
 
 * bug fix

CONTRIBUTING.md

@@ -1,14 +0,0 @@
-### Please read before contributing
-
-1) Do not post questions in the issues tracker. If you have any questions about Devise, search the [Wiki](https://github.com/plataformatec/devise/wiki) or use the [Mailing List](https://groups.google.com/group/plataformatec-devise) or [Stack Overflow](http://stackoverflow.com/questions/tagged/devise). 
-
-2) If you find a security bug, **DO NOT** submit an issue here. Please send an e-mail to [developers@plataformatec.com.br](mailto:developers@plataformatec.com.br) instead.
-
-3) Do a small search on the issues tracker before submitting your issue to see if it was already reported / fixed.
-
-4) When reporting an issue, include Rails, Devise and Warden versions. If you are getting exceptions, please include the full backtrace.
-
-That's it! The more information you give, the easier it becomes for us to track it down and fix it.
-Ideally, you should provide an application that reproduces the error or a test case to Devise's suite.
-
-Thanks!

Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source "http://rubygems.org"
 
 gemspec
 
@@ -10,8 +10,12 @@ gem "rdoc"
 group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", :require => false
-  gem "mocha", "~> 0.13.1", :require => false
+  gem "webrat", "0.7.2", :require => false
+  gem "mocha", :require => false
+
+  platforms :mri_18 do
+    gem "ruby-debug", ">= 0.10.3"
+  end
 end
 
 platforms :jruby do
@@ -22,11 +26,10 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-end
 
-
-platforms :mri_19 do
   group :mongoid do
-    gem "mongoid", "~> 3.0"
+    gem "mongo", "~> 1.3.0"
+    gem "mongoid", "~> 2.0"
+    gem "bson_ext", "~> 1.3.0"
   end
 end

Gemfile.lock

@@ -1,137 +1,143 @@
 PATH
   remote: .
   specs:
-    devise (2.2.8)
+    devise (2.1.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.2.6)
     arel (3.0.2)
-    bcrypt-ruby (3.1.2)
-    builder (3.0.4)
+    bcrypt-ruby (3.1.1)
+    bson (1.5.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    columnize (0.3.5)
     erubis (2.7.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (>= 1.1.0, < 2)
     hashie (1.2.0)
-    hike (1.2.2)
-    httpauth (0.2.0)
-    i18n (0.6.1)
+    hike (1.2.1)
+    i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.7)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    mail (2.5.3)
+    json (1.7.3)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.22)
-    mocha (0.13.3)
+    mime-types (1.18)
+    mocha (0.10.0)
       metaclass (~> 0.0.1)
-    mongoid (3.1.2)
-      activemodel (~> 3.2)
-      moped (~> 1.4.2)
-      origin (~> 1.0)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.3.4)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    moped (1.4.5)
-    multi_json (1.7.2)
-    multipart-post (1.2.0)
-    nokogiri (1.5.9)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
-      rack (~> 1.2)
-    omniauth (1.0.3)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
+    nokogiri (1.5.0)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    omniauth (1.0.1)
       hashie (~> 1.2)
       rack
-    omniauth-facebook (1.4.0)
-      omniauth-oauth2 (~> 1.0.2)
-    omniauth-oauth2 (1.0.3)
-      oauth2 (~> 0.8.0)
+    omniauth-facebook (1.0.0)
+      omniauth-oauth2 (~> 1.0.0)
+    omniauth-oauth2 (1.0.0)
+      oauth2 (~> 0.5.0)
       omniauth (~> 1.0)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    origin (1.0.11)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
-    rack (1.4.5)
+    rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.2)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.0.4)
-    rdoc (3.12.2)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.12)
       json (~> 1.4)
-    ruby-openid (2.2.3)
-    sprockets (2.2.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-openid (2.1.8)
+    sprockets (2.1.3)
       hike (~> 1.2)
-      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    thor (0.18.1)
-    tilt (1.3.7)
-    treetop (1.4.12)
+    sqlite3 (1.3.5)
+    thor (0.15.2)
+    tilt (1.3.3)
+    treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.33)
     warden (1.2.3)
       rack (>= 1.0)
-    webrat (0.7.3)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -142,15 +148,18 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
+  bson_ext (~> 1.3.0)
   devise!
   jruby-openssl
-  mocha (~> 0.13.1)
-  mongoid (~> 3.0)
+  mocha
+  mongo (~> 1.3.0)
+  mongoid (~> 2.0)
   omniauth (~> 1.0.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.0.0)
   omniauth-openid (~> 1.0.1)
   rails (~> 3.2.6)
   rdoc
+  ruby-debug (>= 0.10.3)
   sqlite3
-  webrat (= 0.7.3)
+  webrat (= 0.7.2)

MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
+Copyright 2009-2012 Plataformatec. http://plataformatec.com.br
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.md

@@ -1,12 +1,10 @@
-![Devise Logo](https://raw.github.com/plataformatec/devise/master/devise.png)
+*IMPORTANT:* Devise 2.1 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.1
 
-By [Plataformatec](http://plataformatec.com.br/).
+## Devise
 
-[![Gem Version](https://fury-badge.herokuapp.com/rb/devise.png)](http://badge.fury.io/rb/devise)
-[![Build Status](https://api.travis-ci.org/plataformatec/devise.png?branch=master)](http://travis-ci.org/plataformatec/devise)
-[![Code Climate](https://codeclimate.com/github/plataformatec/devise.png)](https://codeclimate.com/github/plataformatec/devise)
+INFO: This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).
 
-This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).
+[![Build Status](https://secure.travis-ci.org/plataformatec/devise.png)](http://travis-ci.org/plataformatec/devise) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/plataformatec/devise)
 
 Devise is a flexible authentication solution for Rails based on Warden. It:
 
@@ -15,7 +13,7 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 * Allows you to have multiple roles (or models/scopes) signed in at the same time;
 * Is based on a modularity concept: use just what you really need.
 
-It's composed of 11 modules:
+It's composed of 12 modules:
 
 * [Database Authenticatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/DatabaseAuthenticatable): encrypts and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
 * [Token Authenticatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/TokenAuthenticatable): signs in a user based on an authentication token (also known as "single access token"). The token can be given both through query string or HTTP Basic Authentication.
@@ -110,7 +108,7 @@ The generator will install an initializer which describes ALL Devise's configura
 rails generate devise MODEL
 ```
 
-Replace MODEL by the class name used for the applications users, it's frequently 'User' but could also be 'Admin'. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run "rake db:migrate" as the generator will have created a migration file (if your ORM supports them). This generator also configures your config/routes.rb file to point to the Devise controller.
+Replace MODEL by the class name used for the applications users, it's frequently 'User' but could also be 'Admin'. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run "rake db:migrate" as the generator will have created a migration file (if your ORM supports them). This generator also configures your config/routes.rb file to point to Devise controller.
 
 Note that you should re-start your app here if you've already started it. Otherwise you'll run into strange errors like users being unable to login and the route helpers being undefined.
 
@@ -242,14 +240,14 @@ devise_for :admins, :controllers => { :sessions => "admins/sessions" }
 
 3) And since we changed the controller, it won't use the "devise/sessions" views, so remember to copy "devise/sessions" to "admin/sessions".
 
-Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call "flash[:notice]" and "flash[:alert]" as appropriate. Do not print the entire flash hash, print specific keys or at least remove the `:timedout` key from the hash as Devise adds this key in some circumstances, this key is not meant for display.
+Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call "flash[:notice]" and "flash[:alert]" as appropriate.
 
 ### Configuring routes
 
 Devise also ships with default routes. If you need to customize them, you should probably be able to do it through the devise_for method. It accepts several options like :class_name, :path_prefix and so on, including the possibility to change path names for I18n:
 
 ```ruby
-devise_for :users, :path => "auth", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'cmon_let_me_in' }
+devise_for :users, :path => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'cmon_let_me_in' }
 ```
 
 Be sure to check `devise_for` documentation for details.
@@ -306,7 +304,7 @@ https://github.com/plataformatec/devise/wiki/I18n
 
 ### Test helpers
 
-Devise includes some tests helpers for functional specs. In order to use them, you need to include Devise in your functional tests by adding the following to the bottom of your `test/test_helper.rb` file:
+Devise includes some tests helpers for functional specs. In other to use them, you need to include Devise in your functional tests by adding the following to the bottom of your `test/test_helper.rb` file:
 
 ```ruby
 class ActionController::TestCase
@@ -343,13 +341,7 @@ There are two things that is important to keep in mind:
 
 ### Omniauth
 
-Devise comes with Omniauth support out of the box to authenticate with other providers. To use it, just specify your omniauth configuration in `config/initializers/devise.rb`:
-
-```ruby
-config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
-```
-
-You can read more about Omniauth support in the wiki:
+Devise comes with Omniauth support out of the box to authenticate from other providers. You can read more about Omniauth support in the wiki:
 
 * https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview
 
@@ -395,6 +387,4 @@ https://github.com/plataformatec/devise/contributors
 
 ## License
 
-MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br
-
-You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Devise name or logo.
+MIT License. Copyright 2012 Plataformatec. http://plataformatec.com.br

Rakefile

@@ -22,7 +22,6 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
-  t.warning = false
 end
 
 desc 'Generate documentation for Devise.'

app/controllers/devise/confirmations_controller.rb

@@ -32,7 +32,7 @@ class Devise::ConfirmationsController < DeviseController
 
     # The path used after resending confirmation instructions.
     def after_resending_confirmation_instructions_path_for(resource_name)
-      new_session_path(resource_name) if is_navigational_format?
+      new_session_path(resource_name)
     end
 
     # The path used after confirmation.

app/controllers/devise/omniauth_callbacks_controller.rb

@@ -6,7 +6,7 @@ class Devise::OmniauthCallbacksController < DeviseController
   end
 
   def failure
-    set_flash_message :alert, :failure, :kind => OmniAuth::Utils.camelize(failed_strategy.name), :reason => failure_message
+    set_flash_message :alert, :failure, :kind => failed_strategy.name.to_s.humanize, :reason => failure_message
     redirect_to after_omniauth_failure_path_for(resource_name)
   end
 

app/controllers/devise/passwords_controller.rb

@@ -30,24 +30,20 @@ class Devise::PasswordsController < DeviseController
     self.resource = resource_class.reset_password_by_token(resource_params)
 
     if resource.errors.empty?
-      resource.unlock_access! if unlockable?(resource)
       flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
       set_flash_message(:notice, flash_message) if is_navigational_format?
       sign_in(resource_name, resource)
-      respond_with resource, :location => after_resetting_password_path_for(resource)
+      respond_with resource, :location => after_sign_in_path_for(resource)
     else
       respond_with resource
     end
   end
 
   protected
-    def after_resetting_password_path_for(resource)
-      after_sign_in_path_for(resource)
-    end
 
     # The path used after sending reset password instructions
     def after_sending_reset_password_instructions_path_for(resource_name)
-      new_session_path(resource_name) if is_navigational_format?
+      new_session_path(resource_name)
     end
 
     # Check if a reset_password_token is provided in the request
@@ -57,12 +53,4 @@ class Devise::PasswordsController < DeviseController
         redirect_to new_session_path(resource_name)
       end
     end
-
-    # Check if proper Lockable module methods are present & unlock strategy
-    # allows to unlock resource on password reset
-    def unlockable?(resource)
-      resource.respond_to?(:unlock_access!) &&
-        resource.respond_to?(:unlock_strategy_enabled?) &&
-        resource.unlock_strategy_enabled?(:email)
-    end
 end

app/controllers/devise/registrations_controller.rb

@@ -15,7 +15,7 @@ class Devise::RegistrationsController < DeviseController
     if resource.save
       if resource.active_for_authentication?
         set_flash_message :notice, :signed_up if is_navigational_format?
-        sign_up(resource_name, resource)
+        sign_in(resource_name, resource)
         respond_with resource, :location => after_sign_up_path_for(resource)
       else
         set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
@@ -38,13 +38,13 @@ class Devise::RegistrationsController < DeviseController
   # the current user in place.
   def update
     self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
-    prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)
 
     if resource.update_with_password(resource_params)
       if is_navigational_format?
-        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
-          :update_needs_confirmation : :updated
-        set_flash_message :notice, flash_key
+        if resource.respond_to?(:pending_reconfirmation?) && resource.pending_reconfirmation?
+          flash_key = :update_needs_confirmation
+        end
+        set_flash_message :notice, flash_key || :updated
       end
       sign_in resource_name, resource, :bypass => true
       respond_with resource, :location => after_update_path_for(resource)
@@ -74,12 +74,6 @@ class Devise::RegistrationsController < DeviseController
 
   protected
 
-  def update_needs_confirmation?(resource, previous)
-    resource.respond_to?(:pending_reconfirmation?) &&
-      resource.pending_reconfirmation? &&
-      previous != resource.unconfirmed_email
-  end
-
   # Build a devise resource passing in the session. Useful to move
   # temporary session data to the newly created user.
   def build_resource(hash=nil)
@@ -87,12 +81,6 @@ class Devise::RegistrationsController < DeviseController
     self.resource = resource_class.new_with_session(hash, session)
   end
 
-  # Signs in a user on sign up. You can overwrite this method in your own
-  # RegistrationsController.
-  def sign_up(resource_name, resource)
-    sign_in(resource_name, resource)
-  end
-
   # The path used after sign up. You need to overwrite this method
   # in your own RegistrationsController.
   def after_sign_up_path_for(resource)

app/controllers/devise/sessions_controller.rb

@@ -5,14 +5,14 @@ class Devise::SessionsController < DeviseController
 
   # GET /resource/sign_in
   def new
-    self.resource = build_resource(nil, :unsafe => true)
+    resource = build_resource(nil, :unsafe => true)
     clean_up_passwords(resource)
     respond_with(resource, serialize_options(resource))
   end
 
   # POST /resource/sign_in
   def create
-    self.resource = warden.authenticate!(auth_options)
+    resource = warden.authenticate!(auth_options)
     set_flash_message(:notice, :signed_in) if is_navigational_format?
     sign_in(resource_name, resource)
     respond_with resource, :location => after_sign_in_path_for(resource)
@@ -22,13 +22,15 @@ class Devise::SessionsController < DeviseController
   def destroy
     redirect_path = after_sign_out_path_for(resource_name)
     signed_out = (Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name))
-    set_flash_message :notice, :signed_out if signed_out && is_navigational_format?
+    set_flash_message :notice, :signed_out if signed_out
 
     # We actually need to hardcode this as Rails default responder doesn't
     # support returning empty response on GET request
     respond_to do |format|
-      format.all { head :no_content }
       format.any(*navigational_formats) { redirect_to redirect_path }
+      format.all do
+        head :no_content
+      end
     end
   end
 
@@ -45,3 +47,4 @@ class Devise::SessionsController < DeviseController
     { :scope => resource_name, :recall => "#{controller_path}#new" }
   end
 end
+

app/controllers/devise/unlocks_controller.rb

@@ -33,12 +33,12 @@ class Devise::UnlocksController < DeviseController
 
     # The path used after sending unlock password instructions
     def after_sending_unlock_instructions_path_for(resource)
-      new_session_path(resource) if is_navigational_format?
+      new_session_path(resource)
     end
 
     # The path used after unlocking the resource
     def after_unlock_path_for(resource)
-      new_session_path(resource)  if is_navigational_format?
+      new_session_path(resource)
     end
 
 end

app/controllers/devise_controller.rb

@@ -10,7 +10,7 @@ class DeviseController < Devise.parent_controller.constantize
   helper_method *helpers
 
   prepend_before_filter :assert_is_devise_resource!
-  respond_to :html if mimes_for_respond_to.empty?
+  respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?
 
   # Gets the actual resource stored in the instance variable
   def resource
@@ -67,12 +67,12 @@ This may happen for two reasons:
 1) You forgot to wrap your route inside the scope block. For example:
 
   devise_scope :user do
-    get "/some/route" => "some_devise_controller"
+    match "/some/route" => "some_devise_controller"
   end
 
 2) You are testing a Devise controller bypassing the router.
    If so, you can explicitly tell Devise which mapping to use:
-
+   
    @request.env["devise.mapping"] = Devise.mappings[:user]
 
 MESSAGE
@@ -163,18 +163,13 @@ MESSAGE
   #
   # Please refer to README or en.yml locale file to check what messages are
   # available.
-  def set_flash_message(key, kind, options = {})
-    message = find_message(kind, options)
-    flash[key] = message if message.present?
-  end
-
-  # Get message for given
-  def find_message(kind, options = {})
+  def set_flash_message(key, kind, options={})
     options[:scope] = "devise.#{controller_name}"
     options[:default] = Array(options[:default]).unshift(kind.to_sym)
     options[:resource_name] = resource_name
     options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
-    I18n.t("#{options[:resource_name]}.#{kind}", options)
+    message = I18n.t("#{resource_name}.#{kind}", options)
+    flash[key] = message if message.present?
   end
 
   def clean_up_passwords(object)
@@ -186,4 +181,12 @@ MESSAGE
       format.any(*navigational_formats, &block)
     end
   end
+
+  def request_format
+    @request_format ||= request.format.try(:ref)
+  end
+
+  def is_navigational_format?
+    Devise.navigational_formats.include?(request.format.try(:ref))
+  end
 end

app/mailers/devise/mailer.rb

@@ -1,15 +1,15 @@
-class Devise::Mailer < Devise.parent_mailer.constantize
+class Devise::Mailer < ::ActionMailer::Base
   include Devise::Mailers::Helpers
 
-  def confirmation_instructions(record, opts={})
-    devise_mail(record, :confirmation_instructions, opts)
+  def confirmation_instructions(record)
+    devise_mail(record, :confirmation_instructions)
   end
 
-  def reset_password_instructions(record, opts={})
-    devise_mail(record, :reset_password_instructions, opts)
+  def reset_password_instructions(record)
+    devise_mail(record, :reset_password_instructions)
   end
 
-  def unlock_instructions(record, opts={})
-    devise_mail(record, :unlock_instructions, opts)
+  def unlock_instructions(record)
+    devise_mail(record, :unlock_instructions)
   end
 end

app/views/devise/confirmations/new.html.erb

@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email %></div>
 
   <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>

app/views/devise/mailer/confirmation_instructions.html.erb

@@ -1,4 +1,4 @@
-<p>Welcome <%= @email %>!</p>
+<p>Welcome <%= @resource.email %>!</p>
 
 <p>You can confirm your account email through the link below:</p>
 

app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,6 +1,6 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
 
 <p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
 

app/views/devise/mailer/unlock_instructions.html.erb

@@ -1,6 +1,6 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>
 
 <p>Click the link below to unlock your account:</p>
 

app/views/devise/passwords/edit.html.erb

@@ -5,7 +5,7 @@
   <%= f.hidden_field :reset_password_token %>
 
   <div><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password, :autofocus => true %></div>
+  <%= f.password_field :password %></div>
 
   <div><%= f.label :password_confirmation, "Confirm new password" %><br />
   <%= f.password_field :password_confirmation %></div>

app/views/devise/passwords/new.html.erb

@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email %></div>
 
   <div><%= f.submit "Send me reset password instructions" %></div>
 <% end %>

app/views/devise/registrations/edit.html.erb

@@ -4,11 +4,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
-
-  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
-  <% end %>
+  <%= f.email_field :email %></div>
 
   <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
   <%= f.password_field :password, :autocomplete => "off" %></div>
@@ -24,6 +20,6 @@
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
 
 <%= link_to "Back", :back %>

app/views/devise/registrations/new.html.erb

@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email %></div>
 
   <div><%= f.label :password %><br />
   <%= f.password_field :password %></div>

app/views/devise/sessions/new.html.erb

@@ -2,7 +2,7 @@
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email %></div>
 
   <div><%= f.label :password %><br />
   <%= f.password_field :password %></div>

app/views/devise/unlocks/new.html.erb

@@ -4,7 +4,7 @@
   <%= devise_error_messages! %>
 
   <div><%= f.label :email %><br />
-  <%= f.email_field :email, :autofocus => true %></div>
+  <%= f.email_field :email %></div>
 
   <div><%= f.submit "Resend unlock instructions" %></div>
 <% end %>

config/locales/en.yml

@@ -1,59 +1,58 @@
 # Additional translations at https://github.com/plataformatec/devise/wiki/I18n
 
 en:
-  devise:
-    confirmations:
-      confirmed: "Your account was successfully confirmed. You are now signed in."
-      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account was not activated yet."
-      invalid: "Invalid email or password."
-      invalid_token: "Invalid authentication token."
-      locked: "Your account is locked."
-      not_found_in_database: "Invalid email or password."
-      timeout: "Your session expired, please sign in again to continue."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your account before continuing."
-    mailer:
-      confirmation_instructions:
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        subject: "Reset password instructions"
-      unlock_instructions:
-        subject: "Unlock Instructions"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
-      updated: "Your password was changed successfully. You are now signed in."
-      updated_not_active: "Your password was changed successfully."
-    registrations:
-      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
-      signed_up: "Welcome! You have signed up successfully."
-      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
-      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
-      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
-      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
-      updated: "You updated your account successfully."
-    sessions:
-      signed_in: "Signed in successfully."
-      signed_out: "Signed out successfully."
-    unlocks:
-      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
   errors:
     messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
       expired: "has expired, please request a new one"
       not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
       not_locked: "was not locked"
       not_saved:
         one: "1 error prohibited this %{resource} from being saved:"
         other: "%{count} errors prohibited this %{resource} from being saved:"
+
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+      updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+    omniauth_callbacks:
+      success: 'Successfully authenticated from %{kind} account.'
+      failure: 'Could not authenticate you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'

devise.gemspec

@@ -6,7 +6,6 @@ Gem::Specification.new do |s|
   s.name        = "devise"
   s.version     = Devise::VERSION.dup
   s.platform    = Gem::Platform::RUBY
-  s.licenses    = ["MIT"]
   s.summary     = "Flexible authentication solution for Rails with Warden"
   s.email       = "contact@plataformatec.com.br"
   s.homepage    = "http://github.com/plataformatec/devise"

gemfiles/Gemfile.rails-3.1.x

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source "http://rubygems.org"
 
 gem "devise", :path => ".."
 
@@ -10,8 +10,8 @@ gem "rdoc"
 group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", :require => false
-  gem "mocha", "~> 0.13.1", :require => false
+  gem "webrat", "0.7.2", :require => false
+  gem "mocha", :require => false
 
   platforms :mri_18 do
     gem "ruby-debug", ">= 0.10.3"
@@ -26,10 +26,10 @@ end
 
 platforms :ruby do
   gem "sqlite3"
-end
 
-platforms :mri_19 do
   group :mongoid do
-    gem "mongoid", "~> 3.0"
+    gem "mongo", "~> 1.3.0"
+    gem "mongoid", "~> 2.0"
+    gem "bson_ext", "~> 1.3.0"
   end
 end

gemfiles/Gemfile.rails-3.1.x.lock

@@ -1,97 +1,95 @@
 PATH
   remote: ..
   specs:
-    devise (2.2.8)
+    devise (2.1.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
       warden (~> 1.2.1)
 
 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.12)
-      actionpack (= 3.1.12)
-      mail (~> 2.4.4)
-    actionpack (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
+    actionmailer (3.1.4)
+      actionpack (= 3.1.4)
+      mail (~> 2.3.0)
+    actionpack (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.6)
-      rack-cache (~> 1.2)
+      rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.12)
-      activesupport (= 3.1.12)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.4)
+      activesupport (= 3.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
+    activerecord (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.12)
-      activemodel (= 3.1.12)
-      activesupport (= 3.1.12)
-    activesupport (3.1.12)
+    activeresource (3.1.4)
+      activemodel (= 3.1.4)
+      activesupport (= 3.1.4)
+    activesupport (3.1.4)
       multi_json (~> 1.0)
+    addressable (2.2.7)
     arel (2.2.3)
-    bcrypt-ruby (3.1.2)
-    builder (3.0.4)
+    bcrypt-ruby (3.1.1)
+    bson (1.5.2)
+    bson_ext (1.3.1)
+    builder (3.0.0)
     columnize (0.3.6)
     erubis (2.7.0)
-    faraday (0.8.7)
+    faraday (0.7.6)
+      addressable (~> 2.2)
       multipart-post (~> 1.1)
+      rack (~> 1.1)
     hashie (1.2.0)
-    hike (1.2.2)
-    httpauth (0.2.0)
-    i18n (0.6.4)
-    json (1.7.7)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.7.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mail (2.4.4)
+    mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.23)
-    mocha (0.13.3)
+    mime-types (1.18)
+    mocha (0.10.4)
       metaclass (~> 0.0.1)
-    mongoid (3.0.23)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.4.4)
       activemodel (~> 3.1)
-      moped (~> 1.2)
-      origin (~> 1.0)
+      mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    moped (1.4.5)
-    multi_json (1.7.3)
-    multipart-post (1.2.0)
-    nokogiri (1.5.9)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
+    multi_json (1.3.4)
+    multipart-post (1.1.5)
+    nokogiri (1.5.0)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
       multi_json (~> 1.0)
-      rack (~> 1.2)
-    omniauth (1.0.3)
+    omniauth (1.0.2)
       hashie (~> 1.2)
       rack
-    omniauth-facebook (1.4.0)
-      omniauth-oauth2 (~> 1.0.2)
-    omniauth-oauth2 (1.0.3)
-      oauth2 (~> 0.8.0)
+    omniauth-facebook (1.2.0)
+      omniauth-oauth2 (~> 1.0.0)
+    omniauth-oauth2 (1.0.0)
+      oauth2 (~> 0.5.0)
       omniauth (~> 1.0)
     omniauth-openid (1.0.1)
       omniauth (~> 1.0)
       rack-openid (~> 1.3.1)
-    origin (1.1.0)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
-    rack (1.3.10)
+    rack (1.3.6)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -99,49 +97,49 @@ GEM
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.2)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.12)
-      actionmailer (= 3.1.12)
-      actionpack (= 3.1.12)
-      activerecord (= 3.1.12)
-      activeresource (= 3.1.12)
-      activesupport (= 3.1.12)
+    rails (3.1.4)
+      actionmailer (= 3.1.4)
+      actionpack (= 3.1.4)
+      activerecord (= 3.1.4)
+      activeresource (= 3.1.4)
+      activesupport (= 3.1.4)
       bundler (~> 1.0)
-      railties (= 3.1.12)
-    railties (3.1.12)
-      actionpack (= 3.1.12)
-      activesupport (= 3.1.12)
+      railties (= 3.1.4)
+    railties (3.1.4)
+      actionpack (= 3.1.4)
+      activesupport (= 3.1.4)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (10.0.4)
-    rbx-require-relative (0.0.9)
-    rdoc (3.12.2)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.12)
       json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-openid (2.2.3)
+    ruby-openid (2.1.8)
     sprockets (2.0.4)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
+    sqlite3 (1.3.5)
     thor (0.14.6)
-    tilt (1.4.0)
-    treetop (1.4.12)
+    tilt (1.3.3)
+    treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
+    tzinfo (0.3.33)
     warden (1.2.3)
       rack (>= 1.0)
-    webrat (0.7.3)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -152,10 +150,12 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
+  bson_ext (~> 1.3.0)
   devise!
   jruby-openssl
-  mocha (~> 0.13.1)
-  mongoid (~> 3.0)
+  mocha
+  mongo (~> 1.3.0)
+  mongoid (~> 2.0)
   omniauth (~> 1.0.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.0.0)
@@ -164,4 +164,4 @@ DEPENDENCIES
   rdoc
   ruby-debug (>= 0.10.3)
   sqlite3
-  webrat (= 0.7.3)
+  webrat (= 0.7.2)

lib/devise.rb

@@ -6,12 +6,11 @@ require 'set'
 require 'securerandom'
 
 module Devise
-  autoload :Delegator,     'devise/delegator'
-  autoload :FailureApp,    'devise/failure_app'
-  autoload :OmniAuth,      'devise/omniauth'
-  autoload :ParamFilter,   'devise/param_filter'
-  autoload :TestHelpers,   'devise/test_helpers'
-  autoload :TimeInflector, 'devise/time_inflector'
+  autoload :Delegator,   'devise/delegator'
+  autoload :FailureApp,  'devise/failure_app'
+  autoload :OmniAuth,    'devise/omniauth'
+  autoload :ParamFilter, 'devise/param_filter'
+  autoload :TestHelpers, 'devise/test_helpers'
 
   module Controllers
     autoload :Helpers, 'devise/controllers/helpers'
@@ -43,7 +42,7 @@ module Devise
   # True values used to check params
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']
 
-  # Custom domain or key for cookies. Not set by default
+  # Custom domain for cookies. Not set by default
   mattr_accessor :rememberable_options
   @@rememberable_options = {}
 
@@ -51,10 +50,6 @@ module Devise
   mattr_accessor :stretches
   @@stretches = 10
 
-  # The default key used when authenticating over http auth.
-  mattr_accessor :http_authentication_key
-  @@http_authentication_key = nil
-
   # Keys used when authenticating a user.
   mattr_accessor :authentication_keys
   @@authentication_keys = [ :email ]
@@ -91,7 +86,7 @@ module Devise
   # an one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
   mattr_accessor :email_regexp
-  @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+  @@email_regexp = /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/
 
   # Range validation for password length
   mattr_accessor :password_length
@@ -106,14 +101,9 @@ module Devise
   @@extend_remember_period = false
 
   # Time interval you can access your account before confirming your account.
-  # nil - allows unconfirmed access for unlimited time
   mattr_accessor :allow_unconfirmed_access_for
   @@allow_unconfirmed_access_for = 0.days
 
-  # Time interval the confirmation token is valid. nil = unlimited
-  mattr_accessor :confirm_within
-  @@confirm_within = nil
-
   # Defines which key will be used when confirming an account.
   mattr_accessor :confirmation_keys
   @@confirmation_keys = [ :email ]
@@ -204,27 +194,17 @@ module Devise
   mattr_accessor :parent_controller
   @@parent_controller = "ApplicationController"
 
-  # The parent mailer all Devise mailers inherit from.
-  # Defaults to ActionMailer::Base. This should be set early
-  # in the initialization process and should be set to a string.
-  mattr_accessor :parent_mailer
-  @@parent_mailer = "ActionMailer::Base"
-
   # The router Devise should use to generate routes. Defaults
   # to :main_app. Should be overriden by engines in order
   # to provide custom routes.
   mattr_accessor :router_name
   @@router_name = nil
-
+  
   # Set the omniauth path prefix so it can be overriden when
   # Devise is used in a mountable engine
   mattr_accessor :omniauth_path_prefix
   @@omniauth_path_prefix = nil
 
-  # Set if we should clean up the CSRF Token on authentication
-  mattr_accessor :clean_up_csrf_token_on_authentication
-  @@clean_up_csrf_token_on_authentication = true
-
   def self.encryptor=(value)
     warn "\n[DEVISE] To select a encryption which isn't bcrypt, you should use devise-encryptable gem.\n"
   end
@@ -319,7 +299,7 @@ module Devise
   # == Options:
   #
   #   +model+      - String representing the load path to a custom *model* for this module (to autoload.)
-  #   +controller+ - Symbol representing the name of an existing or custom *controller* for this module.
+  #   +controller+ - Symbol representing the name of an exisiting or custom *controller* for this module.
   #   +route+      - Symbol representing the named *route* helper for this module.
   #   +strategy+   - Symbol representing if this module got a custom *strategy*.
   #
@@ -429,17 +409,6 @@ module Devise
 
       Devise.mappings.each_value do |mapping|
         warden_config.scope_defaults mapping.name, :strategies => mapping.strategies
-
-        warden_config.serialize_into_session(mapping.name) do |record|
-          mapping.to.serialize_into_session(record)
-        end
-
-        warden_config.serialize_from_session(mapping.name) do |key|
-          # Previous versions contained an additional entry at the beginning of
-          # key with the record's class name.
-          args = key[-2, 2]
-          mapping.to.serialize_from_session(*args)
-        end
       end
 
       @@warden_config_block.try :call, Devise.warden_config
@@ -447,7 +416,7 @@ module Devise
     end
   end
 
-  # Generate a friendly string randomly to be used as token.
+  # Generate a friendly string randomically to be used as token.
   def self.friendly_token
     SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
   end

lib/devise/controllers/helpers.rb

@@ -162,8 +162,8 @@ module Devise
         users.any?
       end
 
-      # Returns and delete (if it's navigational format) the url stored in the session for
-      # the given scope. Useful for giving redirect backs after sign up:
+      # Returns and delete the url stored in the session for the given scope. Useful
+      # for giving redirect backs after sign up:
       #
       # Example:
       #
@@ -171,12 +171,7 @@ module Devise
       #
       def stored_location_for(resource_or_scope)
         scope = Devise::Mapping.find_scope!(resource_or_scope)
-
-        if is_navigational_format?
-          session.delete("#{scope}_return_to")
-        else
-          session["#{scope}_return_to"]
-        end
+        session.delete("#{scope}_return_to")
       end
 
       # The scope root url to be used when he's signed in. By default, it first
@@ -267,14 +262,6 @@ module Devise
         super # call the default behaviour which resets the session
       end
 
-      def request_format
-        @request_format ||= request.format.try(:ref)
-      end
-
-      def is_navigational_format?
-        Devise.navigational_formats.include?(request_format)
-      end
-
       private
 
       def expire_devise_cached_variables!

lib/devise/controllers/rememberable.rb

@@ -21,17 +21,16 @@ module Devise
 
       # Remembers the given resource by setting up a cookie
       def remember_me(resource)
-        return if env["devise.skip_storage"]
         scope = Devise::Mapping.find_scope!(resource)
         resource.remember_me!(resource.extend_remember_period)
-        cookies.signed[remember_key(resource, scope)] = remember_cookie_values(resource)
+        cookies.signed["remember_#{scope}_token"] = remember_cookie_values(resource)
       end
 
       # Forgets the given resource by deleting a cookie
       def forget_me(resource)
         scope = Devise::Mapping.find_scope!(resource)
         resource.forget_me!
-        cookies.delete(remember_key(resource, scope), forget_cookie_values(resource))
+        cookies.delete("remember_#{scope}_token", forget_cookie_values(resource))
       end
 
       protected
@@ -48,10 +47,6 @@ module Devise
           :expires => resource.remember_expires_at
         )
       end
-
-      def remember_key(resource, scope)
-        resource.rememberable_options.fetch(:key, "remember_#{scope}_token")
-      end
     end
   end
-end
+end

lib/devise/hooks/csrf_cleaner.rb

@@ -1,5 +0,0 @@
-Warden::Manager.after_authentication do |record, warden, options|
-  if Devise.clean_up_csrf_token_on_authentication
-    warden.request.session.try(:delete, :_csrf_token)
-  end
-end

lib/devise/mailers/helpers.rb

@@ -11,9 +11,9 @@ module Devise
       protected
 
       # Configure default email options
-      def devise_mail(record, action, opts={})
+      def devise_mail(record, action)
         initialize_from_record(record)
-        mail headers_for(action, opts)
+        mail headers_for(action)
       end
 
       def initialize_from_record(record)
@@ -25,38 +25,28 @@ module Devise
         @devise_mapping ||= Devise.mappings[scope_name]
       end
 
-      def headers_for(action, opts)
+      def headers_for(action)
         headers = {
-          :subject       => subject_for(action),
-          :to            => resource.email,
+          :subject       => translate(devise_mapping, action),
           :from          => mailer_sender(devise_mapping),
-          :reply_to      => mailer_reply_to(devise_mapping),
-          :template_path => template_paths,
-          :template_name => action
-        }.merge(opts)
+          :to            => resource.email,
+          :template_path => template_paths
+        }
 
         if resource.respond_to?(:headers_for)
-          ActiveSupport::Deprecation.warn "Calling headers_for in the model is no longer supported. " <<
-            "Please customize your mailer instead."
           headers.merge!(resource.headers_for(action))
         end
 
-        @email = headers[:to]
+        unless headers.key?(:reply_to)
+          headers[:reply_to] = headers[:from]
+        end
+
         headers
       end
 
-      def mailer_reply_to(mapping)
-        mailer_sender(mapping, :reply_to)
-      end
-
-      def mailer_from(mapping)
-        mailer_sender(mapping, :from)
-      end
-
-      def mailer_sender(mapping, sender = :from)
-        default_sender = default_params[sender]
-        if default_sender.present?
-          default_sender.respond_to?(:to_proc) ? instance_eval(&default_sender) : default_sender
+      def mailer_sender(mapping)
+        if default_params[:from].present?
+          default_params[:from]
         elsif Devise.mailer_sender.is_a?(Proc)
           Devise.mailer_sender.call(mapping.name)
         else
@@ -65,12 +55,12 @@ module Devise
       end
 
       def template_paths
-        template_path = _prefixes.dup
+        template_path = [self.class.mailer_name]
         template_path.unshift "#{@devise_mapping.scoped_path}/mailer" if self.class.scoped_views?
         template_path
       end
 
-      # Setup a subject doing an I18n lookup. At first, it attempts to set a subject
+      # Setup a subject doing an I18n lookup. At first, it attemps to set a subject
       # based on the current mapping:
       #
       #   en:
@@ -87,8 +77,8 @@ module Devise
       #         confirmation_instructions:
       #           subject: '...'
       #
-      def subject_for(key)
-        I18n.t(:"#{devise_mapping.name}_subject", :scope => [:devise, :mailer, key],
+      def translate(mapping, key)
+        I18n.t(:"#{mapping.name}_subject", :scope => [:devise, :mailer, key],
           :default => [:subject, key.to_s.humanize])
       end
     end

lib/devise/models/authenticatable.rb

@@ -1,5 +1,4 @@
 require 'devise/hooks/activatable'
-require 'devise/hooks/csrf_cleaner'
 
 module Devise
   module Models
@@ -11,15 +10,12 @@ module Devise
     #
     #   * +authentication_keys+: parameters used for authentication. By default [:email].
     #
-    #   * +http_authentication_key+: map the username passed via HTTP Auth to this parameter. Defaults to
-    #     the first element in +authentication_keys+.
-    #
     #   * +request_keys+: parameters from the request object used for authentication.
     #     By specifying a symbol (which should be a request method), it will automatically be
     #     passed to find_for_authentication method and considered in your model lookup.
     #
     #     For instance, if you set :request_keys to [:subdomain], :subdomain will be considered
-    #     as key on authentication. This can also be a hash where the value is a boolean specifying
+    #     as key on authentication. This can also be a hash where the value is a boolean expliciting
     #     if the value is required or not.
     #
     #   * +http_authenticatable+: if this model allows http authentication. By default true.
@@ -36,7 +32,7 @@ module Devise
     # == active_for_authentication?
     #
     # After authenticating a user and in each request, Devise checks if your model is active by
-    # calling model.active_for_authentication?. This method is overwritten by other devise modules. For instance,
+    # calling model.active_for_authentication?. This method is overwriten by other devise modules. For instance,
     # :confirmable overwrites .active_for_authentication? to only return true if your model was confirmed.
     #
     # You overwrite this method yourself, but if you do, don't forget to call super:
@@ -97,6 +93,10 @@ module Devise
       def authenticatable_salt
       end
 
+      def headers_for(name)
+        {}
+      end
+
       array = %w(serializable_hash)
       # to_xml does not call serializable_hash on 3.1
       array << "to_xml" if Rails::VERSION::STRING[0,3] == "3.1"
@@ -144,26 +144,14 @@ module Devise
       #
       #       protected
       #
-      #       def send_devise_notification(notification, opts = {})
-      #         # if the record is new or changed then delay the
-      #         # delivery until the after_commit callback otherwise
-      #         # send now because after_commit will not be called.
-      #         if new_record? || changed?
-      #           pending_notifications << [notification, opts]
-      #         else
-      #           devise_mailer.send(notification, self, opts).deliver
-      #         end
+      #       def send_devise_notification(notification)
+      #         pending_notifications << notification
       #       end
       #
       #       def send_pending_notifications
-      #         pending_notifications.each do |n, opts|
-      #           devise_mailer.send(n, self, opts).deliver
+      #         pending_notifications.each do |n|
+      #           devise_mailer.send(n, self).deliver
       #         end
-      #
-      #         # Empty the pending notifications array because the
-      #         # after_commit hook can be called multiple times which
-      #         # could cause multiple emails to be sent.
-      #         pending_notifications.clear
       #       end
       #
       #       def pending_notifications
@@ -171,35 +159,21 @@ module Devise
       #       end
       #     end
       #
-      def send_devise_notification(notification, opts={})
-        devise_mailer.send(notification, self, opts).deliver
+      def send_devise_notification(notification)
+        devise_mailer.send(notification, self).deliver
       end
 
       def downcase_keys
-        self.class.case_insensitive_keys.each { |k| apply_to_attribute_or_variable(k, :downcase!) }
+        self.class.case_insensitive_keys.each { |k| self[k].try(:downcase!) }
       end
 
       def strip_whitespace
-        self.class.strip_whitespace_keys.each { |k| apply_to_attribute_or_variable(k, :strip!) }
-      end
-
-      def apply_to_attribute_or_variable(attr, method)
-        if self[attr]
-          self[attr].try(method)
-
-        # Use respond_to? here to avoid a regression where globally
-        # configured strip_whitespace_keys or case_insensitive_keys were
-        # attempting to strip! or downcase! when a model didn't have the
-        # globally configured key.
-        elsif respond_to?(attr)
-          send(attr).try(method)
-        end
+        self.class.strip_whitespace_keys.each { |k| self[k].try(:strip!) }
       end
 
       module ClassMethods
         Devise::Models.config(self, :authentication_keys, :request_keys, :strip_whitespace_keys,
-          :case_insensitive_keys, :http_authenticatable, :params_authenticatable, :skip_session_storage,
-          :http_authentication_key)
+          :case_insensitive_keys, :http_authenticatable, :params_authenticatable, :skip_session_storage)
 
         def serialize_into_session(record)
           [record.to_key, record.authenticatable_salt]
@@ -225,7 +199,7 @@ module Devise
         # it may be wrapped as well. For instance, database authenticatable
         # provides a `find_for_database_authentication` that wraps a call to
         # this method. This allows you to customize both database authenticatable
-        # or the whole authenticate stack by customize `find_for_authentication.`
+        # or the whole authenticate stack by customize `find_for_authentication.` 
         #
         # Overwrite to add customized conditions, create a join, or maybe use a
         # namedscope to filter records while authenticating.

lib/devise/models/confirmable.rb

@@ -19,8 +19,6 @@ module Devise
     #     db field to be setup (t.reconfirmable in migrations). Until confirmed new email is
     #     stored in unconfirmed email column, and copied to email column on successful
     #     confirmation.
-    #   * +confirm_within+: the time before a sent confirmation token becomes invalid.
-    #     You can use this to force the user to confirm within a set period of time.
     #
     # == Examples
     #
@@ -30,22 +28,14 @@ module Devise
     #
     module Confirmable
       extend ActiveSupport::Concern
-      include ActionView::Helpers::DateHelper
 
       included do
         before_create :generate_confirmation_token, :if => :confirmation_required?
-        after_create  :send_on_create_confirmation_instructions, :if => :send_confirmation_notification?
+        after_create  :send_on_create_confirmation_instructions, :if => :confirmation_required?
         before_update :postpone_email_change_until_confirmation, :if => :postpone_email_change?
         after_update  :send_confirmation_instructions, :if => :reconfirmation_required?
       end
 
-      def initialize(*args, &block)
-        @bypass_postpone = false
-        @reconfirmation_required = false
-        @skip_confirmation_notification = false
-        super
-      end
-
       def self.required_fields(klass)
         required_methods = [:confirmation_token, :confirmed_at, :confirmation_sent_at]
         required_methods << :unconfirmed_email if klass.reconfirmable
@@ -57,12 +47,6 @@ module Devise
       # add errors
       def confirm!
         pending_any_confirmation do
-          if confirmation_period_expired?
-            self.errors.add(:email, :confirmation_period_expired,
-              :period => Devise::TimeInflector.time_ago_in_words(self.class.confirm_within.ago))
-            return false
-          end
-
           self.confirmation_token = nil
           self.confirmed_at = Time.now.utc
 
@@ -94,17 +78,12 @@ module Devise
         @reconfirmation_required = false
 
         generate_confirmation_token! if self.confirmation_token.blank?
-
-        opts = pending_reconfirmation? ? { :to => unconfirmed_email } : { }
-        send_devise_notification(:confirmation_instructions, opts)
+        send_devise_notification(:confirmation_instructions)
       end
 
       # Resend confirmation token. This method does not need to generate a new token.
       def resend_confirmation_token
-        pending_any_confirmation do
-          self.confirmation_token = nil if confirmation_period_expired?
-          send_confirmation_instructions
-        end
+        pending_any_confirmation { send_confirmation_instructions }
       end
 
       # Overwrites active_for_authentication? for confirmation
@@ -126,18 +105,20 @@ module Devise
         self.confirmed_at = Time.now.utc
       end
 
-      # Skips sending the confirmation notification email after_create. Unlike
-      # #skip_confirmation!, record still requires confirmation.
-      def skip_confirmation_notification!
-        @skip_confirmation_notification = true
-      end
-
       # If you don't want reconfirmation to be sent, neither a code
       # to be generated, call skip_reconfirmation!
       def skip_reconfirmation!
         @bypass_postpone = true
       end
 
+      def headers_for(action)
+        headers = super
+        if action == :confirmation_instructions && pending_reconfirmation?
+          headers[:to] = unconfirmed_email
+        end
+        headers
+      end
+
       protected
 
         # A callback method used to deliver confirmation
@@ -171,32 +152,13 @@ module Devise
         #   # allow_unconfirmed_access_for = 0.days
         #   confirmation_period_valid?   # will always return false
         #
-        #   # allow_unconfirmed_access_for = nil
-        #   confirmation_period_valid?   # will always return true
-        #
         def confirmation_period_valid?
-          self.class.allow_unconfirmed_access_for.nil? || (confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago)
-        end
-
-        # Checks if the user confirmation happens before the token becomes invalid
-        # Examples:
-        #
-        #   # confirm_within = 3.days and confirmation_sent_at = 2.days.ago
-        #   confirmation_period_expired?  # returns false
-        #
-        #   # confirm_within = 3.days and confirmation_sent_at = 4.days.ago
-        #   confirmation_period_expired?  # returns true
-        #
-        #   # confirm_within = nil
-        #   confirmation_period_expired?  # will always return false
-        #
-        def confirmation_period_expired?
-          self.class.confirm_within && (Time.now > self.confirmation_sent_at + self.class.confirm_within )
+          confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago
         end
 
         # Checks whether the record requires any confirmation.
         def pending_any_confirmation
-          if (!confirmed? || pending_reconfirmation?)
+          if !confirmed? || pending_reconfirmation?
             yield
           else
             self.errors.add(:email, :already_confirmed)
@@ -223,7 +185,7 @@ module Devise
 
         def postpone_email_change?
           postpone = self.class.reconfirmable && email_changed? && !@bypass_postpone
-          @bypass_postpone = false
+          @bypass_postpone = nil
           postpone
         end
 
@@ -231,10 +193,6 @@ module Devise
           self.class.reconfirmable && @reconfirmation_required
         end
 
-        def send_confirmation_notification?
-          confirmation_required? && !@skip_confirmation_notification
-        end
-
       module ClassMethods
         # Attempt to find a user by its email. If a record is found, send new
         # confirmation instructions to it. If not, try searching for a user by unconfirmed_email
@@ -272,7 +230,7 @@ module Devise
           find_or_initialize_with_errors(unconfirmed_required_attributes, unconfirmed_attributes, :not_found)
         end
 
-        Devise::Models.config(self, :allow_unconfirmed_access_for, :confirmation_keys, :reconfirmable, :confirm_within)
+        Devise::Models.config(self, :allow_unconfirmed_access_for, :confirmation_keys, :reconfirmable)
       end
     end
   end

lib/devise/models/database_authenticatable.rb

@@ -75,7 +75,7 @@ module Devise
       end
 
       # Updates record attributes without asking for the current password.
-      # Never allows a change to the current password. If you are using this
+      # Never allows to change the current password. If you are using this
       # method, you should probably override this method to protect other
       # attributes you would not like to be updated without a password.
       #
@@ -95,21 +95,6 @@ module Devise
         result
       end
 
-      # Destroy record when :current_password matches, otherwise returns
-      # error on :current_password. It also automatically rejects 
-      # :current_password if it is blank.
-      def destroy_with_password(current_password)
-        result = if valid_password?(current_password)
-          destroy
-        else
-          self.valid?
-          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
-          false
-        end
-
-        result
-      end
-
       def after_database_authentication
       end
 

lib/devise/models/lockable.rb

@@ -27,7 +27,7 @@ module Devise
       def self.required_fields(klass)
         attributes = []
         attributes << :failed_attempts if klass.lock_strategy_enabled?(:failed_attempts)
-        attributes << :locked_at if klass.unlock_strategy_enabled?(:time)
+        attributes << :unlock_at if klass.unlock_strategy_enabled?(:time)
         attributes << :unlock_token if klass.unlock_strategy_enabled?(:email)
 
         attributes
@@ -105,11 +105,7 @@ module Devise
       end
 
       def unauthenticated_message
-        # If set to paranoid mode, do not show the locked message because it
-        # leaks the existence of an account.
-        if Devise.paranoid
-          super
-        elsif lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
+        if lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
           :locked
         else
           super

lib/devise/models/omniauthable.rb

@@ -8,7 +8,7 @@ module Devise
     #
     # Oauthable adds the following options to devise_for:
     #
-    #   * +omniauth_providers+: Which providers are available to this model. It expects an array:
+    #   * +omniauth_providers+: Which providers are avaialble to this model. It expects an array:
     #
     #       devise_for :database_authenticatable, :omniauthable, :omniauth_providers => [:twitter]
     #
@@ -24,4 +24,4 @@ module Devise
       end
     end
   end
-end
+end

lib/devise/models/recoverable.rb

@@ -1,7 +1,7 @@
 module Devise
   module Models
 
-    # Recoverable takes care of resetting the user password and send reset instructions.
+    # Recoverable takes care of reseting the user password and send reset instructions.
     #
     # ==Options
     #
@@ -102,9 +102,9 @@ module Devise
 
       module ClassMethods
         # Attempt to find a user by its email. If a record is found, send new
-        # password instructions to it. If user is not found, returns a new user
+        # password instructions to it. If not user is found, returns a new user
         # with an email not found error.
-        # Attributes must contain the user's email
+        # Attributes must contain the user email
         def send_reset_password_instructions(attributes={})
           recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
           recoverable.send_reset_password_instructions if recoverable.persisted?

lib/devise/models/timeoutable.rb

@@ -2,7 +2,7 @@ require 'devise/hooks/timeoutable'
 
 module Devise
   module Models
-    # Timeoutable takes care of verifyng whether a user session has already
+    # Timeoutable takes care of veryfing whether a user session has already
     # expired or not. When a session expires after the configured time, the user
     # will be asked for credentials again, it means, he/she will be redirected
     # to the sign in page.

lib/devise/models/token_authenticatable.rb

@@ -18,18 +18,6 @@ module Devise
     # If you want to delete the token after it is used, you can do so in the
     # after_token_authentication callback.
     #
-    # == APIs
-    #
-    # If you are using token authentication with APIs and using trackable. Every
-    # request will be considered as a new sign in (since there is no session in
-    # APIs). You can disable this by creating a before filter as follow:
-    #
-    #   before_filter :skip_trackable
-    #
-    #   def skip_trackable
-    #     request.env['devise.skip_trackable'] = true
-    #   end
-    #
     # == Options
     #
     # TokenAuthenticatable adds the following options to devise_for:

lib/devise/models/trackable.rb

@@ -20,7 +20,7 @@ module Devise
         self.last_sign_in_at     = old_current || new_current
         self.current_sign_in_at  = new_current
 
-        old_current, new_current = self.current_sign_in_ip, request.remote_ip
+        old_current, new_current = self.current_sign_in_ip, request.ip
         self.last_sign_in_ip     = old_current || new_current
         self.current_sign_in_ip  = new_current
 

lib/devise/models/validatable.rb

@@ -10,7 +10,7 @@ module Devise
     # Validatable adds the following options to devise_for:
     #
     #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 8..128.
+    #   * +password_length+: a range expressing password length. Defaults to 6..128.
     #
     module Validatable
       # All validations used by this module.

lib/devise/param_filter.rb

@@ -8,16 +8,16 @@ module Devise
     def filter(conditions)
       conditions = stringify_params(conditions.dup)
 
-      conditions.merge!(filtered_hash_by_method_for_given_keys(conditions.dup, :downcase, @case_insensitive_keys))
-      conditions.merge!(filtered_hash_by_method_for_given_keys(conditions.dup, :strip, @strip_whitespace_keys))
-
-      conditions
-    end
-
-    def filtered_hash_by_method_for_given_keys(conditions, method, condition_keys)
-      condition_keys.each do |k|
+      @case_insensitive_keys.each do |k|
         value = conditions[k]
-        conditions[k] = value.send(method) if value.respond_to?(method)
+        next unless value.respond_to?(:downcase)
+        conditions[k] = value.downcase
+      end
+
+      @strip_whitespace_keys.each do |k|
+        value = conditions[k]
+        next unless value.respond_to?(:strip)
+        conditions[k] = value.strip
       end
 
       conditions

lib/devise/rails/routes.rb

@@ -43,20 +43,20 @@ module ActionDispatch::Routing
     # needed routes:
     #
     #  # Session routes for Authenticatable (default)
-    #       new_user_session GET    /users/sign_in                    {:controller=>"devise/sessions", :action=>"new"}
-    #           user_session POST   /users/sign_in                    {:controller=>"devise/sessions", :action=>"create"}
-    #   destroy_user_session DELETE /users/sign_out                   {:controller=>"devise/sessions", :action=>"destroy"}
+    #       new_user_session GET  /users/sign_in                    {:controller=>"devise/sessions", :action=>"new"}
+    #           user_session POST /users/sign_in                    {:controller=>"devise/sessions", :action=>"create"}
+    #   destroy_user_session GET  /users/sign_out                   {:controller=>"devise/sessions", :action=>"destroy"}
     #
     #  # Password routes for Recoverable, if User model has :recoverable configured
-    #      new_user_password GET    /users/password/new(.:format)     {:controller=>"devise/passwords", :action=>"new"}
-    #     edit_user_password GET    /users/password/edit(.:format)    {:controller=>"devise/passwords", :action=>"edit"}
-    #          user_password PUT    /users/password(.:format)         {:controller=>"devise/passwords", :action=>"update"}
-    #                        POST   /users/password(.:format)         {:controller=>"devise/passwords", :action=>"create"}
+    #      new_user_password GET  /users/password/new(.:format)     {:controller=>"devise/passwords", :action=>"new"}
+    #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"devise/passwords", :action=>"edit"}
+    #          user_password PUT  /users/password(.:format)         {:controller=>"devise/passwords", :action=>"update"}
+    #                        POST /users/password(.:format)         {:controller=>"devise/passwords", :action=>"create"}
     #
     #  # Confirmation routes for Confirmable, if User model has :confirmable configured
-    #  new_user_confirmation GET    /users/confirmation/new(.:format) {:controller=>"devise/confirmations", :action=>"new"}
-    #      user_confirmation GET    /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"show"}
-    #                        POST   /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"create"}
+    #  new_user_confirmation GET  /users/confirmation/new(.:format) {:controller=>"devise/confirmations", :action=>"new"}
+    #      user_confirmation GET  /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"show"}
+    #                        POST /users/confirmation(.:format)     {:controller=>"devise/confirmations", :action=>"create"}
     #
     # ==== Options
     #
@@ -183,7 +183,7 @@ module ActionDispatch::Routing
     #      end
     #    end
     #
-    # In order to get Devise to recognize the deactivate action, your devise_scope entry should look like this:
+    # In order to get Devise to recognize the deactivate action, your devise_for entry should look like this,
     #
     #     devise_scope :owner do
     #       post "deactivate", :to => "registrations#deactivate", :as => "deactivate_registration"
@@ -250,11 +250,15 @@ module ActionDispatch::Routing
     #   end
     #
     #   authenticate :user, lambda {|u| u.role == "admin"} do
-    #     root :to => "admin/dashboard#show", :as => :user_root
+    #     root :to => "admin/dashboard#show"
     #   end
     #
     def authenticate(scope=nil, block=nil)
-      constraints_for(:authenticate!, scope, block) do
+      constraint = lambda do |request|
+        request.env["warden"].authenticate!(:scope => scope) && (block.nil? || block.call(request.env["warden"].user(scope)))
+      end
+
+      constraints(constraint) do
         yield
       end
     end
@@ -264,21 +268,25 @@ module ActionDispatch::Routing
     # a model and allows extra constraints to be done on the instance.
     #
     #   authenticated :admin do
-    #     root :to => 'admin/dashboard#show', :as => :admin_root
+    #     root :to => 'admin/dashboard#show'
     #   end
     #
     #   authenticated do
-    #     root :to => 'dashboard#show', :as => :authenticated_root
+    #     root :to => 'dashboard#show'
     #   end
     #
     #   authenticated :user, lambda {|u| u.role == "admin"} do
-    #     root :to => "admin/dashboard#show", :as => :user_root
+    #     root :to => "admin/dashboard#show"
     #   end
     #
     #   root :to => 'landing#show'
     #
     def authenticated(scope=nil, block=nil)
-      constraints_for(:authenticate?, scope, block) do
+      constraint = lambda do |request|
+        request.env["warden"].authenticate?(:scope => scope) && (block.nil? || block.call(request.env["warden"].user(scope)))
+      end
+
+      constraints(constraint) do
         yield
       end
     end
@@ -321,7 +329,7 @@ module ActionDispatch::Routing
     # good and working example.
     #
     #  devise_scope :user do
-    #    get "/some/route" => "some_devise_controller"
+    #    match "/some/route" => "some_devise_controller"
     #  end
     #  devise_for :users
     #
@@ -393,14 +401,12 @@ module ActionDispatch::Routing
         match "#{path_prefix}/:provider",
           :constraints => { :provider => providers },
           :to => "#{controllers[:omniauth_callbacks]}#passthru",
-          :as => :omniauth_authorize,
-          :via => [:get, :post]
+          :as => :omniauth_authorize
 
         match "#{path_prefix}/:action/callback",
           :constraints => { :action => providers },
           :to => controllers[:omniauth_callbacks],
-          :as => :omniauth_callback,
-          :via => [:get, :post]
+          :as => :omniauth_callback
       ensure
         @scope[:path] = path
       end
@@ -420,17 +426,6 @@ module ActionDispatch::Routing
         @scope.merge!(old)
       end
 
-      def constraints_for(method_to_apply, scope=nil, block=nil)
-        constraint = lambda do |request|
-          request.env['warden'].send(method_to_apply, :scope => scope) &&
-            (block.nil? || block.call(request.env["warden"].user(scope)))
-        end
-
-        constraints(constraint) do
-          yield
-        end
-      end
-
       def set_omniauth_path_prefix!(path_prefix) #:nodoc:
         if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
           raise "Wrong OmniAuth configuration. If you are getting this exception, it means that either:\n\n" \

lib/devise/rails/warden_compat.rb

@@ -3,19 +3,41 @@ module Warden::Mixins::Common
     @request ||= ActionDispatch::Request.new(env)
   end
 
-  NULL_STORE =
-    defined?(ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash) ?
-      ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash : nil
-
+  # This is called internally by Warden on logout
   def reset_session!
-    # Calling reset_session on NULL_STORE causes it fail.
-    # This is a bug that needs to be fixed in Rails.
-    unless NULL_STORE && request.session.is_a?(NULL_STORE)
-      request.reset_session
-    end
+    request.reset_session
   end
 
   def cookies
     request.cookie_jar
   end
 end
+
+class Warden::SessionSerializer
+  def serialize(record)
+    klass = record.class
+    array = klass.serialize_into_session(record)
+    array.unshift(klass.name)
+  end
+
+  def deserialize(keys)
+    klass_name, *args = keys
+
+    begin
+      klass = ActiveSupport::Inflector.constantize(klass_name)
+      if klass.respond_to? :serialize_from_session
+        klass.serialize_from_session(*args)
+      else
+        Rails.logger.warn "[Devise] Stored serialized class #{klass_name} seems not to be Devise enabled anymore. Did you do that on purpose?"
+        nil
+      end
+    rescue NameError => e
+      if e.message =~ /uninitialized constant/
+        Rails.logger.debug "[Devise] Trying to deserialize invalid class #{klass_name}"
+        nil
+      else
+        raise
+      end
+    end
+  end
+end

lib/devise/strategies/authenticatable.rb

@@ -100,7 +100,7 @@ module Devise
 
       # Extract a hash with attributes:values from the http params.
       def http_auth_hash
-        keys = [http_authentication_key, :password]
+        keys = [authentication_keys.first, :password]
         Hash[*keys.zip(decode_credentials).flatten]
       end
 
@@ -134,27 +134,24 @@ module Devise
         parse_authentication_key_values(request_values, request_keys)
       end
 
+      # Holds the authentication keys.
       def authentication_keys
         @authentication_keys ||= mapping.to.authentication_keys
       end
 
-      def http_authentication_key
-        @http_authentication_key ||= mapping.to.http_authentication_key || case authentication_keys
-          when Array then authentication_keys.first
-          when Hash then authentication_keys.keys.first
-        end
-      end
-
+      # Holds request keys.
       def request_keys
         @request_keys ||= mapping.to.request_keys
       end
 
+      # Returns values from the request object.
       def request_values
         keys = request_keys.respond_to?(:keys) ? request_keys.keys : request_keys
         values = keys.map { |k| self.request.send(k) }
         Hash[keys.zip(values)]
       end
 
+      # Parse authentication keys considering if they should be enforced or not.
       def parse_authentication_key_values(hash, keys)
         keys.each do |key, enforce|
           value = hash[key].presence

lib/devise/strategies/database_authenticatable.rb

@@ -5,16 +5,13 @@ module Devise
     # Default strategy for signing in a user, based on his email and password in the database.
     class DatabaseAuthenticatable < Authenticatable
       def authenticate!
-        resource  = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
-        encrypted = false
+        resource = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
+        return fail(:invalid) unless resource
 
-        if validate(resource){ encrypted = true; resource.valid_password?(password) }
+        if validate(resource){ resource.valid_password?(password) }
           resource.after_database_authentication
           success!(resource)
         end
-
-        mapping.to.new.password = password if !encrypted && Devise.paranoid
-        fail(:not_found_in_database) unless resource
       end
     end
   end

lib/devise/strategies/rememberable.rb

@@ -41,7 +41,7 @@ module Devise
       end
 
       def remember_key
-        mapping.to.rememberable_options.fetch(:key, "remember_#{scope}_token")
+        "remember_#{scope}_token"
       end
 
       def remember_cookie
@@ -52,4 +52,4 @@ module Devise
   end
 end
 
-Warden::Strategies.add(:rememberable, Devise::Strategies::Rememberable)
+Warden::Strategies.add(:rememberable, Devise::Strategies::Rememberable)

lib/devise/strategies/token_authenticatable.rb

@@ -7,22 +7,13 @@ module Devise
     #
     #   http://myapp.example.com/?user_token=SECRET
     #
-    # For headers, you can use basic authentication passing the token as username and
-    # blank password. Since some clients may require a password, you can pass "X" as
-    # password and it will simply be ignored.
-    #
-    # You may also pass the token using the Token authentication mechanism provided
-    # by Rails: http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
-    # The token options are stored in request.env['devise.token_options']
+    # For HTTP, you can pass the token as username and blank password. Since some clients may require
+    # a password, you can pass "X" as password and it will simply be ignored.
     class TokenAuthenticatable < Authenticatable
       def store?
         super && !mapping.to.skip_session_storage.include?(:token_auth)
       end
 
-      def valid?
-        super || valid_for_token_auth?
-      end
-
       def authenticate!
         resource = mapping.to.find_for_token_authentication(authentication_hash)
         return fail(:invalid_token) unless resource
@@ -45,33 +36,7 @@ module Devise
         false
       end
 
-      # Check if the model accepts this strategy as token authenticatable.
-      def token_authenticatable?
-        mapping.to.http_authenticatable?(:token_options)
-      end
-
-      # Check if this is strategy is valid for token authentication by:
-      #
-      #   * Validating if the model allows http token authentication;
-      #   * If the http auth token exists;
-      #   * If all authentication keys are present;
-      #
-      def valid_for_token_auth?
-        token_authenticatable? && auth_token.present? && with_authentication_hash(:token_auth, token_auth_hash)
-      end
-
-      # Extract the auth token from the request
-      def auth_token
-        @auth_token ||= ActionController::HttpAuthentication::Token.token_and_options(request)
-      end
-
-      # Extract a hash with attributes:values from the auth_token
-      def token_auth_hash
-        request.env['devise.token_options'] = auth_token.last
-        { authentication_keys.first => auth_token.first }
-      end
-
-      # Try both scoped and non scoped keys
+      # Try both scoped and non scoped keys.
       def params_auth_hash
         if params[scope].kind_of?(Hash) && params[scope].has_key?(authentication_keys.first)
           params[scope]

lib/devise/test_helpers.rb

@@ -45,7 +45,6 @@ module Devise
     def sign_in(resource_or_scope, resource=nil)
       scope    ||= Devise::Mapping.find_scope!(resource_or_scope)
       resource ||= resource_or_scope
-      warden.instance_variable_get(:@users).delete(scope)
       warden.session_serializer.store(resource, scope)
     end
 
@@ -107,8 +106,8 @@ module Devise
         env["warden.options"] = options
         Warden::Manager._run_callbacks(:before_failure, env, options)
 
-        status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
-        @controller.send :render, :status => status, :text => response.body,
+        status, headers, body = Devise.warden_config[:failure_app].call(env).to_a
+        @controller.send :render, :status => status, :text => body,
           :content_type => headers["Content-Type"], :location => headers["Location"]
         nil # causes process return @response
       end

lib/devise/time_inflector.rb

@@ -1,14 +0,0 @@
-require "active_support/core_ext/module/delegation"
-
-module Devise
-  class TimeInflector
-    include ActionView::Helpers::DateHelper
-
-    class << self
-      attr_reader :instance
-      delegate :time_ago_in_words, :to => :instance
-    end
-
-    @instance = new
-  end
-end

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.2.8".freeze
+  VERSION = "2.1.4".freeze
 end

lib/generators/active_record/devise_generator.rb

@@ -27,11 +27,7 @@ module ActiveRecord
   attr_accessible :email, :password, :password_confirmation, :remember_me
 CONTENT
 
-        class_path = if namespaced?
-          class_name.to_s.split("::")
-        else
-          [class_name]
-        end
+        class_path = class_name.to_s.split("::")
 
         indent_depth = class_path.size - 1
         content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"

lib/generators/devise/views_generator.rb

@@ -18,7 +18,7 @@ module Devise
         public_task :copy_views
       end
 
-      # TODO: Add this to Rails itself
+      # TODO: Add this to Rails itslef
       module ClassMethods
         def hide!
           Rails::Generators.hide_namespace self.namespace
@@ -36,13 +36,7 @@ module Devise
       protected
 
       def view_directory(name, _target_path = nil)
-        directory name.to_s, _target_path || "#{target_path}/#{name}" do |content|
-          if scope
-            content.gsub "devise/shared/links", "#{scope}/shared/links"
-          else
-            content
-          end
-        end
+        directory name.to_s, _target_path || "#{target_path}/#{name}"
       end
 
       def target_path

lib/generators/mongoid/devise_generator.rb

@@ -22,6 +22,9 @@ module Mongoid
   ## Database authenticatable
   field :email,              :type => String, :default => ""
   field :encrypted_password, :type => String, :default => ""
+
+  validates_presence_of :email
+  validates_presence_of :encrypted_password
   
   ## Recoverable
   field :reset_password_token,   :type => String

lib/generators/templates/README

@@ -21,15 +21,11 @@ Some setup you must do manually if you haven't yet:
        <p class="notice"><%= notice %></p>
        <p class="alert"><%= alert %></p>
 
-  4. If you are deploying Rails 3.1+ on Heroku, you may want to set:
+  4. If you are deploying Rails 3.1 on Heroku, you may want to set:
 
        config.assets.initialize_on_precompile = false
 
      On config/application.rb forcing your application to not access the DB
      or load models when precompiling your assets.
 
-  5. You can copy Devise views (for customization) to your app by running:
-
-       rails g devise:views
-
 ===============================================================================

lib/generators/templates/devise.rb

@@ -48,14 +48,10 @@ Devise.setup do |config|
   # enable it only for database (email + password) authentication.
   # config.params_authenticatable = true
 
-  # Tell if authentication through HTTP Auth is enabled. False by default.
+  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
   # It can be set to an array that will enable http authentication only for the
   # given strategies, for example, `config.http_authenticatable = [:token]` will
-  # enable it only for token authentication. The supported strategies are:
-  # :database      = Support basic authentication with authentication key + password
-  # :token         = Support basic authentication with token authentication key
-  # :token_options = Support token authentication with options as defined in
-  #                  http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html
+  # enable it only for token authentication.
   # config.http_authenticatable = false
 
   # If http headers should be returned for AJAX requests. True by default.
@@ -76,12 +72,6 @@ Devise.setup do |config|
   # passing :skip => :sessions to `devise_for` in your config/routes.rb
   config.skip_session_storage = [:http_auth]
 
-  # By default, Devise cleans up the CSRF token on authentication to
-  # avoid CSRF token fixation attacks. This means that, when using AJAX
-  # requests for sign in and sign up, you need to get a new CSRF token
-  # from the server. You can disable this option at your own risk.
-  # config.clean_up_csrf_token_on_authentication = true
-
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
@@ -102,14 +92,6 @@ Devise.setup do |config|
   # the user cannot access the website without confirming his account.
   # config.allow_unconfirmed_access_for = 2.days
 
-  # A period that the user is allowed to confirm their account before their
-  # token becomes invalid. For example, if set to 3.days, the user can confirm
-  # their account within 3 days after the mail was sent, but on the fourth day
-  # their account can't be confirmed with the token any more.
-  # Default is nil, meaning there is no restriction on how long a user can take
-  # before confirming their account.
-  # config.confirm_within = 3.days
-
   # If true, requires any email changes to be confirmed (exactly the same way as
   # initial account confirmation) to be applied. Requires additional unconfirmed_email
   # db field (see migrations). Until confirmed new email is stored in
@@ -131,11 +113,11 @@ Devise.setup do |config|
   # config.rememberable_options = {}
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 8..128.
-  config.password_length = 8..128
+  # Range for password length. Default is 6..128.
+  # config.password_length = 6..128
 
   # Email regex used to validate email formats. It simply asserts that
-  # one (and only one) @ exists in the given string. This is mainly
+  # an one (and only one) @ exists in the given string. This is mainly
   # to give user feedback and not to assert the e-mail validity.
   # config.email_regexp = /\A[^@]+@[^@]+\z/
 
@@ -143,7 +125,7 @@ Devise.setup do |config|
   # The time you want to timeout the user session without activity. After this
   # time the user will be asked for credentials again. Default is 30 minutes.
   # config.timeout_in = 30.minutes
-
+  
   # If true, expires auth token on session timeout.
   # config.expire_auth_token_on_timeout = false
 
@@ -185,9 +167,7 @@ Devise.setup do |config|
   # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1,
   # :authlogic_sha512 (then you should set stretches above to 20 for default behavior)
   # and :restful_authentication_sha1 (then you should set stretches to 10, and copy
-  # REST_AUTH_SITE_KEY to pepper).
-  #
-  # Require the `devise-encryptable` gem when using anything other than bcrypt
+  # REST_AUTH_SITE_KEY to pepper)
   # config.encryptor = :sha512
 
   # ==> Configuration for :token_authenticatable
@@ -249,4 +229,4 @@ Devise.setup do |config|
   # When using omniauth, Devise cannot automatically set Omniauth path,
   # so you need to do it manually. For the users scope, it would be:
   # config.omniauth_path_prefix = "/my_engine/users/auth"
-end
+end

lib/generators/templates/markerb/confirmation_instructions.markerb

@@ -1,4 +1,4 @@
-Welcome <%= @email %>!
+Welcome <%= @resource.email %>!
 
 You can confirm your account through the link below:
 

lib/generators/templates/markerb/unlock_instructions.markerb

@@ -1,6 +1,6 @@
 Hello <%= @resource.email %>!
 
-Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
 
 Click the link below to unlock your account:
 

lib/generators/templates/simple_form_for/confirmations/new.html.erb

@@ -2,10 +2,9 @@
 
 <%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= f.error_notification %>
-  <%= f.full_error :confirmation_token %>
 
   <div class="form-inputs">
-    <%= f.input :email, :required => true, :autofocus => true %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="form-actions">

lib/generators/templates/simple_form_for/passwords/edit.html.erb

@@ -7,7 +7,7 @@
   <%= f.full_error :reset_password_token %>
 
   <div class="form-inputs">
-    <%= f.input :password, :label => "New password", :required => true, :autofocus => true %>
+    <%= f.input :password, :label => "New password", :required => true %>
     <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
   </div>
 

lib/generators/templates/simple_form_for/passwords/new.html.erb

@@ -4,7 +4,7 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :email, :required => true, :autofocus => true %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="form-actions">

lib/generators/templates/simple_form_for/registrations/edit.html.erb

@@ -5,11 +5,6 @@
 
   <div class="form-inputs">
     <%= f.input :email, :required => true, :autofocus => true %>
-
-    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-      <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
-    <% end %>
-
     <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %>
     <%= f.input :password_confirmation, :required => false %>
     <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
@@ -22,6 +17,6 @@
 
 <h3>Cancel my account</h3>
 
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.</p>
 
 <%= link_to "Back", :back %>

lib/generators/templates/simple_form_for/unlocks/new.html.erb

@@ -2,10 +2,9 @@
 
 <%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= f.error_notification %>
-  <%= f.full_error :unlock_token %>
 
   <div class="form-inputs">
-    <%= f.input :email, :required => true, :autofocus => true %>
+    <%= f.input :email, :required => true %>
   </div>
 
   <div class="form-actions">

test/controllers/helpers_test.rb

@@ -202,7 +202,7 @@ class ControllerAuthenticatableTest < ActionController::TestCase
 
   test 'sign in and redirect uses the stored location' do
     user = User.new
-    @controller.session[:user_return_to] = "/foo.bar"
+    @controller.session[:"user_return_to"] = "/foo.bar"
     @mock_warden.expects(:user).with(:user).returns(nil)
     @mock_warden.expects(:set_user).with(user, :scope => :user).returns(true)
     @controller.expects(:redirect_to).with("/foo.bar")

test/controllers/internal_helpers_test.rb

@@ -95,12 +95,6 @@ class HelpersTest < ActionController::TestCase
     assert_equal 'devise custom options', flash[:notice]
   end
 
-  test 'allows custom i18n options to override resource_name' do
-    I18n.expects(:t).with("custom_resource_name.confirmed", anything)
-    @controller.stubs(:devise_i18n_options).returns(:resource_name => "custom_resource_name")
-    @controller.send :set_flash_message, :notice, :confirmed
-  end
-
   test 'navigational_formats not returning a wild card' do
     MyController.send(:public, :navigational_formats)
     Devise.navigational_formats = [:"*/*", :html]

test/controllers/passwords_controller_test.rb

@@ -1,32 +0,0 @@
-require 'test_helper'
-
-class PasswordsControllerTest < ActionController::TestCase
-  tests Devise::PasswordsController
-  include Devise::TestHelpers
-
-  def setup
-    request.env["devise.mapping"] = Devise.mappings[:user]
-
-    @user = create_user.tap(&:confirm!)
-    @user.send_reset_password_instructions
-  end
-
-  def put_update_with_params
-    put :update, "user" => {
-      "reset_password_token" => @user.reset_password_token, "password" => "123456", "password_confirmation" => "123456"
-    }
-  end
-
-  test 'redirect to after_sign_in_path_for if after_resetting_password_path_for is not overridden' do
-    put_update_with_params
-    assert_redirected_to "http://test.host/"
-  end
-
-  test 'redirect accordingly if after_resetting_password_path_for is overridden' do
-    custom_path = "http://custom.path/"
-    Devise::PasswordsController.any_instance.stubs(:after_resetting_password_path_for).with(@user).returns(custom_path)
-
-    put_update_with_params
-    assert_redirected_to custom_path
-  end
-end

test/controllers/sessions_controller_test.rb

@@ -13,34 +13,6 @@ class SessionsControllerTest < ActionController::TestCase
     end
   end
 
-  test "#create delete the url stored in the session if the requested format is navigational" do
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    request.session["user_return_to"] = 'foo.bar'
-
-    user = create_user
-    user.confirm!
-    post :create, :user => {
-      :email => user.email,
-      :password => user.password
-    }
-
-    assert_nil request.session["user_return_to"]
-  end
-
-  test "#create doesn't delete the url stored in the session if the requested format is not navigational" do
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    request.session["user_return_to"] = 'foo.bar'
-
-    user = create_user
-    user.confirm!
-    post :create, :format => 'json', :user => {
-      :email => user.email,
-      :password => user.password
-    }
-
-    assert_equal 'foo.bar', request.session["user_return_to"]
-  end
-
   test "#create doesn't raise exception after Warden authentication fails when TestHelpers included" do
     request.env["devise.mapping"] = Devise.mappings[:user]
     post :create, :user => {
@@ -51,20 +23,6 @@ class SessionsControllerTest < ActionController::TestCase
     assert_template "devise/sessions/new"
   end
 
-  test "#destroy doesn't set the flash if the requested format is not navigational" do
-    request.env["devise.mapping"] = Devise.mappings[:user]
-    user = create_user
-    user.confirm!
-    post :create, :format => 'json', :user => {
-      :email => user.email,
-      :password => user.password
-    }
-
-    delete :destroy, :format => 'json'
-    assert flash[:notice].blank?, "flash[:notice] should be blank, not #{flash[:notice].inspect}"
-    assert_equal 204, @response.status
-  end
-
   if defined?(ActiveRecord) && ActiveRecord::Base.respond_to?(:mass_assignment_sanitizer)
     test "#new doesn't raise mass-assignment exception even if sign-in key is attr_protected" do
       request.env["devise.mapping"] = Devise.mappings[:user]
@@ -82,4 +40,4 @@ class SessionsControllerTest < ActionController::TestCase
       end
     end
   end
-end
+end

test/devise_test.rb

@@ -68,16 +68,5 @@ class DeviseTest < ActiveSupport::TestCase
     end
     assert_not Devise.secure_compare("size_1", "size_four")
   end
-
-  test 'Devise.email_regexp should match valid email addresses' do
-    valid_emails = ["test@example.com", "jo@jo.co", "f4$_m@you.com", "testing.example@example.com.ua"]
-    non_valid_emails = ["rex", "test@go,com", "test user@example.com", "test_user@example server.com"]
-
-    valid_emails.each do |email|
-      assert_match Devise.email_regexp, email
-    end
-    non_valid_emails.each do |email|
-      assert_no_match Devise.email_regexp, email
-    end
-  end
+  
 end

test/failure_app_test.rb

@@ -80,9 +80,9 @@ class FailureTest < ActiveSupport::TestCase
 
     test 'setup a default message' do
       call_failure
-      assert_match(/You are being/, @response.last.body)
-      assert_match(/redirected/, @response.last.body)
-      assert_match(/users\/sign_in/, @response.last.body)
+      assert_match /You are being/, @response.last.body
+      assert_match /redirected/, @response.last.body
+      assert_match /users\/sign_in/, @response.last.body
     end
 
     test 'works for any navigational format' do

test/generators/active_record_generator_test.rb

@@ -14,12 +14,6 @@ if DEVISE_ORM == :active_record
       assert_migration "db/migrate/devise_create_monsters.rb", /def change/
     end
 
-    test "all files for namespaced model are properly created" do
-      run_generator %w(admin/monster)
-      assert_file "app/models/admin/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
-      assert_migration "db/migrate/devise_create_admin_monsters.rb", /def change/
-    end
-
     test "update model migration when model exists" do
       run_generator %w(monster)
       assert_file "app/models/monster.rb"
@@ -72,4 +66,4 @@ if DEVISE_ORM == :active_record
       end
     end
   end
-end
+end

test/generators/views_generator_test.rb

@@ -8,17 +8,14 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
   test "Assert all views are properly created with no params" do
     run_generator
     assert_files
-    assert_shared_links
   end
 
-  test "Assert all views are properly created with scope param" do
+  test "Assert all views are properly created with scope param param" do
     run_generator %w(users)
     assert_files "users"
-    assert_shared_links "users"
 
     run_generator %w(admins)
     assert_files "admins"
-    assert_shared_links "admins"
   end
 
   test "Assert views with simple form" do
@@ -52,16 +49,4 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
     assert_file "app/views/#{scope}/shared/_links.erb"
     assert_file "app/views/#{scope}/unlocks/new.html.erb"
   end
-
-  def assert_shared_links(scope = nil)
-    scope = "devise" if scope.nil?
-    link = /<%= render \"#{scope}\/shared\/links\" %>/
-
-    assert_file "app/views/#{scope}/passwords/edit.html.erb", link
-    assert_file "app/views/#{scope}/passwords/new.html.erb", link
-    assert_file "app/views/#{scope}/confirmations/new.html.erb", link
-    assert_file "app/views/#{scope}/registrations/new.html.erb", link
-    assert_file "app/views/#{scope}/sessions/new.html.erb", link
-    assert_file "app/views/#{scope}/unlocks/new.html.erb", link
-  end
 end

test/helpers/devise_helper_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class DeviseHelperTest < ActionDispatch::IntegrationTest
+class DeviseHelperTest < ActionController::IntegrationTest
   setup do
     model_labels = { :models => { :user => "utilisateur" } }
 

test/indifferent_hash.rb

@@ -0,0 +1,33 @@
+require 'test_helper'
+
+class IndifferentHashTest < ActiveSupport::TestCase
+  setup do
+    @hash = Devise::IndifferentHash.new
+  end
+
+  test "it overwrites getter and setter" do
+    @hash[:foo] = "bar"
+    assert_equal "bar", @hash["foo"]
+    assert_equal "bar", @hash[:foo]
+
+    @hash["foo"] = "baz"
+    assert_equal "baz", @hash["foo"]
+    assert_equal "baz", @hash[:foo]
+  end
+
+  test "it overwrites update" do
+    @hash.update :foo => "bar"
+    assert_equal "bar", @hash["foo"]
+    assert_equal "bar", @hash[:foo]
+
+    @hash.update "foo" => "baz"
+    assert_equal "baz", @hash["foo"]
+    assert_equal "baz", @hash[:foo]
+  end
+
+  test "it returns a Hash on to_hash" do
+    @hash[:foo] = "bar"
+    assert_equal Hash["foo", "bar"], @hash.to_hash
+    assert_kind_of Hash, @hash.to_hash
+  end
+end if defined?(Devise::IndifferentHash)

test/integration/authenticatable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AuthenticationSanityTest < ActionDispatch::IntegrationTest
+class AuthenticationSanityTest < ActionController::IntegrationTest
   test 'home should be accessible without sign in' do
     visit '/'
     assert_response :success
@@ -134,7 +134,7 @@ class AuthenticationSanityTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
+class AuthenticationRoutesRestrictions < ActionController::IntegrationTest
   test 'not signed in should not be able to access private route (authenticate denied)' do
     get private_path
     assert_redirected_to new_admin_session_path
@@ -254,7 +254,7 @@ class AuthenticationRoutesRestrictions < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationRedirectTest < ActionDispatch::IntegrationTest
+class AuthenticationRedirectTest < ActionController::IntegrationTest
   test 'redirect from warden shows sign in or sign up message' do
     get admins_path
 
@@ -317,7 +317,7 @@ class AuthenticationRedirectTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationSessionTest < ActionDispatch::IntegrationTest
+class AuthenticationSessionTest < ActionController::IntegrationTest
   test 'destroyed account is signed out' do
     sign_in_as_user
     get '/users'
@@ -327,54 +327,28 @@ class AuthenticationSessionTest < ActionDispatch::IntegrationTest
     assert_redirected_to new_user_session_path
   end
 
-  test 'refreshes _csrf_token' do
-    ApplicationController.allow_forgery_protection = true
-
-    begin
-      get new_user_session_path
-      token = request.session[:_csrf_token]
-
-      sign_in_as_user
-      assert_not_equal request.session[:_csrf_token], token
-    ensure
-      ApplicationController.allow_forgery_protection = false
-    end
-  end
-
   test 'allows session to be set for a given scope' do
     sign_in_as_user
     get '/users'
     assert_equal "Cart", @controller.user_session[:cart]
   end
 
-  test 'does not explode when class name is still stored in session' do
-    # In order to test that old sessions do not break with the new scoped
-    # deserialization, we need to serialize the session the old way. This is
-    # done by removing the newly used scoped serialization method
-    # (#user_serialize) and bringing back the old uncsoped #serialize method
-    # that includes the record's class name in the serialization.
+  test 'does not explode when invalid user class is stored in session' do
+    klass = User
+    paths = ActiveSupport::Dependencies.autoload_paths.dup
+
     begin
-      Warden::SessionSerializer.class_eval do
-        alias_method :original_serialize, :serialize
-        alias_method :original_user_serialize, :user_serialize
-        remove_method :user_serialize
-
-        def serialize(record)
-          klass = record.class
-          array = klass.serialize_into_session(record)
-          array.unshift(klass.name)
-        end
-      end
-
       sign_in_as_user
       assert warden.authenticated?(:user)
+
+      Object.send :remove_const, :User
+      ActiveSupport::Dependencies.autoload_paths.clear
+
+      visit "/users"
+      assert_not warden.authenticated?(:user)
     ensure
-      Warden::SessionSerializer.class_eval do
-        alias_method :serialize, :original_serialize
-        remove_method :original_serialize
-        alias_method :user_serialize, :original_user_serialize
-        remove_method :original_user_serialize
-      end
+      Object.const_set(:User, klass)
+      ActiveSupport::Dependencies.autoload_paths.replace(paths)
     end
   end
 
@@ -390,7 +364,7 @@ class AuthenticationSessionTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationWithScopedViewsTest < ActionDispatch::IntegrationTest
+class AuthenticationWithScopedViewsTest < ActionController::IntegrationTest
   test 'renders the scoped view if turned on and view is available' do
     swap Devise, :scoped_views => true do
       assert_raise Webrat::NotFoundError do
@@ -431,9 +405,9 @@ class AuthenticationWithScopedViewsTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationOthersTest < ActionDispatch::IntegrationTest
+class AuthenticationOthersTest < ActionController::IntegrationTest
   test 'handles unverified requests gets rid of caches' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap UsersController, :allow_forgery_protection => true do
       post exhibit_user_url(1)
       assert_not warden.authenticated?(:user)
 
@@ -482,7 +456,7 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
     assert_match '<?xml version="1.0" encoding="UTF-8"?>', response.body
     assert_match /<user>.*<\/user>/m, response.body
     assert_match '<email></email>', response.body
-    assert_match '<password nil="true"', response.body
+    assert_match '<password nil="true"></password>', response.body
   end
 
   test 'sign in stub in json format' do
@@ -509,7 +483,7 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
 
   test 'sign in with xml format returns xml response' do
     create_user
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
@@ -519,64 +493,33 @@ class AuthenticationOthersTest < ActionDispatch::IntegrationTest
     assert_response :success
 
     create_user
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
     assert_response :success
 
     get new_user_session_path(:format => 'xml')
     assert_response :success
 
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '12345678'}
+    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
     assert_response :success
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
-  test 'sign out with html redirects' do
-    sign_in_as_user
-    get destroy_user_session_path
-    assert_response :redirect
-    assert_current_url '/'
-
-    sign_in_as_user
-    get destroy_user_session_path(:format => 'html')
-    assert_response :redirect
-    assert_current_url '/'
-  end
-
-  test 'sign out with xml format returns no content' do
+  test 'sign out with xml format returns ok response' do
     sign_in_as_user
     get destroy_user_session_path(:format => 'xml')
     assert_response :no_content
     assert_not warden.authenticated?(:user)
   end
 
-  test 'sign out with json format returns no content' do
+  test 'sign out with json format returns empty json response' do
     sign_in_as_user
     get destroy_user_session_path(:format => 'json')
     assert_response :no_content
     assert_not warden.authenticated?(:user)
   end
-
-  test 'sign out with non-navigational format via XHR does not redirect' do
-    swap Devise, :navigational_formats => ['*/*', :html] do
-      sign_in_as_user
-      xml_http_request :get, destroy_user_session_path, {}, { "HTTP_ACCEPT" => "application/json,text/javascript,*/*" } # NOTE: Bug is triggered by combination of XHR and */*.
-      assert_response :no_content
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  # Belt and braces ... Perhaps this test is not necessary?
-  test 'sign out with navigational format via XHR does redirect' do
-    swap Devise, :navigational_formats => ['*/*', :html] do
-      sign_in_as_user
-      xml_http_request :get, destroy_user_session_path, {}, { "HTTP_ACCEPT" => "text/html,*/*" }
-      assert_response :redirect
-      assert_not warden.authenticated?(:user)
-    end
-  end
 end
 
-class AuthenticationKeysTest < ActionDispatch::IntegrationTest
+class AuthenticationKeysTest < ActionController::IntegrationTest
   test 'missing authentication keys cause authentication to abort' do
     swap Devise, :authentication_keys => [:subdomain] do
       sign_in_as_user
@@ -593,7 +536,7 @@ class AuthenticationKeysTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationRequestKeysTest < ActionDispatch::IntegrationTest
+class AuthenticationRequestKeysTest < ActionController::IntegrationTest
   test 'request keys are used on authentication' do
     host! 'foo.bar.baz'
 
@@ -634,7 +577,7 @@ class AuthenticationRequestKeysTest < ActionDispatch::IntegrationTest
   end
 end
 
-class AuthenticationSignOutViaTest < ActionDispatch::IntegrationTest
+class AuthenticationSignOutViaTest < ActionController::IntegrationTest
   def sign_in!(scope)
     sign_in_as_admin(:visit => send("new_#{scope}_session_path"))
     assert warden.authenticated?(scope)
@@ -688,26 +631,3 @@ class AuthenticationSignOutViaTest < ActionDispatch::IntegrationTest
     assert warden.authenticated?(:sign_out_via_delete_or_post)
   end
 end
-
-class DoubleAuthenticationRedirectTest < ActionDispatch::IntegrationTest
-  test 'signed in as user redirects when visiting user sign in page' do
-    sign_in_as_user
-    get new_user_session_path(:format => :html)
-    assert_redirected_to '/'
-  end
-
-  test 'signed in as admin redirects when visiting admin sign in page' do
-    sign_in_as_admin
-    get new_admin_session_path(:format => :html)
-    assert_redirected_to '/admin_area/home'
-  end
-
-  test 'signed in as both user and admin redirects when visiting admin sign in page' do
-    sign_in_as_user
-    sign_in_as_admin
-    get new_user_session_path(:format => :html)
-    assert_redirected_to '/'
-    get new_admin_session_path(:format => :html)
-    assert_redirected_to '/admin_area/home'
-  end
-end

test/integration/confirmable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class ConfirmationTest < ActionDispatch::IntegrationTest
+class ConfirmationTest < ActionController::IntegrationTest
 
   def visit_user_confirmation_with_token(confirmation_token)
     visit user_confirmation_path(:confirmation_token => confirmation_token)
@@ -50,30 +50,6 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
     assert user.reload.confirmed?
   end
 
-  test 'user with valid confirmation token should not be able to confirm an account after the token has expired' do
-    swap Devise, :confirm_within => 3.days do
-      user = create_user(:confirm => false, :confirmation_sent_at => 4.days.ago)
-      assert_not user.confirmed?
-      visit_user_confirmation_with_token(user.confirmation_token)
-
-      assert_have_selector '#error_explanation'
-      assert_contain /needs to be confirmed within 3 days/
-      assert_not user.reload.confirmed?
-    end
-  end
-
-  test 'user with valid confirmation token should be able to confirm an account before the token has expired' do
-    swap Devise, :confirm_within => 3.days do
-      user = create_user(:confirm => false, :confirmation_sent_at => 2.days.ago)
-      assert_not user.confirmed?
-      visit_user_confirmation_with_token(user.confirmation_token)
-
-      assert_contain 'Your account was successfully confirmed.'
-      assert_current_url '/'
-      assert user.reload.confirmed?
-    end
-  end
-
   test 'user should be redirected to a custom path after confirmation' do
     Devise::ConfirmationsController.any_instance.stubs(:after_confirmation_path_for).returns("/?custom=1")
 
@@ -167,7 +143,7 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'resent confirmation token with invalid E-Mail in XML format should return invalid response' do
-    create_user(:confirm => false)
+    user = create_user(:confirm => false)
     post user_confirmation_path(:format => 'xml'), :user => { :email => 'invalid.test@test.com' }
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
@@ -181,7 +157,7 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 
   test 'confirm account with invalid confirmation token in XML format should return invalid response' do
-    create_user(:confirm => false)
+    user = create_user(:confirm => false)
     get user_confirmation_path(:confirmation_token => 'invalid_confirmation', :format => 'xml')
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
@@ -226,7 +202,7 @@ class ConfirmationTest < ActionDispatch::IntegrationTest
   end
 end
 
-class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
+class ConfirmationOnChangeTest < ActionController::IntegrationTest
   def create_second_admin(options={})
     @admin = nil
     create_admin(options)
@@ -264,26 +240,6 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
     assert_not admin.reload.pending_reconfirmation?
   end
 
-  test 'admin with previously valid confirmation token should not be able to confirm email after email changed again' do
-    admin = create_admin
-    admin.update_attributes(:email => 'first_test@example.com')
-    assert_equal 'first_test@example.com', admin.unconfirmed_email
-
-    confirmation_token = admin.confirmation_token
-    admin.update_attributes(:email => 'second_test@example.com')
-    assert_equal 'second_test@example.com', admin.unconfirmed_email
-
-    visit_admin_confirmation_with_token(confirmation_token)
-    assert_have_selector '#error_explanation'
-    assert_contain(/Confirmation token(.*)invalid/)
-
-    visit_admin_confirmation_with_token(admin.confirmation_token)
-    assert_contain 'Your account was successfully confirmed.'
-    assert_current_url '/admin_area/home'
-    assert admin.reload.confirmed?
-    assert_not admin.reload.pending_reconfirmation?
-  end
-
   test 'admin email should be unique also within unconfirmed_email' do
     admin = create_admin
     admin.update_attributes(:email => 'new_admin_test@example.com')
@@ -293,7 +249,7 @@ class ConfirmationOnChangeTest < ActionDispatch::IntegrationTest
 
     visit_admin_confirmation_with_token(admin.confirmation_token)
     assert_have_selector '#error_explanation'
-    assert_contain(/Email.*already.*taken/)
+    assert_contain /Email.*already.*taken/
     assert admin.reload.pending_reconfirmation?
   end
 end

test/integration/database_authenticatable_test.rb

@@ -1,46 +1,46 @@
 require 'test_helper'
 
-class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
+class DatabaseAuthenticationTest < ActionController::IntegrationTest
   test 'sign in with email of different case should succeed when email is in the list of case insensitive keys' do
     create_user(:email => 'Foo@Bar.com')
-
+    
     sign_in_as_user do
       fill_in 'email', :with => 'foo@bar.com'
     end
-
+    
     assert warden.authenticated?(:user)
   end
 
   test 'sign in with email of different case should fail when email is NOT the list of case insensitive keys' do
     swap Devise, :case_insensitive_keys => [] do
       create_user(:email => 'Foo@Bar.com')
-
+      
       sign_in_as_user do
         fill_in 'email', :with => 'foo@bar.com'
       end
-
+      
       assert_not warden.authenticated?(:user)
     end
   end
-
+  
   test 'sign in with email including extra spaces should succeed when email is in the list of strip whitespace keys' do
     create_user(:email => ' foo@bar.com ')
-
+    
     sign_in_as_user do
       fill_in 'email', :with => 'foo@bar.com'
     end
-
+    
     assert warden.authenticated?(:user)
   end
 
   test 'sign in with email including extra spaces should fail when email is NOT the list of strip whitespace keys' do
     swap Devise, :strip_whitespace_keys => [] do
       create_user(:email => 'foo@bar.com')
-
+      
       sign_in_as_user do
         fill_in 'email', :with => ' foo@bar.com '
       end
-
+      
       assert_not warden.authenticated?(:user)
     end
   end
@@ -53,14 +53,12 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
   end
 
   test 'sign in with invalid email should return to sign in form with error message' do
-    store_translations :en, :devise => { :failure => { :admin => { :not_found_in_database => 'Invalid email address' } } } do
-      sign_in_as_admin do
-        fill_in 'email', :with => 'wrongemail@test.com'
-      end
-
-      assert_contain 'Invalid email address'
-      assert_not warden.authenticated?(:admin)
+    sign_in_as_admin do
+      fill_in 'email', :with => 'wrongemail@test.com'
     end
+
+    assert_contain 'Invalid email or password'
+    assert_not warden.authenticated?(:admin)
   end
 
   test 'sign in with invalid pasword should return to sign in form with error message' do
@@ -81,4 +79,4 @@ class DatabaseAuthenticationTest < ActionDispatch::IntegrationTest
       assert_contain 'Invalid credentials'
     end
   end
-end
+end

test/integration/http_authenticatable_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
-class HttpAuthenticationTest < ActionDispatch::IntegrationTest
+class HttpAuthenticationTest < ActionController::IntegrationTest
   test 'handles unverified requests gets rid of caches but continues signed in' do
-    swap ApplicationController, :allow_forgery_protection => true do
+    swap UsersController, :allow_forgery_protection => true do
       create_user
-      post exhibit_user_url(1), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("user@test.com:12345678")}"
+      post exhibit_user_url(1), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("user@test.com:123456")}"
       assert warden.authenticated?(:user)
       assert_equal "User is authenticated", response.body
     end
@@ -62,24 +62,6 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'it uses appropriate authentication_keys when configured with hash' do
-    swap Devise, :authentication_keys => ActiveSupport::OrderedHash[:username, false, :email, false] do
-      sign_in_as_new_user_with_http("usertest")
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'it uses the appropriate key when configured explicitly' do
-    swap Devise, :authentication_keys => ActiveSupport::OrderedHash[:email, false, :username, false], :http_authentication_key => :username do
-      sign_in_as_new_user_with_http("usertest")
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert warden.authenticated?(:user)
-    end
-  end
-
   test 'test request with oauth2 header doesnt get mistaken for basic authentication' do
     swap Devise, :http_authenticatable => true do
       add_oauth2_header
@@ -100,7 +82,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
 
   private
 
-    def sign_in_as_new_user_with_http(username="user@test.com", password="12345678")
+    def sign_in_as_new_user_with_http(username="user@test.com", password="123456")
       user = create_user
       get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}"
       user
@@ -109,7 +91,7 @@ class HttpAuthenticationTest < ActionDispatch::IntegrationTest
     # Sign in with oauth2 token. This is just to test that it isn't misinterpreted as basic authentication
     def add_oauth2_header
       user = create_user
-      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:12345678")}"
+      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:123456")}"
     end
 
 end

test/integration/lockable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class LockTest < ActionDispatch::IntegrationTest
+class LockTest < ActionController::IntegrationTest
 
   def visit_user_unlock_with_token(unlock_token)
     visit user_unlock_path(:unlock_token => unlock_token)
@@ -221,22 +221,4 @@ class LockTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test "in paranoid mode, when locking a user that exists it should not say that the user was locked" do
-    swap Devise, :paranoid => true, :maximum_attempts => 1 do
-      user = create_user(:locked => false)
-
-      visit new_user_session_path
-      fill_in 'email', :with => user.email
-      fill_in 'password', :with => "abadpassword"
-      click_button 'Sign in'
-
-      fill_in 'email', :with => user.email
-      fill_in 'password', :with => "abadpassword"
-      click_button 'Sign in'
-
-      assert_current_url "/users/sign_in"
-      assert_not_contain "locked"
-    end
-  end
-
 end

test/integration/omniauthable_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 
-class OmniauthableIntegrationTest < ActionDispatch::IntegrationTest
+class OmniauthableIntegrationTest < ActionController::IntegrationTest
   FACEBOOK_INFO = {
     "id" => '12345',
     "link" => 'http://facebook.com/josevalim',
@@ -61,8 +61,8 @@ class OmniauthableIntegrationTest < ActionDispatch::IntegrationTest
 
     assert_difference "User.count" do
       visit "/users/sign_up"
-      fill_in "Password", :with => "12345678"
-      fill_in "Password confirmation", :with => "12345678"
+      fill_in "Password", :with => "123456"
+      fill_in "Password confirmation", :with => "123456"
       click_button "Sign up"
     end
 
@@ -90,7 +90,7 @@ class OmniauthableIntegrationTest < ActionDispatch::IntegrationTest
     end
 
     assert session["devise.facebook_data"]
-    sign_in_as_user
+    user = sign_in_as_user
     assert !session["devise.facebook_data"]
   end
 

test/integration/recoverable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PasswordTest < ActionDispatch::IntegrationTest
+class PasswordTest < ActionController::IntegrationTest
 
   def visit_new_password_path
     visit new_user_session_path
@@ -190,43 +190,15 @@ class PasswordTest < ActionDispatch::IntegrationTest
     assert warden.authenticated?(:user)
   end
 
-  test 'does not sign in user automatically after changing its password if it\'s locked and unlock strategy is :none or :time' do
-    [:none, :time].each do |strategy|
-      swap Devise, :unlock_strategy => strategy do
-        user = create_user(:locked => true)
-        request_forgot_password
-        reset_password :reset_password_token => user.reload.reset_password_token
+  test 'does not sign in user automatically after changing its password if it\'s locked' do
+    user = create_user(:locked => true)
+    request_forgot_password
+    reset_password :reset_password_token => user.reload.reset_password_token
 
-        assert_contain 'Your password was changed successfully.'
-        assert_not_contain 'You are now signed in.'
-        assert_equal new_user_session_path, @request.path
-        assert !warden.authenticated?(:user)
-      end
-    end
-  end
-
-  test 'unlocks and signs in locked user automatically after changing it\'s password if unlock strategy is :email' do
-    swap Devise, :unlock_strategy => :email do
-      user = create_user(:locked => true)
-      request_forgot_password
-      reset_password :reset_password_token => user.reload.reset_password_token
-
-      assert_contain 'Your password was changed successfully.'
-      assert !user.reload.access_locked?
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'unlocks and signs in locked user automatically after changing it\'s password if unlock strategy is :both' do
-    swap Devise, :unlock_strategy => :both do
-      user = create_user(:locked => true)
-      request_forgot_password
-      reset_password :reset_password_token => user.reload.reset_password_token
-
-      assert_contain 'Your password was changed successfully.'
-      assert !user.reload.access_locked?
-      assert warden.authenticated?(:user)
-    end
+    assert_contain 'Your password was changed successfully.'
+    assert_not_contain 'You are now signed in.'
+    assert_equal new_user_session_path, @request.path
+    assert !warden.authenticated?(:user)
   end
 
   test 'reset password request with valid E-Mail in XML format should return valid response' do
@@ -261,7 +233,7 @@ class PasswordTest < ActionDispatch::IntegrationTest
   end
 
   test 'change password with invalid token in XML format should return invalid response' do
-    create_user
+    user = create_user
     request_forgot_password
     put user_password_path(:format => 'xml'), :user => {:reset_password_token => 'invalid.token', :password => '987654321', :password_confirmation => '987654321'}
     assert_response :unprocessable_entity

test/integration/registerable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RegistrationTest < ActionDispatch::IntegrationTest
+class RegistrationTest < ActionController::IntegrationTest
 
   test 'a guest admin should be able to sign in successfully' do
     get new_admin_session_path
@@ -112,7 +112,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     #    https://github.com/mongoid/mongoid/issues/756
     (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
 
-    create_user
+    user = create_user
     get new_user_registration_path
 
     fill_in 'email', :with => 'user@test.com'
@@ -144,7 +144,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     get edit_user_registration_path
 
     fill_in 'email', :with => 'user.new@example.com'
-    fill_in 'current password', :with => '12345678'
+    fill_in 'current password', :with => '123456'
     click_button 'Update'
 
     assert_current_url '/'
@@ -157,9 +157,9 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => '1234567890'
-    fill_in 'password confirmation', :with => '1234567890'
-    fill_in 'current password', :with => '12345678'
+    fill_in 'password', :with => '12345678'
+    fill_in 'password confirmation', :with => '12345678'
+    fill_in 'current password', :with => '123456'
     click_button 'Update'
 
     assert_contain 'You updated your account successfully.'
@@ -186,15 +186,15 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    fill_in 'password', :with => 'pass1234'
-    fill_in 'password confirmation', :with => 'pass1234'
-    fill_in 'current password', :with => '12345678'
+    fill_in 'password', :with => 'pas123'
+    fill_in 'password confirmation', :with => 'pas123'
+    fill_in 'current password', :with => '123456'
     click_button 'Update'
 
     assert_current_url '/'
     assert_contain 'You updated your account successfully.'
 
-    assert User.first.valid_password?('pass1234')
+    assert User.first.valid_password?('pas123')
   end
 
   test 'a signed in user should not be able to edit his password with invalid confirmation' do
@@ -203,7 +203,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
 
     fill_in 'password', :with => 'pas123'
     fill_in 'password confirmation', :with => ''
-    fill_in 'current password', :with => '12345678'
+    fill_in 'current password', :with => '123456'
     click_button 'Update'
 
     assert_contain "Password doesn't match confirmation"
@@ -214,7 +214,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
     sign_in_as_user
     get edit_user_registration_path
 
-    click_button "Cancel my account"
+    click_link "Cancel my account", :method => :delete
     assert_contain "Bye! Your account was successfully cancelled. We hope to see you again soon."
 
     assert User.all.empty?
@@ -272,7 +272,7 @@ class RegistrationTest < ActionDispatch::IntegrationTest
 
   test 'a user update information with valid data in XML format should return valid response' do
     user = sign_in_as_user
-    put user_registration_path(:format => 'xml'), :user => { :current_password => '12345678', :email => 'user.new@test.com' }
+    put user_registration_path(:format => 'xml'), :user => { :current_password => '123456', :email => 'user.new@test.com' }
     assert_response :success
     assert_equal user.reload.email, 'user.new@test.com'
   end
@@ -285,14 +285,14 @@ class RegistrationTest < ActionDispatch::IntegrationTest
   end
 
   test 'a user cancel his account in XML format should return valid response' do
-    sign_in_as_user
+    user = sign_in_as_user
     delete user_registration_path(:format => 'xml')
     assert_response :success
     assert_equal User.count, 0
   end
 end
 
-class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
+class ReconfirmableRegistrationTest < ActionController::IntegrationTest
   test 'a signed in admin should see a more appropriate flash message when editing his account if reconfirmable is enabled' do
     sign_in_as_admin
     get edit_admin_registration_path
@@ -303,10 +303,8 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
 
     assert_current_url '/admin_area/home'
     assert_contain 'but we need to verify your new email address'
-    assert_equal 'admin.new@example.com', Admin.first.unconfirmed_email
 
-    get edit_admin_registration_path
-    assert_contain 'Currently waiting confirmation for: admin.new@example.com'
+    assert_equal "admin.new@example.com", Admin.first.unconfirmed_email
   end
 
   test 'a signed in admin should not see a reconfirmation message if they did not change their password' do
@@ -323,25 +321,4 @@ class ReconfirmableRegistrationTest < ActionDispatch::IntegrationTest
 
     assert Admin.first.valid_password?('pas123')
   end
-
-  test 'a signed in admin should not see a reconfirmation message if he did not change his email, despite having an unconfirmed email' do
-    sign_in_as_admin
-
-    get edit_admin_registration_path
-    fill_in 'email', :with => 'admin.new@example.com'
-    fill_in 'current password', :with => '123456'
-    click_button 'Update'
-
-    get edit_admin_registration_path
-    fill_in 'password', :with => 'pas123'
-    fill_in 'password confirmation', :with => 'pas123'
-    fill_in 'current password', :with => '123456'
-    click_button 'Update'
-
-    assert_current_url '/admin_area/home'
-    assert_contain 'You updated your account successfully.'
-
-    assert_equal "admin.new@example.com", Admin.first.unconfirmed_email
-    assert Admin.first.valid_password?('pas123')
-  end
-end
+end

test/integration/rememberable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class RememberMeTest < ActionDispatch::IntegrationTest
+class RememberMeTest < ActionController::IntegrationTest
   def create_user_and_remember(add_to_token='')
     user = create_user
     user.remember_me!
@@ -26,12 +26,12 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'do not remember the user if he has not checked remember me option' do
-    sign_in_as_user
+    user = sign_in_as_user
     assert_nil request.cookies["remember_user_cookie"]
   end
 
-  test 'handle unverified requests gets rid of caches' do
-    swap ApplicationController, :allow_forgery_protection => true do
+  test 'handles unverified requests gets rid of caches' do
+    swap UsersController, :allow_forgery_protection => true do
       post exhibit_user_url(1)
       assert_not warden.authenticated?(:user)
 
@@ -42,21 +42,9 @@ class RememberMeTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'handle unverified requests does not create cookies on sign in' do
-    swap ApplicationController, :allow_forgery_protection => true do
-      get new_user_session_path
-      assert request.session[:_csrf_token]
-
-      post user_session_path, :authenticity_token => "oops", :user =>
-           { :email => "jose.valim@gmail.com", :password => "123456", :remember_me => "1" }
-      assert_not warden.authenticated?(:user)
-      assert_not request.cookies['remember_user_token']
-    end
-  end
-
   test 'generate remember token after sign in' do
-    sign_in_as_user :remember_me => true
-    assert request.cookies['remember_user_token']
+    user = sign_in_as_user :remember_me => true
+    assert request.cookies["remember_user_token"]
   end
 
   test 'generate remember token after sign in setting cookie options' do
@@ -69,13 +57,6 @@ class RememberMeTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'generate remember token with a custom key' do
-    swap Devise, :rememberable_options => { :key => "v1lat_token" } do
-      user = sign_in_as_user :remember_me => true
-      assert request.cookies["v1lat_token"]
-    end
-  end
-
   test 'generate remember token after sign in setting session options' do
     begin
       Rails.configuration.session_options[:domain] = "omg.somewhere.com"
@@ -96,12 +77,22 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'remember the user before sign up and redirect him to his home' do
-    create_user_and_remember
+    user = create_user_and_remember
     get new_user_registration_path
     assert warden.authenticated?(:user)
     assert_redirected_to root_path
   end
 
+  test 'cookies are destroyed on unverified requests' do
+    swap ApplicationController, :allow_forgery_protection => true do
+      user = create_user_and_remember
+      get users_path
+      assert warden.authenticated?(:user)
+      post root_path, :authenticity_token => 'INVALID'
+      assert_not warden.authenticated?(:user)
+    end
+  end
+
   test 'does not extend remember period through sign in' do
     swap Devise, :extend_remember_period => true, :remember_for => 1.year do
       user = create_user
@@ -119,7 +110,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'do not remember other scopes' do
-    create_user_and_remember
+    user = create_user_and_remember
     get root_path
     assert_response :success
     assert warden.authenticated?(:user)
@@ -127,14 +118,14 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'do not remember with invalid token' do
-    create_user_and_remember('add')
+    user = create_user_and_remember('add')
     get users_path
     assert_not warden.authenticated?(:user)
     assert_redirected_to new_user_session_path
   end
 
   test 'do not remember with expired token' do
-    create_user_and_remember
+    user = create_user_and_remember
     swap Devise, :remember_for => 0 do
       get users_path
       assert_not warden.authenticated?(:user)
@@ -143,7 +134,7 @@ class RememberMeTest < ActionDispatch::IntegrationTest
   end
 
   test 'do not remember the user anymore after forget' do
-    create_user_and_remember
+    user = create_user_and_remember
     get users_path
     assert warden.authenticated?(:user)
 

test/integration/timeoutable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SessionTimeoutTest < ActionDispatch::IntegrationTest
+class SessionTimeoutTest < ActionController::IntegrationTest
 
   def last_request_at
     @controller.user_session['last_request_at']

test/integration/token_authenticatable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TokenAuthenticationTest < ActionDispatch::IntegrationTest
+class TokenAuthenticationTest < ActionController::IntegrationTest
 
   test 'authenticate with valid authentication token key and value through params' do
     swap Devise, :token_authentication_key => :secret_token do
@@ -129,46 +129,6 @@ class TokenAuthenticationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  test 'authenticate with valid authentication token key and value through http header' do
-    swap Devise, :token_authentication_key => :secret_token do
-      sign_in_as_new_user_with_token(:token_auth => true)
-
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert_equal request.env['devise.token_options'], {}
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http header, with options' do
-    swap Devise, :token_authentication_key => :secret_token, :http_authenticatable => [:token_options] do
-      signature = "**TESTSIGNATURE**"
-      sign_in_as_new_user_with_token(:token_auth => true, :token_options => {:signature => signature, :nonce => 'def'})
-
-      assert_response :success
-      assert_match '<email>user@test.com</email>', response.body
-      assert_equal request.env['devise.token_options'][:signature], signature
-      assert_equal request.env['devise.token_options'][:nonce], 'def'
-      assert warden.authenticated?(:user)
-    end
-  end
-
-  test 'authenticate with valid authentication token key and value through http header without allowing token authorization setting is denied' do
-    swap Devise, :token_authentication_key => :secret_token, :http_authenticatable => false do
-      sign_in_as_new_user_with_token(:token_auth => true)
-
-      assert_response :unauthorized
-      assert_nil warden.user(:user)
-    end
-  end
-
-  test 'does not authenticate with improper authentication token value in header' do
-    sign_in_as_new_user_with_token(:token_auth => true, :auth_token => '*** INVALID TOKEN ***')
-
-    assert_response :unauthorized
-    assert_nil warden.user(:user)
-  end
-
   private
 
     def sign_in_as_new_user_with_token(options = {})
@@ -180,10 +140,6 @@ class TokenAuthenticationTest < ActionDispatch::IntegrationTest
       if options[:http_auth]
         header = "Basic #{Base64.encode64("#{VALID_AUTHENTICATION_TOKEN}:X")}"
         get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => header
-      elsif options[:token_auth]
-        token_options = options[:token_options] || {}
-        header = ActionController::HttpAuthentication::Token.encode_credentials(options[:auth_token], token_options)
-        get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => header
       else
         visit users_path(options[:auth_token_key].to_sym => options[:auth_token])
       end

test/integration/trackable_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TrackableHooksTest < ActionDispatch::IntegrationTest
+class TrackableHooksTest < ActionController::IntegrationTest
 
   test "current and last sign in timestamps are updated on each sign in" do
     user = create_user

test/mailers/confirmation_instructions_test.rb

@@ -46,26 +46,10 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
     assert_equal ['custom@example.com'], mail.from
   end
 
-  test 'setup sender from custom mailer defaults with proc' do
-    Devise.mailer = 'Users::FromProcMailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'custom mailer renders parent mailer template' do
-    Devise.mailer = 'Users::Mailer'
-    assert_not_blank mail.body.encoded
-  end
-
   test 'setup reply to as copy from sender' do
     assert_equal ['test@example.com'], mail.reply_to
   end
 
-  test 'setup reply to as different if set in defaults' do
-    Devise.mailer = 'Users::ReplyToMailer'
-    assert_equal ['custom@example.com'], mail.from
-    assert_equal ['custom_reply_to@example.com'], mail.reply_to
-  end
-
   test 'setup subject from I18n' do
     store_translations :en, :devise => { :mailer => { :confirmation_instructions => { :subject => 'Account Confirmation' } } } do
       assert_equal 'Account Confirmation', mail.subject
@@ -79,7 +63,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match user.email, mail.body.encoded
+    assert_match /#{user.email}/, mail.body.encoded
   end
 
   test 'body should have link to confirm the account' do

test/mailers/reset_password_instructions_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class ResetPasswordInstructionsTest < ActionMailer::TestCase
+
   def setup
     setup_mailer
     Devise.mailer = 'Devise::Mailer'
@@ -48,16 +49,6 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
     assert_equal ['custom@example.com'], mail.from
   end
 
-  test 'setup sender from custom mailer defaults with proc' do
-    Devise.mailer = 'Users::FromProcMailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'custom mailer renders parent mailer template' do
-    Devise.mailer = 'Users::Mailer'
-    assert_not_blank mail.body.encoded
-  end
-
   test 'setup reply to as copy from sender' do
     assert_equal ['test@example.com'], mail.reply_to
   end
@@ -75,7 +66,7 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match user.email, mail.body.encoded
+    assert_match(/#{user.email}/, mail.body.encoded)
   end
 
   test 'body should have link to confirm the account' do

test/mailers/unlock_instructions_test.rb

@@ -49,16 +49,6 @@ class UnlockInstructionsTest < ActionMailer::TestCase
     assert_equal ['custom@example.com'], mail.from
   end
 
-  test 'setup sender from custom mailer defaults with proc' do
-    Devise.mailer = 'Users::FromProcMailer'
-    assert_equal ['custom@example.com'], mail.from
-  end
-
-  test 'custom mailer renders parent mailer template' do
-    Devise.mailer = 'Users::Mailer'
-    assert_not_blank mail.body.encoded
-  end
-
   test 'setup reply to as copy from sender' do
     assert_equal ['test@example.com'], mail.reply_to
   end
@@ -76,7 +66,7 @@ class UnlockInstructionsTest < ActionMailer::TestCase
   end
 
   test 'body should have user info' do
-    assert_match user.email, mail.body.encoded
+    assert_match(/#{user.email}/, mail.body.encoded)
   end
 
   test 'body should have link to unlock the account' do

test/models/authenticatable_test.rb

@@ -8,6 +8,6 @@ class AuthenticatableTest < ActiveSupport::TestCase
   test 'find_first_by_auth_conditions allows custom filtering parameters' do
     user = User.create!(:email => "example@example.com", :password => "123456")
     assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }), user
-    assert_nil User.find_first_by_auth_conditions({ :email => "example@example.com" }, :id => user.id.to_s.next)
+    assert_equal User.find_first_by_auth_conditions({ :email => "example@example.com" }, :id => user.id + 1), nil
   end
 end

test/models/confirmable_test.rb

@@ -104,16 +104,6 @@ class ConfirmableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should skip confirmation e-mail without confirming if skip_confirmation_notification! is invoked' do
-    user = new_user
-    user.skip_confirmation_notification!
-
-    assert_email_not_sent do
-      user.save!
-      assert !user.confirmed?
-    end
-  end
-
   test 'should find a user to send confirmation instructions' do
     user = create_user
     confirmation_user = User.send_confirmation_instructions(:email => user.email)
@@ -214,13 +204,6 @@ class ConfirmableTest < ActiveSupport::TestCase
     assert_not user.active_for_authentication?
   end
 
-  test 'should be active when we set allow_unconfirmed_access_for to nil' do
-    Devise.allow_unconfirmed_access_for = nil
-    user = create_user
-    user.confirmation_sent_at = Date.today
-    assert user.active_for_authentication?
-  end
-
   test 'should not be active without confirmation' do
     user = create_user
     user.confirmation_sent_at = nil
@@ -252,40 +235,6 @@ class ConfirmableTest < ActiveSupport::TestCase
       assert_equal "can't be blank", confirm_user.errors[:username].join
     end
   end
-
-  def confirm_user_by_token_with_confirmation_sent_at(confirmation_sent_at)
-    user = create_user
-    user.update_attribute(:confirmation_sent_at, confirmation_sent_at)
-    confirmed_user = User.confirm_by_token(user.confirmation_token)
-    assert_equal confirmed_user, user
-    user.reload.confirmed?
-  end
-
-  test 'should accept confirmation email token even after 5 years when no expiration is set' do
-    assert confirm_user_by_token_with_confirmation_sent_at(5.years.ago)
-  end
-
-  test 'should accept confirmation email token after 2 days when expiration is set to 3 days' do
-    swap Devise, :confirm_within => 3.days do
-      assert confirm_user_by_token_with_confirmation_sent_at(2.days.ago)
-    end
-  end
-
-  test 'should not accept confirmation email token after 4 days when expiration is set to 3 days' do
-    swap Devise, :confirm_within => 3.days do
-      assert_not confirm_user_by_token_with_confirmation_sent_at(4.days.ago)
-    end
-  end
-
-  test 'should generate a new token if the previous one has expired' do
-    swap Devise, :confirm_within => 3.days do
-      user = create_user
-      user.update_attribute(:confirmation_sent_at, 4.days.ago)
-      old = user.confirmation_token
-      user.resend_confirmation_token
-      assert_not_equal user.confirmation_token, old
-    end
-  end
 end
 
 class ReconfirmableTest < ActiveSupport::TestCase
@@ -311,6 +260,7 @@ class ReconfirmableTest < ActiveSupport::TestCase
     assert_nil admin.confirmation_token
   end
 
+
   test 'should regenerate confirmation token after changing email' do
     admin = create_admin
     assert admin.confirm!
@@ -326,7 +276,6 @@ class ReconfirmableTest < ActiveSupport::TestCase
     assert_email_sent "new_test@example.com" do
       assert admin.update_attributes(:email => 'new_test@example.com')
     end
-    assert_match "new_test@example.com", ActionMailer::Base.deliveries.last.body.encoded
   end
 
   test 'should not send confirmation by email after changing password' do

test/models/database_authenticatable_test.rb

@@ -1,5 +1,4 @@
 require 'test_helper'
-require 'test_models'
 require 'digest/sha1'
 
 class DatabaseAuthenticatableTest < ActiveSupport::TestCase
@@ -13,17 +12,6 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.downcase, user.email
   end
 
-  test 'should downcase case insensitive keys that refer to virtual attributes when saving' do
-    email        = 'Foo@Bar1.com'
-    confirmation = 'Foo@Bar1.com'
-    attributes   = valid_attributes(:email => email, :email_confirmation => confirmation)
-    user = UserWithVirtualAttributes.new(attributes)
-
-    assert_equal confirmation, user.email_confirmation
-    user.save!
-    assert_equal confirmation.downcase, user.email_confirmation
-  end
-
   test 'should remove whitespace from strip whitespace keys when saving' do
     # strip_whitespace_keys is set to :email by default.
     email = ' foo@bar.com '
@@ -34,36 +22,12 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.strip, user.email
   end
 
-  test "doesn't throw exception when globally configured strip_whitespace_keys are not present on a model" do
-    swap Devise, :strip_whitespace_keys => [:fake_key] do
-      assert_nothing_raised { create_user }
-    end
-  end
-
-  test "doesn't throw exception when globally configured case_insensitive_keys are not present on a model" do
-    swap Devise, :case_insensitive_keys => [:fake_key] do
-      assert_nothing_raised { create_user }
-    end
-  end
-
   test "param filter should not convert booleans and integer to strings" do
     conditions = { "login" => "foo@bar.com", "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
     conditions = Devise::ParamFilter.new([], []).filter(conditions)
     assert_equal( { "login" => "foo@bar.com", "bool1" => "true", "bool2" => "false", "fixnum" => "123", "will_be_converted" => "1..10" }, conditions)
   end
 
-  test 'param filter should filter case_insensitive_keys as insensitive' do
-    conditions = {'insensitive' => 'insensitive_VAL', 'sensitive' => 'sensitive_VAL'}
-    conditions = Devise::ParamFilter.new(['insensitive'], []).filter(conditions)
-    assert_equal( {'insensitive' => 'insensitive_val', 'sensitive' => 'sensitive_VAL'}, conditions )
-  end
-
-  test 'param filter should filter strip_whitespace_keys stripping whitespaces' do
-    conditions = {'strip_whitespace' => ' strip_whitespace_val ', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}
-    conditions = Devise::ParamFilter.new([], ['strip_whitespace']).filter(conditions)
-    assert_equal( {'strip_whitespace' => 'strip_whitespace_val', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}, conditions )
-  end
-
   test 'should respond to password and password confirmation' do
     user = new_user
     assert user.respond_to?(:password)
@@ -96,14 +60,14 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should test for a valid password' do
     user = create_user
-    assert user.valid_password?('12345678')
+    assert user.valid_password?('123456')
     assert_not user.valid_password?('654321')
   end
 
   test 'should not raise error with an empty password' do
     user = create_user
     user.encrypted_password = ''
-    assert_nothing_raised { user.valid_password?('12345678') }
+    assert_nothing_raised { user.valid_password?('123456') }
   end
 
   test 'should be an invalid password if the user has an empty password' do
@@ -118,31 +82,31 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should update password with valid current password' do
     user = create_user
-    assert user.update_with_password(:current_password => '12345678',
-      :password => 'pass4321', :password_confirmation => 'pass4321')
-    assert user.reload.valid_password?('pass4321')
+    assert user.update_with_password(:current_password => '123456',
+      :password => 'pass321', :password_confirmation => 'pass321')
+    assert user.reload.valid_password?('pass321')
   end
 
   test 'should update password with valid current password and :as option' do
     user = create_user
-    assert user.update_with_password(:current_password => '12345678',
-      :password => 'pass4321', :password_confirmation => 'pass4321', :as => :admin)
-    assert user.reload.valid_password?('pass4321')
+    assert user.update_with_password(:current_password => '123456',
+      :password => 'pass321', :password_confirmation => 'pass321', :as => :admin)
+    assert user.reload.valid_password?('pass321')
   end
 
   test 'should add an error to current password when it is invalid' do
     user = create_user
     assert_not user.update_with_password(:current_password => 'other',
-      :password => 'pass4321', :password_confirmation => 'pass4321')
-    assert user.reload.valid_password?('12345678')
+      :password => 'pass321', :password_confirmation => 'pass321')
+    assert user.reload.valid_password?('123456')
     assert_match "is invalid", user.errors[:current_password].join
   end
 
   test 'should add an error to current password when it is blank' do
     user = create_user
-    assert_not user.update_with_password(:password => 'pass4321',
-      :password_confirmation => 'pass4321')
-    assert user.reload.valid_password?('12345678')
+    assert_not user.update_with_password(:password => 'pass321',
+      :password_confirmation => 'pass321')
+    assert user.reload.valid_password?('123456')
     assert_match "can't be blank", user.errors[:current_password].join
   end
 
@@ -157,21 +121,21 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should ignore password and its confirmation if they are blank' do
     user = create_user
-    assert user.update_with_password(:current_password => '12345678', :email => "new@example.com")
+    assert user.update_with_password(:current_password => '123456', :email => "new@example.com")
     assert_equal "new@example.com", user.email
   end
 
   test 'should not update password with invalid confirmation' do
     user = create_user
-    assert_not user.update_with_password(:current_password => '12345678',
-      :password => 'pass4321', :password_confirmation => 'other')
-    assert user.reload.valid_password?('12345678')
+    assert_not user.update_with_password(:current_password => '123456',
+      :password => 'pass321', :password_confirmation => 'other')
+    assert user.reload.valid_password?('123456')
   end
 
   test 'should clean up password fields on failure' do
     user = create_user
-    assert_not user.update_with_password(:current_password => '12345678',
-      :password => 'pass4321', :password_confirmation => 'other')
+    assert_not user.update_with_password(:current_password => '123456',
+      :password => 'pass321', :password_confirmation => 'other')
     assert user.password.blank?
     assert user.password_confirmation.blank?
   end
@@ -190,29 +154,9 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should not update password without password' do
     user = create_user
-    user.update_without_password(:password => 'pass4321', :password_confirmation => 'pass4321')
-    assert !user.reload.valid_password?('pass4321')
-    assert user.valid_password?('12345678')
-  end
-
-  test 'should destroy user if current password is valid' do
-    user = create_user
-    assert user.destroy_with_password('12345678')
-    assert !user.persisted?
-  end
-
-  test 'should not destroy user with invalid password' do
-    user = create_user
-    assert_not user.destroy_with_password('other')
-    assert user.persisted?
-    assert_match "is invalid", user.errors[:current_password].join
-  end
-
-  test 'should not destroy user with blank password' do
-    user = create_user
-    assert_not user.destroy_with_password(nil)
-    assert user.persisted?
-    assert_match "can't be blank", user.errors[:current_password].join
+    user.update_without_password(:password => 'pass321', :password_confirmation => 'pass321')
+    assert !user.reload.valid_password?('pass321')
+    assert user.valid_password?('123456')
   end
 
   test 'downcase_keys with validation' do

test/models/lockable_test.rb

@@ -59,7 +59,7 @@ class LockableTest < ActiveSupport::TestCase
     assert_not user.active_for_authentication?
   end
 
-  test "should unlock a user by cleaning locked_at, failed_attempts and unlock_token" do
+  test "should unlock a user by cleaning locked_at, falied_attempts and unlock_token" do
     user = create_user
     user.lock_access!
     assert_not_nil user.reload.locked_at
@@ -232,19 +232,19 @@ class LockableTest < ActiveSupport::TestCase
       swap Devise, :lock_strategy => :failed_attempts do
         assert_same_content Devise::Models::Lockable.required_fields(User), [
          :failed_attempts,
-         :locked_at,
+         :unlock_at,
          :unlock_token
         ]
       end
     end
   end
 
-  test 'required_fields should contain only failed_attempts and locked_at when the strategies are time and failed_attempts are enabled' do
+  test 'required_fields should contain only failed_attempts and unlock_at when the strategies are time and failed_attempts are enabled' do
     swap Devise, :unlock_strategy => :time do
       swap Devise, :lock_strategy => :failed_attempts do
         assert_same_content Devise::Models::Lockable.required_fields(User), [
          :failed_attempts,
-         :locked_at
+         :unlock_at
         ]
       end
     end
@@ -260,14 +260,4 @@ class LockableTest < ActiveSupport::TestCase
       end
     end
   end
-
-  test 'should not return a locked unauthenticated message if in paranoid mode' do
-    swap Devise, :paranoid => :true do
-      user = create_user
-      user.failed_attempts = Devise.maximum_attempts + 1
-      user.lock_access!
-
-      assert_equal :invalid, user.unauthenticated_message
-    end
-  end
 end

test/models/rememberable_test.rb

@@ -57,10 +57,9 @@ class RememberableTest < ActiveSupport::TestCase
 
   test 'forget_me should not try to update resource if it has been destroyed' do
     resource = create_resource
+    resource.destroy
     resource.expects(:remember_created_at).never
     resource.expects(:save).never
-
-    resource.destroy
     resource.forget_me!
   end
 
@@ -115,7 +114,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'remember should not be expired if it was created within the limit time' do
+  test 'remember should not be expired if it was created whitin the limit time' do
     swap Devise, :remember_for => 30.days do
       resource = create_resource
       resource.remember_me!
@@ -167,7 +166,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should have the required_fields array' do
+  test 'should have the required_fiels array' do
     assert_same_content Devise::Models::Rememberable.required_fields(User), [
       :remember_created_at
     ]

test/models/serializable_test.rb

@@ -6,23 +6,22 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on XML' do
-    assert_match(/email/, @user.to_xml)
-    assert_no_match(/confirmation-token/, @user.to_xml)
+    assert_match /email/, @user.to_xml
+    assert_no_match /confirmation-token/, @user.to_xml
   end
 
   test 'should not include unsafe keys on XML even if a new except is provided' do
-    assert_no_match(/email/, @user.to_xml(:except => :email))
-    assert_no_match(/confirmation-token/, @user.to_xml(:except => :email))
+    assert_no_match /email/, @user.to_xml(:except => :email)
+    assert_no_match /confirmation-token/, @user.to_xml(:except => :email)
   end
 
   test 'should include unsafe keys on XML if a force_except is provided' do
-    assert_no_match(/<email/, @user.to_xml(:force_except => :email))
-    assert_match(/confirmation-token/, @user.to_xml(:force_except => :email))
+    assert_no_match /<email/, @user.to_xml(:force_except => :email)
+    assert_match /confirmation-token/, @user.to_xml(:force_except => :email)
   end
 
   test 'should not include unsafe keys on JSON' do
-    keys = from_json().keys.select{ |key| !key.include?("id") }
-    assert_equal %w(created_at email facebook_token updated_at username), keys.sort
+    assert_equal %w(created_at email facebook_token id updated_at username), from_json().keys.sort
   end
 
   test 'should not include unsafe keys on JSON even if a new except is provided' do