Release v3.0.4

Release 3.0.3
Release v3.0.2
2026-01-11 08:37:56 -05:00 · 2013-11-13 14:10:16 +01:00 · 2013-08-18 10:26:26 +02:00 · 2013-08-09 10:24:23 +02:00 · 2013-08-08 23:32:18 +02:00 · 2013-08-08 23:32:09 +02:00
225 changed files with 3309 additions and 6119 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,20 @@
 language: ruby
-
+script: "bundle exec rake test"
 rvm:
  - 1.9.3
  - 2.0.0
-  - 2.1
-  - 2.2
-
+env:
+  - DEVISE_ORM=mongoid
+  - DEVISE_ORM=active_record
 gemfile:
-  - gemfiles/Gemfile.rails-4.2-stable
-  - gemfiles/Gemfile.rails-4.1-stable
-  - gemfiles/Gemfile.rails-4.0-stable
-  - gemfiles/Gemfile.rails-3.2-stable
+  - gemfiles/Gemfile.rails-3.2.x
  - Gemfile
-
-matrix:
-  exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/Gemfile.rails-3.2-stable
-
 services:
  - mongodb
-
-sudo: false
-
-cache: bundler
-
-env:
-  matrix:
-    - DEVISE_ORM=mongoid
-    - DEVISE_ORM=active_record
-
-before_install: "rm ${BUNDLE_GEMFILE}.lock"
-
-before_script: "bundle update"
-
-script: "bundle exec rake test"
-
 notifications:
  email: false
-  slack:
+  campfire:
    on_success: change
    on_failure: always
-    secure: Q3M+kmude3FjisibEeeGe0wSMXgvwLH+vL7Zrx9//q4QtkfnrQ/BBMvY9KXxPEsNF+eys4YopYjTkJ8uRmeboUATW/oQ4Jrv3+u3zkIHK2sFn/Q2cQWpK5w+CbgEnHPjKYnUu34b09njXTgDlr/mqtbPqrKeZ1dLlpKXCB/q4GY=
+    rooms:
+      - secure: "TRiqvuM4i/QmRDWjUSNitE5/P91BOzDkNl53+bZjjtxcISCswZtmECWBR7n9\n3xwqCOU1o2lfohxZ32OHOj/Nj7o+90zWJfWxcv+if0hIXRiil62M5pg0lZUd\nyJ4M5VQ0lSWo5he1OUrXhSabPJeaK3B8yT/tdh+qO5yzR+vb/jc="
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,228 +1,21 @@
-### Unreleased
-
-### 3.5.8 - 2016-04-25
-
-* bug fixes
-  * Fix the e-mail confirmation instructions send when a user updates the email address from nil
-
-### 3.5.7 - 2016-04-18
-
-* bug fixes
-  * Fix the `extend_remember_period` configuration. When set to `false` it does
-    not update the cookie expiration anymore.(by @ulissesalmeida)
-
-### 3.5.6 - 2016-01-02
-
-* bug fixes
-  * Fix type coercion of the rememberable timestamp stored on cookies.
-
-### 3.5.5 - 2016-22-01
-
-* bug fixes
-  * Bring back remember_expired? implementation
-  * Ensure timeouts are not triggered if remember me is being used
-
-### 3.5.4 - 2016-18-01
-
-* bug fixes
-  * Store creation timestamps on remember cookies
-
-### 3.5.3 - 2015-12-10
-
-* bug fixes
-  * Fix password reset for records where `confirmation_required?` is disabled and
-    `confirmation_sent_at` is nil. (by @andygeers)
-  * Allow resources with no `email` field to be recoverable (and do not clear the
-    reset password token if the model was already persisted). (by @seddy, @stanhu)
-
-* enhancements
-  * Upon setting `Devise.send_password_change_notification = true` a user will receive notification when their password has been changed.
-
-### 3.5.2 - 2015-08-10
-
-* enhancements
-  * Perform case insensitive basic authorization matching
-
-* bug fixes
-  * Do not use digests for password confirmation token
-  * Fix infinite redirect in Rails 4.2 authenticated routes
-  * Autoload Devise::Encryptor to avoid errors on thread-safe mode
-
-* deprecations
-  * `config.expire_auth_token_on_timeout` was removed
-
-### 3.5.1 - 2015-05-24
-
-Note: 3.5.0 has been yanked due to a regression
-
-* security improvements
-  * Clean up reset password token whenever e-mail or password changes. thanks to George Deglin & Dennis Charles Hackethal for reporting this bug
-  * Ensure empty `authenticable_salt` cannot be used as remember token. This bug can only affect users who manually implement their own `authenticable_salt` and allow empty values as salt
-
-* enhancements
-  * The hint about minimum password length required both `@validatable` and `@minimum_password_length` variables on the views, it now uses only the latter. If you have generated the views relying on the `@validatable` variable, replace it with `@minimum_password_length`.
-  * Added an ActiveSupport load hook for `:devise_controller`. (by @nakhli)
-  * Location fragments are now preserved between requests. (by @jbourassa)
-  * Added an `after_remembered` callback for the Rememerable module. (by @BM5k)
-  * `RegistrationsController#new` and `SessionsController#new` now yields the
-    current resource. (by @mtarnovan, @deivid-rodriguez)
-  * Password length validation is now limited to 72 characters for newer apps. (by @lleger)
-  * Controllers inheriting from any Devise core controller will now use appropriate translations. The i18n scope can be overridden in `translation_scope`.
-  * Allow the user to set the length of friendly token. (by @Angelmmiguel)
-
-* bug fixes
-  * Use router_name from scope if one is available to support isolated engines. (by @cipater)
-  * Do not clean up CSRF on rememberable.
-  * Only use flash if it has been configured in failure app. (by @alex88)
-
-* deprecations
-  * `confirm!` has been deprecated in favor of `confirm`.
-  * `reset_password!` has been deprecated in favor of `reset_password`.
-  * `Devise.bcrypt` has been deprecated in favor of `Devise::Encryptor.digest`".
-
-### 3.4.1 - 2014-10-29
-
-* enhancements
-  * Devise default views now have a similar markup to Rails scaffold views. (by @udaysinghcode, @cllns)
-  * Passing `now: true` to the `set_flash_message` helper now sets the message into
-    the `flash.now` Hash. (by @hbriggs)
-* bugfixes
-  * Fixed an regression with translation of flash messages for when the `authentication_keys`
-  config is a Hash. (by @lucasmazza)
-
-### 3.4.0 - 2014-10-03
-
-* enhancements
-  * Support added for Rails 4.2. Devise now depends on the `responders` gem due
-    the extraction of the `respond_with` API from Rails. (by @lucasmazza)
-  * The Simple Form templates follow the same change from 3.3.0 by using `Log in` and adding
-    a hint about the minimum password length when `validatable` is enabled. (by @aried3r)
-  * Controller generator added as `devise:controllers SCOPE`. You can use the `-c` flag
-    to pick which controllers (`unlocks`, `confirmations`, etc) you want to generate. (by @Chun-Yang)
-  * Removed the hardcoded references for "email" in the flash messages. If you are using
-    different attributes as the `authentication_keys` they will be interpolated in the
-    messages instead. (by @timoschilling)
-* bug fix
-  * Fixed a regression where the devise generator would fail with a `ConnectionNotEstablished`
-    exception when executed inside a mountable engine. (by @lucasmazza)
-  * Ensure to return symbols in find_scope! fixing a previous regression from 3.3.0 (by @micat)
-  * Ensure all causes of failed login have the same error message (by @pjungwir)
-  * The `last_attempt_warning` now takes effect when generating the unauthenticated
-    message for your users. To keep the current behavior, this flag is now `true`
-    by default. (by @lucasmazza)
-
-### 3.3.0 - 2014-08-13
-
-* enhancements
-  * Support multiple warden configuration blocks on devise configuration. (by @rossta)
-  * Previously, when a user signed out, all remember me tokens for all sessions/browsers would be
-    invalidated, and this behavior could not be changed. This behavior is now configurable via
-    `expire_all_remember_me_on_sign_out`. The default continues to be true. (by @laurocaetano)
-  * Default email messages was updated with grammar fixes, check the diff on
-    #2906 for the updated copy (by @p-originate)
-  * Allow a resource to be found based on its encrypted password token (by @karlentwistle)
-  * Adds `devise_group`, a macro to define controller helpers for multiple mappings at once. (by @dropletzz)
-  * The default views now use `Log in` instead of `Sign in` and have a hint about the minimum password length if
-    the current scope is using the `validatable` module (by @alexsoble)
-
-* bug fix
-  * Check if there is a signed in user before executing the `SessionsController#destroy`.
-  * `SessionsController#destroy` no longer yields the `resource` to receiving block,
-    since the resource isn't loaded in the action. If you need access to the current
-    resource when overring the action use the scope helper (like `current_user`) before
-    calling `super`
-  * Serialize the `last_request_at` entry as an Integer
-  * Ensure registration controller block yields happen on failure in addition to success (by @dpehrson)
-  * Only valid paths will be stored for redirections (by @parallel588)
-
-### 3.2.4 - 2014-03-17
-
-* enhancements
-  * `bcrypt` dependency updated due https://github.com/codahale/bcrypt-ruby/pull/86.
-  * View generator now can generate specific views with the `-v` flag, like `rails g devise:views -v sessions` (by @kayline)
-
-### 3.2.3 - 2014-02-20
-
-* enhancements
-  * Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key`.
-    You can change this and use your own secret by changing the `devise.rb` initializer.
-
-* bug fix
-  * Migrations will be properly generated when using rails 4.1.0.
-
-### 3.2.2 - 2013-11-25
-
-* bug fix
-  * Ensure timeoutable works when `sign_out_all_scopes` is false (by @louman)
-  * Keep the query string when storing location (by @csexton)
-  * Require rails generator base class in devise generators
-
-### 3.2.1 - 2013-11-13
+== 3.0.4

 Security announcement: http://blog.plataformatec.com.br/2013/11/e-mail-enumeration-in-devise-in-paranoid-mode

-* enhancements
-  * Add `store_location_for` helper and ensure it is safe (by @matthewrudy and @homakov)
-  * Add `yield` around resource methods in Devise controllers (by @edelpero)
-
 * bug fix
-  * Bring `password_digest` back to fix compatibility with `devise-encryptable`
  * Avoid e-mail enumeration on sign in when in paranoid mode

-### 3.2.0 - 2013-11-06
-
-* enhancements
-  * Previously deprecated token authenticatable and insecure lookups have been removed
-  * Add a class method so you can encrypt passwords from fixtures (by @tenderlove)
-  * Send custom message when user enters invalid password and it has only one attempt
-  to enter correct password before their account will be locked (by @Lightpower)
-  * Prevent mutation of values assigned to case and whitespace santitized members (by @iamvery)
-  * Separate redirects and flash messages in `navigational_formats` and `flashing_formats` (by @ssendev)
+== 3.0.3

 * bug fix
-  * A GET to sign_in page shouldn't extend the session (by @drewish)
-  * Splat the arguments to `strong_parameters#permit` to work around a limitation in the `strong_parameters` gem (by @memberful)
-  * Omniauth now uses `mapping.fullpath` when generating routes. This means if you call `devise_for :users` inside a scope, like `scope "/api"`, the scope will now apply to the omniauth route (by @AlexanderZaytsev)
-  * Ensure timeoutable hook respects `Devise.sign_out_all_scopes` configuration
+  * Do not confirm account after reset password

-* deprecations
-  * `expire_session_data_after_sign_in!` has been deprecated in favor of `expire_data_after_sign_in!`
-
-### 3.1.1 - 2013-10-01
-
-* bug fix
-  * Improve default message which asked users to sign in even when they were already signed (by @gregates)
-  * Improve error message for when the config.secret_key is missing
-
-### 3.1.0 - 2013-09-05
-
-Security announcement: http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/
-
-* backwards incompatible changes
-  * Do not store confirmation, unlock and reset password tokens directly in the database. This means tokens previously stored in the database are no longer valid. You can reenable this temporarily by setting `config.allow_insecure_token_lookup = true` in your configuration file. It is recommended to keep this configuration set to true just temporarily in your production servers only to aid migration
-  * The Devise mailer and its views were changed to explicitly receive a token argument as `@token`. You will need to update your mailers and re-copy the views to your application with `rails g devise:views`
-  * Sanitization of parameters should be done by calling `devise_parameter_sanitizer.sanitize(:action)` instead of `devise_parameter_sanitizer.for(:action)`
-
-* deprecations
-  * Token authentication is deprecated
-
-* enhancements
-  * Better security defaults
-  * Allow easier customization of parameter sanitizer (by @alexpeattie)
-
-* bug fix
-  * Do not confirm e-mail after password reset (by @moll)
-  * Do not sign in after confirmation
-  * Do not store confirmation, unlock and reset password tokens directly in the database
-  * Do not compare directly against confirmation, unlock and reset password tokens
-  * Skip storage for cookies on unverified requests
-
-### 3.0.2 - 2013-08-09
+== 3.0.2

 * bug fix
  * Skip storage for cookies on unverified requests

-### 3.0.1 - 2013-08-02
+== 3.0.1

 Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixation-attacks-in-devise/

@@ -233,17 +26,17 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
  * When using rails 3.2, the generator adds 'attr_accessible' to the model (by @jcoyne)
  * 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.

-### 3.0.0 - 2013-07-14
+== 3.0.0

 * enhancements
  * Rails 4 and Strong Parameters compatibility (by @carlosantoniodasilva, @josevalim, @latortuga, @lucasmazza, @nashby, @rafaelfranca, @spastorino)
  * Drop support for Rails < 3.2 and Ruby < 1.9.3
-  * Enable to skip sending reconfirmation email when reconfirmable is on and `skip_confirmation_notification!` is invoked (by @tkhr)
+  * Enable to skip sending reconfirmation email when reconfirmable is on and skip_confirmation_notification! is invoked (by @tkhr)

 * bug fix
  * Errors on unlock are now properly reflected on the first `unlock_keys`

-### 2.2.4 - 2013-05-07
+== 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)
@@ -259,28 +52,25 @@ Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixat
  * Fix inheriting mailer templates from `Devise::Mailer`
  * Fix a bug when procs are used as default mailer in Devise (by @tomasv)

-* backwards incompatible changes
-  * Changes on session storage will expire all existing sessions on upgrade. For those storing the session in the DB, they can be upgraded according to this gist: https://gist.github.com/moll/6417606
-
-### 2.2.3 - 2013-01-26
+== 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/

 * bug fix
  * Require string conversion for all values

-### 2.2.2 - 2013-01-15
+== 2.2.2

 * bug fix
  * Fix bug when checking for reconfirmable in templates

-### 2.2.1 - 2013-01-11
+== 2.2.1

 * bug fix
  * Fix regression with case_insensitive_keys
  * Fix regression when password is blank when it is invalid

-### 2.2.0 - 2013-01-08
+== 2.2.0

 * backwards incompatible changes
  * `headers_for` is deprecated, customize the mailer directly instead
@@ -311,17 +101,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
  * `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.4 - 2013-08-18
-
-* bugfix
-  * Do not confirm account after reset password
-
-### 2.1.3 - 2013-01-26
-
-* bugfix
-  * Require string conversion for all values
-
-### 2.1.2 - 2012-06-19
+== 2.1.2

 * enhancements
  * Handle backwards incompatibility between Rails 3.2.6 and Thor 0.15.x
@@ -329,7 +109,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
 * bug fix
  * Fix regression on strategy validation on previous release

-### 2.1.1 - 2012-06-15 (yanked)
+== 2.1.1 (yanked)

 * enhancements
  * `sign_out_all_scopes` now locks warden and does not allow new logins in the same action
@@ -346,7 +126,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
 * deprecations
  * Strategy#validate() no longer validates nil resources

-### 2.1.0 - 2012-05-15
+== 2.1.0

 * enhancements
  * Add `check_fields!(model_class)` method on Devise::Models to check if the model includes the fields that Devise uses
@@ -373,7 +153,7 @@ Security announcement: http://blog.plataformatec.com.br/2013/01/security-announc
  * Return `head :no_content` in SessionsController now that most JS libraries handle it (by @julianvargasalvarez)
  * Reverted moving devise/shared/_links.erb to devise/_links.erb

-### 2.0.4 - 2012-02-17
+== 2.0.4

 Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0

@@ -381,7 +161,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix when :host is used with devise_for  (by @mreinsch)
  * Fix a regression that caused Warden to be initialized too late

-### 2.0.3 - 2012-06-16 (yanked)
+== 2.0.3 (yanked)

 * bug fix
  * Ensure warning is not shown by mistake on apps with mounted engines
@@ -389,7 +169,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure serializable_hash does not depend on accessible attributes
  * Ensure that timeout callback does not run on sign out action

-### 2.0.2 - 2012-02-14
+== 2.0.2

 * enhancements
  * Add devise_i18n_options to customize I18n message
@@ -401,7 +181,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Show a warning in case someone gives a pluralized name to devise generator
  * Fix test behavior for rspec subject requests (by @sj26)

-### 2.0.1 - 2012-02-09
+== 2.0.1

 * enhancements
  * Improved error messages on deprecation warnings
@@ -410,7 +190,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Removed tmp and log files from gem

-### 2.0.0 - 2012-01-26
+== 2.0.0

 * enhancements
  * Add support for e-mail reconfirmation on change (by @Mandaryn and @heimidal)
@@ -436,14 +216,14 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Deprecated support to devise.registrations.reasons and devise.registrations.inactive_signed_up in favor of devise.registrations.signed_up_but_*
  * Protected method render_with_scope was removed.

-### 1.5.3 - 2011-12-19
+== 1.5.3

 * bug fix
  * Ensure delegator converts scope to symbol (by @dmitriy-kiriyenko)
  * Ensure passing :format => false to devise_for is not permanent
  * Ensure path checker does not check invalid routes

-### 1.5.2 - 2011-11-30
+== 1.5.2

 * enhancements
  * Add support for Rails 3.1 new mass assignment conventions (by @kirs)
@@ -452,12 +232,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * OmniAuth error message now shows the proper option (:strategy_class instead of :klass)

-### 1.5.1 - 2011-11-22
+== 1.5.1

 * bug fix
  * Devise should not attempt to load OmniAuth strategies. Strategies should be loaded before hand by the developer or explicitly given to Devise.

-### 1.5.0 - 2011-11-13
+== 1.5.0

 * enhancements
  * Timeoutable also skips tracking if skip_trackable is given
@@ -478,12 +258,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * redirect_location is deprecated, please use after_sign_in_path_for
  * after_sign_in_path_for now redirects to session[scope_return_to] if any value is stored in it

-### 1.4.9 - 2011-10-19
+== 1.4.9

 * bug fix
  * url helpers were not being set under some circumstances

-### 1.4.8 - 2011-10-09
+== 1.4.8

 * enhancements
  * Add docs for assets pipeline and Heroku
@@ -491,12 +271,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * confirmation_url was not being set under some circumstances

-### 1.4.7 - 2011-09-21
+== 1.4.7

 * bug fix
  * Fix backward incompatible change from 1.4.6 for those using custom controllers

-### 1.4.6 - 2011-09-19 (yanked)
+== 1.4.6 (yanked)

 * enhancements
  * Allow devise_for :skip => :all
@@ -504,7 +284,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow --skip-routes to devise generator
  * Add allow_params_authentication! to make it explicit when params authentication is allowed in a controller

-### 1.4.5 - 2011-09-07
+== 1.4.5

 * bug fix
  * Failure app tries the root path if a session one does not exist
@@ -512,12 +292,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Reset password shows proper message if user is not active
  * `clean_up_passwords` sets the accessors to nil to skip validations

-### 1.4.4 - 2011-08-30
+== 1.4.4

 * bug fix
  * Do not always skip helpers, instead provide :skip_helpers as option to trigger it manually

-### 1.4.3 - 2011-08-29
+== 1.4.3

 * enhancements
  * Improve Rails 3.1 compatibility
@@ -533,12 +313,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecations
  * Loosened the used email regexp to simply assert the existent of "@". If someone relies on a more strict regexp, they may use https://github.com/SixArm/sixarm_ruby_email_address_validation

-### 1.4.2 - 2011-06-30
+== 1.4.2

 * bug fix
  * Provide a more robust behavior to serializers and add :force_except option

-### 1.4.1 - 2011-06-29
+== 1.4.1

 * enhancements
  * Add :defaults and :format support on router
@@ -549,10 +329,10 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure to_xml is properly white listened
  * Ensure handle_unverified_request clean up any cached signed-in user

-### 1.4.0 - 2011-06-23
+== 1.4.0

 * enhancements
-  * Added authenticated and unauthenticated to the router to route the used based on their status (by @sj26)
+  * Added authenticated and unauthenticated to the router to route the used based on his status (by @sj26)
  * Improve e-mail regexp (by @rodrigoflores)
  * Add strip_whitespace_keys and default to e-mail (by @swrobel)
  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by @Thibaut)
@@ -561,28 +341,28 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.

 * bug fix
  * password_required? should not affect length validation
-  * User cannot access sign up and similar pages if they are already signed in through a cookie or token
+  * User cannot access sign up and similar pages if he is already signed in through a cookie or token
  * Do not convert booleans to strings on finders (by @xavier)
  * Run validations even if current_password fails (by @crx)
  * Devise now honors routes constraints (by @macmartine)
  * Do not return the user resource when requesting instructions (by @rodrigoflores)

-### 1.3.4 - 2011-04-28
+== 1.3.4

 * bug fix
  * Do not add formats if html or "*/*"

-### 1.3.3 - 2011-04-20
+== 1.3.3

 * bug fix
  * Explicitly mark the token as expired if so

-### 1.3.2 - 2011-04-20
+== 1.3.2

 * bug fix
  * Fix another regression related to reset_password_sent_at (by @alexdreher)

-### 1.3.1 - 2011-04-18
+== 1.3.1

 * enhancements
  * Improve failure_app responses (by @indirect)
@@ -591,7 +371,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fix a regression that occurred if reset_password_sent_at is not present (by @stevehodgkiss)

-### 1.3.0 - 2011-04-15
+== 1.3.0

 * enhancements
  * All controllers can now handle different mime types than html using Responders (by @sikachu)
@@ -611,19 +391,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * backward incompatible changes
  * authentication_keys are no longer considered when creating the e-mail validations, the previous behavior was buggy. You must double check if you were relying on such behavior.

-### 1.2.1 - 2011-03-27
+== 1.2.1

 * enhancements
  * Improve update path messages

-### 1.2.0 - 2011-03-24
+== 1.2.0

 * bug fix
  * Properly ignore path prefix on omniauthable
  * Faster uniqueness queries
  * Rename active? to active_for_authentication? to avoid conflicts

-### 1.2.rc2 - 2011-03-10
+== 1.2.rc2

 * enhancements
  * Make friendly_token 20 chars long
@@ -653,7 +433,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Removed --haml and --slim view templates
  * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode

-### 1.2.rc - 2010-10-25
+== 1.2.rc

 * deprecations
  * cookie_domain is deprecated in favor of cookie_options
@@ -669,10 +449,10 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by @rymai)
  * Extracted encryptors into :encryptable for better bcrypt support
  * :rememberable is now able to use salt as token if no remember_token is provided
-  * Store the salt in session and expire the session if the user changes their password
+  * Store the salt in session and expire the session if the user changes his password
  * Allow :stateless_token to be set to true avoiding users to be stored in session through token authentication
  * cookie_options uses session_options values by default
-  * Sign up now checks if the user is active or not and redirect them accordingly, setting the inactive_signed_up message
+  * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
  * Use ActiveModel#to_key instead of #id
  * sign_out_all_scopes now destroys the whole session
  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by @adahl)
@@ -691,13 +471,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Ensure namespaces has proper scoped views
  * Ensure Devise does not set empty flash messages (by @sxross)

-### 1.1.6 - 2011-02-14
+== 1.1.6

 * Use a more secure e-mail regexp
 * Implement Rails 3.0.4 handle unverified request
 * Use secure_compare to compare passwords

-### 1.1.5 - 2010-11-26
+== 1.1.5

 * bugfix
  * Ensure to convert keys on indifferent hash
@@ -705,12 +485,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * defaults
  * Set config.http_authenticatable to false to avoid confusion

-### 1.1.4 - 2010-11-25
+== 1.1.4

 * bugfix
  * Avoid session fixation attacks

-### 1.1.3 - 2010-09-23
+== 1.1.3

 * bugfix
  * Add reply-to to e-mail headers by default
@@ -721,17 +501,17 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by @bensie)
  * :default options is now honored in migrations

-### 1.1.2 - 2010-08-25
+== 1.1.2

 * bugfix
  * Compatibility with latest Rails routes schema

-### 1.1.1 - 2010-07-26
+== 1.1.1

 * bugfix
  * Fix a small bug where generated locale file was empty on devise:install

-### 1.1.0 - 2010-07-25
+== 1.1.0

 * enhancements
  * Rememberable module allows user to be remembered across browsers and is enabled by default (by @trevorturk)
@@ -751,7 +531,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecations
  * use_default_scope is deprecated and has no effect. Use :as or :devise_scope in the router instead

-### 1.1.rc2 - 2010-06-22
+== 1.1.rc2

 * enhancements
  * Allow to set cookie domain for the remember token. (by @mantas)
@@ -769,7 +549,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * devise.mailer.user.confirmations_instructions now should be devise.mailer.confirmations_instructions.user_subject
  * Generators now use Rails 3 syntax (devise:install) instead of devise_install

-### 1.1.rc1 - 2010-04-14
+== 1.1.rc1

 * enhancements
  * Rails 3 compatibility
@@ -801,7 +581,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * All messages under devise.sessions, except :signed_in and :signed_out, should be moved to devise.failure
  * :as and :scope in routes is deprecated. Use :path and :singular instead

-### 1.0.8 - 2010-06-22
+== 1.0.8

 * enhancements
  * Support for latest MongoMapper
@@ -810,7 +590,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * confirmation_required? is properly honored on active? calls. (by @paulrosania)

-### 1.0.7 - 2010-05-02
+== 1.0.7

 * bug fix
  * Ensure password confirmation is always required
@@ -819,14 +599,14 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * authenticatable was deprecated and renamed to database_authenticatable
  * confirmable is not included by default on generation

-### 1.0.6 - 2010-04-02
+== 1.0.6

 * bug fix
  * Do not allow unlockable strategies based on time to access a controller.
  * Do not send unlockable email several times.
  * Allow controller to upstram custom! failures to Warden.

-### 1.0.5 - 2010-03-25
+== 1.0.5

 * bug fix
  * Use prepend_before_filter in require_no_authentication.
@@ -834,19 +614,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fix a bug when giving an association proxy to devise.
  * Do not use lock! on lockable since it's part of ActiveRecord API.

-### 1.0.4 - 2010-03-02
+== 1.0.4

 * bug fix
  * Fixed a bug when deleting an account with rememberable
  * Fixed a bug with custom controllers

-### 1.0.3 - 2010-02-22
+== 1.0.3

 * enhancements
  * HTML e-mails now have proper formatting
  * Do not remove MongoMapper options in find

-### 1.0.2 - 2010-02-17
+== 1.0.2

 * enhancements
  * Allows you set mailer content type (by @glennr)
@@ -854,7 +634,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Uses the same content type as request on http authenticatable 401 responses

-### 1.0.1 - 2010-02-16
+== 1.0.1

 * enhancements
  * HttpAuthenticatable is not added by default automatically.
@@ -863,7 +643,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fixed encryptors autoload

-### 1.0.0 - 2010-02-08
+== 1.0.0

 * deprecation
  * :old_password in update_with_password is deprecated, use :current_password instead
@@ -872,9 +652,9 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added Registerable
  * Added Http Basic Authentication support
  * Allow scoped_views to be customized per controller/mailer class
-  * Allow authenticatable to used in change_table statements
+  * [#99] Allow authenticatable to used in change_table statements

-### 0.9.2 - 2010-02-04
+== 0.9.2

 * bug fix
  * Ensure inactive user cannot sign in
@@ -884,13 +664,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added gemspec to repo
  * Added token authenticatable (by @grimen)

-### 0.9.1 - 2010-01-24
+== 0.9.1

 * bug fix
  * Allow bigger salt size (by @jgeiger)
  * Fix relative url root

-### 0.9.0 - 2010-01-20
+== 0.9.0

 * deprecation
  * devise :all is deprecated
@@ -907,7 +687,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Accept path prefix not starting with slash
  * url helpers should rely on find_scope!

-### 0.8.2 - 2010-01-12
+== 0.8.2

 * enhancements
  * Allow Devise.mailer_sender to be a proc (by @grimen)
@@ -915,7 +695,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Fix bug with passenger, update is required to anyone deploying on passenger (by @dvdpalm)

-### 0.8.1 - 2010-01-07
+== 0.8.1

 * enhancements
  * Move salt to encryptors
@@ -925,7 +705,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * bug fix
  * Bcrypt generator was not being loaded neither setting the proper salt

-### 0.8.0 - 2010-01-06
+== 0.8.0

 * enhancements
  * Warden 0.8.0 compatibility
@@ -939,19 +719,19 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
 * deprecation
  * Removed DeviseMailer.sender

-### 0.7.5 - 2010-01-01
+== 0.7.5

 * enhancements
  * Set a default value for mailer to avoid find_template issues
  * Add models configuration to MongoMapper::EmbeddedDocument as well

-### 0.7.4 - 2009-12-21
+== 0.7.4

 * enhancements
  * Extract Activatable from Confirmable
  * Decouple Serializers from Devise modules

-### 0.7.3 - 2009-12-15
+== 0.7.3

 * bug fix
  * Give scope to the proper model validation
@@ -961,7 +741,7 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added update_with_password for authenticatable
  * Allow render_with_scope to accept :controller option

-### 0.7.2 - 2009-12-14
+== 0.7.2

 * deprecation
  * Renamed reset_confirmation! to resend_confirmation!
@@ -971,12 +751,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Fixed render_with_scope to work with all controllers
  * Allow sign in with two different users in Devise::TestHelpers

-### 0.7.1 - 2009-12-09
+== 0.7.1

 * enhancements
  * Small enhancements for other plugins compatibility (by @grimen)

-### 0.7.0 - 2009-12-08
+== 0.7.0

 * deprecations
  * :authenticatable is not included by default anymore
@@ -985,25 +765,25 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Improve loading process
  * Extract SessionSerializer from Authenticatable

-### 0.6.3 - 2009-12-02
+== 0.6.3

 * bug fix
  * Added trackable to migrations
  * Allow inflections to work

-### 0.6.2 - 2009-11-25
+== 0.6.2

 * enhancements
  * More DataMapper compatibility
  * Devise::Trackable - track sign in count, timestamps and ips

-### 0.6.1 - 2009-11-24
+== 0.6.1

 * enhancements
  * Devise::Timeoutable - timeout sessions without activity
  * DataMapper now accepts conditions

-### 0.6.0 - 2009-11-22
+== 0.6.0

 * deprecations
  * :authenticatable is still included by default, but yields a deprecation warning
@@ -1012,57 +792,57 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Added DataMapper support
  * Remove store_location from authenticatable strategy and add it to failure app
  * Allow a strategy to be placed after authenticatable
-  * Do not rely attribute? methods, since they are not added on Datamapper
+  * [#45] Do not rely attribute? methods, since they are not added on Datamapper

-### 0.5.6 - 2009-11-21
+== 0.5.6

 * enhancements
-  * Do not send nil to build (DataMapper compatibility)
-  * Allow to have scoped views
+  * [#42] Do not send nil to build (DataMapper compatibility)
+  * [#44] Allow to have scoped views

-### 0.5.5 - 2009-11-20
+== 0.5.5

 * enhancements
  * Allow overwriting find for authentication method
-  * Remove Ruby 1.8.7 dependency
+  * [#38] Remove Ruby 1.8.7 dependency

-### 0.5.4 - 2009-11-19
+== 0.5.4

 * deprecations
  * Deprecate :singular in devise_for and use :scope instead

 * enhancements
-  * Create after_sign_in_path_for and after_sign_out_path_for hooks to be
+  * [#37] Create after_sign_in_path_for and after_sign_out_path_for hooks to be
    overwriten in ApplicationController
  * Create sign_in_and_redirect and sign_out_and_redirect helpers
  * Warden::Manager.default_scope is automatically configured to the first given scope

-### 0.5.3 - 2009-11-18
+== 0.5.3

 * bug fix
  * MongoMapper now converts DateTime to Time
  * Ensure all controllers are unloadable

 * enhancements
-  * Moved friendly_token to Devise
+  * [#35] Moved friendly_token to Devise
  * Added Devise.all, so you can freeze your app strategies
  * Added Devise.apply_schema, so you can turn it to false in Datamapper or MongoMapper
    in cases you don't want it be handlded automatically

-### 0.5.2 - 2009-11-17
+== 0.5.2

 * enhancements
-  * Improved sign_in and sign_out helpers to accepts resources
-  * Added stored_location_for as a helper
-  * Added test helpers
+  * [#28] Improved sign_in and sign_out helpers to accepts resources
+  * [#28] Added stored_location_for as a helper
+  * [#20] Added test helpers

-### 0.5.1 - 2009-11-15
+== 0.5.1

 * enhancements
  * Added serializers based on Warden ones
  * Allow authentication keys to be set

-### 0.5.0 - 2009-11-13
+== 0.5.0

 * bug fix
  * Fixed a bug where remember me module was not working properly
@@ -1072,13 +852,13 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by @mhfs)
  * Added support for MongoMapper (by @shingara)

-### 0.4.3 - 2009-11-10
+== 0.4.3

 * bug fix
-  * Authentication just fails if user cannot be serialized from session, without raising errors;
+  * [#29] Authentication just fails if user cannot be serialized from session, without raising errors;
  * Default configuration values should not overwrite user values;

-### 0.4.2 - 2009-11-06
+== 0.4.2

 * deprecations
  * Renamed mail_sender to mailer_sender
@@ -1090,12 +870,12 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Allow :path_prefix to be given to devise_for
  * Allow default_url_options to be configured through devise (:path_prefix => "/:locale" is now supported)

-### 0.4.1 - 2009-11-04
+== 0.4.1

 * bug fix
-  * Ensure options can be set even if models were not loaded
+  * [#21] Ensure options can be set even if models were not loaded

-### 0.4.0 - 2009-11-03
+== 0.4.0

 * deprecations
  * Notifier is deprecated, use DeviseMailer instead. Remember to rename
@@ -1104,52 +884,52 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * :authenticable calls are deprecated, use :authenticatable instead

 * enhancements
-  * Allow devise to be more agnostic and do not require ActiveRecord to be loaded
+  * [#16] Allow devise to be more agnostic and do not require ActiveRecord to be loaded
  * Allow Warden::Manager to be configured through Devise
  * Created a generator which creates an initializer

-### 0.3.0 - 2009-10-30
+== 0.3.0

 * bug fix
-  * Allow yml messages to be configured by not using engine locales
+  * [#15] Allow yml messages to be configured by not using engine locales

 * deprecations
  * Renamed confirm_in to confirm_within
-  * Do not send confirmation messages when user changes their e-mail
-  * Renamed authenticable to authenticatable and added deprecation warnings
+  * [#14] Do not send confirmation messages when user changes his e-mail
+  * [#13] Renamed authenticable to authenticatable and added deprecation warnings

-### 0.2.3 - 2009-10-29
+== 0.2.3

 * enhancements
  * Ensure fail! works inside strategies
-  * Make unauthenticated message (when you haven't signed in) different from invalid message
+  * [#12] Make unauthenticated message (when you haven't signed in) different from invalid message

 * bug fix
  * Do not redirect on invalid authenticate
  * Allow model configuration to be set to nil

-### 0.2.2 - 2009-10-28
+== 0.2.2

 * bug fix
-  * Fix a bug when using customized resources
+  * [#9] Fix a bug when using customized resources

-### 0.2.1 - 2009-10-27
+== 0.2.1

 * refactor
  * Clean devise_views generator to use devise existing views

 * enhancements
-  * Create instance variables (like @user) for each devise controller
+  * [#7] Create instance variables (like @user) for each devise controller
  * Use Devise::Controller::Helpers only internally

 * bug fix
-  * Fix a bug with Mongrel and Ruby 1.8.6
+  * [#6] Fix a bug with Mongrel and Ruby 1.8.6

-### 0.2.0 - 2009-10-24
+== 0.2.0

 * enhancements
-  * Allow option :null => true in authenticable migration
-  * Remove attr_accessible calls from devise modules
+  * [#4] Allow option :null => true in authenticable migration
+  * [#3] Remove attr_accessible calls from devise modules
  * Customizable time frame for rememberable with :remember_for config
  * Customizable time frame for confirmable with :confirm_in config
  * Generators for creating a resource and copy views
@@ -1158,14 +938,14 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Do not load hooks or strategies if they are not used

 * bug fixes
-  * Fixed requiring devise strategies
+  * [#2] Fixed requiring devise strategies

-### 0.1.1 - 2009-10-21
+== 0.1.1

 * bug fixes
-  * Fixed requiring devise mapping
+  * [#1] Fixed requiring devise mapping

-### 0.1.0 - 2009-10-21
+== 0.1.0

 * Devise::Authenticable
 * Devise::Confirmable
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,22 +0,0 @@
-# Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses, without explicit permission
-* Other unethical or unprofessional conduct.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by sending an email to [conduct@plataformatec.com.br](conduct@plataformatec.com.br) or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,15 +1,13 @@
 ### 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).
+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 [opensource@plataformatec.com.br](mailto:opensource@plataformatec.com.br) instead.
+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.

-5) Notice that all of your interactions in the project are expected to follow our [Code of Conduct](CODE_OF_CONDUCT.md)
-
 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.

--- a/16
+++ b/16
@@ -2,16 +2,16 @@ source "https://rubygems.org"

 gemspec

-gem "rails", "4.2.2"
-gem "omniauth", "~> 1.2.0"
-gem "omniauth-oauth2", "~> 1.1.0"
+gem "rails", "~> 4.0.0"
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
+  gem "webrat", "0.7.3", :require => false
+  gem "mocha", "~> 0.13.1", :require => false
 end

 platforms :jruby do
@@ -24,6 +24,8 @@ platforms :ruby do
  gem "sqlite3"
 end

-group :mongoid do
-  gem "mongoid", "~> 4.0"
+platforms :mri_19, :mri_20 do
+  group :mongoid do
+    gem "mongoid", github: "mongoid/mongoid", branch: "master"
+  end
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,159 +1,138 @@
+GIT
+  remote: git://github.com/mongoid/mongoid.git
+  revision: fe7f43430580860db6d1d89cea27eda24ab60ab1
+  branch: master
+  specs:
+    mongoid (4.0.0)
+      activemodel (~> 4.0.0.rc1)
+      moped (~> 1.4.2)
+      origin (~> 1.0)
+      tzinfo (~> 0.3.22)
+
 PATH
  remote: .
  specs:
-    devise (3.5.8)
-      bcrypt (~> 3.0)
+    devise (3.0.4)
+      bcrypt-ruby (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
      warden (~> 1.2.3)

 GEM
  remote: https://rubygems.org/
  specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.2)
-      activesupport (= 4.2.2)
-      builder (~> 3.1)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.2)
-      activesupport (= 4.2.2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
-      builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
-      arel (~> 6.0)
-    activesupport (4.2.2)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arel (6.0.0)
-    bcrypt (3.1.11)
-    bson (3.1.2)
-    builder (3.2.2)
-    connection_pool (2.2.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.10)
+    bcrypt-ruby (3.1.2)
+    builder (3.1.4)
    erubis (2.7.0)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.3.5)
-      activesupport (>= 4.1.0)
-    hashie (3.4.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    jwt (1.4.1)
-    loofah (2.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.7.0)
-    mocha (1.1.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    hashie (1.2.0)
+    hike (1.2.3)
+    httpauth (0.2.0)
+    i18n (0.6.4)
+    json (1.7.7)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.23)
+    minitest (4.7.5)
+    mocha (0.13.3)
      metaclass (~> 0.0.1)
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.6)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.11.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
+    moped (1.4.5)
+    multi_json (1.7.7)
+    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.2.2)
-      hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (1.6.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
-      omniauth (~> 1.2)
+    omniauth (1.0.3)
+      hashie (~> 1.2)
+      rack
+    omniauth-facebook (1.4.0)
+      omniauth-oauth2 (~> 1.0.2)
+    omniauth-oauth2 (1.0.3)
+      oauth2 (~> 0.8.0)
+      omniauth (~> 1.0)
    omniauth-openid (1.0.1)
      omniauth (~> 1.0)
      rack-openid (~> 1.3.1)
-    optionable (0.2.0)
-    origin (2.1.1)
-    orm_adapter (0.5.0)
-    rack (1.6.2)
+    origin (1.1.0)
+    orm_adapter (0.4.0)
+    polyglot (0.3.3)
+    rack (1.5.2)
    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
+    rack-test (0.6.2)
      rack (>= 1.0)
-    rails (4.2.2)
-      actionmailer (= 4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
-      activemodel (= 4.2.2)
-      activerecord (= 4.2.2)
-      activesupport (= 4.2.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
      rake (>= 0.8.7)
      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    responders (2.1.2)
-      railties (>= 4.2.0, < 5.1)
-    ruby-openid (2.7.0)
-    sprockets (3.2.0)
+    rake (10.1.0)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    ruby-openid (2.2.3)
+    sprockets (2.10.0)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
      rack (~> 1.0)
-    sprockets-rails (2.3.1)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    warden (1.2.6)
+      sprockets (~> 2.8)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.14)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    warden (1.2.3)
      rack (>= 1.0)
    webrat (0.7.3)
      nokogiri (>= 1.2.0)
@@ -168,16 +147,13 @@ DEPENDENCIES
  activerecord-jdbcsqlite3-adapter
  devise!
  jruby-openssl
-  mocha (~> 1.1)
-  mongoid (~> 4.0)
-  omniauth (~> 1.2.0)
+  mocha (~> 0.13.1)
+  mongoid!
+  omniauth (~> 1.0.0)
  omniauth-facebook
-  omniauth-oauth2 (~> 1.1.0)
+  omniauth-oauth2 (~> 1.0.0)
  omniauth-openid (~> 1.0.1)
-  rails (= 4.2.2)
+  rails (~> 4.0.0)
  rdoc
  sqlite3
  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.11.2
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2009-2015 Plataformatec. http://plataformatec.com.br
+Copyright 2009-2013 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
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@

 By [Plataformatec](http://plataformatec.com.br/).

-[![Build Status](https://api.travis-ci.org/plataformatec/devise.svg?branch=master)](http://travis-ci.org/plataformatec/devise)
-[![Code Climate](https://codeclimate.com/github/plataformatec/devise.svg)](https://codeclimate.com/github/plataformatec/devise)
-[![Security](https://hakiri.io/github/plataformatec/devise/master.svg)](https://hakiri.io/github/plataformatec/devise/master)
+[![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)

 This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).

@@ -13,22 +13,23 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 * Is Rack based;
 * Is a complete MVC solution based on Rails engines;
 * Allows you to have multiple models signed in at the same time;
-* Is based on a modularity concept: use only what you really need.
+* Is based on a modularity concept: use just what you really need.

-It's composed of 10 modules:
+It's composed of 11 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.
-* [Omniauthable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Omniauthable): adds OmniAuth (https://github.com/intridea/omniauth) support.
+* [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.
+* [Omniauthable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Omniauthable): adds Omniauth (https://github.com/intridea/omniauth) support;
 * [Confirmable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Confirmable): sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
 * [Recoverable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Recoverable): resets the user password and sends reset instructions.
 * [Registerable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Registerable): handles signing up users through a registration process, also allowing them to edit and destroy their account.
 * [Rememberable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Rememberable): manages generating and clearing a token for remembering the user from a saved cookie.
 * [Trackable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Trackable): tracks sign in count, timestamps and IP address.
-* [Timeoutable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Timeoutable): expires sessions that have not been active in a specified period of time.
+* [Timeoutable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Timeoutable): expires sessions that have no activity in a specified period of time.
 * [Validatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
 * [Lockable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.

-Devise is guaranteed to be thread-safe on YARV. Thread-safety support on JRuby is in progress.
+Devise is guaranteed to be thread-safe on YARV. Thread-safety support on JRuby is on progress.

 ## Information

@@ -36,7 +37,7 @@ Devise is guaranteed to be thread-safe on YARV. Thread-safety support on JRuby i

 The Devise Wiki has lots of additional information about Devise including many "how-to" articles and answers to the most frequently asked questions. Please browse the Wiki after finishing this README:

-https://github.com/plataformatec/devise/wiki
+https://wiki.github.com/plataformatec/devise

 ### Bug reports

@@ -44,7 +45,7 @@ If you discover a problem with Devise, we would like to know about it. However,

 https://github.com/plataformatec/devise/wiki/Bug-reports

-If you have discovered a security related bug, please do *NOT* use the GitHub issue tracker. Send an email to opensource@plataformatec.com.br.
+If you found a security bug, do *NOT* use the GitHub issue tracker. Send an email to the maintainers listed at the bottom of the README.

 ### Mailing list

@@ -82,13 +83,12 @@ You will usually want to write tests for your changes.  To run the test suite, g

 ## Starting with Rails?

-If you are building your first Rails application, we recommend you *do not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch. Today, we have three resources that should help you get started:
+If you are building your first Rails application, we recommend you to *not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch, today we have two resources:

-* Michael Hartl's online book: https://www.railstutorial.org/book/modeling_users
+* Michael Hartl's online book: http://railstutorial.org/chapters/modeling-and-viewing-users-two#top
 * Ryan Bates' Railscast: http://railscasts.com/episodes/250-authentication-from-scratch
-* Codecademy's Ruby on Rails: Authentication and Authorization: http://www.codecademy.com/en/learn/rails-auth

-Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :smiley:
+Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :)

 ## Getting started

@@ -106,34 +106,24 @@ After you install Devise and add it to your Gemfile, you need to run the generat
 rails generate devise:install
 ```

-The generator will install an initializer which describes ALL of Devise's configuration options. It is *imperative* that you take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:
+The generator will install an initializer which describes ALL Devise's configuration options and you MUST take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:

 ```console
 rails generate devise MODEL
 ```

-Replace MODEL with the class name used for the application’s 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. The 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 the Devise controller.

-Next, check the MODEL for any additional configuration options you might want to add, such as confirmable or lockable. If you add an option, be sure to inspect the migration file (created by the generator if your ORM supports them) and uncomment the appropriate section.  For example, if you add the confirmable option in the model, you'll need to uncomment the Confirmable section in the migration. Then run `rake db:migrate`
-
-Next, you need to set up the default URL options for the Devise mailer in each environment. Here is a possible configuration for `config/environments/development.rb`:
-
-```ruby
-config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
-```
-
-You should restart your application after changing Devise's configuration options. Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.
+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.

 ### Controller filters and helpers

-Devise will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_action (assuming your devise model is 'User'):
+Devise will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_filter:

 ```ruby
-before_action :authenticate_user!
+before_filter :authenticate_user!
 ```

-If your devise model is something other than User, replace "_user" with "_yourmodel". The same logic applies to the instructions below.
-
 To verify if a user is signed in, use the following helper:

 ```ruby
@@ -152,18 +142,24 @@ You can access the session for this scope:
 user_session
 ```

-After signing in a user, confirming the account or updating the password, Devise will look for a scoped root path to redirect to. For instance, when using a `:user` resource, the `user_root_path` will be used if it exists; otherwise, the default `root_path` will be used. This means that you need to set the root inside your routes:
+After signing in a user, confirming the account or updating the password, Devise will look for a scoped root path to redirect. Example: For a :user resource, it will use `user_root_path` if it exists, otherwise default `root_path` will be used. This means that you need to set the root inside your routes:

 ```ruby
 root to: "home#index"
 ```

-You can also override `after_sign_in_path_for` and `after_sign_out_path_for` to customize your redirect hooks.
+You can also overwrite `after_sign_in_path_for` and `after_sign_out_path_for` to customize your redirect hooks.

-Notice that if your Devise model is called `Member` instead of `User`, for example, then the helpers available are:
+Finally, you need to set up default url options for the mailer in each environment. Here is the configuration for "config/environments/development.rb":

 ```ruby
-before_action :authenticate_member!
+config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+```
+
+Notice that if your devise model is not called "user" but "member", then the helpers you should use are:
+
+```ruby
+before_filter :authenticate_member!

 member_signed_in?

@@ -174,60 +170,39 @@ member_session

 ### Configuring Models

-The Devise method in your models also accepts some options to configure its modules. For example, you can choose the cost of the encryption algorithm with:
+The devise method in your models also accepts some options to configure its modules. For example, you can choose the cost of the encryption algorithm with:

 ```ruby
-devise :database_authenticatable, :registerable, :confirmable, :recoverable, stretches: 20
+devise :database_authenticatable, :registerable, :confirmable, :recoverable, :stretches => 20
 ```

-Besides `:stretches`, you can define `:pepper`, `:encryptor`, `:confirm_within`, `:remember_for`, `:timeout_in`, `:unlock_in` among other options. For more details, see the initializer file that was created when you invoked the "devise:install" generator described above. This file is usually located at `/config/initializers/devise.rb`.
+Besides :stretches, you can define :pepper, :encryptor, :confirm_within, :remember_for, :timeout_in, :unlock_in and other values. For details, see the initializer file that was created when you invoked the "devise:install" generator described above.

 ### Strong Parameters

 When you customize your own views, you may end up adding new attributes to forms. Rails 4 moved the parameter sanitization from the model to the controller, causing Devise to handle this concern at the controller as well.

-There are just three actions in Devise that allow any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and the permitted parameters by default are:
+There are just three actions in Devise that allows any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and the permited parameters by default are:

-* `sign_in` (`Devise::SessionsController#create`) - Permits only the authentication keys (like `email`)
+* `sign_in` (`Devise::SessionsController#new`) - Permits only the authentication keys (like `email`)
 * `sign_up` (`Devise::RegistrationsController#create`) - Permits authentication keys plus `password` and `password_confirmation`
 * `account_update` (`Devise::RegistrationsController#update`) - Permits authentication keys plus `password`, `password_confirmation` and `current_password`

-In case you want to permit additional parameters (the lazy way™), you can do so using a simple before filter in your `ApplicationController`:
+In case you want to customize the permitted parameters (the lazy way™) you can do with a simple before filter in your `ApplicationController`:

 ```ruby
 class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
+  before_filter :configure_permitted_parameters, if: :devise_controller?

  protected

  def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) << :username
+    devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email) }
  end
 end
 ```

-The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_attributes_for`), then you will need to tell devise about those nestings and types. Devise allows you to completely change Devise defaults or invoke custom behaviour by passing a block:
-
-To permit simple scalar values for username and email, use this
-
-```ruby
-def configure_permitted_parameters
-  devise_parameter_sanitizer.for(:sign_in) { |u| u.permit(:username, :email) }
-end
-```
-
-If you have some checkboxes that express the roles a user may take on registration, the browser will send those selected checkboxes as an array. An array is not one of Strong Parameters' permitted scalars, so we need to configure Devise in the following way:
-
-```ruby
-def configure_permitted_parameters
-  devise_parameter_sanitizer.for(:sign_up) { |u| u.permit({ roles: [] }, :email, :password, :password_confirmation) }
-end
-```
-For the list of permitted scalars, and how to declare permitted keys in nested hashes and arrays, see
-
-https://github.com/rails/strong_parameters#nested-parameters
-
-If you have multiple Devise models, you may want to set up a different parameter sanitizer per model. In this case, we recommend inheriting from `Devise::ParameterSanitizer` and adding your own logic:
+If you have multiple Devise models, you may want to set up different parameter sanitizer per model. In this case, we recommend inheriting from `Devise::ParameterSanitizer` and add your own logic:

 ```ruby
 class User::ParameterSanitizer < Devise::ParameterSanitizer
@@ -265,103 +240,60 @@ Since Devise is an engine, all its views are packaged inside the gem. These view
 rails generate devise:views
 ```

-If you have more than one Devise model in your application (such as `User` and `Admin`), you will notice that Devise uses the same views for all models. Fortunately, Devise offers an easy way to customize views. All you need to do is set `config.scoped_views = true` inside the `config/initializers/devise.rb` file.
+If you have more than one Devise model in your application (such as "User" and "Admin"), you will notice that Devise uses the same views for all models. Fortunately, Devise offers an easy way to customize views. All you need to do is set "config.scoped_views = true" inside "config/initializers/devise.rb".

-After doing so, you will be able to have views based on the role like `users/sessions/new` and `admins/sessions/new`. If no view is found within the scope, Devise will use the default view at `devise/sessions/new`. You can also use the generator to generate scoped views:
+After doing so, you will be able to have views based on the role like "users/sessions/new" and "admins/sessions/new". If no view is found within the scope, Devise will use the default view at "devise/sessions/new". You can also use the generator to generate scoped views:

 ```console
 rails generate devise:views users
 ```

-If you would like to generate only a few sets of views, like the ones for the `registerable` and `confirmable` module,
-you can pass a list of modules to the generator with the `-v` flag.
-
-```console
-rails generate devise:views -v registrations confirmations
-```
-
 ### Configuring controllers

 If the customization at the views level is not enough, you can customize each controller by following these steps:

-1. Create your custom controllers using the generator which requires a scope:
-
-    ```console
-    rails generate devise:controllers [scope]
-    ```
-
-    If you specify `users` as the scope, controllers will be created in `app/controllers/users/`.
-    And the sessions controller will look like this:
+1. Create your custom controller, for example a `Admins::SessionsController`:  

    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      # GET /resource/sign_in
-      # def new
-      #   super
-      # end
-      ...
+    class Admins::SessionsController < Devise::SessionsController
    end
    ```

+    Note that in the above example, the controller needs to be created in the `app/controller/admins/` directory.
+
 2. Tell the router to use this controller:

    ```ruby
-    devise_for :users, controllers: { sessions: "users/sessions" }
+    devise_for :admins, :controllers => { :sessions => "admins/sessions" }
    ```

-3. Copy the views from `devise/sessions` to `users/sessions`. Since the controller was changed, it won't use the default views located in `devise/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"`.

-4. Finally, change or extend the desired controller actions.
-
-    You can completely override a controller action:
-
-    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      def create
-        # custom sign-in code
-      end
-    end
-    ```
-
-    Or you can simply add new behaviour to it:
-
-    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      def create
-        super do |resource|
-          BackgroundWorker.trigger(resource)
-        end
-      end
-    end
-    ```
-
-    This is useful for triggering background jobs or logging events during certain actions.
-
-Remember that Devise uses flash messages to let users know if sign in was successful or unsuccessful. Devise expects your application to call `flash[:notice]` and `flash[:alert]` as appropriate. Do not print the entire flash hash, print only specific keys. In some circumstances, Devise adds a `:timedout` key to the flash hash, which is not meant for display. Remove this key from the hash if you intend to print the entire hash.
+    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.

 ### 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 => "auth", :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.

-If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is create your routes normally and wrap them in a `devise_scope` block in the router:
+If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is to create your routes normally and wrap them in a `devise_scope` block in the router:

 ```ruby
 devise_scope :user do
-  get "sign_in", to: "devise/sessions#new"
+  get "sign_in", :to => "devise/sessions#new"
 end
 ```

-This way, you tell Devise to use the scope `:user` when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.
+This way you tell devise to use the scope :user when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.

 ### I18n

-Devise uses flash messages with I18n, in conjunction with the flash keys :notice and :alert. To customize your app, you can set up your locale file:
+Devise uses flash messages with I18n with the flash keys :notice and :alert. To customize your app, you can set up your locale file:

 ```yaml
 en:
@@ -399,11 +331,9 @@ Take a look at our locale file to check all available messages. You may also be

 https://github.com/plataformatec/devise/wiki/I18n

-Caution: Devise Controllers inherit from ApplicationController. If your app uses multiple locales, you should be sure to set I18n.locale in ApplicationController.
-
 ### Test helpers

-Devise includes some test 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 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:

 ```ruby
 class ActionController::TestCase
@@ -411,16 +341,14 @@ class ActionController::TestCase
 end
 ```

-If you're using RSpec, you can put the following inside a file named `spec/support/devise.rb` or in your `spec/spec_helper.rb` (or `spec/rails_helper.rb` if you are using rspec-rails):
+If you're using RSpec, you can put the following inside a file named `spec/support/devise.rb`:

 ```ruby
 RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
+  config.include Devise::TestHelpers, :type => :controller
 end
 ```

-Just be sure that this inclusion is made *after* the `require 'rspec/rails'` directive.
-
 Now you are ready to use the `sign_in` and `sign_out` methods. Such methods have the same signature as in controllers:

 ```ruby
@@ -431,30 +359,26 @@ sign_out :user         # sign_out(scope)
 sign_out @user         # sign_out(resource)
 ```

-There are two things that are important to keep in mind:
+There are two things that is important to keep in mind:

 1. These helpers are not going to work for integration tests driven by Capybara or Webrat. They are meant to be used with functional tests only. Instead, fill in the form or explicitly set the user in session;

-2. If you are testing Devise internal controllers or a controller that inherits from Devise's, you need to tell Devise which mapping should be used before a request. This is necessary because Devise gets this information from the router, but since functional tests do not pass through the router, it needs to be stated explicitly. For example, if you are testing the user scope, simply use:
+2. If you are testing Devise internal controllers or a controller that inherits from Devise's, you need to tell Devise which mapping should be used before a request. This is necessary because Devise gets this information from router, but since functional tests do not pass through the router, it needs to be told explicitly. For example, if you are testing the user scope, simply do:

    ```ruby
    @request.env["devise.mapping"] = Devise.mappings[:user]
    get :new
    ```

-You can read more about testing your Rails 3 - Rails 4 controllers with RSpec in the wiki:
+### Omniauth

-* https://github.com/plataformatec/devise/wiki/How-To:-Test-controllers-with-Rails-3-and-4-%28and-RSpec%29
-
-### OmniAuth
-
-Devise comes with OmniAuth support out of the box to authenticate with other providers. To use it, simply specify your OmniAuth configuration in `config/initializers/devise.rb`:
+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'
+config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
 ```

-You can read more about OmniAuth support in the wiki:
+You can read more about Omniauth support in the wiki:

 * https://github.com/plataformatec/devise/wiki/OmniAuth:-Overview

@@ -467,7 +391,7 @@ Devise allows you to set up as many Devise models as you want. If you want to ha
 create_table :admins do |t|
  t.string :email
  t.string :encrypted_password
-  t.timestamps null: false
+  t.timestamps
 end

 # Inside your Admin model
@@ -487,43 +411,17 @@ admin_session

 Alternatively, you can simply run the Devise generator.

-Keep in mind that those models will have completely different routes. They **do not** and **cannot** share the same controller for sign in, sign out and so on. In case you want to have different roles sharing the same actions, we recommend that you use a role-based approach, by either providing a role column or using a dedicated gem for authorization.
-
-### ActiveJob Integration
-
-If you are using Rails 4.2 and ActiveJob to deliver ActionMailer messages in the
-background through a queuing back-end, you can send Devise emails through your
-existing queue by overriding the `send_devise_notification` method in your model.
-
-```ruby
-def send_devise_notification(notification, *args)
-  devise_mailer.send(notification, self, *args).deliver_later
-end
-```
-
-### Password reset tokens and Rails logs
-
-If you enable the [Recoverable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Recoverable) module, note that a stolen password reset token could give an attacker access to your application. Devise takes effort to generate random, secure tokens, and stores only token digests in the database, never plaintext. However the default logging behavior in Rails can cause plaintext tokens to leak into log files:
-
-1. Action Mailer logs the entire contents of all outgoing emails to the DEBUG level. Password reset tokens delivered to users in email will be leaked.
-2. Active Job logs all arguments to every enqueued job at the INFO level. If you configure Devise to use `deliver_later` to send password reset emails, password reset tokens will be leaked.
-
-Rails sets the production logger level to DEBUG by default. Consider changing your production logger level to WARN if you wish to prevent tokens from being leaked into your logs. In `config/environments/production.rb`:
-
-```ruby
-config.log_level = :warn
-```
-
+Keep in mind that those models will have completely different routes. They **do not** and **cannot** share the same controller for sign in, sign out and so on. In case you want to have different roles sharing the same actions, we recommend you to use a role-based approach, by either providing a role column or using [CanCan](https://github.com/ryanb/cancan).

 ### Other ORMs

-Devise supports ActiveRecord (default) and Mongoid. To select another ORM, simply require it in the initializer file.
+Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you just need to require it in the initializer file.

 ## Additional information

 ### Heroku

-Using Devise on Heroku with Ruby on Rails 3.2 requires setting:
+Using devise on Heroku with Ruby on Rails 3.1 requires setting:

 ```ruby
 config.assets.initialize_on_precompile = false
@@ -541,10 +439,16 @@ https://github.com/hassox/warden

 We have a long list of valued contributors. Check them all at:

-https://github.com/plataformatec/devise/graphs/contributors
+https://github.com/plataformatec/devise/contributors
+
+### Maintainers
+
+* José Valim (https://github.com/josevalim)
+* Carlos Antônio da Silva (https://github.com/carlosantoniodasilva)
+* Rodrigo Flores (https://github.com/rodrigoflores)

 ## License

-MIT License. Copyright 2009-2015 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2013 Plataformatec. http://plataformatec.com.br

-You are not granted rights or licenses to the trademarks of Plataformatec, including without limitation the Devise name or logo.
+You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Devise name or logo.
--- a/5
+++ b/5
@@ -1,11 +1,10 @@
 # encoding: UTF-8
-
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'rdoc/task'

 desc 'Default: run tests for all ORMs.'
-task default: :test
+task :default => :test

 desc 'Run Devise tests for all ORMs.'
 task :pre_commit do
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -7,10 +7,9 @@ class Devise::ConfirmationsController < DeviseController
  # POST /resource/confirmation
  def create
    self.resource = resource_class.send_confirmation_instructions(resource_params)
-    yield resource if block_given?

    if successfully_sent?(resource)
-      respond_with({}, location: after_resending_confirmation_instructions_path_for(resource_name))
+      respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
    else
      respond_with(resource)
    end
@@ -19,13 +18,13 @@ class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation?confirmation_token=abcdef
  def show
    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
-    yield resource if block_given?

    if resource.errors.empty?
-      set_flash_message(:notice, :confirmed) if is_flashing_format?
+      set_flash_message(:notice, :confirmed) if is_navigational_format?
+      sign_in(resource_name, resource)
      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
    else
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end

@@ -33,19 +32,11 @@ class Devise::ConfirmationsController < DeviseController

    # The path used after resending confirmation instructions.
    def after_resending_confirmation_instructions_path_for(resource_name)
-      is_navigational_format? ? new_session_path(resource_name) : '/'
+      new_session_path(resource_name) if is_navigational_format?
    end

    # The path used after confirmation.
    def after_confirmation_path_for(resource_name, resource)
-      if signed_in?(resource_name)
-        signed_in_root_path(resource)
-      else
-        new_session_path(resource_name)
-      end
-    end
-
-    def translation_scope
-      'devise.confirmations'
+      after_sign_in_path_for(resource)
    end
 end
--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -2,11 +2,11 @@ class Devise::OmniauthCallbacksController < DeviseController
  prepend_before_filter { request.env["devise.skip_timeout"] = true }

  def passthru
-    render status: 404, text: "Not found. Authentication passthru."
+    render :status => 404, :text => "Not found. Authentication passthru."
  end

  def failure
-    set_flash_message :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
+    set_flash_message :alert, :failure, :kind => OmniAuth::Utils.camelize(failed_strategy.name), :reason => failure_message
    redirect_to after_omniauth_failure_path_for(resource_name)
  end

@@ -27,8 +27,4 @@ class Devise::OmniauthCallbacksController < DeviseController
  def after_omniauth_failure_path_for(scope)
    new_session_path(scope)
  end
-
-  def translation_scope
-    'devise.omniauth_callbacks'
-  end
 end
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,7 +1,7 @@
 class Devise::PasswordsController < DeviseController
  prepend_before_filter :require_no_authentication
  # Render the #edit only if coming from a reset password email link
-  append_before_filter :assert_reset_token_passed, only: :edit
+  append_before_filter :assert_reset_token_passed, :only => :edit

  # GET /resource/password/new
  def new
@@ -11,10 +11,9 @@ class Devise::PasswordsController < DeviseController
  # POST /resource/password
  def create
    self.resource = resource_class.send_reset_password_instructions(resource_params)
-    yield resource if block_given?

    if successfully_sent?(resource)
-      respond_with({}, location: after_sending_reset_password_instructions_path_for(resource_name))
+      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
    else
      respond_with(resource)
    end
@@ -23,34 +22,27 @@ class Devise::PasswordsController < DeviseController
  # GET /resource/password/edit?reset_password_token=abcdef
  def edit
    self.resource = resource_class.new
-    set_minimum_password_length
    resource.reset_password_token = params[:reset_password_token]
  end

  # PUT /resource/password
  def update
    self.resource = resource_class.reset_password_by_token(resource_params)
-    yield resource if block_given?

    if resource.errors.empty?
      resource.unlock_access! if unlockable?(resource)
-      if Devise.sign_in_after_reset_password
-        flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
-        set_flash_message(:notice, flash_message) if is_flashing_format?
-        sign_in(resource_name, resource)
-      else
-        set_flash_message(:notice, :updated_not_active) if is_flashing_format?
-      end
-      respond_with resource, location: after_resetting_password_path_for(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)
    else
-      set_minimum_password_length
      respond_with resource
    end
  end

  protected
    def after_resetting_password_path_for(resource)
-      Devise.sign_in_after_reset_password ? after_sign_in_path_for(resource) : new_session_path(resource_name)
+      after_sign_in_path_for(resource)
    end

    # The path used after sending reset password instructions
@@ -73,8 +65,4 @@ class Devise::PasswordsController < DeviseController
        resource.respond_to?(:unlock_strategy_enabled?) &&
        resource.unlock_strategy_enabled?(:email)
    end
-
-    def translation_scope
-      'devise.passwords'
-    end
 end
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,12 +1,10 @@
 class Devise::RegistrationsController < DeviseController
-  prepend_before_filter :require_no_authentication, only: [:new, :create, :cancel]
-  prepend_before_filter :authenticate_scope!, only: [:edit, :update, :destroy]
+  prepend_before_filter :require_no_authentication, :only => [ :new, :create, :cancel ]
+  prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]

  # GET /resource/sign_up
  def new
    build_resource({})
-    set_minimum_password_length
-    yield resource if block_given?
    respond_with self.resource
  end

@@ -14,21 +12,18 @@ class Devise::RegistrationsController < DeviseController
  def create
    build_resource(sign_up_params)

-    resource.save
-    yield resource if block_given?
-    if resource.persisted?
+    if resource.save
      if resource.active_for_authentication?
-        set_flash_message :notice, :signed_up if is_flashing_format?
+        set_flash_message :notice, :signed_up if is_navigational_format?
        sign_up(resource_name, resource)
-        respond_with resource, location: after_sign_up_path_for(resource)
+        respond_with resource, :location => after_sign_up_path_for(resource)
      else
-        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_flashing_format?
-        expire_data_after_sign_in!
-        respond_with resource, location: after_inactive_sign_up_path_for(resource)
+        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_navigational_format?
+        expire_session_data_after_sign_in!
+        respond_with resource, :location => after_inactive_sign_up_path_for(resource)
      end
    else
      clean_up_passwords resource
-      set_minimum_password_length
      respond_with resource
    end
  end
@@ -45,16 +40,14 @@ class Devise::RegistrationsController < DeviseController
    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)

-    resource_updated = update_resource(resource, account_update_params)
-    yield resource if block_given?
-    if resource_updated
-      if is_flashing_format?
+    if resource.update_with_password(account_update_params)
+      if is_navigational_format?
        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
          :update_needs_confirmation : :updated
        set_flash_message :notice, flash_key
      end
-      sign_in resource_name, resource, bypass: true
-      respond_with resource, location: after_update_path_for(resource)
+      sign_in resource_name, resource, :bypass => true
+      respond_with resource, :location => after_update_path_for(resource)
    else
      clean_up_passwords resource
      respond_with resource
@@ -65,8 +58,7 @@ class Devise::RegistrationsController < DeviseController
  def destroy
    resource.destroy
    Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
-    set_flash_message :notice, :destroyed if is_flashing_format?
-    yield resource if block_given?
+    set_flash_message :notice, :destroyed if is_navigational_format?
    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name) }
  end

@@ -76,7 +68,7 @@ class Devise::RegistrationsController < DeviseController
  # cancel oauth signing in/up in the middle of the process,
  # removing all OAuth session data.
  def cancel
-    expire_data_after_sign_in!
+    expire_session_data_after_sign_in!
    redirect_to new_registration_path(resource_name)
  end

@@ -88,12 +80,6 @@ class Devise::RegistrationsController < DeviseController
      previous != resource.unconfirmed_email
  end

-  # By default we want to require a password checks on update.
-  # You can overwrite this method in your own RegistrationsController.
-  def update_resource(resource, params)
-    resource.update_with_password(params)
-  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)
@@ -115,10 +101,7 @@ class Devise::RegistrationsController < DeviseController
  # The path used after sign up for inactive accounts. You need to overwrite
  # this method in your own RegistrationsController.
  def after_inactive_sign_up_path_for(resource)
-    scope = Devise::Mapping.find_scope!(resource)
-    router_name = Devise.mappings[scope].router_name
-    context = router_name ? send(router_name) : self
-    context.respond_to?(:root_path) ? context.root_path : "/"
+    respond_to?(:root_path) ? root_path : "/"
  end

  # The default url to be used after updating a resource. You need to overwrite
@@ -129,19 +112,15 @@ class Devise::RegistrationsController < DeviseController

  # Authenticates the current scope and gets the current resource from the session.
  def authenticate_scope!
-    send(:"authenticate_#{resource_name}!", force: true)
+    send(:"authenticate_#{resource_name}!", :force => true)
    self.resource = send(:"current_#{resource_name}")
  end

  def sign_up_params
-    devise_parameter_sanitizer.sanitize(:sign_up)
+    devise_parameter_sanitizer.for(:sign_up)
  end

  def account_update_params
-    devise_parameter_sanitizer.sanitize(:account_update)
-  end
-
-  def translation_scope
-    'devise.registrations'
+    devise_parameter_sanitizer.for(:account_update)
  end
 end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,81 +1,51 @@
 class Devise::SessionsController < DeviseController
-  prepend_before_filter :require_no_authentication, only: [:new, :create]
-  prepend_before_filter :allow_params_authentication!, only: :create
-  prepend_before_filter :verify_signed_out_user, only: :destroy
-  prepend_before_filter only: [:create, :destroy] { request.env["devise.skip_timeout"] = true }
+  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
+  prepend_before_filter :allow_params_authentication!, :only => :create
+  prepend_before_filter { request.env["devise.skip_timeout"] = true }

  # GET /resource/sign_in
  def new
    self.resource = resource_class.new(sign_in_params)
    clean_up_passwords(resource)
-    yield resource if block_given?
    respond_with(resource, serialize_options(resource))
  end

  # POST /resource/sign_in
  def create
    self.resource = warden.authenticate!(auth_options)
-    set_flash_message(:notice, :signed_in) if is_flashing_format?
+    set_flash_message(:notice, :signed_in) if is_navigational_format?
    sign_in(resource_name, resource)
-    yield resource if block_given?
-    respond_with resource, location: after_sign_in_path_for(resource)
+    respond_with resource, :location => after_sign_in_path_for(resource)
  end

  # DELETE /resource/sign_out
  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_flashing_format?
-    yield if block_given?
-    respond_to_on_destroy
+    set_flash_message :notice, :signed_out if signed_out && is_navigational_format?
+
+    # 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 }
+    end
  end

  protected

  def sign_in_params
-    devise_parameter_sanitizer.sanitize(:sign_in)
+    devise_parameter_sanitizer.for(:sign_in)
  end

  def serialize_options(resource)
    methods = resource_class.authentication_keys.dup
    methods = methods.keys if methods.is_a?(Hash)
    methods << :password if resource.respond_to?(:password)
-    { methods: methods, only: [:password] }
+    { :methods => methods, :only => [:password] }
  end

  def auth_options
-    { scope: resource_name, recall: "#{controller_path}#new" }
-  end
-
-  def translation_scope
-    'devise.sessions'
-  end
-
-  private
-
-  # Check if there is no signed in user before doing the sign out.
-  #
-  # If there is no signed in user, it will set the flash message and redirect
-  # to the after_sign_out path.
-  def verify_signed_out_user
-    if all_signed_out?
-      set_flash_message :notice, :already_signed_out if is_flashing_format?
-
-      respond_to_on_destroy
-    end
-  end
-
-  def all_signed_out?
-    users = Devise.mappings.keys.map { |s| warden.user(scope: s, run_callbacks: false) }
-
-    users.all?(&:blank?)
-  end
-
-  def respond_to_on_destroy
-    # 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 after_sign_out_path_for(resource_name) }
-    end
+    { :scope => resource_name, :recall => "#{controller_path}#new" }
  end
 end
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -9,10 +9,9 @@ class Devise::UnlocksController < DeviseController
  # POST /resource/unlock
  def create
    self.resource = resource_class.send_unlock_instructions(resource_params)
-    yield resource if block_given?

    if successfully_sent?(resource)
-      respond_with({}, location: after_sending_unlock_instructions_path_for(resource))
+      respond_with({}, :location => after_sending_unlock_instructions_path_for(resource))
    else
      respond_with(resource)
    end
@@ -21,13 +20,12 @@ class Devise::UnlocksController < DeviseController
  # GET /resource/unlock?unlock_token=abcdef
  def show
    self.resource = resource_class.unlock_access_by_token(params[:unlock_token])
-    yield resource if block_given?

    if resource.errors.empty?
-      set_flash_message :notice, :unlocked if is_flashing_format?
+      set_flash_message :notice, :unlocked if is_navigational_format?
      respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
    else
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end

@@ -43,7 +41,4 @@ class Devise::UnlocksController < DeviseController
      new_session_path(resource)  if is_navigational_format?
    end

-    def translation_scope
-      'devise.unlocks'
-    end
 end
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -6,28 +6,12 @@ class DeviseController < Devise.parent_controller.constantize

  helpers = %w(resource scope_name resource_name signed_in_resource
               resource_class resource_params devise_mapping)
-  helper_method(*helpers)
+  hide_action *helpers
+  helper_method *helpers

  prepend_before_filter :assert_is_devise_resource!
  respond_to :html if mimes_for_respond_to.empty?

-  # Override prefixes to consider the scoped view.
-  # Notice we need to check for the request due to a bug in
-  # Action Controller tests that forces _prefixes to be
-  # loaded before even having a request object.
-  #
-  # This method should be public as it is is in ActionPack
-  # itself. Changing its visibility may break other gems.
-  def _prefixes #:nodoc:
-    @_prefixes ||= if self.class.scoped_views? && request && devise_mapping
-      ["#{devise_mapping.scoped_path}/#{controller_name}"] + super
-    else
-      super
-    end
-  end
-
-  protected
-
  # Gets the actual resource stored in the instance variable
  def resource
    instance_variable_get(:"@#{resource_name}")
@@ -46,7 +30,7 @@ class DeviseController < Devise.parent_controller.constantize

  # Returns a signed in resource from session (if one exists)
  def signed_in_resource
-    warden.authenticate(scope: resource_name)
+    warden.authenticate(:scope => resource_name)
  end

  # Attempt to find the mapped route for devise based on request path
@@ -54,6 +38,22 @@ class DeviseController < Devise.parent_controller.constantize
    @devise_mapping ||= request.env["devise.mapping"]
  end

+  # Override prefixes to consider the scoped view.
+  # Notice we need to check for the request due to a bug in
+  # Action Controller tests that forces _prefixes to be
+  # loaded before even having a request object.
+  def _prefixes #:nodoc:
+    @_prefixes ||= if self.class.scoped_views? && request && devise_mapping
+      super.unshift("#{devise_mapping.scoped_path}/#{controller_name}")
+    else
+      super
+    end
+  end
+
+  hide_action :_prefixes
+
+  protected
+
  # Checks whether it's a devise mapped resource or not.
  def assert_is_devise_resource! #:nodoc:
    unknown_action! <<-MESSAGE unless devise_mapping
@@ -92,14 +92,14 @@ MESSAGE
  # Helper for use in before_filters where no authentication is required.
  #
  # Example:
-  #   before_filter :require_no_authentication, only: :new
+  #   before_filter :require_no_authentication, :only => :new
  def require_no_authentication
    assert_is_devise_resource!
    return unless is_navigational_format?
    no_input = devise_mapping.no_input_strategies

    authenticated = if no_input.present?
-      args = no_input.dup.push scope: resource_name
+      args = no_input.dup.push :scope => resource_name
      warden.authenticate?(*args)
    else
      warden.authenticated?(resource_name)
@@ -123,17 +123,14 @@ MESSAGE
    end

    if notice
-      set_flash_message :notice, notice if is_flashing_format?
+      set_flash_message :notice, notice if is_navigational_format?
      true
    end
  end

  # Sets the flash message with :key, using I18n. By default you are able
-  # to setup your messages using specific resource scope, and if no message is
-  # found we look to the default scope. Set the "now" options key to a true
-  # value to populate the flash.now hash in lieu of the default flash hash (so
-  # the flash message will be available to the current action instead of the
-  # next action).
+  # to setup your messages using specific resource scope, and if no one is
+  # found we look to default scope.
  # Example (i18n locale file):
  #
  #   en:
@@ -147,40 +144,18 @@ MESSAGE
  # available.
  def set_flash_message(key, kind, options = {})
    message = find_message(kind, options)
-    if options[:now]
-      flash.now[key] = message if message.present?
-    else
-      flash[key] = message if message.present?
-    end
-  end
-
-  # Sets minimum password length to show to user
-  def set_minimum_password_length
-    if devise_mapping.validatable?
-      @minimum_password_length = resource_class.password_length.min
-    end
-  end
-
-  def devise_i18n_options(options)
-    options
+    flash[key] = message if message.present?
  end

  # Get message for given
  def find_message(kind, options = {})
-    options[:scope] ||= translation_scope
+    options[:scope] = "devise.#{controller_name}"
    options[:default] = Array(options[:default]).unshift(kind.to_sym)
    options[:resource_name] = resource_name
-    options = devise_i18n_options(options)
+    options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
    I18n.t("#{options[:resource_name]}.#{kind}", options)
  end

-  # Controllers inheriting DeviseController are advised to override this
-  # method so that other controllers inheriting from them would use
-  # existing translations.
-  def translation_scope
-    "devise.#{controller_name}"
-  end
-
  def clean_up_passwords(object)
    object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
  end
@@ -194,6 +169,4 @@ MESSAGE
  def resource_params
    params.fetch(resource_name, {})
  end
-
-  ActiveSupport.run_load_hooks(:devise_controller, self)
 end
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -10,8 +10,8 @@ module DeviseHelper

    messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
    sentence = I18n.t("errors.messages.not_saved",
-                      count: resource.errors.count,
-                      resource: resource.class.model_name.human.downcase)
+                      :count => resource.errors.count,
+                      :resource => resource.class.model_name.human.downcase)

    html = <<-HTML
    <div id="error_explanation">
--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -1,24 +1,15 @@
-if defined?(ActionMailer)
-  class Devise::Mailer < Devise.parent_mailer.constantize
-    include Devise::Mailers::Helpers
+class Devise::Mailer < Devise.parent_mailer.constantize
+  include Devise::Mailers::Helpers

-    def confirmation_instructions(record, token, opts={})
-      @token = token
-      devise_mail(record, :confirmation_instructions, opts)
-    end
+  def confirmation_instructions(record, opts={})
+    devise_mail(record, :confirmation_instructions, opts)
+  end

-    def reset_password_instructions(record, token, opts={})
-      @token = token
-      devise_mail(record, :reset_password_instructions, opts)
-    end
+  def reset_password_instructions(record, opts={})
+    devise_mail(record, :reset_password_instructions, opts)
+  end

-    def unlock_instructions(record, token, opts={})
-      @token = token
-      devise_mail(record, :unlock_instructions, opts)
-    end
-
-    def password_change(record, opts={})
-      devise_mail(record, :password_change, opts)
-    end
+  def unlock_instructions(record, opts={})
+    devise_mail(record, :unlock_instructions, opts)
  end
 end
--- a/app/views/devise/_links.erb
+++ b/app/views/devise/_links.erb
@@ -0,0 +1,3 @@
+<% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
+  "please use devise/shared/_links.erb instead."%>
+<%= render "shared/links" %>
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Resend confirmation instructions</h2>

-<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
  <%= devise_error_messages! %>

-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %> 
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Resend confirmation instructions" %>
-  </div>
+  <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -2,4 +2,4 @@

 <p>You can confirm your account email through the link below:</p>

-<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
--- a/app/views/devise/mailer/password_change.html.erb
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -1,3 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>We're contacting you to notify you that your password has been changed.</p>
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -2,7 +2,7 @@

 <p>Someone has requested a link to change your password. You can do this through the link below.</p>

-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>

 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -4,4 +4,4 @@

 <p>Click the link below to unlock your account:</p>

-<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,25 +1,16 @@
 <h2>Change your password</h2>

-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
  <%= devise_error_messages! %>
  <%= f.hidden_field :reset_password_token %>

-  <div class="field">
-    <%= f.label :password, "New password" %><br />
-    <% if @minimum_password_length %>
-      <em>(<%= @minimum_password_length %> characters minimum)</em><br />
-    <% end %>
-    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password, :autofocus => true %></div>

-  <div class="field">
-    <%= f.label :password_confirmation, "Confirm new password" %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="actions">
-    <%= f.submit "Change my password" %>
-  </div>
+  <div><%= f.submit "Change my password" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Forgot your password?</h2>

-<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
  <%= devise_error_messages! %>

-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Send me reset password instructions" %>
-  </div>
+  <div><%= f.submit "Send me reset password instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,39 +1,29 @@
 <h2>Edit <%= resource_name.to_s.humanize %></h2>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
  <%= devise_error_messages! %>

-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+  <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 %>

-  <div class="field">
-    <%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </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>

-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="field">
-    <%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-    <%= f.password_field :current_password, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></div>

-  <div class="actions">
-    <%= f.submit "Update" %>
-  </div>
+  <div><%= f.submit "Update" %></div>
 <% end %>

 <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? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>

 <%= link_to "Back", :back %>
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,29 +1,18 @@
 <h2>Sign up</h2>

-<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
  <%= devise_error_messages! %>

-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="field">
-    <%= f.label :password %>
-    <% if @minimum_password_length %>
-    <em>(<%= @minimum_password_length %> characters minimum)</em>
-    <% end %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>

-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="actions">
-    <%= f.submit "Sign up" %>
-  </div>
+  <div><%= f.submit "Sign up" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,26 +1,17 @@
-<h2>Log in</h2>
+<h2>Sign in</h2>

-<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+<%= 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>

-  <div class="field">
-    <%= f.label :password %><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password %><br />
+  <%= f.password_field :password %></div>

  <% if devise_mapping.rememberable? -%>
-    <div class="field">
-      <%= f.check_box :remember_me %>
-      <%= f.label :remember_me %>
-    </div>
+    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
  <% end -%>

-  <div class="actions">
-    <%= f.submit "Log in" %>
-  </div>
+  <div><%= f.submit "Sign in" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -1,12 +1,12 @@
 <%- if controller_name != 'sessions' %>
-  <%= link_to "Log in", new_session_path(resource_name) %><br />
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
 <% end -%>

 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
 <% end -%>

-<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
 <% end -%>

@@ -20,6 +20,6 @@

 <%- if devise_mapping.omniauthable? %>
  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %><br />
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
  <% end -%>
-<% end -%>
+<% end -%>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,16 +1,12 @@
 <h2>Resend unlock instructions</h2>

-<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
  <%= devise_error_messages! %>

-  <div class="field">
-    <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true %>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email, :autofocus => true %></div>

-  <div class="actions">
-    <%= f.submit "Resend unlock instructions" %>
-  </div>
+  <div><%= f.submit "Resend unlock instructions" %></div>
 <% end %>

 <%= render "devise/shared/links" %>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,52 +3,49 @@
 en:
  devise:
    confirmations:
-      confirmed: "Your email address has been successfully confirmed."
-      send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes."
-      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes."
+      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 is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
+      inactive: "Your account was not activated yet."
+      invalid: "Invalid email or password."
+      invalid_token: "Invalid authentication token."
      locked: "Your account is locked."
-      last_attempt: "You have one more attempt before your account is locked."
-      not_found_in_database: "Invalid %{authentication_keys} or password."
-      timeout: "Your session expired. Please sign in again to continue."
+      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 email address 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"
-      password_change:
-        subject: "Password Changed"
+        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 on how to reset your password in a few minutes."
+      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 has been changed successfully. You are now signed in."
-      updated_not_active: "Your password has been changed successfully."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
    registrations:
-      destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon."
+      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 follow 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 follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated 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."
+      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."
-      already_signed_out: "Signed out successfully."
    unlocks:
-      send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes."
-      send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes."
+      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:
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -9,19 +9,18 @@ Gem::Specification.new do |s|
  s.licenses    = ["MIT"]
  s.summary     = "Flexible authentication solution for Rails with Warden"
  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "https://github.com/plataformatec/devise"
+  s.homepage    = "http://github.com/plataformatec/devise"
  s.description = "Flexible authentication solution for Rails with Warden"
  s.authors     = ['José Valim', 'Carlos Antônio']

+  s.rubyforge_project = "devise"
+
  s.files         = `git ls-files`.split("\n")
  s.test_files    = `git ls-files -- test/*`.split("\n")
  s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 1.9.3'

  s.add_dependency("warden", "~> 1.2.3")
  s.add_dependency("orm_adapter", "~> 0.1")
-  s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("thread_safe", "~> 0.1")
+  s.add_dependency("bcrypt-ruby", "~> 3.0")
  s.add_dependency("railties", ">= 3.2.6", "< 5")
-  s.add_dependency("responders")
 end
--- a/gemfiles/Gemfile.rails-3.2-stable.lock
+++ b/gemfiles/Gemfile.rails-3.2-stable.lock
@@ -1,172 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: b344986bc3d94ca7821fc5e0eef1874882ac6cbb
-  branch: 3-2-stable
-  specs:
-    actionmailer (3.2.21)
-      actionpack (= 3.2.21)
-      mail (~> 2.5.4)
-    actionpack (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.21)
-      activesupport (= 3.2.21)
-      builder (~> 3.0.0)
-    activerecord (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.21)
-      activemodel (= 3.2.21)
-      activesupport (= 3.2.21)
-    activesupport (3.2.21)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    rails (3.2.21)
-      actionmailer (= 3.2.21)
-      actionpack (= 3.2.21)
-      activerecord (= 3.2.21)
-      activeresource (= 3.2.21)
-      activesupport (= 3.2.21)
-      bundler (~> 1.0)
-      railties (= 3.2.21)
-    railties (3.2.21)
-      actionpack (= 3.2.21)
-      activesupport (= 3.2.21)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.5.6)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (3.0.3)
-    bcrypt (3.1.10)
-    builder (3.0.4)
-    erubis (2.7.0)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.4.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    journey (1.0.4)
-    json (1.8.2)
-    jwt (1.4.1)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (3.1.6)
-      activemodel (~> 3.2)
-      moped (~> 1.4)
-      origin (~> 1.0)
-      tzinfo (~> 0.3.29)
-    moped (1.5.2)
-    multi_json (1.11.0)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.2)
-      hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (1.6.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
-      omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    origin (1.1.0)
-    orm_adapter (0.5.0)
-    polyglot (0.3.5)
-    rack (1.4.5)
-    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.4)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.4.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.7.0)
-    sprockets (2.2.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.43)
-    warden (1.2.6)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  devise!
-  jruby-openssl
-  mocha (~> 1.1)
-  mongoid (~> 3.0)
-  omniauth (~> 1.2.0)
-  omniauth-facebook
-  omniauth-oauth2 (~> 1.1.0)
-  omniauth-openid (~> 1.0.1)
-  rails!
-  rdoc
-  sqlite3
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.11.2
--- a/gemfiles/Gemfile.rails-3.2-stable
+++ b/gemfiles/Gemfile.rails-3.2-stable
@@ -1,17 +1,17 @@
 source "https://rubygems.org"

-gemspec path: '..'
+gemspec :path => '..'

-gem "rails", github: 'rails/rails', branch: '3-2-stable'
-gem "omniauth", "~> 1.2.0"
-gem "omniauth-oauth2", "~> 1.1.0"
+gem "rails", "~> 3.2.6"
+gem "omniauth", "~> 1.0.0"
+gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"

 group :test do
  gem "omniauth-facebook"
  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
+  gem "webrat", "0.7.3", :require => false
+  gem "mocha", "~> 0.13.1", :require => false
 end

 platforms :jruby do
@@ -24,6 +24,8 @@ platforms :ruby do
  gem "sqlite3"
 end

-group :mongoid do
-  gem "mongoid", "~> 3.0"
+platforms :mri_19, :mri_20 do
+  group :mongoid do
+    gem "mongoid", "~> 3.0"
+  end
 end
--- a/gemfiles/Gemfile.rails-3.2.x.lock
+++ b/gemfiles/Gemfile.rails-3.2.x.lock
@@ -0,0 +1,156 @@
+PATH
+  remote: ..
+  specs:
+    devise (3.0.4)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      warden (~> 1.2.3)
+
+GEM
+  remote: https://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)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
+      builder (~> 3.0.0)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
+      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)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    bcrypt-ruby (3.1.2)
+    builder (3.0.4)
+    erubis (2.7.0)
+    faraday (0.8.7)
+      multipart-post (~> 1.1)
+    hashie (1.2.0)
+    hike (1.2.2)
+    httpauth (0.2.0)
+    i18n (0.6.1)
+    journey (1.0.4)
+    json (1.7.7)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    mail (2.5.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)
+      metaclass (~> 0.0.1)
+    mongoid (3.1.3)
+      activemodel (~> 3.2)
+      moped (~> 1.4.2)
+      origin (~> 1.0)
+      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.0)
+      rack (~> 1.2)
+    omniauth (1.0.3)
+      hashie (~> 1.2)
+      rack
+    omniauth-facebook (1.4.0)
+      omniauth-oauth2 (~> 1.0.2)
+    omniauth-oauth2 (1.0.3)
+      oauth2 (~> 0.8.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.4.5)
+    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
+    rack-test (0.6.2)
+      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)
+      bundler (~> 1.0)
+      railties (= 3.2.13)
+    railties (3.2.13)
+      actionpack (= 3.2.13)
+      activesupport (= 3.2.13)
+      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)
+      json (~> 1.4)
+    ruby-openid (2.2.3)
+    sprockets (2.2.2)
+      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.4.0)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+    warden (1.2.3)
+      rack (>= 1.0)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  devise!
+  jruby-openssl
+  mocha (~> 0.13.1)
+  mongoid (~> 3.0)
+  omniauth (~> 1.0.0)
+  omniauth-facebook
+  omniauth-oauth2 (~> 1.0.0)
+  omniauth-openid (~> 1.0.1)
+  rails (~> 3.2.6)
+  rdoc
+  sqlite3
+  webrat (= 0.7.3)
--- a/gemfiles/Gemfile.rails-4.0-stable
+++ b/gemfiles/Gemfile.rails-4.0-stable
@@ -1,29 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem "rails", github: 'rails/rails', branch: '4-0-stable'
-gem "omniauth", "~> 1.2.0"
-gem "omniauth-oauth2", "~> 1.1.0"
-gem "rdoc"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 4.0.0"
-end
--- a/gemfiles/Gemfile.rails-4.0-stable.lock
+++ b/gemfiles/Gemfile.rails-4.0-stable.lock
@@ -1,163 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 9be9597e510d185ca7964d0a05b4ea2a7f2d50d1
-  branch: 4-0-stable
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.5.6)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activerecord-deprecated_finders (1.0.4)
-    arel (4.0.2)
-    bcrypt (3.1.10)
-    bson (3.2.6)
-    builder (3.1.4)
-    concurrent-ruby (1.0.0)
-    connection_pool (2.2.0)
-    erubis (2.7.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.4.3)
-    i18n (0.7.0)
-    jwt (1.5.2)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.99)
-    mini_portile2 (2.0.0)
-    minitest (4.7.5)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.7)
-      bson (~> 3.0)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.2)
-      hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (1.6.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
-      omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    optionable (0.2.0)
-    origin (2.2.0)
-    orm_adapter (0.5.0)
-    rack (1.5.5)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.5.0)
-    rdoc (4.2.1)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.7.0)
-    sprockets (3.5.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.11)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (0.3.46)
-    warden (1.2.6)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  devise!
-  jruby-openssl
-  mocha (~> 1.1)
-  mongoid (~> 4.0.0)
-  omniauth (~> 1.2.0)
-  omniauth-facebook
-  omniauth-oauth2 (~> 1.1.0)
-  omniauth-openid (~> 1.0.1)
-  rails!
-  rdoc
-  sqlite3
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.11.2
--- a/gemfiles/Gemfile.rails-4.1-stable
+++ b/gemfiles/Gemfile.rails-4.1-stable
@@ -1,29 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem "rails", github: 'rails/rails', branch: '4-1-stable'
-gem "omniauth", "~> 1.2.0"
-gem "omniauth-oauth2", "~> 1.1.0"
-gem "rdoc"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 4.0.0"
-end
--- a/gemfiles/Gemfile.rails-4.1-stable.lock
+++ b/gemfiles/Gemfile.rails-4.1-stable.lock
@@ -1,172 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: bf32ec7b8611e6b4c7e9398f7d297a1f0221e9b9
-  branch: 4-1-stable
-  specs:
-    actionmailer (4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.10)
-      actionview (= 4.1.10)
-      activesupport (= 4.1.10)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.10)
-      activesupport (= 4.1.10)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.10)
-      activesupport (= 4.1.10)
-      builder (~> 3.1)
-    activerecord (4.1.10)
-      activemodel (= 4.1.10)
-      activesupport (= 4.1.10)
-      arel (~> 5.0.0)
-    activesupport (4.1.10)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    rails (4.1.10)
-      actionmailer (= 4.1.10)
-      actionpack (= 4.1.10)
-      actionview (= 4.1.10)
-      activemodel (= 4.1.10)
-      activerecord (= 4.1.10)
-      activesupport (= 4.1.10)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.10)
-      sprockets-rails (~> 2.0)
-    railties (4.1.10)
-      actionpack (= 4.1.10)
-      activesupport (= 4.1.10)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.5.6)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (5.0.1.20140414130214)
-    bcrypt (3.1.10)
-    bson (2.3.0)
-    builder (3.2.2)
-    connection_pool (2.1.3)
-    erubis (2.7.0)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.4.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    json (1.8.2)
-    jwt (1.4.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.4.3)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.4)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.11.0)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (0.9.4)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.2)
-      hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (1.6.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-oauth2 (1.1.2)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
-      omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    optionable (0.2.0)
-    origin (2.1.1)
-    orm_adapter (0.5.0)
-    rack (1.5.2)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.7.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    warden (1.2.6)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  devise!
-  jruby-openssl
-  mocha (~> 1.1)
-  mongoid (~> 4.0.0)
-  omniauth (~> 1.2.0)
-  omniauth-facebook
-  omniauth-oauth2 (~> 1.1.0)
-  omniauth-openid (~> 1.0.1)
-  rails!
-  rdoc
-  sqlite3
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.11.2
--- a/gemfiles/Gemfile.rails-4.2-stable
+++ b/gemfiles/Gemfile.rails-4.2-stable
@@ -1,29 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem "rails", github: 'rails/rails', branch: '4-2-stable'
-gem "omniauth", "~> 1.2.2"
-gem "omniauth-oauth2", "~> 1.2.0"
-gem "rdoc"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid", "~> 1.0.1"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-end
-
-platforms :jruby do
-  gem "activerecord-jdbc-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-  gem "jruby-openssl"
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end
-
-group :mongoid do
-  gem "mongoid", "~> 4.0.0"
-end
--- a/gemfiles/Gemfile.rails-4.2-stable.lock
+++ b/gemfiles/Gemfile.rails-4.2-stable.lock
@@ -1,194 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: f12ff8ddab7b199707ec36d72bd72f206f142c8b
-  branch: 4-2-stable
-  specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
-      globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
-      builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
-      arel (~> 6.0)
-    activesupport (4.2.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
-      sprockets-rails
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.5.6)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    arel (6.0.0)
-    bcrypt (3.1.10)
-    bson (2.3.0)
-    builder (3.2.2)
-    connection_pool (2.1.3)
-    erubis (2.7.0)
-    faraday (0.9.1)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.3.3)
-      activesupport (>= 4.1.0)
-    hashie (3.4.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    json (1.8.2)
-    jwt (1.4.1)
-    loofah (2.0.1)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.4.3)
-    mini_portile (0.6.2)
-    minitest (5.5.1)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (4.0.2)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.4)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.11.0)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
-    omniauth (1.2.2)
-      hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-facebook (2.0.1)
-      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 1.0)
-      omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    optionable (0.2.0)
-    origin (2.1.1)
-    orm_adapter (0.5.0)
-    rack (1.6.0)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
-    responders (2.1.1)
-      railties (>= 4.2.0, < 5.1)
-    ruby-openid (2.7.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.10)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    warden (1.2.6)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  devise!
-  jruby-openssl
-  mocha (~> 1.1)
-  mongoid (~> 4.0.0)
-  omniauth (~> 1.2.2)
-  omniauth-facebook
-  omniauth-oauth2 (~> 1.2.0)
-  omniauth-openid (~> 1.0.1)
-  rails!
-  rdoc
-  sqlite3
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.11.2
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -4,11 +4,9 @@ require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
 require 'securerandom'
-require 'responders'

 module Devise
  autoload :Delegator,          'devise/delegator'
-  autoload :Encryptor,          'devise/encryptor'
  autoload :FailureApp,         'devise/failure_app'
  autoload :OmniAuth,           'devise/omniauth'
  autoload :ParameterFilter,    'devise/parameter_filter'
@@ -16,21 +14,14 @@ module Devise
  autoload :ParameterSanitizer, 'devise/parameter_sanitizer'
  autoload :TestHelpers,        'devise/test_helpers'
  autoload :TimeInflector,      'devise/time_inflector'
-  autoload :TokenGenerator,     'devise/token_generator'

  module Controllers
    autoload :Helpers, 'devise/controllers/helpers'
    autoload :Rememberable, 'devise/controllers/rememberable'
    autoload :ScopedViews, 'devise/controllers/scoped_views'
-    autoload :SignInOut, 'devise/controllers/sign_in_out'
-    autoload :StoreLocation, 'devise/controllers/store_location'
    autoload :UrlHelpers, 'devise/controllers/url_helpers'
  end

-  module Hooks
-    autoload :Proxy, 'devise/hooks/proxy'
-  end
-
  module Mailers
    autoload :Helpers, 'devise/mailers/helpers'
  end
@@ -54,10 +45,6 @@ module Devise
  # True values used to check params
  TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']

-  # Secret key used by the key generator
-  mattr_accessor :secret_key
-  @@secret_key = nil
-
  # Custom domain or key for cookies. Not set by default
  mattr_accessor :rememberable_options
  @@rememberable_options = {}
@@ -72,7 +59,7 @@ module Devise

  # Keys used when authenticating a user.
  mattr_accessor :authentication_keys
-  @@authentication_keys = [:email]
+  @@authentication_keys = [ :email ]

  # Request keys used when authenticating a user.
  mattr_accessor :request_keys
@@ -80,7 +67,7 @@ module Devise

  # Keys that should be case-insensitive.
  mattr_accessor :case_insensitive_keys
-  @@case_insensitive_keys = [:email]
+  @@case_insensitive_keys = [ :email ]

  # Keys that should have whitespace stripped.
  mattr_accessor :strip_whitespace_keys
@@ -106,7 +93,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]+\.)+[^@\W]+\z/
+  @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/

  # Range validation for password length
  mattr_accessor :password_length
@@ -120,10 +107,6 @@ module Devise
  mattr_accessor :extend_remember_period
  @@extend_remember_period = false

-  # If true, all the remember me tokens are going to be invalidated when the user signs out.
-  mattr_accessor :expire_all_remember_me_on_sign_out
-  @@expire_all_remember_me_on_sign_out = true
-
  # Time interval you can access your account before confirming your account.
  # nil - allows unconfirmed access for unlimited time
  mattr_accessor :allow_unconfirmed_access_for
@@ -135,7 +118,7 @@ module Devise

  # Defines which key will be used when confirming an account.
  mattr_accessor :confirmation_keys
-  @@confirmation_keys = [:email]
+  @@confirmation_keys = [ :email ]

  # Defines if email should be reconfirmable.
  # False by default for backwards compatibility.
@@ -146,14 +129,14 @@ module Devise
  mattr_accessor :timeout_in
  @@timeout_in = 30.minutes

+  # Authentication token expiration on timeout
+  mattr_accessor :expire_auth_token_on_timeout
+  @@expire_auth_token_on_timeout = false
+
  # Used to encrypt password. Please generate one with rake secret.
  mattr_accessor :pepper
  @@pepper = nil

-  # Used to enable sending notification to user when their password is changed
-  mattr_accessor :send_password_change_notification
-  @@send_password_change_notification = false
-
  # Scoped views. Since it relies on fallbacks to render default views, it's
  # turned off by default.
  mattr_accessor :scoped_views
@@ -166,7 +149,7 @@ module Devise

  # Defines which key will be used when locking and unlocking an account
  mattr_accessor :unlock_keys
-  @@unlock_keys = [:email]
+  @@unlock_keys = [ :email ]

  # Defines which strategy can be used to unlock an account.
  # Values: :email, :time, :both
@@ -183,16 +166,12 @@ module Devise

  # Defines which key will be used when recovering the password for an account
  mattr_accessor :reset_password_keys
-  @@reset_password_keys = [:email]
+  @@reset_password_keys = [ :email ]

  # Time interval you can reset your password with a reset password key
  mattr_accessor :reset_password_within
  @@reset_password_within = 6.hours

-  # When set to false, resetting a password does not automatically sign in a user
-  mattr_accessor :sign_in_after_reset_password
-  @@sign_in_after_reset_password = true
-
  # The default scope which is used by warden.
  mattr_accessor :default_scope
  @@default_scope = nil
@@ -201,6 +180,10 @@ module Devise
  mattr_accessor :mailer_sender
  @@mailer_sender = nil

+  # Authentication token params key name of choice. E.g. /users/sign_in?some_key=...
+  mattr_accessor :token_authentication_key
+  @@token_authentication_key = :auth_token
+
  # Skip session storage for the following strategies
  mattr_accessor :skip_session_storage
  @@skip_session_storage = []
@@ -230,12 +213,12 @@ module Devise
  @@parent_mailer = "ActionMailer::Base"

  # The router Devise should use to generate routes. Defaults
-  # to :main_app. Should be overridden by engines in order
+  # 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 overridden when
+  # 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
@@ -244,13 +227,25 @@ module Devise
  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
+
+  def self.use_salt_as_remember_token=(value)
+    warn "\n[DEVISE] Devise.use_salt_as_remember_token is deprecated and has no effect. Please remove it.\n"
+  end
+
+  def self.apply_schema=(value)
+    warn "\n[DEVISE] Devise.apply_schema is deprecated and has no effect. Please remove it.\n"
+  end
+
  # PRIVATE CONFIGURATION

  # Store scopes mappings.
  mattr_reader :mappings
  @@mappings = ActiveSupport::OrderedHash.new

-  # OmniAuth configurations.
+  # Omniauth configurations.
  mattr_reader :omniauth_configs
  @@omniauth_configs = ActiveSupport::OrderedHash.new

@@ -262,20 +257,12 @@ module Devise
  # Private methods to interface with Warden.
  mattr_accessor :warden_config
  @@warden_config = nil
-  @@warden_config_blocks = []
+  @@warden_config_block = nil

  # When true, enter in paranoid mode to avoid user enumeration.
  mattr_accessor :paranoid
  @@paranoid = false

-  # When true, warn user if they just used next-to-last attempt of authentication
-  mattr_accessor :last_attempt_warning
-  @@last_attempt_warning = true
-
-  # Stores the token generator
-  mattr_accessor :token_generator
-  @@token_generator = nil
-
  # Default way to setup Devise. Run rails generate devise_install to create
  # a fresh initializer with all configuration values.
  def self.setup
@@ -329,12 +316,7 @@ module Devise
    mapping
  end

-  # Register available devise modules. For the standard modules that Devise provides, this method is
-  # called from lib/devise/modules.rb. Third-party modules need to be added explicitly using this method.
-  #
-  # Note that adding a module using this method does not cause it to be used in the authentication
-  # process. That requires that the module be listed in the arguments passed to the 'devise' method
-  # in the model class definition.
+  # Make Devise aware of an 3rd party Devise-module (like invitable). For convenience.
  #
  # == Options:
  #
@@ -342,7 +324,6 @@ module Devise
  #   +controller+ - Symbol representing the name of an existing 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*.
-  #   +insert_at+  - Integer representing the order in which this module's model will be included
  #
  # All values, except :model, accept also a boolean and will have the same name as the given module
  # name.
@@ -350,14 +331,12 @@ module Devise
  # == Examples:
  #
  #   Devise.add_module(:party_module)
-  #   Devise.add_module(:party_module, strategy: true, controller: :sessions)
-  #   Devise.add_module(:party_module, model: 'party_module/model')
-  #   Devise.add_module(:party_module, insert_at: 0)
+  #   Devise.add_module(:party_module, :strategy => true, :controller => :sessions)
+  #   Devise.add_module(:party_module, :model => 'party_module/model')
  #
  def self.add_module(module_name, options = {})
-    options.assert_valid_keys(:strategy, :model, :controller, :route, :no_input, :insert_at)
-
-    ALL.insert (options[:insert_at] || -1), module_name
+    ALL << module_name
+    options.assert_valid_keys(:strategy, :model, :controller, :route, :no_input)

    if strategy = options[:strategy]
      strategy = (strategy == true ? module_name : strategy)
@@ -402,7 +381,7 @@ module Devise
  # Sets warden configuration using a block that will be invoked on warden
  # initialization.
  #
-  #  Devise.setup do |config|
+  #  Devise.initialize do |config|
  #    config.allow_unconfirmed_access_for = 2.days
  #
  #    config.warden do |manager|
@@ -411,10 +390,10 @@ module Devise
  #    end
  #  end
  def self.warden(&block)
-    @@warden_config_blocks << block
+    @@warden_config_block = block
  end

-  # Specify an OmniAuth provider.
+  # Specify an omniauth provider.
  #
  #   config.omniauth :github, APP_ID, APP_SECRET
  #
@@ -442,8 +421,8 @@ module Devise
    Devise::Controllers::UrlHelpers.generate_helpers!
  end

-  # A method used internally to complete the setup of warden manager after routes are loaded.
-  # See lib/devise/rails/routes.rb - ActionDispatch::Routing::RouteSet#finalize_with_devise!
+  # A method used internally to setup warden manager from the Rails initialize
+  # block.
  def self.configure_warden! #:nodoc:
    @@warden_configured ||= begin
      warden_config.failure_app   = Devise::Delegator.new
@@ -451,7 +430,7 @@ module Devise
      warden_config.intercept_401 = false

      Devise.mappings.each_value do |mapping|
-        warden_config.scope_defaults mapping.name, strategies: mapping.strategies
+        warden_config.scope_defaults mapping.name, :strategies => mapping.strategies

        warden_config.serialize_into_session(mapping.name) do |record|
          mapping.to.serialize_into_session(record)
@@ -465,18 +444,14 @@ module Devise
        end
      end

-      @@warden_config_blocks.map { |block| block.call Devise.warden_config }
+      @@warden_config_block.try :call, Devise.warden_config
      true
    end
  end

  # Generate a friendly string randomly to be used as token.
-  # By default, length is 20 characters.
-  def self.friendly_token(length = 20)
-    # To calculate real characters, we must perform this operation.
-    # See SecureRandom.urlsafe_base64
-    rlength = (length * 3) / 4
-    SecureRandom.urlsafe_base64(rlength).tr('lIO0', 'sxyz')
+  def self.friendly_token
+    SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
  end

  # constant-time comparison algorithm to prevent timing attacks
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -3,80 +3,12 @@ module Devise
    # Those helpers are convenience methods added to ApplicationController.
    module Helpers
      extend ActiveSupport::Concern
-      include Devise::Controllers::SignInOut
-      include Devise::Controllers::StoreLocation

      included do
-        if respond_to?(:helper_method)
-          helper_method :warden, :signed_in?, :devise_controller?
-        end
+        helper_method :warden, :signed_in?, :devise_controller?
      end

      module ClassMethods
-        # Define authentication filters and accessor helpers for a group of mappings.
-        # These methods are useful when you are working with multiple mappings that
-        # share some functionality. They are pretty much the same as the ones
-        # defined for normal mappings.
-        #
-        # Example:
-        #
-        #   inside BlogsController (or any other controller, it doesn't matter which):
-        #     devise_group :blogger, contains: [:user, :admin]
-        #
-        #   Generated methods:
-        #     authenticate_blogger!  # Redirects unless user or admin are signed in
-        #     blogger_signed_in?     # Checks whether there is either a user or an admin signed in
-        #     current_blogger        # Currently signed in user or admin
-        #     current_bloggers       # Currently signed in user and admin
-        #
-        #   Use:
-        #     before_filter :authenticate_blogger!              # Redirects unless either a user or an admin are authenticated
-        #     before_filter ->{ authenticate_blogger! :admin }  # Redirects to the admin login page
-        #     current_blogger :user                             # Preferably returns a User if one is signed in
-        #
-        def devise_group(group_name, opts={})
-          mappings = "[#{ opts[:contains].map { |m| ":#{m}" }.join(',') }]"
-
-          class_eval <<-METHODS, __FILE__, __LINE__ + 1
-            def authenticate_#{group_name}!(favourite=nil, opts={})
-              unless #{group_name}_signed_in?
-                mappings = #{mappings}
-                mappings.unshift mappings.delete(favourite.to_sym) if favourite
-                mappings.each do |mapping|
-                  opts[:scope] = mapping
-                  warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
-                end
-              end
-            end
-
-            def #{group_name}_signed_in?
-              #{mappings}.any? do |mapping|
-                warden.authenticate?(scope: mapping)
-              end
-            end
-
-            def current_#{group_name}(favourite=nil)
-              mappings = #{mappings}
-              mappings.unshift mappings.delete(favourite.to_sym) if favourite
-              mappings.each do |mapping|
-                current = warden.authenticate(scope: mapping)
-                return current if current
-              end
-              nil
-            end
-
-            def current_#{group_name.to_s.pluralize}
-              #{mappings}.map do |mapping|
-                warden.authenticate(scope: mapping)
-              end.compact
-            end
-
-            if respond_to?(:helper_method)
-              helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
-            end
-          METHODS
-        end
-
        def log_process_action(payload)
          payload[:status] ||= 401 unless payload[:exception]
          super
@@ -121,7 +53,7 @@ module Devise
          end

          def current_#{mapping}
-            @current_#{mapping} ||= warden.authenticate(scope: :#{mapping})
+            @current_#{mapping} ||= warden.authenticate(:scope => :#{mapping})
          end

          def #{mapping}_session
@@ -130,9 +62,7 @@ module Devise
        METHODS

        ActiveSupport.on_load(:action_controller) do
-          if respond_to?(:helper_method)
-            helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
-          end
+          helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
        end
      end

@@ -145,9 +75,9 @@ module Devise
      # the controllers defined inside devise. Useful if you want to apply a before
      # filter to all controllers, except the ones in devise:
      #
-      #   before_filter :my_filter, unless: :devise_controller?
+      #   before_filter :my_filter, :unless => :devise_controller?
      def devise_controller?
-        is_a?(::DeviseController)
+        is_a?(DeviseController)
      end

      # Setup a param sanitizer to filter parameters using strong_parameters. See
@@ -166,20 +96,107 @@ module Devise
        request.env["devise.allow_params_authentication"] = true
      end

-      # The scope root url to be used when they're signed in. By default, it first
+      # Return true if the given scope is signed in session. If no scope given, return
+      # true if any scope is signed in. Does not run authentication hooks.
+      def signed_in?(scope=nil)
+        [ scope || Devise.mappings.keys ].flatten.any? do |_scope|
+          warden.authenticate?(:scope => _scope)
+        end
+      end
+
+      # Sign in a user that already was authenticated. This helper is useful for logging
+      # users in after sign up.
+      #
+      # All options given to sign_in is passed forward to the set_user method in warden.
+      # The only exception is the :bypass option, which bypass warden callbacks and stores
+      # the user straight in session. This option is useful in cases the user is already
+      # signed in, but we want to refresh the credentials in session.
+      #
+      # Examples:
+      #
+      #   sign_in :user, @user                      # sign_in(scope, resource)
+      #   sign_in @user                             # sign_in(resource)
+      #   sign_in @user, :event => :authentication  # sign_in(resource, options)
+      #   sign_in @user, :bypass => true            # sign_in(resource, options)
+      #
+      def sign_in(resource_or_scope, *args)
+        options  = args.extract_options!
+        scope    = Devise::Mapping.find_scope!(resource_or_scope)
+        resource = args.last || resource_or_scope
+
+        expire_session_data_after_sign_in!
+
+        if options[:bypass]
+          warden.session_serializer.store(resource, scope)
+        elsif warden.user(scope) == resource && !options.delete(:force)
+          # Do nothing. User already signed in and we are not forcing it.
+          true
+        else
+          warden.set_user(resource, options.merge!(:scope => scope))
+        end
+      end
+
+      # Sign out a given user or scope. This helper is useful for signing out a user
+      # after deleting accounts. Returns true if there was a logout and false if there
+      # is no user logged in on the referred scope
+      #
+      # Examples:
+      #
+      #   sign_out :user     # sign_out(scope)
+      #   sign_out @user     # sign_out(resource)
+      #
+      def sign_out(resource_or_scope=nil)
+        return sign_out_all_scopes unless resource_or_scope
+        scope = Devise::Mapping.find_scope!(resource_or_scope)
+        user = warden.user(:scope => scope, :run_callbacks => false) # If there is no user
+
+        warden.raw_session.inspect # Without this inspect here. The session does not clear.
+        warden.logout(scope)
+        warden.clear_strategies_cache!(:scope => scope)
+        instance_variable_set(:"@current_#{scope}", nil)
+
+        !!user
+      end
+
+      # Sign out all active users or scopes. This helper is useful for signing out all roles
+      # in one click. This signs out ALL scopes in warden. Returns true if there was at least one logout
+      # and false if there was no user logged in on all scopes.
+      def sign_out_all_scopes(lock=true)
+        users = Devise.mappings.keys.map { |s| warden.user(:scope => s, :run_callbacks => false) }
+
+        warden.raw_session.inspect
+        warden.logout
+        expire_devise_cached_variables!
+        warden.clear_strategies_cache!
+        warden.lock! if lock
+
+        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:
+      #
+      # Example:
+      #
+      #   redirect_to stored_location_for(:user) || root_path
+      #
+      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
+      end
+
+      # The scope root url to be used when he's signed in. By default, it first
      # tries to find a resource_root_path, otherwise it uses the root_path.
      def signed_in_root_path(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        router_name = Devise.mappings[scope].router_name
-
        home_path = "#{scope}_root_path"
-
-        context = router_name ? send(router_name) : self
-
-        if context.respond_to?(home_path, true)
-          context.send(home_path)
-        elsif context.respond_to?(:root_path)
-          context.root_path
+        if respond_to?(home_path, true)
+          send(home_path)
        elsif respond_to?(:root_path)
          root_path
        else
@@ -196,10 +213,10 @@ module Devise
      # root path. For a user scope, you can define the default url in
      # the following way:
      #
-      #   get '/users' => 'users#index', as: :user_root # creates user_root_path
+      #   map.user_root '/users', :controller => 'users' # creates user_root_path
      #
-      #   namespace :user do
-      #     root 'users#index' # creates user_root_path
+      #   map.namespace :user do |user|
+      #     user.root :controller => 'users' # creates user_root_path
      #   end
      #
      # If the resource root path is not defined, root_path is used. However,
@@ -225,10 +242,7 @@ module Devise
      #
      # By default it is the root_path.
      def after_sign_out_path_for(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        router_name = Devise.mappings[scope].router_name
-        context = router_name ? send(router_name) : self
-        context.respond_to?(:root_path) ? context.root_path : "/"
+        respond_to?(:root_path) ? root_path : "/"
      end

      # Sign in a user and tries to redirect first to the stored location and
@@ -242,6 +256,10 @@ module Devise
        redirect_to after_sign_in_path_for(resource)
      end

+      def expire_session_data_after_sign_in!
+        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
+      end
+
      # Sign out a user and tries to redirect to the url specified by
      # after_sign_out_path_for.
      def sign_out_and_redirect(resource_or_scope)
@@ -254,9 +272,10 @@ module Devise
      # Overwrite Rails' handle unverified request to sign out all scopes,
      # clear run strategies and remove cached variables.
      def handle_unverified_request
-        super # call the default behaviour which resets/nullifies/raises
-        request.env["devise.skip_storage"] = true
        sign_out_all_scopes(false)
+        request.env["devise.skip_storage"] = true
+        expire_devise_cached_variables!
+        super # call the default behaviour which resets the session
      end

      def request_format
@@ -267,23 +286,10 @@ module Devise
        Devise.navigational_formats.include?(request_format)
      end

-      # Check if flash messages should be emitted. Default is to do it on
-      # navigational formats
-      def is_flashing_format?
-        is_navigational_format?
-      end
-
      private

-      def expire_session_data_after_sign_in!
-        ActiveSupport::Deprecation.warn "expire_session_data_after_sign_in! is deprecated " \
-          "in favor of expire_data_after_sign_in!"
-        expire_data_after_sign_in!
-      end
-
-      def expire_data_after_sign_out!
+      def expire_devise_cached_variables!
        Devise.mappings.each { |_,m| instance_variable_set("@current_#{m.name}", nil) }
-        super
      end
    end
  end
--- a/lib/devise/controllers/rememberable.rb
+++ b/lib/devise/controllers/rememberable.rb
@@ -1,26 +1,29 @@
 module Devise
  module Controllers
    # A module that may be optionally included in a controller in order
-    # to provide remember me behavior. Useful when signing in is done
-    # through a callback, like in OmniAuth.
+    # to provide remember me behavior.
    module Rememberable
      # Return default cookie values retrieved from session options.
      def self.cookie_values
        Rails.configuration.session_options.slice(:path, :domain, :secure)
      end

-      def remember_me_is_active?(resource)
-        return false unless resource.respond_to?(:remember_me)
-        scope = Devise::Mapping.find_scope!(resource)
-        _, token, generated_at = cookies.signed[remember_key(resource, scope)]
-        resource.remember_me?(token, generated_at)
+      # A small warden proxy so we can remember and forget uses from hooks.
+      class Proxy #:nodoc:
+        include Devise::Controllers::Rememberable
+
+        delegate :cookies, :env, :to => :@warden
+
+        def initialize(warden)
+          @warden = warden
+        end
      end

      # 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.remember_me!(resource.extend_remember_period)
        cookies.signed[remember_key(resource, scope)] = remember_cookie_values(resource)
      end

@@ -38,11 +41,11 @@ module Devise
      end

      def remember_cookie_values(resource)
-        options = { httponly: true }
+        options = { :httponly => true }
        options.merge!(forget_cookie_values(resource))
        options.merge!(
-          value: resource.class.serialize_into_cookie(resource),
-          expires: resource.remember_expires_at
+          :value => resource.class.serialize_into_cookie(resource),
+          :expires => resource.remember_expires_at
        )
      end

--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -14,4 +14,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/controllers/sign_in_out.rb
+++ b/lib/devise/controllers/sign_in_out.rb
@@ -1,96 +0,0 @@
-module Devise
-  module Controllers
-    # Provide sign in and sign out functionality.
-    # Included by default in all controllers.
-    module SignInOut
-      # Return true if the given scope is signed in session. If no scope given, return
-      # true if any scope is signed in. Does not run authentication hooks.
-      def signed_in?(scope=nil)
-        [scope || Devise.mappings.keys].flatten.any? do |_scope|
-          warden.authenticate?(scope: _scope)
-        end
-      end
-
-      # Sign in a user that already was authenticated. This helper is useful for logging
-      # users in after sign up.
-      #
-      # All options given to sign_in is passed forward to the set_user method in warden.
-      # The only exception is the :bypass option, which bypass warden callbacks and stores
-      # the user straight in session. This option is useful in cases the user is already
-      # signed in, but we want to refresh the credentials in session.
-      #
-      # Examples:
-      #
-      #   sign_in :user, @user                      # sign_in(scope, resource)
-      #   sign_in @user                             # sign_in(resource)
-      #   sign_in @user, event: :authentication  # sign_in(resource, options)
-      #   sign_in @user, store: false            # sign_in(resource, options)
-      #   sign_in @user, bypass: true            # sign_in(resource, options)
-      #
-      def sign_in(resource_or_scope, *args)
-        options  = args.extract_options!
-        scope    = Devise::Mapping.find_scope!(resource_or_scope)
-        resource = args.last || resource_or_scope
-
-        expire_data_after_sign_in!
-
-        if options[:bypass]
-          warden.session_serializer.store(resource, scope)
-        elsif warden.user(scope) == resource && !options.delete(:force)
-          # Do nothing. User already signed in and we are not forcing it.
-          true
-        else
-          warden.set_user(resource, options.merge!(scope: scope))
-        end
-      end
-
-      # Sign out a given user or scope. This helper is useful for signing out a user
-      # after deleting accounts. Returns true if there was a logout and false if there
-      # is no user logged in on the referred scope
-      #
-      # Examples:
-      #
-      #   sign_out :user     # sign_out(scope)
-      #   sign_out @user     # sign_out(resource)
-      #
-      def sign_out(resource_or_scope=nil)
-        return sign_out_all_scopes unless resource_or_scope
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        user = warden.user(scope: scope, run_callbacks: false) # If there is no user
-
-        warden.raw_session.inspect # Without this inspect here. The session does not clear.
-        warden.logout(scope)
-        warden.clear_strategies_cache!(scope: scope)
-        instance_variable_set(:"@current_#{scope}", nil)
-
-        !!user
-      end
-
-      # Sign out all active users or scopes. This helper is useful for signing out all roles
-      # in one click. This signs out ALL scopes in warden. Returns true if there was at least one logout
-      # and false if there was no user logged in on all scopes.
-      def sign_out_all_scopes(lock=true)
-        users = Devise.mappings.keys.map { |s| warden.user(scope: s, run_callbacks: false) }
-
-        warden.logout
-        expire_data_after_sign_out!
-        warden.clear_strategies_cache!
-        warden.lock! if lock
-
-        users.any?
-      end
-
-      private
-
-      def expire_data_after_sign_in!
-        # session.keys will return an empty array if the session is not yet loaded.
-        # This is a bug in both Rack and Rails.
-        # A call to #empty? forces the session to be loaded.
-        session.empty?
-        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
-      end
-
-      alias :expire_data_after_sign_out! :expire_data_after_sign_in!
-    end
-  end
-end
--- a/lib/devise/controllers/store_location.rb
+++ b/lib/devise/controllers/store_location.rb
@@ -1,58 +0,0 @@
-require "uri"
-
-module Devise
-  module Controllers
-    # Provide the ability to store a location.
-    # Used to redirect back to a desired path after sign in.
-    # Included by default in all controllers.
-    module StoreLocation
-      # 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:
-      #
-      # Example:
-      #
-      #   redirect_to stored_location_for(:user) || root_path
-      #
-      def stored_location_for(resource_or_scope)
-        session_key = stored_location_key_for(resource_or_scope)
-
-        if is_navigational_format?
-          session.delete(session_key)
-        else
-          session[session_key]
-        end
-      end
-
-      # Stores the provided location to redirect the user after signing in.
-      # Useful in combination with the `stored_location_for` helper.
-      #
-      # Example:
-      #
-      #   store_location_for(:user, dashboard_path)
-      #   redirect_to user_omniauth_authorize_path(:facebook)
-      #
-      def store_location_for(resource_or_scope, location)
-        session_key = stored_location_key_for(resource_or_scope)
-        uri = parse_uri(location)
-        if uri
-          path = [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
-          path = [path, uri.fragment].compact.join('#')
-          session[session_key] = path
-        end
-      end
-
-      private
-
-      def parse_uri(location)
-        location && URI.parse(location)
-      rescue URI::InvalidURIError
-        nil
-      end
-
-      def stored_location_key_for(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        "#{scope}_return_to"
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -42,14 +42,14 @@ module Devise
          [:path, :url].each do |path_or_url|
            actions.each do |action|
              action = action ? "#{action}_" : ""
-              method = :"#{action}#{module_name}_#{path_or_url}"
+              method = "#{action}#{module_name}_#{path_or_url}"

-              define_method method do |resource_or_scope, *args|
-                scope = Devise::Mapping.find_scope!(resource_or_scope)
-                router_name = Devise.mappings[scope].router_name
-                context = router_name ? send(router_name) : _devise_route_context
-                context.send("#{action}#{scope}_#{module_name}_#{path_or_url}", *args)
-              end
+              class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
+                def #{method}(resource_or_scope, *args)
+                  scope = Devise::Mapping.find_scope!(resource_or_scope)
+                  _devise_route_context.send("#{action}\#{scope}_#{module_name}_#{path_or_url}", *args)
+                end
+              URL_HELPERS
            end
          end
        end
--- a/lib/devise/encryptor.rb
+++ b/lib/devise/encryptor.rb
@@ -1,22 +0,0 @@
-require 'bcrypt'
-
-module Devise
-  module Encryptor
-    def self.digest(klass, password)
-      if klass.pepper.present?
-        password = "#{password}#{klass.pepper}"
-      end
-      ::BCrypt::Password.create(password, cost: klass.stretches).to_s
-    end
-
-    def self.compare(klass, encrypted_password, password)
-      return false if encrypted_password.blank?
-      bcrypt   = ::BCrypt::Password.new(encrypted_password)
-      if klass.pepper.present?
-        password = "#{password}#{klass.pepper}"
-      end
-      password = ::BCrypt::Engine.hash_secret(password, bcrypt.salt)
-      Devise.secure_compare(password, encrypted_password)
-    end
-  end
-end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -13,21 +13,16 @@ module Devise
    include Rails.application.routes.url_helpers
    include Rails.application.routes.mounted_helpers

-    include Devise::Controllers::StoreLocation
-
-    delegate :flash, to: :request
+    delegate :flash, :to => :request

    def self.call(env)
      @respond ||= action(:respond)
      @respond.call(env)
    end

-    # Try retrieving the URL options from the parent controller (usually 
-    # ApplicationController). Instance methods are not supported at the moment,
-    # so only the class-level attribute is used.
    def self.default_url_options(*args)
-      if defined?(Devise.parent_controller.constantize)
-        Devise.parent_controller.constantize.try(:default_url_options) || {}
+      if defined?(ApplicationController)
+        ApplicationController.default_url_options(*args)
      else
        {}
      end
@@ -51,55 +46,30 @@ module Devise
    end

    def recall
-      config = Rails.application.config
-
-      if config.try(:relative_url_root)
-        base_path = Pathname.new(config.relative_url_root)
-        full_path = Pathname.new(attempted_path)
-
-        env["SCRIPT_NAME"] = config.relative_url_root
-        env["PATH_INFO"] = '/' + full_path.relative_path_from(base_path).to_s
-      else
-        env["PATH_INFO"]  = attempted_path
-      end
-
-      flash.now[:alert] = i18n_message(:invalid) if is_flashing_format?
+      env["PATH_INFO"]  = attempted_path
+      flash.now[:alert] = i18n_message(:invalid)
      self.response = recall_app(warden_options[:recall]).call(env)
    end

    def redirect
      store_location!
-      if is_flashing_format?
-        if flash[:timedout] && flash[:alert]
-          flash.keep(:timedout)
-          flash.keep(:alert)
-        else
-          flash[:alert] = i18n_message
-        end
+      if flash[:timedout] && flash[:alert]
+        flash.keep(:timedout)
+        flash.keep(:alert)
+      else
+        flash[:alert] = i18n_message
      end
      redirect_to redirect_url
    end

  protected

-    def i18n_options(options)
-      options
-    end
-
    def i18n_message(default = nil)
      message = warden_message || default || :unauthenticated

      if message.is_a?(Symbol)
-        options = {}
-        options[:resource_name] = scope
-        options[:scope] = "devise.failure"
-        options[:default] = [message]
-        auth_keys = scope_class.authentication_keys
-        keys = auth_keys.respond_to?(:keys) ? auth_keys.keys : auth_keys
-        options[:authentication_keys] = keys.join(I18n.translate(:"support.array.words_connector"))
-        options = i18n_options(options)
-
-        I18n.t(:"#{scope}.#{message}", options)
+        I18n.t(:"#{scope}.#{message}", :resource_name => scope,
+               :scope => "devise.failure", :default => [message])
      else
        message.to_s
      end
@@ -107,7 +77,7 @@ module Devise

    def redirect_url
      if warden_message == :timeout
-        flash[:timedout] = true if is_flashing_format?
+        flash[:timedout] = true

        path = if request.get?
          attempted_path
@@ -115,39 +85,26 @@ module Devise
          request.referrer
        end

-        path || scope_url
+        path || scope_path
      else
-        scope_url
+        scope_path
      end
    end

-    def route(scope)
-      :"new_#{scope}_session_url"
-    end
-
-    def scope_url
+    def scope_path
      opts  = {}
-      route = route(scope)
+      route = :"new_#{scope}_session_path"
      opts[:format] = request_format unless skip_format?

      config = Rails.application.config
+      opts[:script_name] = (config.relative_url_root if config.respond_to?(:relative_url_root))

-      # Rails 4.2 goes into an infinite loop if opts[:script_name] is unset
-      if (Rails::VERSION::MAJOR >= 4) && (Rails::VERSION::MINOR >= 2)
-        opts[:script_name] = (config.relative_url_root if config.respond_to?(:relative_url_root))
-      else
-        if config.respond_to?(:relative_url_root) && config.relative_url_root.present?
-          opts[:script_name] = config.relative_url_root
-        end
-      end
-
-      router_name = Devise.mappings[scope].router_name || Devise.available_router_name
-      context = send(router_name)
+      context = send(Devise.available_router_name)

      if context.respond_to?(route)
        context.send(route, opts)
-      elsif respond_to?(:root_url)
-        root_url(opts)
+      elsif respond_to?(:root_path)
+        root_path(opts)
      else
        "/"
      end
@@ -176,16 +133,16 @@ module Devise
    # It does not make sense to send authenticate headers in ajax requests
    # or if the user disabled them.
    def http_auth_header?
-      scope_class.http_authenticatable && !request.xhr?
+      Devise.mappings[scope].to.http_authenticatable && !request.xhr?
    end

    def http_auth_body
      return i18n_message unless request_format
      method = "to_#{request_format}"
      if method == "to_xml"
-        { error: i18n_message }.to_xml(root: "errors")
+        { :error => i18n_message }.to_xml(:root => "errors")
      elsif {}.respond_to?(method)
-        { error: i18n_message }.send(method)
+        { :error => i18n_message }.send(method)
      else
        i18n_message
      end
@@ -214,10 +171,6 @@ module Devise
      @scope ||= warden_options[:scope] || Devise.default_scope
    end

-    def scope_class
-      @scope_class ||= Devise.mappings[scope].to
-    end
-
    def attempted_path
      warden_options[:attempted_path]
    end
@@ -227,19 +180,13 @@ module Devise
    # yet, but we still need to store the uri based on scope, so different scopes
    # would never use the same uri to redirect.
    def store_location!
-      store_location_for(scope, attempted_path) if request.get? && !http_auth?
+      session["#{scope}_return_to"] = attempted_path if request.get? && !http_auth?
    end

    def is_navigational_format?
      Devise.navigational_formats.include?(request_format)
    end

-    # Check if flash messages should be emitted. Default is to do it on
-    # navigational formats
-    def is_flashing_format?
-      is_navigational_format?
-    end
-
    def request_format
      @request_format ||= request.format.try(:ref)
    end
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -1,10 +1,11 @@
-# Deny user access whenever their account is not active yet.
-# We need this as hook to validate the user activity on each request
-# and in case the user is using other strategies beside Devise ones.
+# Deny user access whenever his account is not active yet. All strategies that inherits from
+# Devise::Strategies::Authenticatable and uses the validate already check if the user is active_for_authentication?
+# before actively signing him in. However, we need this as hook to validate the user activity
+# in each request and in case the user is using other strategies beside Devise ones.
 Warden::Manager.after_set_user do |record, warden, options|
  if record && record.respond_to?(:active_for_authentication?) && !record.active_for_authentication?
    scope = options[:scope]
    warden.logout(scope)
-    throw :warden, scope: scope, message: record.inactive_message
+    throw :warden, :scope => scope, :message => record.inactive_message
  end
-end
+end
--- a/lib/devise/hooks/csrf_cleaner.rb
+++ b/lib/devise/hooks/csrf_cleaner.rb
@@ -1,7 +1,5 @@
 Warden::Manager.after_authentication do |record, warden, options|
-  clean_up_for_winning_strategy = !warden.winning_strategy.respond_to?(:clean_up_csrf?) ||
-    warden.winning_strategy.clean_up_csrf?
-  if Devise.clean_up_csrf_token_on_authentication && clean_up_for_winning_strategy
+  if Devise.clean_up_csrf_token_on_authentication
    warden.request.session.try(:delete, :_csrf_token)
  end
 end
--- a/lib/devise/hooks/forgetable.rb
+++ b/lib/devise/hooks/forgetable.rb
@@ -4,6 +4,6 @@
 # This avoids forgetting deleted users.
 Warden::Manager.before_logout do |record, warden, options|
  if record.respond_to?(:forget_me!)
-    Devise::Hooks::Proxy.new(warden).forget_me(record)
+    Devise::Controllers::Rememberable::Proxy.new(warden).forget_me(record)
  end
 end
--- a/lib/devise/hooks/lockable.rb
+++ b/lib/devise/hooks/lockable.rb
@@ -1,7 +1,7 @@
 # After each sign in, if resource responds to failed_attempts, sets it to 0
 # This is only triggered when the user is explicitly set (with set_user)
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
  if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
-    record.update_attribute(:failed_attempts, 0) unless record.failed_attempts.to_i.zero?
+    record.update_attribute(:failed_attempts, 0) unless record.failed_attempts.zero?
  end
 end
--- a/lib/devise/hooks/proxy.rb
+++ b/lib/devise/hooks/proxy.rb
@@ -1,21 +0,0 @@
-module Devise
-  module Hooks
-    # A small warden proxy so we can remember, forget and
-    # sign out users from hooks.
-    class Proxy #:nodoc:
-      include Devise::Controllers::Rememberable
-      include Devise::Controllers::SignInOut
-
-      attr_reader :warden
-      delegate :cookies, :env, to: :warden
-
-      def initialize(warden)
-        @warden = warden
-      end
-
-      def session
-        warden.request.session
-      end
-    end
-  end
-end
--- a/lib/devise/hooks/rememberable.rb
+++ b/lib/devise/hooks/rememberable.rb
@@ -1,7 +1,6 @@
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
  scope = options[:scope]
-  if record.respond_to?(:remember_me) && options[:store] != false &&
-     record.remember_me && warden.authenticated?(scope)
-    Devise::Hooks::Proxy.new(warden).remember_me(record)
+  if record.respond_to?(:remember_me) && record.remember_me && warden.authenticated?(scope)
+    Devise::Controllers::Rememberable::Proxy.new(warden).remember_me(record)
  end
-end
+end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -7,27 +7,19 @@ Warden::Manager.after_set_user do |record, warden, options|
  scope = options[:scope]
  env   = warden.request.env

-  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) &&
-     options[:store] != false && !env['devise.skip_timeoutable']
+  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) && options[:store] != false
    last_request_at = warden.session(scope)['last_request_at']

-    if last_request_at.is_a? Integer
-      last_request_at = Time.at(last_request_at).utc
-    elsif last_request_at.is_a? String
-      last_request_at = Time.parse(last_request_at)
-    end
-
-    proxy = Devise::Hooks::Proxy.new(warden)
-
-    if record.timedout?(last_request_at) &&
-        !env['devise.skip_timeout'] &&
-        !proxy.remember_me_is_active?(record)
-      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(scope)
-      throw :warden, scope: scope, message: :timeout
+    if record.timedout?(last_request_at) && !env['devise.skip_timeout']
+      warden.logout(scope)
+      if record.respond_to?(:expire_auth_token_on_timeout) && record.expire_auth_token_on_timeout
+        record.reset_authentication_token!
+      end
+      throw :warden, :scope => scope, :message => :timeout
    end

    unless env['devise.skip_trackable']
-      warden.session(scope)['last_request_at'] = Time.now.utc.to_i
+      warden.session(scope)['last_request_at'] = Time.now.utc
    end
  end
 end
--- a/lib/devise/hooks/trackable.rb
+++ b/lib/devise/hooks/trackable.rb
@@ -2,7 +2,7 @@
 # This is only triggered when the user is explicitly set (with set_user)
 # and on authentication. Retrieving the user from session (:fetch) does
 # not trigger it.
-Warden::Manager.after_set_user except: :fetch do |record, warden, options|
+Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope]) && !warden.request.env['devise.skip_trackable']
    record.update_tracked_fields!(warden.request)
  end
--- a/lib/devise/mailers/helpers.rb
+++ b/lib/devise/mailers/helpers.rb
@@ -27,14 +27,20 @@ module Devise

      def headers_for(action, opts)
        headers = {
-          subject: subject_for(action),
-          to: resource.email,
-          from: mailer_sender(devise_mapping),
-          reply_to: mailer_reply_to(devise_mapping),
-          template_path: template_paths,
-          template_name: action
+          :subject       => subject_for(action),
+          :to            => resource.email,
+          :from          => mailer_sender(devise_mapping),
+          :reply_to      => mailer_reply_to(devise_mapping),
+          :template_path => template_paths,
+          :template_name => action
        }.merge(opts)

+        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]
        headers
      end
@@ -82,8 +88,8 @@ module Devise
      #           subject: '...'
      #
      def subject_for(key)
-        I18n.t(:"#{devise_mapping.name}_subject", scope: [:devise, :mailer, key],
-          default: [:subject, key.to_s.humanize])
+        I18n.t(:"#{devise_mapping.name}_subject", :scope => [:devise, :mailer, key],
+          :default => [:subject, key.to_s.humanize])
      end
    end
  end
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -23,18 +23,16 @@ module Devise
  #
  class Mapping #:nodoc:
    attr_reader :singular, :scoped_path, :path, :controllers, :path_names,
-                :class_name, :sign_out_via, :format, :used_routes, :used_helpers,
-                :failure_app, :router_name
+                :class_name, :sign_out_via, :format, :used_routes, :used_helpers, :failure_app

    alias :name :singular

    # Receives an object and find a scope for it. If a scope cannot be found,
    # raises an error. If a symbol is given, it's considered to be the scope.
    def self.find_scope!(obj)
-      obj = obj.devise_scope if obj.respond_to?(:devise_scope)
      case obj
      when String, Symbol
-        return obj.to_sym
+        return obj
      when Class
        Devise.mappings.each_value { |m| return m.name if obj <= m.to }
      else
@@ -62,8 +60,6 @@ module Devise
      @sign_out_via = options[:sign_out_via] || Devise.sign_out_via
      @format = options[:format]

-      @router_name = options[:router_name]
-
      default_failure_app(options)
      default_controllers(options)
      default_path_names(options)
--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -12,7 +12,7 @@ module Devise

    # Creates configuration values for Devise and for the given module.
    #
-    #   Devise::Models.config(Devise::DatabaseAuthenticatable, :stretches)
+    #   Devise::Models.config(Devise::Authenticatable, :stretches, 10)
    #
    # The line above creates:
    #
@@ -56,8 +56,14 @@ module Devise
      klass.devise_modules.each do |mod|
        constant = const_get(mod.to_s.classify)

-        constant.required_fields(klass).each do |field|
-          failed_attributes << field unless instance.respond_to?(field)
+        if constant.respond_to?(:required_fields)
+          constant.required_fields(klass).each do |field|
+            failed_attributes << field unless instance.respond_to?(field)
+          end
+        else
+          ActiveSupport::Deprecation.warn "The module #{mod} doesn't implement self.required_fields(klass). " \
+            "Devise uses required_fields to warn developers of any missing fields in their models. " \
+            "Please implement #{mod}.required_fields(klass) that returns an array of symbols with the required fields."
        end
      end

@@ -83,8 +89,11 @@ module Devise

      devise_modules_hook! do
        include Devise::Models::Authenticatable
-
        selected_modules.each do |m|
+          if m == :encryptable && !(defined?(Devise::Models::Encryptable))
+            warn "[DEVISE] You're trying to include :encryptable in your model but it is not bundled with the Devise gem anymore. Please add `devise-encryptable` to your Gemfile to proceed.\n"
+          end
+
          mod = Devise::Models.const_get(m.to_s.classify)

          if mod.const_defined?("ClassMethods")
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -1,4 +1,3 @@
-require 'active_model/version'
 require 'devise/hooks/activatable'
 require 'devise/hooks/csrf_cleaner'

@@ -30,7 +29,9 @@ module Devise
    #     It also accepts an array specifying the strategies that should allow params authentication.
    #
    #   * +skip_session_storage+: By default Devise will store the user in session.
-    #     By default is set to skip_session_storage: [:http_auth].
+    #     You can skip storage for http and token auth by appending values to array:
+    #     :skip_session_storage => [:token_auth] or :skip_session_storage => [:http_auth, :token_auth],
+    #     by default is set to :skip_session_storage => [:http_auth].
    #
    # == active_for_authentication?
    #
@@ -38,7 +39,7 @@ module Devise
    # calling model.active_for_authentication?. This method is overwritten by other devise modules. For instance,
    # :confirmable overwrites .active_for_authentication? to only return true if your model was confirmed.
    #
-    # You can overwrite this method yourself, but if you do, don't forget to call super:
+    # You overwrite this method yourself, but if you do, don't forget to call super:
    #
    #   def active_for_authentication?
    #     super && special_condition_is_valid?
@@ -57,10 +58,10 @@ module Devise
      BLACKLIST_FOR_SERIALIZATION = [:encrypted_password, :reset_password_token, :reset_password_sent_at,
        :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip,
        :last_sign_in_ip, :password_salt, :confirmation_token, :confirmed_at, :confirmation_sent_at,
-        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at]
+        :remember_token, :unconfirmed_email, :failed_attempts, :unlock_token, :locked_at, :authentication_token]

      included do
-        class_attribute :devise_modules, instance_writer: false
+        class_attribute :devise_modules, :instance_writer => false
        self.devise_modules ||= []

        before_validation :downcase_keys
@@ -96,22 +97,29 @@ module Devise
      def authenticatable_salt
      end

-      # Redefine serializable_hash in models for more secure defaults.
-      # By default, it removes from the serializable model all attributes that
-      # are *not* accessible. You can remove this default by using :force_except
-      # and passing a new list of attributes you want to exempt. All attributes
-      # given to :except will simply add names to exempt to Devise internal list.
-      def serializable_hash(options = nil)
-        options ||= {}
-        options[:except] = Array(options[:except])
+      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"

-        if options[:force_except]
-          options[:except].concat Array(options[:force_except])
-        else
-          options[:except].concat BLACKLIST_FOR_SERIALIZATION
-        end
+      array.each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__
+          # Redefine to_xml and serializable_hash in models for more secure defaults.
+          # By default, it removes from the serializable model all attributes that
+          # are *not* accessible. You can remove this default by using :force_except
+          # and passing a new list of attributes you want to exempt. All attributes
+          # given to :except will simply add names to exempt to Devise internal list.
+          def #{method}(options=nil)
+            options ||= {}
+            options[:except] = Array(options[:except])

-        super(options)
+            if options[:force_except]
+              options[:except].concat Array(options[:force_except])
+            else
+              options[:except].concat BLACKLIST_FOR_SERIALIZATION
+            end
+            super(options)
+          end
+        RUBY
      end

      protected
@@ -121,7 +129,7 @@ module Devise
      end

      # This is an internal method called every time Devise needs
-      # to send a notification/mail. This can be overridden if you
+      # to send a notification/mail. This can be overriden if you
      # need to customize the e-mail delivery logic. For instance,
      # if you are using a queue to deliver e-mails (delayed job,
      # sidekiq, resque, etc), you must add the delivery to the queue
@@ -136,20 +144,20 @@ module Devise
      #
      #       protected
      #
-      #       def send_devise_notification(notification, *args)
-      #         # If the record is new or changed then delay the
+      #       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, args]
+      #           pending_notifications << [notification, opts]
      #         else
-      #           devise_mailer.send(notification, self, *args).deliver
+      #           devise_mailer.send(notification, self, opts).deliver
      #         end
      #       end
      #
      #       def send_pending_notifications
-      #         pending_notifications.each do |notification, args|
-      #           devise_mailer.send(notification, self, *args).deliver
+      #         pending_notifications.each do |n, opts|
+      #           devise_mailer.send(n, self, opts).deliver
      #         end
      #
      #         # Empty the pending notifications array because the
@@ -163,35 +171,28 @@ module Devise
      #       end
      #     end
      #
-      def send_devise_notification(notification, *args)
-        message = devise_mailer.send(notification, self, *args)
-        # Remove once we move to Rails 4.2+ only.
-        if message.respond_to?(:deliver_now)
-          message.deliver_now
-        else
-          message.deliver
-        end
+      def send_devise_notification(notification, opts={})
+        devise_mailer.send(notification, self, opts).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| apply_to_attribute_or_variable(k, :downcase!) }
      end

      def strip_whitespace
-        self.class.strip_whitespace_keys.each { |k| apply_to_attribute_or_variable(k, :strip) }
+        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] = self[attr].try(method)
+          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
+        # attempting to strip! or downcase! when a model didn't have the
        # globally configured key.
-        elsif respond_to?(attr) && respond_to?("#{attr}=")
-          new_value = send(attr).try(method)
-          send("#{attr}=", new_value)
+        elsif respond_to?(attr)
+          send(attr).try(method)
        end
      end

@@ -231,7 +232,7 @@ module Devise
        # Example:
        #
        #   def self.find_for_authentication(tainted_conditions)
-        #     find_first_by_auth_conditions(tainted_conditions, active: true)
+        #     find_first_by_auth_conditions(tainted_conditions, :active => true)
        #   end
        #
        # Finally, notice that Devise also queries for users in other scenarios
@@ -246,14 +247,14 @@ module Devise
          to_adapter.find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
        end

-        # Find or initialize a record setting an error if it can't be found.
+        # Find an initialize a record setting an error if it can't be found.
        def find_or_initialize_with_error_by(attribute, value, error=:invalid) #:nodoc:
          find_or_initialize_with_errors([attribute], { attribute => value }, error)
        end

-        # Find or initialize a record with group of attributes based on a list of required attributes.
+        # Find an initialize a group of attributes based on a list of required attributes.
        def find_or_initialize_with_errors(required_attributes, attributes, error=:invalid) #:nodoc:
-          attributes = attributes.slice(*required_attributes).with_indifferent_access
+          attributes = attributes.slice(*required_attributes)
          attributes.delete_if { |key, value| value.blank? }

          if attributes.size == required_attributes.size
@@ -278,6 +279,14 @@ module Devise
        def devise_parameter_filter
          @devise_parameter_filter ||= Devise::ParameterFilter.new(case_insensitive_keys, strip_whitespace_keys)
        end
+
+        # Generate a token by looping and ensuring does not already exist.
+        def generate_token(column)
+          loop do
+            token = Devise.friendly_token
+            break token unless to_adapter.find_first({ column => token })
+          end
+        end
      end
    end
  end
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -5,36 +5,26 @@ module Devise
    # Confirmation instructions are sent to the user email after creating a
    # record and when manually requested by a new confirmation instruction request.
    #
-    # Confirmable tracks the following columns:
-    #
-    # * confirmation_token   - A unique random token
-    # * confirmed_at         - A timestamp when the user clicked the confirmation link
-    # * confirmation_sent_at - A timestamp when the confirmation_token was generated (not sent)
-    # * unconfirmed_email    - An email address copied from the email attr. After confirmation
-    #                          this value is copied to the email attr then cleared
-    #
    # == Options
    #
-    # Confirmable adds the following options to +devise+:
+    # Confirmable adds the following options to devise_for:
    #
-    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access their account
+    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access his account
    #     before confirming it. After this period, the user access is denied. You can
    #     use this to let your user access some features of your application without
    #     confirming the account, but blocking it after a certain period (ie 7 days).
    #     By default allow_unconfirmed_access_for is zero, it means users always have to confirm to sign in.
    #   * +reconfirmable+: requires any email changes to be confirmed (exactly the same way as
    #     initial account confirmation) to be applied. Requires additional unconfirmed_email
-    #     db field to be setup (t.reconfirmable in migrations). Until confirmed, new email is
+    #     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.
-    #     Confirmable will not generate a new token if a repeat confirmation is requested
-    #     during this time frame, unless the user's email changed too.
    #
    # == Examples
    #
-    #   User.find(1).confirm       # returns true unless it's already confirmed
+    #   User.find(1).confirm!      # returns true unless it's already confirmed
    #   User.find(1).confirmed?    # true/false
    #   User.find(1).send_confirmation_instructions # manually send instructions
    #
@@ -43,17 +33,16 @@ module Devise
      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?
-        before_update :postpone_email_change_until_confirmation_and_regenerate_confirmation_token, if: :postpone_email_change?
-        after_update  :send_reconfirmation_instructions,  if: :reconfirmation_required?
+        before_create :generate_confirmation_token, :if => :confirmation_required?
+        after_create  :send_on_create_confirmation_instructions, :if => :send_confirmation_notification?
+        before_update :postpone_email_change_until_confirmation_and_regenerate_confirmation_token, :if => :postpone_email_change?
+        after_update  :send_reconfirmation_instructions,  :if => :reconfirmation_required?
      end

      def initialize(*args, &block)
-        @bypass_confirmation_postpone = false
+        @bypass_postpone = false
        @reconfirmation_required = false
        @skip_confirmation_notification = false
-        @raw_confirmation_token = nil
        super
      end

@@ -66,14 +55,15 @@ module Devise
      # Confirm a user by setting it's confirmed_at to actual time. If the user
      # is already confirmed, add an error to email field. If the user is invalid
      # add errors
-      def confirm(args={})
+      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))
+              :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

          saved = if self.class.reconfirmable && unconfirmed_email.present?
@@ -82,9 +72,9 @@ module Devise
            self.unconfirmed_email = nil

            # We need to validate in such cases to enforce e-mail uniqueness
-            save(validate: true)
+            save(:validate => true)
          else
-            save(validate: args[:ensure_valid] == true)
+            save(:validate => false)
          end

          after_confirmation if saved
@@ -92,11 +82,6 @@ module Devise
        end
      end

-      def confirm!(args={})
-        ActiveSupport::Deprecation.warn "confirm! is deprecated in favor of confirm"
-        confirm(args)
-      end
-
      # Verifies whether a user is confirmed or not
      def confirmed?
        !!confirmed_at
@@ -108,12 +93,10 @@ module Devise

      # Send confirmation instructions by email
      def send_confirmation_instructions
-        unless @raw_confirmation_token
-          generate_confirmation_token!
-        end
+        ensure_confirmation_token!

-        opts = pending_reconfirmation? ? { to: unconfirmed_email } : { }
-        send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
+        opts = pending_reconfirmation? ? { :to => unconfirmed_email } : { }
+        send_devise_notification(:confirmation_instructions, opts)
      end

      def send_reconfirmation_instructions
@@ -126,11 +109,17 @@ module Devise

      # Resend confirmation token.
      # Regenerates the token if the period is expired.
-      def resend_confirmation_instructions
+      def resend_confirmation_token
        pending_any_confirmation do
+          regenerate_confirmation_token! if confirmation_period_expired?
          send_confirmation_instructions
        end
      end
+      
+      # Generate a confirmation token unless already exists and save the record.
+      def ensure_confirmation_token!
+        generate_confirmation_token! if should_generate_confirmation_token?
+      end 

      # Overwrites active_for_authentication? for confirmation
      # by verifying whether a user is active to sign in or not. If the user
@@ -160,17 +149,19 @@ module Devise
      # If you don't want reconfirmation to be sent, neither a code
      # to be generated, call skip_reconfirmation!
      def skip_reconfirmation!
-        @bypass_confirmation_postpone = true
+        @bypass_postpone = true
      end

      protected
+        def should_generate_confirmation_token?
+          confirmation_token.nil? || confirmation_period_expired?
+        end

        # A callback method used to deliver confirmation
-        # instructions on creation. This can be overridden
+        # instructions on creation. This can be overriden
        # in models to map to a nice sign up e-mail.
        def send_on_create_confirmation_instructions
-          send_confirmation_instructions
-          skip_reconfirmation!
+          send_devise_notification(:confirmation_instructions)
        end

        # Callback to overwrite if confirmation is required or not.
@@ -217,7 +208,7 @@ module Devise
        #   confirmation_period_expired?  # will always return false
        #
        def confirmation_period_expired?
-          self.class.confirm_within && self.confirmation_sent_at && (Time.now > self.confirmation_sent_at + self.class.confirm_within)
+          self.class.confirm_within && (Time.now > self.confirmation_sent_at + self.class.confirm_within )
        end

        # Checks whether the record requires any confirmation.
@@ -230,54 +221,47 @@ module Devise
          end
        end

-        # Generates a new random token for confirmation, and stores
-        # the time this token is being generated in confirmation_sent_at
+        # Generates a new random token for confirmation, and stores the time
+        # this token is being generated
        def generate_confirmation_token
-          if self.confirmation_token && !confirmation_period_expired?
-            @raw_confirmation_token = self.confirmation_token
-          else
-            raw, _ = Devise.token_generator.generate(self.class, :confirmation_token)
-            self.confirmation_token = @raw_confirmation_token = raw
-            self.confirmation_sent_at = Time.now.utc
-          end
+          self.confirmation_token = self.class.confirmation_token
+          self.confirmation_sent_at = Time.now.utc
        end

        def generate_confirmation_token!
-          generate_confirmation_token && save(validate: false)
+          generate_confirmation_token && save(:validate => false)
+        end
+
+        # Regenerates a new token.
+        def regenerate_confirmation_token
+          generate_confirmation_token
+        end
+
+        def regenerate_confirmation_token!
+          regenerate_confirmation_token && save(:validate => false)
        end

        def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
          @reconfirmation_required = true
          self.unconfirmed_email = self.email
          self.email = self.email_was
-          self.confirmation_token = nil
-          generate_confirmation_token
+          regenerate_confirmation_token
        end

        def postpone_email_change?
-          postpone = self.class.reconfirmable && email_changed? && !@bypass_confirmation_postpone && self.email.present?
-          @bypass_confirmation_postpone = false
+          postpone = self.class.reconfirmable && email_changed? && !@bypass_postpone && !self.email.blank?
+          @bypass_postpone = false
          postpone
        end

        def reconfirmation_required?
-          self.class.reconfirmable && @reconfirmation_required && (self.email.present? || self.unconfirmed_email.present?)
+          self.class.reconfirmable && @reconfirmation_required && !self.email.blank?
        end

        def send_confirmation_notification?
-          confirmation_required? && !@skip_confirmation_notification && self.email.present?
+          confirmation_required? && !@skip_confirmation_notification && !self.email.blank?
        end

-        # A callback initiated after successfully confirming. This can be
-        # used to insert your own logic that is only run after the user successfully
-        # confirms.
-        #
-        # Example:
-        #
-        #   def after_confirmation
-        #     self.update_attribute(:invite_code, nil)
-        #   end
-        #
        def after_confirmation
        end

@@ -291,7 +275,7 @@ module Devise
          unless confirmable.try(:persisted?)
            confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
          end
-          confirmable.resend_confirmation_instructions if confirmable.persisted?
+          confirmable.resend_confirmation_token if confirmable.persisted?
          confirmable
        end

@@ -300,20 +284,16 @@ module Devise
        # If the user is already confirmed, create an error for the user
        # Options must have the confirmation_token
        def confirm_by_token(confirmation_token)
-          confirmable = find_first_by_auth_conditions(confirmation_token: confirmation_token)
-          unless confirmable
-            confirmation_digest = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
-            confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_digest)
-          end
-
-          # TODO: replace above lines with
-          # confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          # after enough time has passed that Devise clients do not use digested tokens
-
-          confirmable.confirm if confirmable.persisted?
+          confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
+          confirmable.confirm! if confirmable.persisted?
          confirmable
        end

+        # Generate a token checking if one does not already exist in the database.
+        def confirmation_token
+          generate_token(:confirmation_token)
+        end
+
        # Find a record for confirmation by unconfirmed email field
        def find_by_unconfirmed_email_with_errors(attributes = {})
          unconfirmed_required_attributes = confirmation_keys.map { |k| k == :email ? :unconfirmed_email : k }
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -1,18 +1,14 @@
 require 'devise/strategies/database_authenticatable'
+require 'bcrypt'

 module Devise
-  def self.bcrypt(klass, password)
-    ActiveSupport::Deprecation.warn "Devise.bcrypt is deprecated; use Devise::Encryptor.digest instead"
-    Devise::Encryptor.digest(klass, password)
-  end
-
  module Models
    # Authenticatable Module, responsible for encrypting password and validating
    # authenticity of a user while signing in.
    #
    # == Options
    #
-    # DatabaseAuthenticatable adds the following options to devise_for:
+    # DatabaseAuthenticable adds the following options to devise_for:
    #
    #   * +pepper+: a random string used to provide a more secure hash. Use
    #     `rake secret` to generate new keys.
@@ -27,8 +23,6 @@ module Devise
      extend ActiveSupport::Concern

      included do
-        after_update :send_password_change_notification, if: :send_password_change_notification?
-
        attr_reader :password, :current_password
        attr_accessor :password_confirmation
      end
@@ -43,9 +37,12 @@ module Devise
        self.encrypted_password = password_digest(@password) if @password.present?
      end

-      # Verifies whether a password (ie from sign in) is the user password.
+      # Verifies whether an password (ie from sign in) is the user password.
      def valid_password?(password)
-        Devise::Encryptor.compare(self.class, encrypted_password, password)
+        return false if encrypted_password.blank?
+        bcrypt   = ::BCrypt::Password.new(encrypted_password)
+        password = ::BCrypt::Engine.hash_secret("#{password}#{self.class.pepper}", bcrypt.salt)
+        Devise.secure_compare(password, encrypted_password)
      end

      # Set password and password confirmation to nil
@@ -53,13 +50,9 @@ module Devise
        self.password = self.password_confirmation = nil
      end

-      # Update record attributes when :current_password matches, otherwise
-      # returns error on :current_password.
-      #
-      # This method also rejects the password field if it is blank (allowing
-      # users to change relevant information like the e-mail without changing
-      # their password). In case the password field is rejected, the confirmation
-      # is also rejected as long as it is also blank.
+      # Update record attributes when :current_password matches, otherwise returns
+      # error on :current_password. It also automatically rejects :password and
+      # :password_confirmation if they are blank.
      def update_with_password(params, *options)
        current_password = params.delete(:current_password)

@@ -103,7 +96,7 @@ module Devise
      end

      # Destroy record when :current_password matches, otherwise returns
-      # error on :current_password. It also automatically rejects
+      # 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)
@@ -117,16 +110,6 @@ module Devise
        result
      end

-      # A callback initiated after successfully authenticating. This can be
-      # used to insert your own logic that is only run after the user successfully
-      # authenticates.
-      #
-      # Example:
-      #
-      #   def after_database_authentication
-      #     self.update_attribute(:invite_code, nil)
-      #   end
-      #
      def after_database_authentication
      end

@@ -135,27 +118,15 @@ module Devise
        encrypted_password[0,29] if encrypted_password
      end

-      def send_password_change_notification
-        send_devise_notification(:password_change)
-      end
-
    protected

-      # Digests the password using bcrypt. Custom encryption should override
-      # this method to apply their own algorithm.
-      #
-      # See https://github.com/plataformatec/devise-encryptable for examples
-      # of other encryption engines.
+      # Digests the password using bcrypt.
      def password_digest(password)
-        Devise::Encryptor.digest(self.class, password)
-      end
-
-      def send_password_change_notification?
-        self.class.send_password_change_notification && encrypted_password_changed?
+        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
      end

      module ClassMethods
-        Devise::Models.config(self, :pepper, :stretches, :send_password_change_notification)
+        Devise::Models.config(self, :pepper, :stretches)

        # We assume this method already gets the sanitized values from the
        # DatabaseAuthenticatable strategy. If you are using this method on
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -22,7 +22,7 @@ module Devise
    module Lockable
      extend  ActiveSupport::Concern

-      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, to: "self.class"
+      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, :to => "self.class"

      def self.required_fields(klass)
        attributes = []
@@ -34,16 +34,14 @@ module Devise
      end

      # Lock a user setting its locked_at to actual time.
-      # * +opts+: Hash options if you don't want to send email
-      #   when you lock access, you could pass the next hash
-      #   `{ send_instructions: false } as option`.
-      def lock_access!(opts = { })
+      def lock_access!
        self.locked_at = Time.now.utc

-        if unlock_strategy_enabled?(:email) && opts.fetch(:send_instructions, true)
+        if unlock_strategy_enabled?(:email)
+          generate_unlock_token!
          send_unlock_instructions
        else
-          save(validate: false)
+          save(:validate => false)
        end
      end

@@ -52,7 +50,7 @@ module Devise
        self.locked_at = nil
        self.failed_attempts = 0 if respond_to?(:failed_attempts=)
        self.unlock_token = nil  if respond_to?(:unlock_token=)
-        save(validate: false)
+        save(:validate => false)
      end

      # Verifies whether a user is locked or not.
@@ -62,15 +60,11 @@ module Devise

      # Send unlock instructions by email
      def send_unlock_instructions
-        raw, enc = Devise.token_generator.generate(self.class, :unlock_token)
-        self.unlock_token = enc
-        self.save(validate: false)
-        send_devise_notification(:unlock_instructions, raw, {})
-        raw
+        send_devise_notification(:unlock_instructions)
      end

      # Resend the unlock instructions if the user is locked.
-      def resend_unlock_instructions
+      def resend_unlock_token
        if_access_locked { send_unlock_instructions }
      end

@@ -104,7 +98,7 @@ module Devise
          if attempts_exceeded?
            lock_access! unless access_locked?
          else
-            save(validate: false)
+            save(:validate => false)
          end
          false
        end
@@ -115,10 +109,8 @@ module Devise
        # leaks the existence of an account.
        if Devise.paranoid
          super
-        elsif access_locked? || (lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?)
+        elsif lock_strategy_enabled?(:failed_attempts) && attempts_exceeded?
          :locked
-        elsif lock_strategy_enabled?(:failed_attempts) && last_attempt? && self.class.last_attempt_warning
-          :last_attempt
        else
          super
        end
@@ -127,11 +119,16 @@ module Devise
      protected

        def attempts_exceeded?
-          self.failed_attempts >= self.class.maximum_attempts
+          self.failed_attempts > self.class.maximum_attempts
        end

-        def last_attempt?
-          self.failed_attempts == self.class.maximum_attempts - 1
+        # Generates unlock token
+        def generate_unlock_token
+          self.unlock_token = self.class.unlock_token
+        end
+
+        def generate_unlock_token!
+          generate_unlock_token && save(:validate => false)
        end

        # Tells if the lock is expired if :time unlock strategy is active
@@ -161,7 +158,7 @@ module Devise
        # Options must contain the user's unlock keys
        def send_unlock_instructions(attributes={})
          lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
-          lockable.resend_unlock_instructions if lockable.persisted?
+          lockable.resend_unlock_token if lockable.persisted?
          lockable
        end

@@ -170,12 +167,8 @@ module Devise
        # If the user is not locked, creates an error for the user
        # Options must have the unlock_token
        def unlock_access_by_token(unlock_token)
-          original_token = unlock_token
-          unlock_token   = Devise.token_generator.digest(self, :unlock_token, unlock_token)
-
          lockable = find_or_initialize_with_error_by(:unlock_token, unlock_token)
          lockable.unlock_access! if lockable.persisted?
-          lockable.unlock_token = original_token
          lockable
        end

@@ -189,7 +182,11 @@ module Devise
          self.lock_strategy == strategy
        end

-        Devise::Models.config(self, :maximum_attempts, :lock_strategy, :unlock_strategy, :unlock_in, :unlock_keys, :last_attempt_warning)
+        def unlock_token
+          Devise.friendly_token
+        end
+
+        Devise::Models.config(self, :maximum_attempts, :lock_strategy, :unlock_strategy, :unlock_in, :unlock_keys)
      end
    end
  end
--- a/lib/devise/models/omniauthable.rb
+++ b/lib/devise/models/omniauthable.rb
@@ -10,7 +10,7 @@ module Devise
    #
    #   * +omniauth_providers+: Which providers are available to this model. It expects an array:
    #
-    #       devise_for :database_authenticatable, :omniauthable, omniauth_providers: [:twitter]
+    #       devise_for :database_authenticatable, :omniauthable, :omniauth_providers => [:twitter]
    #
    module Omniauthable
      extend ActiveSupport::Concern
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -8,13 +8,15 @@ module Devise
    # Recoverable adds the following options to devise_for:
    #
    #   * +reset_password_keys+: the keys you want to use when recovering the password for an account
-    #   * +reset_password_within+: the time period within which the password must be reset or the token expires.
-    #   * +sign_in_after_reset_password+: whether or not to sign in the user automatically after a password reset.
    #
    # == Examples
    #
    #   # resets the user password and save the record, true if valid passwords are given, otherwise false
-    #   User.find(1).reset_password('password123', 'password123')
+    #   User.find(1).reset_password!('password123', 'password123')
+    #
+    #   # only resets the user password, without saving the record
+    #   user = User.find(1)
+    #   user.reset_password('password123', 'password123')
    #
    #   # creates a new token and send it with instructions about how to reset the password
    #   User.find(1).send_reset_password_instructions
@@ -26,42 +28,31 @@ module Devise
        [:reset_password_sent_at, :reset_password_token]
      end

-      included do
-        before_update do
-          if (respond_to?(:email_changed?) && email_changed?) || encrypted_password_changed?
-            clear_reset_password_token
-          end
-        end
-      end
-
      # Update password saving the record and clearing token. Returns true if
      # the passwords are valid and the record was saved, false otherwise.
-      def reset_password(new_password, new_password_confirmation)
+      def reset_password!(new_password, new_password_confirmation)
        self.password = new_password
        self.password_confirmation = new_password_confirmation

-        if respond_to?(:after_password_reset) && valid?
-          ActiveSupport::Deprecation.warn "after_password_reset is deprecated"
+        if valid?
+          clear_reset_password_token
          after_password_reset
        end

        save
      end

-      def reset_password!(new_password, new_password_confirmation)
-        ActiveSupport::Deprecation.warn "reset_password! is deprecated in favor of reset_password"
-        reset_password(new_password, new_password_confirmation)
-      end
-
-      # Resets reset password token and send reset password instructions by email.
-      # Returns the token sent in the e-mail.
+      # Resets reset password token and send reset password instructions by email
      def send_reset_password_instructions
-        token = set_reset_password_token
-        send_reset_password_instructions_notification(token)
-
-        token
+        ensure_reset_password_token!
+        send_devise_notification(:reset_password_instructions)
      end
-
+      
+      # Generate reset password token unless already exists and save the record.
+      def ensure_reset_password_token!
+        generate_reset_password_token! if should_generate_reset_token?
+      end 
+      
      # Checks if the reset password token sent is within the limit time.
      # We do this by calculating if the difference between today and the
      # sending date does not exceed the confirm in time configured.
@@ -83,38 +74,38 @@ module Devise
      #   reset_password_period_valid?   # will always return false
      #
      def reset_password_period_valid?
-        reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago.utc
+        reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago
      end

      protected

+        def should_generate_reset_token?
+          reset_password_token.nil? || !reset_password_period_valid?
+        end
+
+        # Generates a new random token for reset password
+        def generate_reset_password_token
+          self.reset_password_token = self.class.reset_password_token
+          self.reset_password_sent_at = Time.now.utc
+          self.reset_password_token
+        end
+
+        # Resets the reset password token with and save the record without
+        # validating
+        def generate_reset_password_token!
+          generate_reset_password_token && save(:validate => false)
+        end
+
        # Removes reset_password token
        def clear_reset_password_token
          self.reset_password_token = nil
          self.reset_password_sent_at = nil
        end

-        def set_reset_password_token
-          raw, enc = Devise.token_generator.generate(self.class, :reset_password_token)
-
-          self.reset_password_token   = enc
-          self.reset_password_sent_at = Time.now.utc
-          self.save(validate: false)
-          raw
-        end
-
-        def send_reset_password_instructions_notification(token)
-          send_devise_notification(:reset_password_instructions, token, {})
+        def after_password_reset
        end

      module ClassMethods
-        # Attempt to find a user by password reset token. If a user is found, return it
-        # If a user is not found, return nil
-        def with_reset_password_token(token)
-          reset_password_token = Devise.token_generator.digest(self, :reset_password_token, token)
-          to_adapter.find_first(reset_password_token: reset_password_token)
-        end
-
        # 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
        # with an email not found error.
@@ -125,30 +116,29 @@ module Devise
          recoverable
        end

+        # Generate a token checking if one does not already exist in the database.
+        def reset_password_token
+          generate_token(:reset_password_token)
+        end
+
        # Attempt to find a user by its reset_password_token to reset its
        # password. If a user is found and token is still valid, reset its password and automatically
        # try saving the record. If not user is found, returns a new user
        # containing an error in reset_password_token attribute.
        # Attributes must contain reset_password_token, password and confirmation
        def reset_password_by_token(attributes={})
-          original_token       = attributes[:reset_password_token]
-          reset_password_token = Devise.token_generator.digest(self, :reset_password_token, original_token)
-
-          recoverable = find_or_initialize_with_error_by(:reset_password_token, reset_password_token)
-
+          recoverable = find_or_initialize_with_error_by(:reset_password_token, attributes[:reset_password_token])
          if recoverable.persisted?
            if recoverable.reset_password_period_valid?
-              recoverable.reset_password(attributes[:password], attributes[:password_confirmation])
+              recoverable.reset_password!(attributes[:password], attributes[:password_confirmation])
            else
              recoverable.errors.add(:reset_password_token, :expired)
            end
          end
-
-          recoverable.reset_password_token = original_token if recoverable.reset_password_token.present?
          recoverable
        end

-        Devise::Models.config(self, :reset_password_keys, :reset_password_within, :sign_in_after_reset_password)
+        Devise::Models.config(self, :reset_password_keys, :reset_password_within)
      end
    end
  end
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -17,7 +17,7 @@ module Devise
    #
    #   * +remember_for+: the time you want the user will be remembered without
    #     asking for credentials. After this time the user will be blocked and
-    #     will have to enter their credentials again. This configuration is also
+    #     will have to enter his credentials again. This configuration is also
    #     used to calculate the expires time for the cookie created to remember
    #     the user. By default remember_for is 2.weeks.
    #
@@ -39,46 +39,43 @@ module Devise
    module Rememberable
      extend ActiveSupport::Concern

-      attr_accessor :remember_me
+      attr_accessor :remember_me, :extend_remember_period

      def self.required_fields(klass)
        [:remember_created_at]
      end

-      # TODO: We were used to receive a extend period argument but we no longer do.
-      # Remove this for Devise 4.0.
-      def remember_me!(*)
-        self.remember_token = self.class.remember_token if respond_to?(:remember_token)
-        self.remember_created_at ||= Time.now.utc
-        save(validate: false) if self.changed?
+      # Generate a new remember token and save the record without validations
+      # unless remember_across_browsers is true and the user already has a valid token.
+      def remember_me!(extend_period=false)
+        self.remember_token = self.class.remember_token if generate_remember_token?
+        self.remember_created_at = Time.now.utc if generate_remember_timestamp?(extend_period)
+        save(:validate => false) if self.changed?
      end

      # If the record is persisted, remove the remember token (but only if
      # it exists), and save the record without validations.
      def forget_me!
        return unless persisted?
-        self.remember_token = nil if respond_to?(:remember_token)
-        self.remember_created_at = nil if self.class.expire_all_remember_me_on_sign_out
-        save(validate: false)
+        self.remember_token = nil if respond_to?(:remember_token=)
+        self.remember_created_at = nil
+        save(:validate => false)
      end

      # Remember token should be expired if expiration time not overpass now.
      def remember_expired?
-        remember_created_at.nil?
+        remember_created_at.nil? || (remember_expires_at <= Time.now.utc)
      end

+      # Remember token expires at created time + remember_for configuration
      def remember_expires_at
-        self.class.remember_for.from_now
-      end
-
-      def extend_remember_period
-        self.class.extend_remember_period
+        remember_created_at + self.class.remember_for
      end

      def rememberable_value
        if respond_to?(:remember_token)
          remember_token
-        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt.presence)
+        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt)
          salt
        else
          raise "authenticable_salt returned nil for the #{self.class.name} model. " \
@@ -92,71 +89,36 @@ module Devise
        self.class.rememberable_options
      end

-      # A callback initiated after successfully being remembered. This can be
-      # used to insert your own logic that is only run after the user is
-      # remembered.
-      #
-      # Example:
-      #
-      #   def after_remembered
-      #     self.update_attribute(:invite_code, nil)
-      #   end
-      #
-      def after_remembered
+    protected
+
+      def generate_remember_token? #:nodoc:
+        respond_to?(:remember_token) && remember_expired?
      end

-      def remember_me?(token, generated_at)
-        # TODO: Normalize the JSON type coercion along with the Timeoutable hook
-        # in a single place https://github.com/plataformatec/devise/blob/ffe9d6d406e79108cf32a2c6a1d0b3828849c40b/lib/devise/hooks/timeoutable.rb#L14-L18
-        if generated_at.is_a?(String)
-          generated_at = time_from_json(generated_at)
-        end
-
-        # The token is only valid if:
-        # 1. we have a date
-        # 2. the current time does not pass the expiry period
-        # 3. the record has a remember_created_at date
-        # 4. the token date is bigger than the remember_created_at
-        # 5. the token matches
-        generated_at.is_a?(Time) &&
-         (self.class.remember_for.ago < generated_at) &&
-         (generated_at > (remember_created_at || Time.now).utc) &&
-         Devise.secure_compare(rememberable_value, token)
-      end
-
-      private
-
-      def time_from_json(value)
-        if value =~ /\A\d+\.\d+\Z/
-          Time.at(value.to_f)
-        else
-          Time.parse(value) rescue nil
-        end
+      # Generate a timestamp if extend_remember_period is true, if no remember_token
+      # exists, or if an existing remember token has expired.
+      def generate_remember_timestamp?(extend_period) #:nodoc:
+        extend_period || remember_created_at.nil? || remember_expired?
      end

      module ClassMethods
        # Create the cookie key using the record id and remember_token
        def serialize_into_cookie(record)
-          [record.to_key, record.rememberable_value, Time.now.utc.to_f.to_s]
+          [record.to_key, record.rememberable_value]
        end

        # Recreate the user based on the stored cookie
-        def serialize_from_cookie(*args)
-          id, token, generated_at = *args
-
+        def serialize_from_cookie(id, remember_token)
          record = to_adapter.get(id)
-          record if record && record.remember_me?(token, generated_at)
+          record if record && record.rememberable_value == remember_token && !record.remember_expired?
        end

        # Generate a token checking if one does not already exist in the database.
        def remember_token #:nodoc:
-          loop do
-            token = Devise.friendly_token
-            break token unless to_adapter.find_first({ remember_token: token })
-          end
+          generate_token(:remember_token)
        end

-        Devise::Models.config(self, :remember_for, :extend_remember_period, :rememberable_options, :expire_all_remember_me_on_sign_out)
+        Devise::Models.config(self, :remember_for, :extend_remember_period, :rememberable_options)
      end
    end
  end
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -2,9 +2,9 @@ require 'devise/hooks/timeoutable'

 module Devise
  module Models
-    # Timeoutable takes care of verifying whether a user session has already
+    # Timeoutable takes care of verifyng 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, they will be redirected
+    # will be asked for credentials again, it means, he/she will be redirected
    # to the sign in page.
    #
    # == Options
@@ -26,6 +26,7 @@ module Devise

      # Checks whether the user session has expired based on configured time.
      def timedout?(last_access)
+        return false if remember_exists_and_not_expired?
        !timeout_in.nil? && last_access && last_access <= timeout_in.ago
      end

@@ -35,6 +36,11 @@ module Devise

      private

+      def remember_exists_and_not_expired?
+        return false unless respond_to?(:remember_created_at) && respond_to?(:remember_expired?)
+        remember_created_at && !remember_expired?
+      end
+
      module ClassMethods
        Devise::Models.config(self, :timeout_in)
      end
--- a/lib/devise/models/token_authenticatable.rb
+++ b/lib/devise/models/token_authenticatable.rb
@@ -0,0 +1,89 @@
+require 'devise/strategies/token_authenticatable'
+
+module Devise
+  module Models
+    # The TokenAuthenticatable module is responsible for generating an authentication token and
+    # validating the authenticity of the same while signing in.
+    #
+    # This module only provides a few helpers to help you manage the token, but it is up to you
+    # to choose how to use it. For example, if you want to have a new token every time the user
+    # saves his account, you can do the following:
+    #
+    #   before_save :reset_authentication_token
+    #
+    # On the other hand, if you want to generate token unless one exists, you should use instead:
+    #
+    #   before_save :ensure_authentication_token
+    #
+    # 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:
+    #
+    #   * +token_authentication_key+: Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
+    #
+    module TokenAuthenticatable
+      extend ActiveSupport::Concern
+
+      def self.required_fields(klass)
+        [:authentication_token]
+      end
+
+      # Generate new authentication token (a.k.a. "single access token").
+      def reset_authentication_token
+        self.authentication_token = self.class.authentication_token
+      end
+
+      # Generate new authentication token and save the record.
+      def reset_authentication_token!
+        reset_authentication_token
+        save(:validate => false)
+      end
+
+      # Generate authentication token unless already exists.
+      def ensure_authentication_token
+        reset_authentication_token if authentication_token.blank?
+      end
+
+      # Generate authentication token unless already exists and save the record.
+      def ensure_authentication_token!
+        reset_authentication_token! if authentication_token.blank?
+      end
+
+      # Hook called after token authentication.
+      def after_token_authentication
+      end
+
+      def expire_auth_token_on_timeout
+        self.class.expire_auth_token_on_timeout
+      end
+
+      module ClassMethods
+        def find_for_token_authentication(conditions)
+          find_for_authentication(:authentication_token => conditions[token_authentication_key])
+        end
+
+        # Generate a token checking if one does not already exist in the database.
+        def authentication_token
+          generate_token(:authentication_token)
+        end
+
+        Devise::Models.config(self, :token_authentication_key, :expire_auth_token_on_timeout)
+      end
+    end
+  end
+end
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -15,7 +15,7 @@ module Devise
        [:current_sign_in_at, :current_sign_in_ip, :last_sign_in_at, :last_sign_in_ip, :sign_in_count]
      end

-      def update_tracked_fields(request)
+      def update_tracked_fields!(request)
        old_current, new_current = self.current_sign_in_at, Time.now.utc
        self.last_sign_in_at     = old_current || new_current
        self.current_sign_in_at  = new_current
@@ -26,11 +26,9 @@ module Devise

        self.sign_in_count ||= 0
        self.sign_in_count += 1
-      end

-      def update_tracked_fields!(request)
-        update_tracked_fields(request)
-        save(validate: false)
+        save(:validate => false) or raise "Devise trackable could not save #{inspect}." \
+          "Please make sure a model using trackable can be saved at sign in."
      end
    end
  end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -10,12 +10,12 @@ 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..72.
+    #   * +password_length+: a range expressing password length. Defaults to 8..128.
    #
    module Validatable
      # All validations used by this module.
-      VALIDATIONS = [:validates_presence_of, :validates_uniqueness_of, :validates_format_of,
-                     :validates_confirmation_of, :validates_length_of].freeze
+      VALIDATIONS = [ :validates_presence_of, :validates_uniqueness_of, :validates_format_of,
+                      :validates_confirmation_of, :validates_length_of ].freeze

      def self.required_fields(klass)
        []
@@ -26,13 +26,13 @@ module Devise
        assert_validations_api!(base)

        base.class_eval do
-          validates_presence_of   :email, if: :email_required?
-          validates_uniqueness_of :email, allow_blank: true, if: :email_changed?
-          validates_format_of     :email, with: email_regexp, allow_blank: true, if: :email_changed?
+          validates_presence_of   :email, :if => :email_required?
+          validates_uniqueness_of :email, :allow_blank => true, :if => :email_changed?
+          validates_format_of     :email, :with  => email_regexp, :allow_blank => true, :if => :email_changed?

-          validates_presence_of     :password, if: :password_required?
-          validates_confirmation_of :password, if: :password_required?
-          validates_length_of       :password, within: password_length, allow_blank: true
+          validates_presence_of     :password, :if => :password_required?
+          validates_confirmation_of :password, :if => :password_required?
+          validates_length_of       :password, :within => password_length, :allow_blank => true
        end
      end

--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -1,28 +1,29 @@
 require 'active_support/core_ext/object/with_options'

-Devise.with_options model: true do |d|
+Devise.with_options :model => true do |d|
  # Strategies first
-  d.with_options strategy: true do |s|
+  d.with_options :strategy => true do |s|
    routes = [nil, :new, :destroy]
-    s.add_module :database_authenticatable, controller: :sessions, route: { session: routes }
-    s.add_module :rememberable, no_input: true
+    s.add_module :database_authenticatable, :controller => :sessions, :route => { :session => routes }
+    s.add_module :token_authenticatable,    :controller => :sessions, :route => { :session => routes }, :no_input => true
+    s.add_module :rememberable, :no_input => true
  end

  # Other authentications
-  d.add_module :omniauthable, controller: :omniauth_callbacks,  route: :omniauth_callback
+  d.add_module :omniauthable, :controller => :omniauth_callbacks,  :route => :omniauth_callback

  # Misc after
  routes = [nil, :new, :edit]
-  d.add_module :recoverable,  controller: :passwords,     route: { password: routes }
-  d.add_module :registerable, controller: :registrations, route: { registration: (routes << :cancel) }
+  d.add_module :recoverable,  :controller => :passwords,     :route => { :password => routes }
+  d.add_module :registerable, :controller => :registrations, :route => { :registration => (routes << :cancel) }
  d.add_module :validatable

  # The ones which can sign out after
  routes = [nil, :new]
-  d.add_module :confirmable,  controller: :confirmations, route: { confirmation: routes }
-  d.add_module :lockable,     controller: :unlocks,       route: { unlock: routes }
+  d.add_module :confirmable,  :controller => :confirmations, :route => { :confirmation => routes }
+  d.add_module :lockable,     :controller => :unlocks,       :route => { :unlock => routes }
  d.add_module :timeoutable

  # Stats for last, so we make sure the user is really signed in
  d.add_module :trackable
-end
+end
--- a/lib/devise/omniauth/url_helpers.rb
+++ b/lib/devise/omniauth/url_helpers.rb
@@ -6,12 +6,12 @@ module Devise

      def omniauth_authorize_path(resource_or_scope, *args)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_omniauth_authorize_path", *args)
+        send("#{scope}_omniauth_authorize_path", *args)
      end

      def omniauth_callback_path(resource_or_scope, *args)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        _devise_route_context.send("#{scope}_omniauth_callback_path", *args)
+        send("#{scope}_omniauth_callback_path", *args)
      end
    end
  end
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -1,3 +1,3 @@
 require 'orm_adapter/adapters/active_record'

-ActiveRecord::Base.extend Devise::Models
+ActiveRecord::Base.extend Devise::Models
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,3 +1,3 @@
 require 'orm_adapter/adapters/mongoid'

-Mongoid::Document::ClassMethods.send :include, Devise::Models
+Mongoid::Document::ClassMethods.send :include, Devise::Models
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -13,25 +13,14 @@ module Devise
      if block_given?
        @blocks[kind] = block
      else
-        default_for(kind)
-      end
-    end
-
-    def sanitize(kind)
-      if block = @blocks[kind]
-        block.call(default_params)
-      else
-        default_sanitize(kind)
+        block = @blocks[kind]
+        block ? block.call(default_params) : fallback_for(kind)
      end
    end

    private

-    def default_for(kind)
-      raise ArgumentError, "a block is expected in Devise base sanitizer"
-    end
-
-    def default_sanitize(kind)
+    def fallback_for(kind)
      default_params
    end

@@ -41,59 +30,34 @@ module Devise
  end

  class ParameterSanitizer < BaseSanitizer
-    def initialize(*)
-      super
-      @permitted = Hash.new { |h,k| h[k] = attributes_for(k) }
-    end
-
-    def sign_in
-      permit self.for(:sign_in)
-    end
-
-    def sign_up
-      permit self.for(:sign_up)
-    end
-
-    def account_update
-      permit self.for(:account_update)
-    end
-
    private

-    # TODO: We do need to flatten so it works with strong_parameters
-    # gem. We should drop it once we move to Rails 4 only support.
-    def permit(keys)
-      default_params.permit(*Array(keys))
-    end
-
-    # Change for(kind) to return the values in the @permitted
-    # hash, allowing the developer to customize at runtime.
-    def default_for(kind)
-      @permitted[kind] || raise("No sanitizer provided for #{kind}")
-    end
-
-    def default_sanitize(kind)
+    def fallback_for(kind)
      if respond_to?(kind, true)
        send(kind)
      else
-        raise NotImplementedError, "Devise doesn't know how to sanitize parameters for #{kind}"
+        raise NotImplementedError, "Devise Parameter Sanitizer doesn't know how to sanitize parameters for #{kind}"
      end
    end

-    def attributes_for(kind)
-      case kind
-      when :sign_in
-        auth_keys + [:password, :remember_me]
-      when :sign_up
-        auth_keys + [:password, :password_confirmation]
-      when :account_update
-        auth_keys + [:password, :password_confirmation, :current_password]
-      end
+    # These are the params used to sign in a user so we don't need to
+    # mass-assign the password param in order to authenticate. Excluding it
+    # here allows us to construct a new user without sensitive information if
+    # authentication fails.
+    def sign_in
+      default_params.permit(*auth_keys + [:password, :remember_me])
+    end
+
+    def sign_up
+      default_params.permit(*(auth_keys + [:password, :password_confirmation]))
+    end
+
+    def account_update
+      default_params.permit(*(auth_keys + [:password, :password_confirmation, :current_password]))
    end

    def auth_keys
-      @auth_keys ||= @resource_class.authentication_keys.respond_to?(:keys) ?
-                       @resource_class.authentication_keys.keys : @resource_class.authentication_keys
+      resource_class.authentication_keys.respond_to?(:keys) ? resource_class.authentication_keys.keys : resource_class.authentication_keys
    end
  end
 end
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -17,7 +17,7 @@ module Devise
      Devise.include_helpers(Devise::Controllers)
    end

-    initializer "devise.omniauth", after: :load_config_initializers, before: :build_middleware_stack do |app|
+    initializer "devise.omniauth" do |app|
      Devise.omniauth_configs.each do |provider, config|
        app.middleware.use config.strategy_class, *config.args do |strategy|
          config.strategy = strategy
@@ -29,23 +29,21 @@ module Devise
      end
    end

-    initializer "devise.secret_key" do |app|
-      if app.respond_to?(:secrets)
-        Devise.secret_key ||= app.secrets.secret_key_base
-      elsif app.config.respond_to?(:secret_key_base)
-        Devise.secret_key ||= app.config.secret_key_base
-      end
-
-      Devise.token_generator ||=
-        if secret_key = Devise.secret_key
-          Devise::TokenGenerator.new(
-            Devise::CachingKeyGenerator.new(Devise::KeyGenerator.new(secret_key))
-          )
+    initializer "devise.mongoid_version_warning" do
+      if defined?(Mongoid)
+        require 'mongoid/version'
+        if Mongoid::VERSION.to_f < 2.1
+          puts "\n[DEVISE] Please note that Mongoid versions prior to 2.1 handle dirty model " \
+            "object attributes in such a way that the Devise `validatable` module will not apply " \
+            "its usual uniqueness and format validations for the email field. It is recommended " \
+            "that you upgrade to Mongoid 2.1+ for this and other fixes, but if for some reason you " \
+            "are unable to do so, you should add these validations manually.\n"
        end
+      end
    end

    initializer "devise.fix_routes_proxy_missing_respond_to_bug" do
-      # Deprecate: Remove once we move to Rails 4 only.
+      # We can get rid of this once we support only Rails > 3.2
      ActionDispatch::Routing::RoutesProxy.class_eval do
        def respond_to?(method, include_private = false)
          super || routes.url_helpers.respond_to?(method)
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -43,132 +43,103 @@ 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 DELETE /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"}
-    #
-    # ==== Routes integration
-    #
-    # +devise_for+ is meant to play nicely with other routes methods. For example,
-    # by calling +devise_for+ inside a namespace, it automatically nests your devise
-    # controllers:
-    #
-    #     namespace :publisher do
-    #       devise_for :account
-    #     end
-    #
-    # The snippet above will use publisher/sessions controller instead of devise/sessions
-    # controller. You can revert this change or configure it directly by passing the :module
-    # option described below to +devise_for+.
-    #
-    # Also note that when you use a namespace it will affect all the helpers and methods
-    # for controllers and views. For example, using the above setup you'll end with
-    # following methods: current_publisher_account, authenticate_publisher_account!,
-    # publisher_account_signed_in, etc.
-    #
-    # The only aspect not affect by the router configuration is the model name. The
-    # model name can be explicitly set via the :class_name option.
+    #  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
    #
    # You can configure your routes with some options:
    #
-    #  * class_name: setup a different class to be looked up by devise, if it cannot be
+    #  * :class_name => setup a different class to be looked up by devise, if it cannot be
    #    properly found by the route name.
    #
-    #      devise_for :users, class_name: 'Account'
+    #      devise_for :users, :class_name => 'Account'
    #
-    #  * path: allows you to setup path name that will be used, as rails routes does.
+    #  * :path => allows you to setup path name that will be used, as rails routes does.
    #    The following route configuration would setup your route as /accounts instead of /users:
    #
-    #      devise_for :users, path: 'accounts'
+    #      devise_for :users, :path => 'accounts'
    #
-    #  * singular: setup the singular name for the given resource. This is used as the helper methods
-    #    names in controller ("authenticate_#{singular}!", "#{singular}_signed_in?", "current_#{singular}"
-    #    and "#{singular}_session"), as the scope name in routes and as the scope given to warden.
+    #  * :singular => setup the singular name for the given resource. This is used as the instance variable
+    #    name in controller, as the name in routes and the scope given to warden.
    #
-    #      devise_for :admins, singular: :manager
+    #      devise_for :users, :singular => :user
    #
-    #      devise_scope :manager do
-    #        ...
-    #      end
-    #
-    #      class ManagerController < ApplicationController
-    #        before_filter authenticate_manager!
-    #
-    #        def show
-    #          @manager = current_manager
-    #          ...
-    #        end
-    #      end
-    #
-    #  * path_names: configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
+    #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
    #    :password, :confirmation, :unlock.
    #
-    #      devise_for :users, path_names: {
-    #        sign_in: 'login', sign_out: 'logout',
-    #        password: 'secret', confirmation: 'verification',
-    #        registration: 'register', edit: 'edit/profile'
-    #      }
+    #      devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
    #
-    #  * controllers: the controller which should be used. All routes by default points to Devise controllers.
+    #  * :controllers => the controller which should be used. All routes by default points to Devise controllers.
    #    However, if you want them to point to custom controller, you should do:
    #
-    #      devise_for :users, controllers: { sessions: "users/sessions" }
+    #      devise_for :users, :controllers => { :sessions => "users/sessions" }
    #
-    #  * failure_app: a rack app which is invoked whenever there is a failure. Strings representing a given
+    #  * :failure_app => a rack app which is invoked whenever there is a failure. Strings representing a given
    #    are also allowed as parameter.
    #
-    #  * sign_out_via: the HTTP method(s) accepted for the :sign_out action (default: :get),
+    #  * :sign_out_via => the HTTP method(s) accepted for the :sign_out action (default: :get),
    #    if you wish to restrict this to accept only :post or :delete requests you should do:
    #
-    #      devise_for :users, sign_out_via: [:post, :delete]
+    #      devise_for :users, :sign_out_via => [ :post, :delete ]
    #
    #    You need to make sure that your sign_out controls trigger a request with a matching HTTP method.
    #
-    #  * module: the namespace to find controllers (default: "devise", thus
+    #  * :module => the namespace to find controllers (default: "devise", thus
    #    accessing devise/sessions, devise/registrations, and so on). If you want
    #    to namespace all at once, use module:
    #
-    #      devise_for :users, module: "users"
+    #      devise_for :users, :module => "users"
    #
-    #  * skip: tell which controller you want to skip routes from being created.
-    #    It accepts :all as an option, meaning it will not generate any route at all:
+    #    Notice that whenever you use namespace in the router DSL, it automatically sets the module.
+    #    So the following setup:
    #
-    #      devise_for :users, skip: :sessions
+    #      namespace :publisher do
+    #        devise_for :account
+    #      end
    #
-    #  * only: the opposite of :skip, tell which controllers only to generate routes to:
+    #    Will use publisher/sessions controller instead of devise/sessions controller. You can revert
+    #    this by providing the :module option to devise_for.
    #
-    #      devise_for :users, only: :sessions
+    #    Also pay attention that when you use a namespace it will affect all the helpers and methods for controllers
+    #    and views. For example, using the above setup you'll end with following methods:
+    #    current_publisher_account, authenticate_publisher_account!, publisher_account_signed_in, etc.
    #
-    #  * skip_helpers: skip generating Devise url helpers like new_session_path(@user).
+    #  * :skip => tell which controller you want to skip routes from being created:
+    #
+    #      devise_for :users, :skip => :sessions
+    #
+    #  * :only => the opposite of :skip, tell which controllers only to generate routes to:
+    #
+    #      devise_for :users, :only => :sessions
+    #
+    #  * :skip_helpers => skip generating Devise url helpers like new_session_path(@user).
    #    This is useful to avoid conflicts with previous routes and is false by default.
    #    It accepts true as option, meaning it will skip all the helpers for the controllers
    #    given in :skip but it also accepts specific helpers to be skipped:
    #
-    #      devise_for :users, skip: [:registrations, :confirmations], skip_helpers: true
-    #      devise_for :users, skip_helpers: [:registrations, :confirmations]
+    #      devise_for :users, :skip => [:registrations, :confirmations], :skip_helpers => true
+    #      devise_for :users, :skip_helpers => [:registrations, :confirmations]
    #
-    #  * format: include "(.:format)" in the generated routes? true by default, set to false to disable:
+    #  * :format => include "(.:format)" in the generated routes? true by default, set to false to disable:
    #
-    #      devise_for :users, format: false
+    #      devise_for :users, :format => false
    #
-    #  * constraints: works the same as Rails' constraints
+    #  * :constraints => works the same as Rails' constraints
    #
-    #  * defaults: works the same as Rails' defaults
-    #
-    #  * router_name: allows application level router name to be overwritten for the current scope
+    #  * :defaults => works the same as Rails' defaults
    #
    # ==== Scoping
    #
@@ -190,7 +161,7 @@ module ActionDispatch::Routing
    #
    #   class ApplicationController < ActionController::Base
    #     def self.default_url_options
-    #       { locale: I18n.locale }
+    #       { :locale => I18n.locale }
    #     end
    #   end
    #
@@ -215,12 +186,11 @@ module ActionDispatch::Routing
    # In order to get Devise to recognize the deactivate action, your devise_scope entry should look like this:
    #
    #     devise_scope :owner do
-    #       post "deactivate", to: "registrations#deactivate", as: "deactivate_registration"
+    #       post "deactivate", :to => "registrations#deactivate", :as => "deactivate_registration"
    #     end
    #
    def devise_for(*resources)
      @devise_finalized = false
-      raise_no_secret_key unless Devise.secret_key
      options = resources.extract_options!

      options[:as]          ||= @scope[:as]     if @scope[:as].present?
@@ -241,7 +211,7 @@ module ActionDispatch::Routing
          raise_no_devise_method_error!(mapping.class_name) unless mapping.to.respond_to?(:devise)
        rescue NameError => e
          raise unless mapping.class_name == resource.to_s.classify
-          warn "[WARNING] You provided devise_for #{resource.inspect} but there is " \
+          warn "[WARNING] You provided devise_for #{resource.inspect} but there is " <<
            "no model #{mapping.class_name} defined in your application"
          next
        rescue NoMethodError => e
@@ -249,16 +219,17 @@ module ActionDispatch::Routing
          raise_no_devise_method_error!(mapping.class_name)
        end

-        if options[:controllers] && options[:controllers][:omniauth_callbacks]
-          unless mapping.omniauthable?
-            raise ArgumentError, "Mapping omniauth_callbacks on a resource that is not omniauthable\n" \
-              "Please add `devise :omniauthable` to the `#{mapping.class_name}` model"
-          end
-        end
-
-        routes = mapping.used_routes
+        routes  = mapping.used_routes

        devise_scope mapping.name do
+          if block_given?
+            ActiveSupport::Deprecation.warn "Passing a block to devise_for is deprecated. " \
+              "Please remove the block from devise_for (only the block, the call to " \
+              "devise_for must still exist) and call devise_scope :#{mapping.name} do ... end " \
+              "with the block instead", caller
+            yield
+          end
+
          with_devise_exclusive_scope mapping.fullpath, mapping.name, options do
            routes.each { |mod| send("devise_#{mod}", mapping, mapping.controllers) }
          end
@@ -279,7 +250,7 @@ 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", :as => :user_root
    #   end
    #
    def authenticate(scope=nil, block=nil)
@@ -293,18 +264,18 @@ 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', :as => :admin_root
    #   end
    #
    #   authenticated do
-    #     root to: 'dashboard#show', as: :authenticated_root
+    #     root :to => 'dashboard#show', :as => :authenticated_root
    #   end
    #
    #   authenticated :user, lambda {|u| u.role == "admin"} do
-    #     root to: "admin/dashboard#show", as: :user_root
+    #     root :to => "admin/dashboard#show", :as => :user_root
    #   end
    #
-    #   root to: 'landing#show'
+    #   root :to => 'landing#show'
    #
    def authenticated(scope=nil, block=nil)
      constraints_for(:authenticate?, scope, block) do
@@ -317,15 +288,15 @@ module ActionDispatch::Routing
    #
    #   unauthenticated do
    #     as :user do
-    #       root to: 'devise/registrations#new'
+    #       root :to => 'devise/registrations#new'
    #     end
    #   end
    #
-    #   root to: 'dashboard#show'
+    #   root :to => 'dashboard#show'
    #
    def unauthenticated(scope=nil)
      constraint = lambda do |request|
-        not request.env["warden"].authenticate? scope: scope
+        not request.env["warden"].authenticate? :scope => scope
      end

      constraints(constraint) do
@@ -338,7 +309,7 @@ module ActionDispatch::Routing
    # to which controller it is targetted.
    #
    #   as :user do
-    #     get "sign_in", to: "devise/sessions#new"
+    #     get "sign_in", :to => "devise/sessions#new"
    #   end
    #
    # Notice you cannot have two scopes mapping to the same URL. And remember, if
@@ -370,42 +341,41 @@ module ActionDispatch::Routing
    protected

      def devise_session(mapping, controllers) #:nodoc:
-        resource :session, only: [], controller: controllers[:sessions], path: "" do
-          get   :new,     path: mapping.path_names[:sign_in],  as: "new"
-          post  :create,  path: mapping.path_names[:sign_in]
-          match :destroy, path: mapping.path_names[:sign_out], as: "destroy", via: mapping.sign_out_via
+        resource :session, :only => [], :controller => controllers[:sessions], :path => "" do
+          get   :new,     :path => mapping.path_names[:sign_in],  :as => "new"
+          post  :create,  :path => mapping.path_names[:sign_in]
+          match :destroy, :path => mapping.path_names[:sign_out], :as => "destroy", :via => mapping.sign_out_via
        end
      end

      def devise_password(mapping, controllers) #:nodoc:
-        resource :password, only: [:new, :create, :edit, :update],
-          path: mapping.path_names[:password], controller: controllers[:passwords]
+        resource :password, :only => [:new, :create, :edit, :update],
+          :path => mapping.path_names[:password], :controller => controllers[:passwords]
      end

      def devise_confirmation(mapping, controllers) #:nodoc:
-        resource :confirmation, only: [:new, :create, :show],
-          path: mapping.path_names[:confirmation], controller: controllers[:confirmations]
+        resource :confirmation, :only => [:new, :create, :show],
+          :path => mapping.path_names[:confirmation], :controller => controllers[:confirmations]
      end

      def devise_unlock(mapping, controllers) #:nodoc:
        if mapping.to.unlock_strategy_enabled?(:email)
-          resource :unlock, only: [:new, :create, :show],
-            path: mapping.path_names[:unlock], controller: controllers[:unlocks]
+          resource :unlock, :only => [:new, :create, :show],
+            :path => mapping.path_names[:unlock], :controller => controllers[:unlocks]
        end
      end

      def devise_registration(mapping, controllers) #:nodoc:
        path_names = {
-          new: mapping.path_names[:sign_up],
-          edit: mapping.path_names[:edit],
-          cancel: mapping.path_names[:cancel]
+          :new => mapping.path_names[:sign_up],
+          :cancel => mapping.path_names[:cancel]
        }

        options = {
-          only: [:new, :create, :edit, :update, :destroy],
-          path: mapping.path_names[:registration],
-          path_names: path_names,
-          controller: controllers[:registrations]
+          :only => [:new, :create, :edit, :update, :destroy],
+          :path => mapping.path_names[:registration],
+          :path_names => path_names,
+          :controller => controllers[:registrations]
        }

        resource :registration, options do
@@ -414,58 +384,45 @@ module ActionDispatch::Routing
      end

      def devise_omniauth_callback(mapping, controllers) #:nodoc:
-        if mapping.fullpath =~ /:[a-zA-Z_]/
-          raise <<-ERROR
-Devise does not support scoping OmniAuth callbacks under a dynamic segment
-and you have set #{mapping.fullpath.inspect}. You can work around by passing
-`skip: :omniauth_callbacks` to the `devise_for` call and extract omniauth
-options to another `devise_for` call outside the scope. Here is an example:
-
-    devise_for :users, only: :omniauth_callbacks, controllers: {omniauth_callbacks: 'users/omniauth_callbacks'}
-
-    scope '/(:locale)', locale: /ru|en/ do
-      devise_for :users, skip: :omniauth_callbacks
-    end
-ERROR
-        end
-
        path, @scope[:path] = @scope[:path], nil
-        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.fullpath}/auth".squeeze("/")
-
+        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.path}/auth".squeeze("/")
        set_omniauth_path_prefix!(path_prefix)

        providers = Regexp.union(mapping.to.omniauth_providers.map(&:to_s))

        match "#{path_prefix}/:provider",
-          constraints: { provider: providers },
-          to: "#{controllers[:omniauth_callbacks]}#passthru",
-          as: :omniauth_authorize,
-          via: [:get, :post]
+          :constraints => { :provider => providers },
+          :to => "#{controllers[:omniauth_callbacks]}#passthru",
+          :as => :omniauth_authorize,
+          :via => [:get, :post]

        match "#{path_prefix}/:action/callback",
-          constraints: { action: providers },
-          to: "#{controllers[:omniauth_callbacks]}#:action",
-          as: :omniauth_callback,
-          via: [:get, :post]
+          :constraints => { :action => providers },
+          :to => controllers[:omniauth_callbacks],
+          :as => :omniauth_callback,
+          :via => [:get, :post]
      ensure
        @scope[:path] = path
      end

+      DEVISE_SCOPE_KEYS = [:as, :path, :module, :constraints, :defaults, :options]
+
      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
-        current_scope = @scope.dup
+        old = {}
+        DEVISE_SCOPE_KEYS.each { |k| old[k] = @scope[k] }

-        exclusive = { as: new_as, path: new_path, module: nil }
-        exclusive.merge!(options.slice(:constraints, :defaults, :options))
+        new = { :as => new_as, :path => new_path, :module => nil }
+        new.merge!(options.slice(:constraints, :defaults, :options))

-        exclusive.each_pair { |key, value| @scope[key] = value }
+        @scope.merge!(new)
        yield
      ensure
-        @scope = current_scope
+        @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) &&
+          request.env['warden'].send(method_to_apply, :scope => scope) &&
            (block.nil? || block.call(request.env["warden"].user(scope)))
        end

@@ -485,16 +442,6 @@ ERROR
        end
      end

-      def raise_no_secret_key #:nodoc:
-        raise <<-ERROR
-Devise.secret_key was not set. Please add the following to your Devise initializer:
-
-  config.secret_key = '#{SecureRandom.hex(64)}'
-
-Please ensure you restarted your application after installing Devise or setting the key.
-ERROR
-      end
-
      def raise_no_devise_method_error!(klass) #:nodoc:
        raise "#{klass} does not respond to 'devise' method. This usually means you haven't " \
          "loaded your ORM file or it's being loaded too late. To fix it, be sure to require 'devise/orm/YOUR_ORM' " \
--- a/lib/devise/rails/warden_compat.rb
+++ b/lib/devise/rails/warden_compat.rb
@@ -3,7 +3,6 @@ module Warden::Mixins::Common
    @request ||= ActionDispatch::Request.new(env)
  end

-  # Deprecate: Remove this check once we move to Rails 4 only.
  NULL_STORE =
    defined?(ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash) ?
      ActionController::RequestForgeryProtection::ProtectionMethods::NullSession::NullSessionHash : nil
--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -16,26 +16,32 @@ module Devise
        valid_for_params_auth? || valid_for_http_auth?
      end

-      # Override and set to false for things like OmniAuth that technically
-      # run through Authentication (user_set) very often, which would normally
-      # reset CSRF data in the session
-      def clean_up_csrf?
-        true
-      end
-
    private

      # Receives a resource and check if it is valid by calling valid_for_authentication?
      # An optional block that will be triggered while validating can be optionally
-      # given as parameter. Check Devise::Models::Authenticatable.valid_for_authentication?
+      # given as parameter. Check Devise::Models::Authenticable.valid_for_authentication?
      # for more information.
      #
      # In case the resource can't be validated, it will fail with the given
      # unauthenticated_message.
      def validate(resource, &block)
+        unless resource
+          ActiveSupport::Deprecation.warn "an empty resource was given to #{self.class.name}#validate. " \
+            "Please ensure the resource is not nil", caller
+        end
+
        result = resource && resource.valid_for_authentication?(&block)

+        case result
+        when Symbol, String
+          ActiveSupport::Deprecation.warn "valid_for_authentication? should return a boolean value"
+          fail!(result)
+          return false
+        end
+
        if result
+          decorate(resource)
          true
        else
          if resource
@@ -46,7 +52,7 @@ module Devise
      end

      # Get values from params and set in the resource.
-      def remember_me(resource)
+      def decorate(resource)
        resource.remember_me = remember_me? if resource.respond_to?(:remember_me=)
      end

@@ -55,9 +61,9 @@ module Devise
        valid_params? && Devise::TRUE_VALUES.include?(params_auth_hash[:remember_me])
      end

-      # Check if this is a valid strategy for http authentication by:
+      # Check if this is strategy is valid for http authentication by:
      #
-      #   * Validating if the model allows http authentication;
+      #   * Validating if the model allows params authentication;
      #   * If any of the authorization headers were sent;
      #   * If all authentication keys are present;
      #
@@ -65,7 +71,7 @@ module Devise
        http_authenticatable? && request.authorization && with_authentication_hash(:http_auth, http_auth_hash)
      end

-      # Check if this is a valid strategy for params authentication by:
+      # Check if this is strategy is valid for params authentication by:
      #
      #   * Validating if the model allows params authentication;
      #   * If the request hits the sessions controller through POST;
@@ -108,17 +114,14 @@ module Devise
        params_auth_hash.is_a?(Hash)
      end

-      # Note: unlike `Model.valid_password?`, this method does not actually
-      # ensure that the password in the params matches the password stored in
-      # the database. It only checks if the password is *present*. Do not rely
-      # on this method for validating that a given password is correct.
+      # Check if password is present and is not equal to "X" (default value for token).
      def valid_password?
-        password.present?
+        password.present? && password != "X"
      end

      # Helper to decode credentials from HTTP.
      def decode_credentials
-        return [] unless request.authorization && request.authorization =~ /^Basic (.*)/mi
+        return [] unless request.authorization && request.authorization =~ /^Basic (.*)/m
        Base64.decode64($1).split(/:/, 2)
      end

--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -17,4 +17,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -2,14 +2,13 @@ require 'devise/strategies/authenticatable'

 module Devise
  module Strategies
-    # Default strategy for signing in a user, based on their email and password in the database.
+    # Default strategy for signing in a user, based on his email and password in the database.
    class DatabaseAuthenticatable < Authenticatable
      def authenticate!
-        resource  = password.present? && mapping.to.find_for_database_authentication(authentication_hash)
+        resource  = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
        encrypted = false

        if validate(resource){ encrypted = true; resource.valid_password?(password) }
-          remember_me(resource)
          resource.after_database_authentication
          success!(resource)
        end
--- a/lib/devise/strategies/rememberable.rb
+++ b/lib/devise/strategies/rememberable.rb
@@ -25,25 +25,15 @@ module Devise
        end

        if validate(resource)
-          remember_me(resource) if extend_remember_me?(resource)
-          resource.after_remembered
          success!(resource)
        end
      end

-      # No need to clean up the CSRF when using rememberable.
-      # In fact, cleaning it up here would be a bug because
-      # rememberable is triggered on GET requests which means
-      # we would render a page on first access with all csrf
-      # tokens expired.
-      def clean_up_csrf?
-        false
-      end
-
    private

-      def extend_remember_me?(resource)
-        resource.respond_to?(:extend_remember_period) && resource.extend_remember_period
+      def decorate(resource)
+        super
+        resource.extend_remember_period = mapping.to.extend_remember_period if resource.respond_to?(:extend_remember_period=)
      end

      def remember_me?
--- a/lib/devise/strategies/token_authenticatable.rb
+++ b/lib/devise/strategies/token_authenticatable.rb
@@ -0,0 +1,91 @@
+require 'devise/strategies/base'
+
+module Devise
+  module Strategies
+    # Strategy for signing in a user, based on a authenticatable token. This works for both params
+    # and http. For the former, all you need to do is to pass the params in the URL:
+    #
+    #   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']
+    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
+
+        if validate(resource)
+          resource.after_token_authentication
+          success!(resource)
+        end
+      end
+
+    private
+
+      # Token Authenticatable can be authenticated with params in any controller and any verb.
+      def valid_params_request?
+        true
+      end
+
+      # Do not use remember_me behavior with token.
+      def remember_me?
+        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
+      def params_auth_hash
+        if params[scope].kind_of?(Hash) && params[scope].has_key?(authentication_keys.first)
+          params[scope]
+        else
+          params
+        end
+      end
+
+      # Overwrite authentication keys to use token_authentication_key.
+      def authentication_keys
+        @authentication_keys ||= [mapping.to.token_authentication_key]
+      end
+    end
+  end
+end
+
+Warden::Strategies.add(:token_authenticatable, Devise::Strategies::TokenAuthenticatable)
--- a/lib/devise/test_helpers.rb
+++ b/lib/devise/test_helpers.rb
@@ -26,11 +26,11 @@ module Devise

    # Quick access to Warden::Proxy.
    def warden #:nodoc:
-      @request.env['warden'] ||= begin
+      @warden ||= begin
        manager = Warden::Manager.new(nil) do |config|
          config.merge! Devise.warden_config
        end
-        Warden::Proxy.new(@request.env, manager)
+        @request.env['warden'] = Warden::Proxy.new(@request.env, manager)
      end
    end

@@ -108,9 +108,8 @@ module Devise
        Warden::Manager._run_callbacks(:before_failure, env, options)

        status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
-        @controller.response.headers.merge!(headers)
-        @controller.send :render, status: status, text: response.body,
-          content_type: headers["Content-Type"], location: headers["Location"]
+        @controller.send :render, :status => status, :text => response.body,
+          :content_type => headers["Content-Type"], :location => headers["Location"]
        nil # causes process return @response
      end

--- a/lib/devise/time_inflector.rb
+++ b/lib/devise/time_inflector.rb
@@ -6,9 +6,9 @@ module Devise

    class << self
      attr_reader :instance
-      delegate :time_ago_in_words, to: :instance
+      delegate :time_ago_in_words, :to => :instance
    end

    @instance = new
  end
-end
+end
--- a/lib/devise/token_generator.rb
+++ b/lib/devise/token_generator.rb
@@ -1,70 +0,0 @@
-# Deprecate: Copied verbatim from Rails source, remove once we move to Rails 4 only.
-require 'thread_safe'
-require 'openssl'
-require 'securerandom'
-
-module Devise
-  class TokenGenerator
-    def initialize(key_generator, digest="SHA256")
-      @key_generator = key_generator
-      @digest = digest
-    end
-
-    def digest(klass, column, value)
-      value.present? && OpenSSL::HMAC.hexdigest(@digest, key_for(column), value.to_s)
-    end
-
-    def generate(klass, column)
-      key = key_for(column)
-
-      loop do
-        raw = Devise.friendly_token
-        enc = OpenSSL::HMAC.hexdigest(@digest, key, raw)
-        break [raw, enc] unless klass.to_adapter.find_first({ column => enc })
-      end
-    end
-
-    private
-
-    def key_for(column)
-      @key_generator.generate_key("Devise #{column}")
-    end
-  end
-
-  # KeyGenerator is a simple wrapper around OpenSSL's implementation of PBKDF2
-  # It can be used to derive a number of keys for various purposes from a given secret.
-  # This lets Rails applications have a single secure secret, but avoid reusing that
-  # key in multiple incompatible contexts.
-  class KeyGenerator
-    def initialize(secret, options = {})
-      @secret = secret
-      # The default iterations are higher than required for our key derivation uses
-      # on the off chance someone uses this for password storage
-      @iterations = options[:iterations] || 2**16
-    end
-
-    # Returns a derived key suitable for use.  The default key_size is chosen
-    # to be compatible with the default settings of ActiveSupport::MessageVerifier.
-    # i.e. OpenSSL::Digest::SHA1#block_length
-    def generate_key(salt, key_size=64)
-      OpenSSL::PKCS5.pbkdf2_hmac_sha1(@secret, salt, @iterations, key_size)
-    end
-  end
-
-  # CachingKeyGenerator is a wrapper around KeyGenerator which allows users to avoid
-  # re-executing the key generation process when it's called using the same salt and
-  # key_size
-  class CachingKeyGenerator
-    def initialize(key_generator)
-      @key_generator = key_generator
-      @cache_keys = ThreadSafe::Cache.new
-    end
-
-    # Returns a derived key suitable for use.  The default key_size is chosen
-    # to be compatible with the default settings of ActiveSupport::MessageVerifier.
-    # i.e. OpenSSL::Digest::SHA1#block_length
-    def generate_key(salt, key_size=64)
-      @cache_keys["#{salt}#{key_size}"] ||= @key_generator.generate_key(salt, key_size)
-    end
-  end
-end
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "3.5.8".freeze
+  VERSION = "3.0.4".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -4,21 +4,21 @@ require 'generators/devise/orm_helpers'
 module ActiveRecord
  module Generators
    class DeviseGenerator < ActiveRecord::Generators::Base
-      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"

      include Devise::Generators::OrmHelpers
      source_root File.expand_path("../templates", __FILE__)

      def copy_devise_migration
        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}.rb"
+          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}"
        else
-          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}.rb"
+          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
        end
      end

      def generate_model
-        invoke "active_record:model", [name], migration: false unless model_exists? && behavior == :invoke
+        invoke "active_record:model", [name], :migration => false unless model_exists? && behavior == :invoke
      end

      def inject_devise_content
@@ -39,8 +39,8 @@ module ActiveRecord
      def migration_data
 <<RUBY
      ## Database authenticatable
-      t.string :email,              null: false, default: ""
-      t.string :encrypted_password, null: false, default: ""
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""

      ## Recoverable
      t.string   :reset_password_token
@@ -50,11 +50,11 @@ module ActiveRecord
      t.datetime :remember_created_at

      ## Trackable
-      t.integer  :sign_in_count, default: 0, null: false
+      t.integer  :sign_in_count, :default => 0
      t.datetime :current_sign_in_at
      t.datetime :last_sign_in_at
-      t.#{ip_column} :current_sign_in_ip
-      t.#{ip_column} :last_sign_in_ip
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip

      ## Confirmable
      # t.string   :confirmation_token
@@ -63,29 +63,14 @@ module ActiveRecord
      # t.string   :unconfirmed_email # Only if using reconfirmable

      ## Lockable
-      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
      # t.string   :unlock_token # Only if unlock strategy is :email or :both
      # t.datetime :locked_at
+
+      ## Token authenticatable
+      # t.string :authentication_token
 RUBY
      end
-
-      def ip_column
-        # Padded with spaces so it aligns nicely with the rest of the columns.
-        "%-8s" % (inet? ? "inet" : "string")
-      end
-
-      def inet?
-        rails4? && postgresql?
-      end
-
-      def rails4?
-        Rails.version.start_with? '4'
-      end
-
-      def postgresql?
-        config = ActiveRecord::Base.configurations[Rails.env]
-        config && config['adapter'] == 'postgresql'
-      end
    end
  end
 end
--- a/lib/generators/active_record/templates/migration.rb
+++ b/lib/generators/active_record/templates/migration.rb
@@ -7,12 +7,13 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
      t.<%= attribute.type %> :<%= attribute.name %>
 <% end -%>

-      t.timestamps null: false
+      t.timestamps
    end

-    add_index :<%= table_name %>, :email,                unique: true
-    add_index :<%= table_name %>, :reset_password_token, unique: true
-    # add_index :<%= table_name %>, :confirmation_token,   unique: true
-    # add_index :<%= table_name %>, :unlock_token,         unique: true
+    add_index :<%= table_name %>, :email,                :unique => true
+    add_index :<%= table_name %>, :reset_password_token, :unique => true
+    # add_index :<%= table_name %>, :confirmation_token,   :unique => true
+    # add_index :<%= table_name %>, :unlock_token,         :unique => true
+    # add_index :<%= table_name %>, :authentication_token, :unique => true
  end
 end
--- a/lib/generators/active_record/templates/migration_existing.rb
+++ b/lib/generators/active_record/templates/migration_existing.rb
@@ -8,13 +8,14 @@ class AddDeviseTo<%= table_name.camelize %> < ActiveRecord::Migration
 <% end -%>

      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps null: false
+      # t.timestamps
    end

-    add_index :<%= table_name %>, :email,                unique: true
-    add_index :<%= table_name %>, :reset_password_token, unique: true
-    # add_index :<%= table_name %>, :confirmation_token,   unique: true
-    # add_index :<%= table_name %>, :unlock_token,         unique: true
+    add_index :<%= table_name %>, :email,                :unique => true
+    add_index :<%= table_name %>, :reset_password_token, :unique => true
+    # add_index :<%= table_name %>, :confirmation_token,   :unique => true
+    # add_index :<%= table_name %>, :unlock_token,         :unique => true
+    # add_index :<%= table_name %>, :authentication_token, :unique => true
  end

  def self.down
--- a/lib/generators/devise/controllers_generator.rb
+++ b/lib/generators/devise/controllers_generator.rb
@@ -1,44 +0,0 @@
-require 'rails/generators/base'
-
-module Devise
-  module Generators
-    class ControllersGenerator < Rails::Generators::Base
-      CONTROLLERS = %w(confirmations passwords registrations sessions unlocks omniauth_callbacks).freeze
-
-      desc <<-DESC.strip_heredoc
-        Create inherited Devise controllers in your app/controllers folder.
-
-        Use -c to specify which controller you want to overwrite.
-        If you do no specify a controller, all controllers will be created.
-        For example:
-
-          rails generate devise:controllers users -c=sessions
-
-        This will create a controller class at app/controllers/users/sessions_controller.rb like this:
-
-          class Users::ConfirmationsController < Devise::ConfirmationsController
-            content...
-          end
-      DESC
-
-      source_root File.expand_path("../../templates/controllers", __FILE__)
-      argument :scope, required: true,
-        desc: "The scope to create controllers in, e.g. users, admins"
-      class_option :controllers, aliases: "-c", type: :array,
-        desc: "Select specific controllers to generate (#{CONTROLLERS.join(', ')})"
-
-      def create_controllers
-        @scope_prefix = scope.blank? ? '' : (scope.camelize + '::')
-        controllers = options[:controllers] || CONTROLLERS
-        controllers.each do |name|
-          template "#{name}_controller.rb",
-                   "app/controllers/#{scope}/#{name}_controller.rb"
-        end
-      end
-
-      def show_readme
-        readme "README" if behavior == :invoke
-      end
-    end
-  end
-end
--- a/lib/generators/devise/devise_generator.rb
+++ b/lib/generators/devise/devise_generator.rb
@@ -1,5 +1,3 @@
-require 'rails/generators/named_base'
-
 module Devise
  module Generators
    class DeviseGenerator < Rails::Generators::NamedBase
@@ -13,12 +11,12 @@ module Devise

      hook_for :orm

-      class_option :routes, desc: "Generate routes", type: :boolean, default: true
+      class_option :routes, :desc => "Generate routes", :type => :boolean, :default => true

      def add_devise_routes
        devise_route  = "devise_for :#{plural_name}"
-        devise_route << %Q(, class_name: "#{class_name}") if class_name.include?("::")
-        devise_route << %Q(, skip: :all) unless options.routes?
+        devise_route << %Q(, :class_name => "#{class_name}") if class_name.include?("::")
+        devise_route << %Q(, :skip => :all) unless options.routes?
        route devise_route
      end
    end
--- a/lib/generators/devise/install_generator.rb
+++ b/lib/generators/devise/install_generator.rb
@@ -1,4 +1,3 @@
-require 'rails/generators/base'
 require 'securerandom'

 module Devise
@@ -20,10 +19,6 @@ module Devise
      def show_readme
        readme "README" if behavior == :invoke
      end
-
-      def rails_4?
-        Rails::VERSION::MAJOR == 4
-      end
    end
  end
 end
--- a/lib/generators/devise/orm_helpers.rb
+++ b/lib/generators/devise/orm_helpers.rb
@@ -4,7 +4,8 @@ module Devise
      def model_contents
        buffer = <<-CONTENT
  # Include default devise modules. Others available are:
-  # :confirmable, :lockable, :timeoutable and :omniauthable
+  # :token_authenticatable, :confirmable,
+  # :lockable, :timeoutable and :omniauthable
  devise :database_authenticatable, :registerable,
         :recoverable, :rememberable, :trackable, :validatable

--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -1,5 +1,3 @@
-require 'rails/generators/base'
-
 module Devise
  module Generators
    # Include this module in your generator to generate Devise views.
@@ -9,14 +7,13 @@ module Devise
      extend ActiveSupport::Concern

      included do
-        argument :scope, required: false, default: nil,
-                         desc: "The scope to copy views to"
+        argument :scope, :required => false, :default => nil,
+                         :desc => "The scope to copy views to"

        # Le sigh, ensure Thor won't handle opts as args
        # It should be fixed in future Rails releases
-        class_option :form_builder, aliases: "-b"
+        class_option :form_builder, :aliases => "-b"
        class_option :markerb
-        class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (confirmations, passwords, registrations, sessions, unlocks, mailer)"

        public_task :copy_views
      end
@@ -29,17 +26,11 @@ module Devise
      end

      def copy_views
-        if options[:views]
-          options[:views].each do |directory|
-            view_directory directory.to_sym
-          end
-        else
-          view_directory :confirmations
-          view_directory :passwords
-          view_directory :registrations
-          view_directory :sessions
-          view_directory :unlocks
-        end
+        view_directory :confirmations
+        view_directory :passwords
+        view_directory :registrations
+        view_directory :sessions
+        view_directory :unlocks
      end

      protected
@@ -47,7 +38,7 @@ module Devise
      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", "#{plural_scope}/shared/links"
+            content.gsub "devise/shared/links", "#{scope}/shared/links"
          else
            content
          end
@@ -55,11 +46,7 @@ module Devise
      end

      def target_path
-        @target_path ||= "app/views/#{plural_scope || :devise}"
-      end
-
-      def plural_scope
-        @plural_scope ||= scope.presence && scope.underscore.pluralize
+        @target_path ||= "app/views/#{scope || :devise}"
      end
    end

@@ -87,13 +74,6 @@ module Devise
      source_root File.expand_path("../../templates/simple_form_for", __FILE__)
      desc "Copies simple form enabled views to your application."
      hide!
-
-      def copy_views
-        if options[:views]
-          options[:views].delete('mailer')
-        end
-        super
-      end
    end

    class ErbGenerator < Rails::Generators::Base #:nodoc:
@@ -103,9 +83,7 @@ module Devise
      hide!

      def copy_views
-        if !options[:views] || options[:views].include?('mailer')
-          view_directory :mailer
-        end
+        view_directory :mailer
      end
    end

@@ -116,31 +94,29 @@ module Devise
      hide!

      def copy_views
-        if !options[:views] || options[:views].include?('mailer')
-          view_directory :markerb, target_path
-        end
+        view_directory :markerb, target_path
      end

      def target_path
-        "app/views/#{plural_scope || :devise}/mailer"
+        "app/views/#{scope || :devise}/mailer"
      end
    end

    class ViewsGenerator < Rails::Generators::Base
      desc "Copies Devise views to your application."

-      argument :scope, required: false, default: nil,
-                       desc: "The scope to copy views to"
+      argument :scope, :required => false, :default => nil,
+                       :desc => "The scope to copy views to"

      invoke SharedViewsGenerator

-      hook_for :form_builder, aliases: "-b",
-                              desc: "Form builder to be used",
-                              default: defined?(SimpleForm) ? "simple_form_for" : "form_for"
+      hook_for :form_builder, :aliases => "-b",
+                              :desc => "Form builder to be used",
+                              :default => defined?(SimpleForm) ? "simple_form_for" : "form_for"

-      hook_for :markerb,  desc: "Generate markerb instead of erb mail views",
-                          default: defined?(Markerb) ? :markerb : :erb,
-                          type: :boolean
+      hook_for :markerb,  :desc => "Generate markerb instead of erb mail views",
+                          :default => defined?(Markerb) ? :markerb : :erb,
+                          :type => :boolean
    end
  end
 end
--- a/lib/generators/mongoid/devise_generator.rb
+++ b/lib/generators/mongoid/devise_generator.rb
@@ -1,4 +1,3 @@
-require 'rails/generators/named_base'
 require 'generators/devise/orm_helpers'

 module Mongoid
@@ -11,43 +10,46 @@ module Mongoid
      end

      def inject_field_types
-        inject_into_file model_path, migration_data, after: "include Mongoid::Document\n" if model_exists?
+        inject_into_file model_path, migration_data, :after => "include Mongoid::Document\n" if model_exists?
      end

      def inject_devise_content
-        inject_into_file model_path, model_contents, after: "include Mongoid::Document\n" if model_exists?
+        inject_into_file model_path, model_contents, :after => "include Mongoid::Document\n" if model_exists?
      end

      def migration_data
 <<RUBY
  ## Database authenticatable
-  field :email,              type: String, default: ""
-  field :encrypted_password, type: String, default: ""
+  field :email,              :type => String, :default => ""
+  field :encrypted_password, :type => String, :default => ""

  ## Recoverable
-  field :reset_password_token,   type: String
-  field :reset_password_sent_at, type: Time
+  field :reset_password_token,   :type => String
+  field :reset_password_sent_at, :type => Time

  ## Rememberable
-  field :remember_created_at, type: Time
+  field :remember_created_at, :type => Time

  ## Trackable
-  field :sign_in_count,      type: Integer, default: 0
-  field :current_sign_in_at, type: Time
-  field :last_sign_in_at,    type: Time
-  field :current_sign_in_ip, type: String
-  field :last_sign_in_ip,    type: String
+  field :sign_in_count,      :type => Integer, :default => 0
+  field :current_sign_in_at, :type => Time
+  field :last_sign_in_at,    :type => Time
+  field :current_sign_in_ip, :type => String
+  field :last_sign_in_ip,    :type => String

  ## Confirmable
-  # field :confirmation_token,   type: String
-  # field :confirmed_at,         type: Time
-  # field :confirmation_sent_at, type: Time
-  # field :unconfirmed_email,    type: String # Only if using reconfirmable
+  # field :confirmation_token,   :type => String
+  # field :confirmed_at,         :type => Time
+  # field :confirmation_sent_at, :type => Time
+  # field :unconfirmed_email,    :type => String # Only if using reconfirmable

  ## Lockable
-  # field :failed_attempts, type: Integer, default: 0 # Only if lock strategy is :failed_attempts
-  # field :unlock_token,    type: String # Only if unlock strategy is :email or :both
-  # field :locked_at,       type: Time
+  # field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
+  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
+  # field :locked_at,       :type => Time
+
+  ## Token authenticatable
+  # field :authentication_token, :type => String
 RUBY
      end
    end
--- a/lib/generators/templates/README
+++ b/lib/generators/templates/README
@@ -2,18 +2,18 @@

 Some setup you must do manually if you haven't yet:

-  1. Ensure you have defined default url options in your environments files. Here
-     is an example of default_url_options appropriate for a development environment
+  1. Ensure you have defined default url options in your environments files. Here 
+     is an example of default_url_options appropriate for a development environment 
     in config/environments/development.rb:

-       config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
+       config.action_mailer.default_url_options = { :host => 'localhost:3000' }

     In production, :host should be set to the actual host of your application.

  2. Ensure you have defined root_url to *something* in your config/routes.rb.
     For example:

-       root to: "home#index"
+       root :to => "home#index"

  3. Ensure you have flash messages in app/views/layouts/application.html.erb.
     For example:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
José Valim	d401147f68	Release v3.0.4	2013-11-13 14:10:16 +01:00
José Valim	d559a32646	Release 3.0.3	2013-08-18 10:26:26 +02:00
José Valim	6b95b96547	Release v3.0.2	2013-08-09 10:24:23 +02:00
José Valim	df8e6cf225	Skip storage for cookies on unverified requests	2013-08-08 23:32:18 +02:00
José Valim	cf87cd0742	Update OTHER lock	2013-08-08 23:32:09 +02:00