Release 2.0.6

Use the Ruby 1.8 hash syntax.
Yes we still support Ruby 1.8 😢 Conflicts: Gemfile.lock
2026-01-12 08:17:59 -05:00 · 2013-08-18 10:43:33 +02:00 · 2013-01-28 13:26:29 -02:00 · 2013-01-26 11:53:34 -07:00 · 2013-01-26 11:52:15 -07:00 · 2012-02-17 12:49:21 +01:00
241 changed files with 3888 additions and 7387 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,16 @@
-language: ruby
 script: "bundle exec rake test"
-install: script/cached-bundle install --deployment --path vendor/bundle
+before_install: gem update --system
 rvm:
+  - 1.8.7
+  - 1.9.2
  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-env:
-  matrix:
-    - DEVISE_ORM=mongoid
-    - DEVISE_ORM=active_record
-  global:
-    # AMAZON_S3_BUCKET
-    - secure: "qkeYGn2mpgsgU5tKS9GWvFp/utUF/9O8++Shch24DMnq8OB01TrV5QQ2Elj7sSjMWqw2Pbe56nUCA9eOWXhPglGyIq2AI9E0umsEGZxdRlqqobpiMWs5wl8KZ0cFD1rZm6CwfL8atmcNfTt5TnvsaQ2l/k3TerOT2e66R/Mibk8="
-    # AMAZON_ACCESS_KEY_ID
-    - secure: "rTYGUFH9SPN0L7QtdE6Liyy/1z7nGKxqDF9LMRsmNsIfsqxoTPKZ8bCctQ4ksuk9svynGQsLfsda5pA+YvuALzjdWmGcID6ENgOGvoFnhZO5LuJ5f6t0k8gFpV9oBquQgDWzhzrcPYvCUrUYg3GSlHjFSXdPdht3SoYn7PiDaNs="
-    # AMAZON_SECRET_ACCESS_KEY
-    - secure: "VJ4qiWMzoleLojCcluX+w0RtaFVc9ybRNo6NODkGhHSaao8+4EX4rETBQG67tNSInk1iuNqCcZAGwC8V/12RXdao3PguRSLD5IiKeT+D78dqFEoP0+yHg4PbmZ6TJXADW3gUv/IOqkW7f/UYGinRaPu7hloyiC498FpQdmMWSNI="
+  - ree
 gemfile:
-  - gemfiles/Gemfile.rails-4.1-stable
-  - gemfiles/Gemfile.rails-4.0-stable
-  - gemfiles/Gemfile.rails-3.2-stable
+  - gemfiles/Gemfile.rails-3.1.x
  - Gemfile
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.rails-head
-services:
-  - mongodb
 notifications:
-  email: false
-  campfire:
-    on_success: change
-    on_failure: always
-    rooms:
-      - secure: "TRiqvuM4i/QmRDWjUSNitE5/P91BOzDkNl53+bZjjtxcISCswZtmECWBR7n9\n3xwqCOU1o2lfohxZ32OHOj/Nj7o+90zWJfWxcv+if0hIXRiil62M5pg0lZUd\nyJ4M5VQ0lSWo5he1OUrXhSabPJeaK3B8yT/tdh+qO5yzR+vb/jc="
+  recipients:
+    - jose.valim@plataformatec.com.br
+    - carlos@plataformatec.com.br
+    - rodrigo.flores@plataformatec.com.br
+    - rafael.franca@plataformatec.com.br
--- a/.yardopts
+++ b/.yardopts
@@ -1,9 +0,0 @@
--protected
--no-private
--embed-mixin ClassMethods
-
-README.md
-CHANGELOG.rdoc
-CONTRIBUTING.md
-MIT-LICENSE
-
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,307 +1,19 @@
-### Unreleased
-
-### 3.4.1
-
-* 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
-
-* 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
-
-* 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)
+== 2.0.6

 * 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
-
-* 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
-
-* 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
-
-* 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
-
-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
-
-* 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)
-
-* 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
-
-* deprecations
-  * `expire_session_data_after_sign_in!` has been deprecated in favor of `expire_data_after_sign_in!`
-
-### 3.1.1
-
-* 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
-
-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
-
-* bug fix
-  * Skip storage for cookies on unverified requests
-
-### 3.0.1
-
-Security announcement: http://blog.plataformatec.com.br/2013/08/csrf-token-fixation-attacks-in-devise/
-
-* enhancements
-  * Add after_confirmation callback
-
-* bug fix
-  * 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
-
-* 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)
-
-* bug fix
-  * Errors on unlock are now properly reflected on the first `unlock_keys`
-
-### 2.2.4
-
-* enhancements
-  * Add `destroy_with_password` to `DatabaseAuthenticatable`. Allows destroying a record when `:current_password` matches, similarly to how `update_with_password` works. (by @michiel3)
-  * Allow to override path after password resetting (by @worker8)
-  * Add `#skip_confirmation_notification!` method to `Confirmable`. Allows skipping confirmation email without auto-confirming. (by @gregates)
-  * allow_unconfirmed_access_for config from `:confirmable` module can be set to `nil` that means unconfirmed access for unlimited time. (by @nashby)
-  * Support Rails' token strategy on authentication (by @robhurring)
-  * Support explicitly setting the http authentication key via `config.http_authentication_key` (by @neo)
-
-* bug fix
-  * Do not redirect when accessing devise API via JSON. (by @sebastianwr)
-  * Generating scoped devise views now uses the correct scoped shared links partial instead of the default devise one (by @nashby)
-  * Fix inheriting mailer templates from `Devise::Mailer`
-  * Fix a bug when procs are used as default mailer in Devise (by @tomasv)
-
-* 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
-
-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
-
-* bug fix
-  * Fix bug when checking for reconfirmable in templates
-
-### 2.2.1
-
-* bug fix
-  * Fix regression with case_insensitive_keys
-  * Fix regression when password is blank when it is invalid
-
-### 2.2.0
-
-* backwards incompatible changes
-  * `headers_for` is deprecated, customize the mailer directly instead
-  * All mailer methods now expect a second argument with delivery options
-  * Default minimum password length is now 8 (by @carlosgaldino)
-  * Support alternate sign in error message when email record does not exist (this adds a new I18n key to the locale file) (by @gabetax)
-  * DeviseController responds only to HTML requests by default (call `DeviseController.respond_to` or `ApplicationController.respond_to` to add new formats)
-  * Support Mongoid 3 onwards (by @durran)
-
-* enhancements
-  * Fix unlockable which could leak account existence on paranoid mode (by @latortuga)
-  * Confirmable now has a confirm_within option to set a period while the confirmation token is still valid (by @promisedlandt)
-  * Flash messages in controller now respects `resource_name` (by @latortuga)
-  * Separate `sign_in` and `sign_up` on RegistrationsController (by @rubynortheast)
-  * Add autofocus to default views (by @Radagaisus)
-  * Unlock user on password reset (by @marcinb)
-  * Allow validation callbacks to apply to virtual attributes (by @latortuga)
-
-* bug fix
-  * unconfirmed_email now uses the proper e-mail on salutation
-  * Fix default email_regexp config to not allow spaces (by @kukula)
-  * Fix a regression introduced on warden 1.2.1 (by @ejfinneran)
-  * Properly camelize omniauth strategies (by @saizai)
-  * Do not set flash messages for non navigational requests on session sign out (by @mathieul)
-  * Set the proper fields as required on the lockable module (by @nickhoffman)
-  * Respects Devise mailer default's reply_to (by @mrchrisadams)
-  * Properly assign resource on `sign_in` related action (by @adammcnamara)
-  * `update_with_password` doesn't change encrypted password when it is invalid (by @nashby)
-  * Properly handle namespaced models on Active Record generator (by @nashby)
-
-### 2.1.4
-
-* bugfix
  * Do not confirm account after reset password

-### 2.1.3
+== 2.0.5

-* bugfix
+* bug fix
  * Require string conversion for all values

-### 2.1.2
-
-* enhancements
-  * Handle backwards incompatibility between Rails 3.2.6 and Thor 0.15.x
+== 2.0.4

 * bug fix
-  * Fix regression on strategy validation on previous release
-
-### 2.1.1 (yanked)
-
-* enhancements
-  * `sign_out_all_scopes` now locks warden and does not allow new logins in the same action
-  * `Devise.omniauth_path_prefix` is available to configure omniauth path prefix
-  * Redirect to sign in page when trying to access password#edit without a token (by @gbataille)
-  * Allow a lambda in authenticate(d) routes helpers to further select the scope
-  * Removed warnings on Rails 3.2.6 (by @nashby)
-
-* bug fix
-  * `update_with_password` now relies on assign_attributes and forwards the :as option (by @wtn)
-  * Do not trigger timeout on sign in related actions
-  * Timeout does not explode when reset_authentication_token! is accidentally defined by Active Model (by @remomueller)
-
-* deprecations
-  * Strategy#validate() no longer validates nil resources
-
-### 2.1.0
-
-* enhancements
-  * Add `check_fields!(model_class)` method on Devise::Models to check if the model includes the fields that Devise uses
-  * Add `skip_reconfirmation!` to skip reconfirmation
-  * Devise model generator now works with engines
-  * Devise encryptable was moved to its new gem (http://github.com/plataformatec/devise-encryptable)
-
-* deprecations
-  * Deprecations warnings added on Devise 2.0 are now removed with their features
-  * All devise modules should now have a `required_fields(klass)` module method to help gathering missing attributes
-  * `use_salt_as_remember_token` and `apply_schema` does not have any effect since 2.0 and are now deprecated
-  * `valid_for_authentication?` must now return a boolean
-
-* bug fix
-  * Ensure after sign in hook is not called without a resource
-  * Fix a term: now on Omniauth related flash messages, we say that we're authenticating from an omniauth provider instead of authorizing
-  * Fixed redirect when authenticated mounted apps (by @hakanensari)
-  * Ensure the failure app still respects config.relative_url_root
-  * `/users/sign_in` doesn't choke on protected attributes used to select sign in scope (by @Paymium)
-  * `failed_attempts` is set to zero after any sign in (including via reset password) (by @rodrigoflores)
-  * Added token expiration on timeout (by @antiarchitect)
-  * Do not accidentally mark `_prefixes` as private
-  * Better support for custom strategies on test helpers (by @mattconnolly)
-  * 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
-
-Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
-
-* bug fix
-  * Fix when :host is used with devise_for  (by @mreinsch)
  * Fix a regression that caused Warden to be initialized too late

-### 2.0.3 (yanked)
+== 2.0.3 (yanked)

 * bug fix
  * Ensure warning is not shown by mistake on apps with mounted engines
@@ -309,7 +21,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
+== 2.0.2

 * enhancements
  * Add devise_i18n_options to customize I18n message
@@ -321,7 +33,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
+== 2.0.1

 * enhancements
  * Improved error messages on deprecation warnings
@@ -330,7 +42,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
+== 2.0.0

 * enhancements
  * Add support for e-mail reconfirmation on change (by @Mandaryn and @heimidal)
@@ -354,16 +66,15 @@ Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.
  * Move devise/shared/_links.erb to devise/_links.erb
  * Deprecated support of nested devise_for blocks
  * 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
+== 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
+== 1.5.2

 * enhancements
  * Add support for Rails 3.1 new mass assignment conventions (by @kirs)
@@ -372,12 +83,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
+== 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
+== 1.5.0

 * enhancements
  * Timeoutable also skips tracking if skip_trackable is given
@@ -398,12 +109,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
+== 1.4.9

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

-### 1.4.8
+== 1.4.8

 * enhancements
  * Add docs for assets pipeline and Heroku
@@ -411,12 +122,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
+== 1.4.7

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

-### 1.4.6 (yanked)
+== 1.4.6 (yanked)

 * enhancements
  * Allow devise_for :skip => :all
@@ -424,7 +135,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
+== 1.4.5

 * bug fix
  * Failure app tries the root path if a session one does not exist
@@ -432,12 +143,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
+== 1.4.4

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

-### 1.4.3
+== 1.4.3

 * enhancements
  * Improve Rails 3.1 compatibility
@@ -453,12 +164,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
+== 1.4.2

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

-### 1.4.1
+== 1.4.1

 * enhancements
  * Add :defaults and :format support on router
@@ -469,10 +180,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
+== 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)
@@ -481,28 +192,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
+== 1.3.4

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

-### 1.3.3
+== 1.3.3

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

-### 1.3.2
+== 1.3.2

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

-### 1.3.1
+== 1.3.1

 * enhancements
  * Improve failure_app responses (by @indirect)
@@ -511,7 +222,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
+== 1.3.0

 * enhancements
  * All controllers can now handle different mime types than html using Responders (by @sikachu)
@@ -531,19 +242,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
+== 1.2.1

 * enhancements
  * Improve update path messages

-### 1.2.0
+== 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
+== 1.2.rc2

 * enhancements
  * Make friendly_token 20 chars long
@@ -573,7 +284,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
+== 1.2.rc

 * deprecations
  * cookie_domain is deprecated in favor of cookie_options
@@ -589,10 +300,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)
@@ -611,13 +322,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
+== 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
+== 1.1.5

 * bugfix
  * Ensure to convert keys on indifferent hash
@@ -625,12 +336,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
+== 1.1.4

 * bugfix
  * Avoid session fixation attacks

-### 1.1.3
+== 1.1.3

 * bugfix
  * Add reply-to to e-mail headers by default
@@ -641,17 +352,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
+== 1.1.2

 * bugfix
  * Compatibility with latest Rails routes schema

-### 1.1.1
+== 1.1.1

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

-### 1.1.0
+== 1.1.0

 * enhancements
  * Rememberable module allows user to be remembered across browsers and is enabled by default (by @trevorturk)
@@ -671,7 +382,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
+== 1.1.rc2

 * enhancements
  * Allow to set cookie domain for the remember token. (by @mantas)
@@ -689,7 +400,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
+== 1.1.rc1

 * enhancements
  * Rails 3 compatibility
@@ -721,7 +432,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
+== 1.0.8

 * enhancements
  * Support for latest MongoMapper
@@ -730,7 +441,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
+== 1.0.7

 * bug fix
  * Ensure password confirmation is always required
@@ -739,14 +450,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
+== 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
+== 1.0.5

 * bug fix
  * Use prepend_before_filter in require_no_authentication.
@@ -754,19 +465,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
+== 1.0.4

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

-### 1.0.3
+== 1.0.3

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

-### 1.0.2
+== 1.0.2

 * enhancements
  * Allows you set mailer content type (by @glennr)
@@ -774,7 +485,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
+== 1.0.1

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

-### 1.0.0
+== 1.0.0

 * deprecation
  * :old_password in update_with_password is deprecated, use :current_password instead
@@ -792,9 +503,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
+== 0.9.2

 * bug fix
  * Ensure inactive user cannot sign in
@@ -804,13 +515,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
+== 0.9.1

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

-### 0.9.0
+== 0.9.0

 * deprecation
  * devise :all is deprecated
@@ -827,7 +538,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
+== 0.8.2

 * enhancements
  * Allow Devise.mailer_sender to be a proc (by @grimen)
@@ -835,7 +546,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
+== 0.8.1

 * enhancements
  * Move salt to encryptors
@@ -845,7 +556,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
+== 0.8.0

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

-### 0.7.5
+== 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
+== 0.7.4

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

-### 0.7.3
+== 0.7.3

 * bug fix
  * Give scope to the proper model validation
@@ -881,7 +592,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
+== 0.7.2

 * deprecation
  * Renamed reset_confirmation! to resend_confirmation!
@@ -891,12 +602,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
+== 0.7.1

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

-### 0.7.0
+== 0.7.0

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

-### 0.6.3
+== 0.6.3

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

-### 0.6.2
+== 0.6.2

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

-### 0.6.1
+== 0.6.1

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

-### 0.6.0
+== 0.6.0

 * deprecations
  * :authenticatable is still included by default, but yields a deprecation warning
@@ -932,57 +643,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
+== 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
+== 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
+== 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
+== 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
+== 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
+== 0.5.1

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

-### 0.5.0
+== 0.5.0

 * bug fix
  * Fixed a bug where remember me module was not working properly
@@ -992,13 +703,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
+== 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
+== 0.4.2

 * deprecations
  * Renamed mail_sender to mailer_sender
@@ -1010,12 +721,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
+== 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
+== 0.4.0

 * deprecations
  * Notifier is deprecated, use DeviseMailer instead. Remember to rename
@@ -1024,52 +735,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
+== 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
+== 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
+== 0.2.2

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

-### 0.2.1
+== 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
+== 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
@@ -1078,14 +789,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
+== 0.1.1

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

-### 0.1.0
+== 0.1.0

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

 gemspec

-gem "rails", "4.2.0.beta2"
-gem "omniauth", "~> 1.2.0"
-gem "omniauth-oauth2", "~> 1.1.0"
+gem "rails", "~> 3.2.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.2", :require => false
+  gem "mocha", :require => false
+
+  platforms :mri_18 do
+    gem "ruby-debug", ">= 0.10.3"
+  end
 end

 platforms :jruby do
@@ -21,9 +25,11 @@ platforms :jruby do
 end

 platforms :ruby do
-  gem "sqlite3"
-end
+  gem "sqlite3-ruby"

-group :mongoid do
-  gem "mongoid", github: "mongoid/mongoid", branch: "master"
+  group :mongoid do
+    gem "mongo", "~> 1.3.0"
+    gem "mongoid", "~> 2.0"
+    gem "bson_ext", "~> 1.3.0"
+  end
 end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,173 +1,145 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 5ba2e1fb4cb8189c9890e29c19cf4e16c25e4bc5
-  branch: master
-  specs:
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
 PATH
  remote: .
  specs:
-    devise (3.4.1)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      responders
-      thread_safe (~> 0.1)
-      warden (~> 1.2.3)
+    devise (2.0.6)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      railties (~> 3.1)
+      warden (~> 1.1.1)

 GEM
-  remote: https://rubygems.org/
+  remote: http://rubygems.org/
  specs:
-    actionmailer (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-    actionpack (4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      builder (~> 3.1)
+    actionmailer (3.2.0)
+      actionpack (= 3.2.0)
+      mail (~> 2.4.0)
+    actionpack (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      builder (~> 3.0.0)
      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.3)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      globalid (>= 0.3.0)
-    activemodel (4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      builder (~> 3.1)
-    activerecord (4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta2)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    arel (6.0.0.beta1)
-    bcrypt (3.1.7)
-    bson (2.3.0)
-    builder (3.2.2)
-    connection_pool (2.0.0)
+      journey (~> 1.0.0)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.1)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.0)
+      activesupport (= 3.2.0)
+      builder (~> 3.0.0)
+    activerecord (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+      arel (~> 3.0.0)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.0)
+      activemodel (= 3.2.0)
+      activesupport (= 3.2.0)
+    activesupport (3.2.0)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    addressable (2.2.6)
+    arel (3.0.0)
+    bcrypt-ruby (3.1.1)
+    bson (1.5.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    columnize (0.3.5)
    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.3.0)
-      activesupport (>= 4.1.0)
-    hashie (3.2.0)
-    hike (1.2.3)
-    i18n (0.7.0.beta1)
-    json (1.8.1)
-    jwt (1.0.0)
-    loofah (2.0.1)
-      nokogiri (>= 1.5.9)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (5.4.2)
-    mocha (1.1.0)
+    faraday (0.7.5)
+      addressable (~> 2.2.6)
+      multipart-post (~> 1.1.3)
+      rack (>= 1.1.0, < 2)
+    hashie (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.0)
+    json (1.6.5)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.4.1)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.0)
      metaclass (~> 0.0.1)
-    moped (2.0.0)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      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)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.3.4)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.4)
+    multipart-post (1.1.4)
+    nokogiri (1.5.0)
+    oauth2 (0.5.1)
+      faraday (~> 0.7.4)
+      multi_json (~> 1.0.3)
+    omniauth (1.0.1)
+      hashie (~> 1.2)
+      rack
+    omniauth-facebook (1.0.0)
+      omniauth-oauth2 (~> 1.0.0)
+    omniauth-oauth2 (1.0.0)
+      oauth2 (~> 0.5.0)
+      omniauth (~> 1.0)
    omniauth-openid (1.0.1)
      omniauth (~> 1.0)
      rack-openid (~> 1.3.1)
-    optionable (0.2.0)
-    origin (2.1.1)
-    orm_adapter (0.5.0)
-    rack (1.6.0.beta)
+    orm_adapter (0.0.7)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.1)
+      rack (>= 0.4)
    rack-openid (1.3.1)
      rack (>= 1.1.0)
      ruby-openid (>= 2.1.8)
-    rack-test (0.6.2)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
      rack (>= 1.0)
-    rails (4.2.0.beta2)
-      actionmailer (= 4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      actionview (= 4.2.0.beta2)
-      activejob (= 4.2.0.beta2)
-      activemodel (= 4.2.0.beta2)
-      activerecord (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta2)
-      sprockets-rails (~> 3.0.0.beta1)
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.3)
-      activesupport
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
-      loofah (~> 2.0)
-    railties (4.2.0.beta2)
-      actionpack (= 4.2.0.beta2)
-      activesupport (= 4.2.0.beta2)
+    rails (3.2.0)
+      actionmailer (= 3.2.0)
+      actionpack (= 3.2.0)
+      activerecord (= 3.2.0)
+      activeresource (= 3.2.0)
+      activesupport (= 3.2.0)
+      bundler (~> 1.0)
+      railties (= 3.2.0)
+    railties (3.2.0)
+      actionpack (= 3.2.0)
+      activesupport (= 3.2.0)
+      rack-ssl (~> 1.3.2)
      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.12)
      json (~> 1.4)
-    responders (2.0.0)
-      railties (>= 4.2.0.alpha, < 5)
-    ruby-openid (2.5.0)
-    sprockets (2.12.2)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-openid (2.1.8)
+    sprockets (2.1.2)
      hike (~> 1.2)
-      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    warden (1.2.3)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    warden (1.1.1)
      rack (>= 1.0)
-    webrat (0.7.3)
+    webrat (0.7.2)
      nokogiri (>= 1.2.0)
      rack (>= 1.0)
      rack-test (>= 0.5.3)
@@ -178,15 +150,18 @@ PLATFORMS
 DEPENDENCIES
  activerecord-jdbc-adapter
  activerecord-jdbcsqlite3-adapter
+  bson_ext (~> 1.3.0)
  devise!
  jruby-openssl
-  mocha (~> 1.1)
-  mongoid!
-  omniauth (~> 1.2.0)
+  mocha
+  mongo (~> 1.3.0)
+  mongoid (~> 2.0)
+  omniauth (~> 1.0.0)
  omniauth-facebook
-  omniauth-oauth2 (~> 1.1.0)
+  omniauth-oauth2 (~> 1.0.0)
  omniauth-openid (~> 1.0.1)
-  rails (= 4.2.0.beta2)
+  rails (~> 3.2.0)
  rdoc
-  sqlite3
-  webrat (= 0.7.3)
+  ruby-debug (>= 0.10.3)
+  sqlite3-ruby
+  webrat (= 0.7.2)
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2009-2014 Plataformatec. http://plataformatec.com.br
+Copyright 2009-2012 Plataforma Tecnologia. http://blog.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
@@ -1,34 +1,32 @@
-![Devise Logo](https://raw.github.com/plataformatec/devise/master/devise.png)
+*IMPORTANT:* Devise 2.0.0 is out. If you are upgrading, please read: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0

-By [Plataformatec](http://plataformatec.com.br/).
+## 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)
-[![Security](https://hakiri.io/github/plataformatec/devise/master.svg)](https://hakiri.io/github/plataformatec/devise/master)
+INFO: This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).

-This README is [also available in a friendly navigable format](http://devise.plataformatec.com.br/).
+[![Build Status](https://secure.travis-ci.org/plataformatec/devise.png)](http://travis-ci.org/plataformatec/devise)

 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;
+* Allows you to have multiple roles (or models/scopes) signed in at the same time;
 * Is based on a modularity concept: use just what you really need.

-It's composed of 10 modules:
+It's comprised of 12 modules:

-* [Database Authenticatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/DatabaseAuthenticatable): encrypts and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
-* [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 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.
+* Database Authenticatable: encrypts and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
+* Token Authenticatable: 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: adds Omniauth (github.com/intridea/omniauth) support;
+* Confirmable: sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
+* Recoverable: resets the user password and sends reset instructions.
+* Registerable: handles signing up users through a registration process, also allowing them to edit and destroy their account.
+* Rememberable: manages generating and clearing a token for remembering the user from a saved cookie.
+* Trackable: tracks sign in count, timestamps and IP address.
+* Timeoutable: expires sessions that have no activity in a specified period of time.
+* Validatable: provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
+* Lockable: locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
+* Encryptable: adds support of other authentication mechanisms besides the built-in Bcrypt (the default).

 ## Information

@@ -36,7 +34,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 +42,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 found a security bug, 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 email or a private GitHub message to the maintainers listed at the bottom of the README.

 ### Mailing list

@@ -58,7 +56,7 @@ You can view the Devise documentation in RDoc format here:

 http://rubydoc.info/github/plataformatec/devise/master/frames

-If you need to use Devise with previous versions of Rails, you can always run "gem server" from the command line after you install the gem to access the old documentation.
+If you need to use Devise with Rails 2.3, you can always run "gem server" from the command line after you install the gem to access the old documentation.

 ### Example applications

@@ -84,18 +82,16 @@ You will usually want to write tests for your changes.  To run the test suite, g

 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: http://www.railstutorial.org/book/demo_app#sec-modeling_demo_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

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

 ## Getting started

-Devise 3.0 works with Rails 3.2 onwards. You can add it to your Gemfile with:
+Devise 2.0 works with Rails 3.1 onwards. You can add it to your Gemfile with:

-```ruby
-gem 'devise'
-```
+  gem 'devise'

 Run the bundle command to install it.

@@ -111,28 +107,16 @@ The generator will install an initializer which describes ALL Devise's configura
 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.
-
-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'll run into strange errors like users being unable to login and route helpers being undefined.
+Replace MODEL by the class name used for the applications users, it's frequently 'User' but could also be 'Admin'. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run "rake db:migrate" as the generator will have created a migration file (if your ORM supports them). This generator also configures your config/routes.rb file to point to Devise controller.

 ### 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
@@ -151,18 +135,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. For instance, for 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"
+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?

@@ -173,86 +163,42 @@ 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.
+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
+### Configuring multiple models

-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 allows any set of parameters to be passed down to the model, therefore requiring sanitization. Their names and the permitted parameters by default are:
-
-* `sign_in` (`Devise::SessionsController#create`) - 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 with a simple before filter in your `ApplicationController`:
+Devise allows you to set up as many roles as you want. For example, you may have a User model and also want an Admin model with just authentication and timeoutable features. If so, just follow these steps:

 ```ruby
-class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
-
-  protected
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.for(:sign_up) << :username
-  end
+# Create a migration with the required fields
+create_table :admins do |t|
+  t.string :email
+  t.string :encrypted_password
+  t.timestamps
 end
+
+# Inside your Admin model
+devise :database_authenticatable, :timeoutable
+
+# Inside your routes
+devise_for :admins
+
+# Inside your protected controller
+before_filter :authenticate_admin!
+
+# Inside your controllers and views
+admin_signed_in?
+current_admin
+admin_session
 ```

-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 thusly:
-
-```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 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
-  def sign_in
-    default_params.permit(:username, :email)
-  end
-end
-```
-
-And then configure your controllers to use it:
-
-```ruby
-class ApplicationController < ActionController::Base
-  protected
-
-  def devise_parameter_sanitizer
-    if resource_class == User
-      User::ParameterSanitizer.new(User, :user, params)
-    else
-      super # Use the default one
-    end
-  end
-end
-```
-
-The example above overrides the permitted parameters for the user to be both `:username` and `:email`. The non-lazy way to configure parameters would be by defining the before filter above in a custom controller. We detail how to configure and customize controllers in some sections below.
+On the other hand, you can simply run the generator!

 ### Configuring views

@@ -264,99 +210,62 @@ 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 role in your application (such as "User" and "Admin"), you will notice that Devise uses the same views for all roles. 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 want to generate only a few set of views, like the ones for the `registrable` 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:
+1) Create your custom controller, for example a Admins::SessionsController:

-    ```console
-    rails generate devise:controllers [scope]
-    ```
+```ruby
+class Admins::SessionsController < Devise::SessionsController
+end
+```

-    If you specify `users` as the scope, controllers will be created in `app/controllers/users/`.
-    And the sessions controller will look like this:
+2) Tell the router to use this controller:

-    ```ruby
-    class Users::SessionsController < Devise::SessionsController
-      # GET /resource/sign_in
-      # def new
-      #   super
-      # end
-      ...
-    end
-    ```
+```ruby
+devise_for :admins, :controllers => { :sessions => "admins/sessions" }
+```

-2. Tell the router to use this controller:
+3) And since we changed the controller, it won't use the "devise/sessions" views, so remember to copy "devise/sessions" to "admin/sessions".

-    ```ruby
-    devise_for :users, controllers: { sessions: "users/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`.
-
-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 failed. 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.

 ### Configuring routes

 Devise also ships with default routes. If you need to customize them, you should probably be able to do it through the devise_for method. It accepts several options like :class_name, :path_prefix and so on, including the possibility to change path names for I18n:

 ```ruby
-devise_for :users, path: "auth", path_names: { sign_in: 'login', sign_out: 'logout', password: 'secret', confirmation: 'verification', unlock: 'unblock', registration: 'register', sign_up: 'cmon_let_me_in' }
+devise_for :users, :path => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'cmon_let_me_in' }
 ```

-Be sure to check `devise_for` documentation for details.
+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 to 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+ and you can also give a block to +devise_for+, resulting in the same behavior:
+
+```ruby
+devise_for :users do
+  get "sign_in", :to => "devise/sessions#new"
+end
+```
+
+Feel free to choose the one you prefer!

 ### I18n

@@ -398,27 +307,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:
-
-```ruby
-class ActionController::TestCase
-  include Devise::TestHelpers
-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):
-
-```ruby
-RSpec.configure do |config|
-  config.include Devise::TestHelpers, type: :controller
-end
-```
-
-Now you are ready to use the `sign_in` and `sign_out` methods. Such methods have the same signature as in controllers:
+Devise includes some tests helpers for functional specs. To use them, you just need to include Devise::TestHelpers in your test class and use the sign_in and sign_out method. Such methods have the same signature as in controllers:

 ```ruby
 sign_in :user, @user   # sign_in(scope, resource)
@@ -428,81 +319,43 @@ sign_out :user         # sign_out(scope)
 sign_out @user         # sign_out(resource)
 ```

-There are two things that are important to keep in mind:
+You can include the Devise Test Helpers in all of your tests by adding the following to the bottom of your test/test_helper.rb file:

-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;
+```ruby
+class ActionController::TestCase
+  include Devise::TestHelpers
+end
+```

-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 told explicitly. For example, if you are testing the user scope, simply do:
+If you're using RSpec and want the helpers automatically included within all +describe+ blocks, add a file called spec/support/devise.rb with the following contents:

-    ```ruby
-    @request.env["devise.mapping"] = Devise.mappings[:user]
-    get :new
-    ```
+```ruby
+RSpec.configure do |config|
+  config.include Devise::TestHelpers, :type => :controller
+end
+```
+
+Do not use such helpers for integration tests such as Cucumber or Webrat. Instead, fill in the form or explicitly set the user in session. For more tips, check the wiki (https://wiki.github.com/plataformatec/devise).

 ### Omniauth

-Devise comes with Omniauth support out of the box to authenticate with other providers. To use it, just specify your omniauth configuration in `config/initializers/devise.rb`:
-
-```ruby
-config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
-```
-
-You can read more about Omniauth support in the wiki:
+Devise comes with Omniauth support out of the box to authenticate from other providers. You can read more about Omniauth support in the wiki:

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

-### Configuring multiple models
-
-Devise allows you to set up as many Devise models as you want. If you want to have an Admin model with just authentication and timeout features, in addition to the User model above, just run:
-
-```ruby
-# Create a migration with the required fields
-create_table :admins do |t|
-  t.string :email
-  t.string :encrypted_password
-  t.timestamps
-end
-
-# Inside your Admin model
-devise :database_authenticatable, :timeoutable
-
-# Inside your routes
-devise_for :admins
-
-# Inside your protected controller
-before_filter :authenticate_admin!
-
-# Inside your controllers and views
-admin_signed_in?
-current_admin
-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 you to 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 queueing backend, 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
-```
-
 ### Other ORMs

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

-## Additional information
+### Migrating from other solutions
+
+Devise implements encryption strategies for Clearance, Authlogic and Restful-Authentication. To make use of these strategies, you need set the desired encryptor in the encryptor initializer config option and add :encryptable to your model. You might also need to rename your encrypted password and salt columns to match Devise's fields (encrypted_password and password_salt).
+
+## Troubleshooting

 ### Heroku

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

 ```ruby
 config.assets.initialize_on_precompile = false
@@ -510,6 +363,8 @@ config.assets.initialize_on_precompile = false

 Read more about the potential issues at http://guides.rubyonrails.org/asset_pipeline.html

+## Additional information
+
 ### Warden

 Devise is based on Warden, which is a general Rack authentication framework created by Daniel Neighman. We encourage you to read more about Warden here:
@@ -520,10 +375,14 @@ 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-2014 Plataformatec. http://plataformatec.com.br
-
-You are not granted rights or licenses to the trademarks of the Plataformatec, including without limitation the Devise name or logo.
+MIT License. Copyright 2012 Plataforma Tecnologia. http://blog.plataformatec.com.br
--- a/7
+++ b/7
@@ -1,10 +1,10 @@
 # encoding: UTF-8
-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
@@ -22,7 +22,6 @@ Rake::TestTask.new(:test) do |t|
  t.libs << 'test'
  t.pattern = 'test/**/*_test.rb'
  t.verbose = true
-  t.warning = false
 end

 desc 'Generate documentation for Devise.'
@@ -30,6 +29,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
  rdoc.rdoc_dir = 'rdoc'
  rdoc.title    = 'Devise'
  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.md')
+  rdoc.rdoc_files.include('README.rdoc')
  rdoc.rdoc_files.include('lib/**/*.rb')
 end
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,16 +1,15 @@
 class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation/new
  def new
-    self.resource = resource_class.new
+    build_resource({})
  end

  # POST /resource/confirmation
  def create
-    self.resource = resource_class.send_confirmation_instructions(resource_params)
-    yield resource if block_given?
+    self.resource = resource_class.send_confirmation_instructions(params[resource_name])

    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,15 +32,12 @@ 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)
    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
+      after_sign_in_path_for(resource)
    end
+
 end
--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -1,12 +1,6 @@
 class Devise::OmniauthCallbacksController < DeviseController
-  prepend_before_filter { request.env["devise.skip_timeout"] = true }
-
-  def 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 => failed_strategy.name.to_s.humanize, :reason => failure_message
    redirect_to after_omniauth_failure_path_for(resource_name)
  end

--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,20 +1,17 @@
 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

  # GET /resource/password/new
  def new
-    self.resource = resource_class.new
+    build_resource({})
  end

  # POST /resource/password
  def create
-    self.resource = resource_class.send_reset_password_instructions(resource_params)
-    yield resource if block_given?
+    self.resource = resource_class.send_reset_password_instructions(params[resource_name])

    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
@@ -28,43 +25,23 @@ class Devise::PasswordsController < DeviseController

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

    if resource.errors.empty?
-      resource.unlock_access! if unlockable?(resource)
      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
-      set_flash_message(:notice, flash_message) if is_flashing_format?
+      set_flash_message(:notice, flash_message) if is_navigational_format?
      sign_in(resource_name, resource)
-      respond_with resource, location: after_resetting_password_path_for(resource)
+      respond_with resource, :location => after_sign_in_path_for(resource)
    else
      respond_with resource
    end
  end

  protected
-    def after_resetting_password_path_for(resource)
-      after_sign_in_path_for(resource)
-    end

    # The path used after sending reset password instructions
    def after_sending_reset_password_instructions_path_for(resource_name)
-      new_session_path(resource_name) if is_navigational_format?
+      new_session_path(resource_name)
    end

-    # Check if a reset_password_token is provided in the request
-    def assert_reset_token_passed
-      if params[:reset_password_token].blank?
-        set_flash_message(:alert, :no_token)
-        redirect_to new_session_path(resource_name)
-      end
-    end
-
-    # Check if proper Lockable module methods are present & unlock strategy
-    # allows to unlock resource on password reset
-    def unlockable?(resource)
-      resource.respond_to?(:unlock_access!) &&
-        resource.respond_to?(:unlock_strategy_enabled?) &&
-        resource.unlock_strategy_enabled?(:email)
-    end
 end
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,39 +1,29 @@
 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({})
-    @validatable = devise_mapping.validatable?
-    if @validatable
-      @minimum_password_length = resource_class.password_length.min
-    end
-    respond_with self.resource
+    resource = build_resource({})
+    respond_with resource
  end

  # POST /resource
  def create
-    build_resource(sign_up_params)
+    build_resource

-    resource_saved = resource.save
-    yield resource if block_given?
-    if resource_saved
+    if resource.save
      if resource.active_for_authentication?
-        set_flash_message :notice, :signed_up if is_flashing_format?
-        sign_up(resource_name, resource)
-        respond_with resource, location: after_sign_up_path_for(resource)
+        set_flash_message :notice, :signed_up if is_navigational_format?
+        sign_in(resource_name, resource)
+        respond_with resource, :location => after_sign_up_path_for(resource)
      else
-        set_flash_message :notice, :"signed_up_but_#{resource.inactive_message}" if is_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
-      @validatable = devise_mapping.validatable?
-      if @validatable
-        @minimum_password_length = resource_class.password_length.min
-      end
      respond_with resource
    end
  end
@@ -48,18 +38,16 @@ class Devise::RegistrationsController < DeviseController
  # the current user in place.
  def update
    self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
-    prev_unconfirmed_email = resource.unconfirmed_email if resource.respond_to?(:unconfirmed_email)

-    resource_updated = update_resource(resource, account_update_params)
-    yield resource if block_given?
-    if resource_updated
-      if is_flashing_format?
-        flash_key = update_needs_confirmation?(resource, prev_unconfirmed_email) ?
-          :update_needs_confirmation : :updated
-        set_flash_message :notice, flash_key
+    if resource.update_with_password(params[resource_name])
+      if is_navigational_format?
+        if resource.respond_to?(:pending_reconfirmation?) && resource.pending_reconfirmation?
+          flash_key = :update_needs_confirmation
+        end
+        set_flash_message :notice, flash_key || :updated
      end
-      sign_in resource_name, resource, bypass: true
-      respond_with resource, location: after_update_path_for(resource)
+      sign_in resource_name, resource, :bypass => true
+      respond_with resource, :location => after_update_path_for(resource)
    else
      clean_up_passwords resource
      respond_with resource
@@ -70,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

@@ -81,34 +68,17 @@ 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

  protected

-  def update_needs_confirmation?(resource, previous)
-    resource.respond_to?(:pending_reconfirmation?) &&
-      resource.pending_reconfirmation? &&
-      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)
-    self.resource = resource_class.new_with_session(hash || {}, session)
-  end
-
-  # Signs in a user on sign up. You can overwrite this method in your own
-  # RegistrationsController.
-  def sign_up(resource_name, resource)
-    sign_in(resource_name, resource)
+    hash ||= params[resource_name] || {}
+    self.resource = resource_class.new_with_session(hash, session)
  end

  # The path used after sign up. You need to overwrite this method
@@ -120,10 +90,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
@@ -134,15 +101,7 @@ 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)
-  end
-
-  def account_update_params
-    devise_parameter_sanitizer.sanitize(:account_update)
-  end
 end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,76 +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

  # GET /resource/sign_in
  def new
-    self.resource = resource_class.new(sign_in_params)
+    resource = build_resource
    clean_up_passwords(resource)
    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?
+    resource = warden.authenticate!(auth_options)
+    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
+
+    # We actually need to hardcode this as Rails default responder doesn't
+    # support returning empty response on GET request
+    respond_to do |format|
+      format.any(*navigational_formats) { redirect_to redirect_path }
+      format.all do
+        method = "to_#{request_format}"
+        text = {}.respond_to?(method) ? {}.send(method) : ""
+        render :text => text, :status => :ok
+      end
+    end
  end

  protected

-  def sign_in_params
-    devise_parameter_sanitizer.sanitize(: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
-
-  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
@@ -3,16 +3,15 @@ class Devise::UnlocksController < DeviseController

  # GET /resource/unlock/new
  def new
-    self.resource = resource_class.new
+    build_resource({})
  end

  # POST /resource/unlock
  def create
-    self.resource = resource_class.send_unlock_instructions(resource_params)
-    yield resource if block_given?
+    self.resource = resource_class.send_unlock_instructions(params[resource_name])

    if successfully_sent?(resource)
-      respond_with({}, location: after_sending_unlock_instructions_path_for(resource))
+      respond_with({}, :location => new_session_path(resource_name))
    else
      respond_with(resource)
    end
@@ -21,26 +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?
-      respond_with_navigational(resource){ redirect_to after_unlock_path_for(resource) }
+      set_flash_message :notice, :unlocked if is_navigational_format?
+      respond_with_navigational(resource){ redirect_to new_session_path(resource) }
    else
-      respond_with_navigational(resource.errors, status: :unprocessable_entity){ render :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end
-
-  protected
-
-    # The path used after sending unlock password instructions
-    def after_sending_unlock_instructions_path_for(resource)
-      new_session_path(resource) if is_navigational_format?
-    end
-
-    # The path used after unlocking the resource
-    def after_unlock_path_for(resource)
-      new_session_path(resource)  if is_navigational_format?
-    end
-
 end
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -5,12 +5,12 @@ class DeviseController < Devise.parent_controller.constantize
  helper DeviseHelper

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

  prepend_before_filter :assert_is_devise_resource!
-  respond_to :html if mimes_for_respond_to.empty?
+  respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?

  # Gets the actual resource stored in the instance variable
  def resource
@@ -30,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
@@ -38,39 +38,17 @@ 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
-      ["#{devise_mapping.scoped_path}/#{controller_name}"] + super
-    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
 Could not find devise mapping for path #{request.fullpath.inspect}.
-This may happen for two reasons:
-
-1) You forgot to wrap your route inside the scope block. For example:
-
-  devise_scope :user do
-    get "/some/route" => "some_devise_controller"
-  end
-
-2) You are testing a Devise controller bypassing the router.
-   If so, you can explicitly tell Devise which mapping to use:
-
-   @request.env["devise.mapping"] = Devise.mappings[:user]
+Maybe you forgot to wrap your route inside the scope block? For example:

+devise_scope :user do
+  match "/some/route" => "some_devise_controller"
+end
 MESSAGE
  end

@@ -89,23 +67,30 @@ MESSAGE
    instance_variable_set(:"@#{resource_name}", new_resource)
  end

+  # Build a devise resource.
+  def build_resource(hash=nil)
+    hash ||= params[resource_name] || {}
+    self.resource = resource_class.new(hash)
+  end
+
  # 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)
    end

-    if authenticated && resource = warden.user(resource_name)
+    if authenticated
+      resource = warden.user(resource_name)
      flash[:alert] = I18n.t("devise.failure.already_authenticated")
      redirect_to after_sign_in_path_for(resource)
    end
@@ -123,17 +108,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:
@@ -145,26 +127,13 @@ MESSAGE
  #
  # Please refer to README or en.yml locale file to check what messages are
  # available.
-  def set_flash_message(key, kind, options = {})
-    message = find_message(kind, options)
-    if options[:now]
-      flash.now[key] = message if message.present?
-    else
-      flash[key] = message if message.present?
-    end
-  end
-
-  def devise_i18n_options(options)
-    options
-  end
-
-  # Get message for given
-  def find_message(kind, options = {})
+  def set_flash_message(key, kind, options={})
    options[:scope] = "devise.#{controller_name}"
    options[:default] = Array(options[:default]).unshift(kind.to_sym)
    options[:resource_name] = resource_name
-    options = devise_i18n_options(options)
-    I18n.t("#{options[:resource_name]}.#{kind}", options)
+    options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
+    message = I18n.t("#{resource_name}.#{kind}", options)
+    flash[key] = message if message.present?
  end

  def clean_up_passwords(object)
@@ -177,7 +146,20 @@ MESSAGE
    end
  end

-  def resource_params
-    params.fetch(resource_name, {})
+  def request_format
+    @request_format ||= request.format.try(:ref)
  end
-end
+
+  def is_navigational_format?
+    Devise.navigational_formats.include?(request.format.try(:ref))
+  end
+
+  # Override prefixes to consider the scoped view.
+  def _prefixes #:nodoc:
+    @_prefixes ||= if self.class.scoped_views? && devise_mapping
+      super.unshift("#{devise_mapping.scoped_path}/#{controller_name}")
+    else
+      super
+    end
+  end
+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,20 +1,15 @@
-if defined?(ActionMailer)
-  class Devise::Mailer < Devise.parent_mailer.constantize
-    include Devise::Mailers::Helpers
+class Devise::Mailer < ::ActionMailer::Base
+  include Devise::Mailers::Helpers

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

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

-    def unlock_instructions(record, token, opts={})
-      @token = token
-      devise_mail(record, :unlock_instructions, opts)
-    end
+  def unlock_instructions(record)
+    devise_mail(record, :unlock_instructions)
  end
 end
--- 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 -%>

@@ -22,4 +22,4 @@
  <%- resource_class.omniauth_providers.each do |provider| %>
    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
  <% end -%>
-<% end -%>
+<% end -%>
--- 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 %>
-  </div>
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>

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

-<%= render "devise/shared/links" %>
+<%= render "links" %>
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,5 +1,5 @@
-<p>Welcome <%= @email %>!</p>
+<p>Welcome <%= @resource.email %>!</p>

 <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/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,8 +1,8 @@
 <p>Hello <%= @resource.email %>!</p>

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

-<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @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
@@ -1,7 +1,7 @@
 <p>Hello <%= @resource.email %>!</p>

-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p>

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

-<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,22 +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 />
-    <%= f.password_field :password, autofocus: true, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></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" %>
+<%= render "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 %></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" %>
+<%= render "links" %>
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,39 +1,25 @@
 <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 %></div>

-  <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
-    <div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
-  <% end %>
+  <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 %> <i>(leave blank if you don't want to change it)</i><br />
-    <%= f.password_field :password, autocomplete: "off" %>
-  </div>
+  <div><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></div>

-  <div class="field">
-    <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, 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="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 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? <%= link_to "Cancel my account", registration_path(resource_name), :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 %></div>

-  <div class="field">
-    <%= f.label :password %>
-    <% if @validatable %>
-    <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" %>
+<%= render "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 %></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" %>
+<%= render "links" %>
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -0,0 +1,3 @@
+<% ActiveSupport::Deprecation.warn "Rendering partials devise/shared/_links.erb is deprecated" \
+  "please use devise/_links.erb instead." %>
+<%= render "links" %>
--- 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 %></div>

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

-<%= render "devise/shared/links" %>
+<%= render "links" %>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,60 +1,57 @@
 # Additional translations at https://github.com/plataformatec/devise/wiki/I18n

 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."
-    failure:
-      already_authenticated: "You are already signed in."
-      inactive: "Your account is not activated yet."
-      invalid: "Invalid %{authentication_keys} or password."
-      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."
-      unauthenticated: "You need to sign in or sign up before continuing."
-      unconfirmed: "You have to confirm your email address before continuing."
-    mailer:
-      confirmation_instructions:
-        subject: "Confirmation instructions"
-      reset_password_instructions:
-        subject: "Reset password instructions"
-      unlock_instructions:
-        subject: "Unlock instructions"
-    omniauth_callbacks:
-      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
-      success: "Successfully authenticated from %{kind} account."
-    passwords:
-      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
-      send_instructions: "You will receive an email with instructions on 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."
-    registrations:
-      destroyed: "Bye! Your account has been 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."
-    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."
-      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
  errors:
    messages:
-      already_confirmed: "was already confirmed, please try signing in"
-      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
      expired: "has expired, please request a new one"
      not_found: "not found"
+      already_confirmed: "was already confirmed, please try signing in"
      not_locked: "was not locked"
      not_saved:
        one: "1 error prohibited this %{resource} from being saved:"
        other: "%{count} errors prohibited this %{resource} from being saved:"
+
+  devise:
+    failure:
+      already_authenticated: 'You are already signed in.'
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    sessions:
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      updated_not_active: 'Your password was changed successfully.'
+      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    registrations:
+      signed_up: 'Welcome! You have signed up successfully.'
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+      updated: 'You updated your account successfully.'
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account has been unlocked successfully. Please sign in to continue.'
+      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
+    omniauth_callbacks:
+      success: 'Successfully authorized from %{kind} account.'
+      failure: 'Could not authorize you from %{kind} because "%{reason}".'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -6,10 +6,9 @@ Gem::Specification.new do |s|
  s.name        = "devise"
  s.version     = Devise::VERSION.dup
  s.platform    = Gem::Platform::RUBY
-  s.licenses    = ["MIT"]
  s.summary     = "Flexible authentication solution for Rails with Warden"
  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "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']

@@ -18,12 +17,9 @@ Gem::Specification.new do |s|
  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("railties", ">= 3.2.6", "< 5")
-  s.add_dependency("responders")
+  s.add_dependency("warden", "~> 1.1.1")
+  s.add_dependency("orm_adapter", "~> 0.0.3")
+  s.add_dependency("bcrypt-ruby", "~> 3.0")
+  s.add_dependency("railties", "~> 3.1")
 end
--- a/devise.png
+++ b/devise.png
--- a/gemfiles/Gemfile.rails-3.1.x
+++ b/gemfiles/Gemfile.rails-3.1.x
@@ -0,0 +1,35 @@
+source "http://rubygems.org"
+
+gem "devise", :path => ".."
+
+gem "rails", "~> 3.1.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.2", :require => false
+  gem "mocha", :require => false
+
+  platforms :mri_18 do
+    gem "ruby-debug", ">= 0.10.3"
+  end
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "jruby-openssl"
+end
+
+platforms :ruby do
+  gem "sqlite3-ruby"
+
+  group :mongoid do
+    gem "mongo", "~> 1.3.0"
+    gem "mongoid", "~> 2.0"
+    gem "bson_ext", "~> 1.3.0"
+  end
+end
--- a/gemfiles/Gemfile.rails-3.1.x.lock
+++ b/gemfiles/Gemfile.rails-3.1.x.lock
@@ -0,0 +1,169 @@
+PATH
+  remote: ..
+  specs:
+    devise (2.0.6)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      railties (~> 3.1)
+      warden (~> 1.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.3)
+      actionpack (= 3.1.3)
+      mail (~> 2.3.0)
+    actionpack (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.5)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.3)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.3)
+      activemodel (= 3.1.3)
+      activesupport (= 3.1.3)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    addressable (2.2.7)
+    arel (2.2.1)
+    bcrypt-ruby (3.1.1)
+    bson (1.5.2)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    columnize (0.3.6)
+    erubis (2.7.0)
+    faraday (0.7.6)
+      addressable (~> 2.2)
+      multipart-post (~> 1.1)
+      rack (~> 1.1)
+    hashie (1.2.0)
+    hike (1.2.1)
+    i18n (0.6.0)
+    json (1.6.5)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    metaclass (0.0.1)
+    mime-types (1.17.2)
+    mocha (0.10.4)
+      metaclass (~> 0.0.1)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    mongoid (2.4.4)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.4)
+    multipart-post (1.1.5)
+    nokogiri (1.5.0)
+    oauth2 (0.5.2)
+      faraday (~> 0.7)
+      multi_json (~> 1.0)
+    omniauth (1.0.2)
+      hashie (~> 1.2)
+      rack
+    omniauth-facebook (1.2.0)
+      omniauth-oauth2 (~> 1.0.0)
+    omniauth-oauth2 (1.0.0)
+      oauth2 (~> 0.5.0)
+      omniauth (~> 1.0)
+    omniauth-openid (1.0.1)
+      omniauth (~> 1.0)
+      rack-openid (~> 1.3.1)
+    orm_adapter (0.0.7)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.1)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-openid (1.3.1)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.3)
+      actionmailer (= 3.1.3)
+      actionpack (= 3.1.3)
+      activerecord (= 3.1.3)
+      activeresource (= 3.1.3)
+      activesupport (= 3.1.3)
+      bundler (~> 1.0)
+      railties (= 3.1.3)
+    railties (3.1.3)
+      actionpack (= 3.1.3)
+      activesupport (= 3.1.3)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rdoc (3.12)
+      json (~> 1.4)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-openid (2.1.8)
+    sprockets (2.0.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.5)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.31)
+    warden (1.1.1)
+      rack (>= 1.0)
+    webrat (0.7.2)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbc-adapter
+  activerecord-jdbcsqlite3-adapter
+  bson_ext (~> 1.3.0)
+  devise!
+  jruby-openssl
+  mocha
+  mongo (~> 1.3.0)
+  mongoid (~> 2.0)
+  omniauth (~> 1.0.0)
+  omniauth-facebook
+  omniauth-oauth2 (~> 1.0.0)
+  omniauth-openid (~> 1.0.1)
+  rails (~> 3.1.0)
+  rdoc
+  ruby-debug (>= 0.10.3)
+  sqlite3-ruby
+  webrat (= 0.7.2)
--- a/gemfiles/Gemfile.rails-3.2-stable
+++ b/gemfiles/Gemfile.rails-3.2-stable
@@ -1,29 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: '..'
-
-gem "rails", github: 'rails/rails', branch: '3-2-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", "~> 3.0"
-end
--- a/gemfiles/Gemfile.rails-3.2-stable.lock
+++ b/gemfiles/Gemfile.rails-3.2-stable.lock
@@ -1,169 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 11fd052aa815ae0255ea5b2463e88138fb3fec61
-  branch: 3-2-stable
-  specs:
-    actionmailer (3.2.19)
-      actionpack (= 3.2.19)
-      mail (~> 2.5.4)
-    actionpack (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      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.19)
-      activesupport (= 3.2.19)
-      builder (~> 3.0.0)
-    activerecord (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.19)
-      activemodel (= 3.2.19)
-      activesupport (= 3.2.19)
-    activesupport (3.2.19)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    rails (3.2.19)
-      actionmailer (= 3.2.19)
-      actionpack (= 3.2.19)
-      activerecord (= 3.2.19)
-      activeresource (= 3.2.19)
-      activesupport (= 3.2.19)
-      bundler (~> 1.0)
-      railties (= 3.2.19)
-    railties (3.2.19)
-      actionpack (= 3.2.19)
-      activesupport (= 3.2.19)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.4.1)
-      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.7)
-    builder (3.0.4)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.2.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    journey (1.0.4)
-    json (1.8.1)
-    jwt (1.0.0)
-    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.0)
-    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.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      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.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    responders (1.1.1)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.5.0)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
-    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 (~> 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)
--- 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,165 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 2d8886e05104316273a0f95dfbcd171d3b12678b
-  branch: 4-0-stable
-  specs:
-    actionmailer (4.0.9)
-      actionpack (= 4.0.9)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.9)
-      activesupport (= 4.0.9)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.9)
-      activesupport (= 4.0.9)
-      builder (~> 3.1.0)
-    activerecord (4.0.9)
-      activemodel (= 4.0.9)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.9)
-      arel (~> 4.0.0)
-    activesupport (4.0.9)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    rails (4.0.9)
-      actionmailer (= 4.0.9)
-      actionpack (= 4.0.9)
-      activerecord (= 4.0.9)
-      activesupport (= 4.0.9)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.9)
-      sprockets-rails (~> 2.0)
-    railties (4.0.9)
-      actionpack (= 4.0.9)
-      activesupport (= 4.0.9)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.4.1)
-      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.3)
-    arel (4.0.2)
-    bcrypt (3.1.7)
-    bson (2.3.0)
-    builder (3.1.4)
-    connection_pool (2.0.0)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.2.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    json (1.8.1)
-    jwt (1.0.0)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (4.7.5)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.0)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      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.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    responders (1.1.1)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.5.0)
-    sprockets (2.12.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (0.3.41)
-    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 (~> 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)
--- 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,170 +0,0 @@
-GIT
-  remote: git://github.com/rails/rails.git
-  revision: 90b70cd453e6b88b2ad484861ad9913f70bd15c9
-  branch: 4-1-stable
-  specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
-      builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
-      arel (~> 5.0.0)
-    activesupport (4.1.5)
-      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.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
-      sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-
-PATH
-  remote: ..
-  specs:
-    devise (3.4.1)
-      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.7)
-    bson (2.3.0)
-    builder (3.2.2)
-    connection_pool (2.0.0)
-    erubis (2.7.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    hashie (3.2.0)
-    hike (1.2.3)
-    i18n (0.6.11)
-    json (1.8.1)
-    jwt (1.0.0)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
-    metaclass (0.0.4)
-    mime-types (2.3)
-    mini_portile (0.6.0)
-    minitest (5.4.0)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    moped (2.0.0)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (2.0.0)
-    nokogiri (1.6.3.1)
-      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.2)
-      rack (>= 1.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
-      json (~> 1.4)
-    responders (1.1.1)
-      railties (>= 3.2, < 4.2)
-    ruby-openid (2.5.0)
-    sprockets (2.12.1)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    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 (~> 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)
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -4,30 +4,29 @@ require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
 require 'securerandom'
-require 'responders'

 module Devise
-  autoload :Delegator,          'devise/delegator'
-  autoload :FailureApp,         'devise/failure_app'
-  autoload :OmniAuth,           'devise/omniauth'
-  autoload :ParameterFilter,    'devise/parameter_filter'
-  autoload :BaseSanitizer,      'devise/parameter_sanitizer'
-  autoload :ParameterSanitizer, 'devise/parameter_sanitizer'
-  autoload :TestHelpers,        'devise/test_helpers'
-  autoload :TimeInflector,      'devise/time_inflector'
-  autoload :TokenGenerator,     'devise/token_generator'
+  autoload :Delegator,   'devise/delegator'
+  autoload :FailureApp,  'devise/failure_app'
+  autoload :OmniAuth,    'devise/omniauth'
+  autoload :ParamFilter, 'devise/param_filter'
+  autoload :Schema,      'devise/schema'
+  autoload :TestHelpers, 'devise/test_helpers'

  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'
+  module Encryptors
+    autoload :Base, 'devise/encryptors/base'
+    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512'
+    autoload :ClearanceSha1, 'devise/encryptors/clearance_sha1'
+    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1'
+    autoload :Sha512, 'devise/encryptors/sha512'
+    autoload :Sha1, 'devise/encryptors/sha1'
  end

  module Mailers
@@ -53,27 +52,16 @@ 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
+  # Declare encryptors length which are used in migrations.
+  ENCRYPTORS_LENGTH = {
+    :sha1   => 40,
+    :sha512 => 128,
+    :clearance_sha1 => 40,
+    :restful_authentication_sha1 => 40,
+    :authlogic_sha512 => 128
+  }

-  [ :allow_insecure_token_lookup,
-    :allow_insecure_sign_in_after_confirmation,
-    :token_authentication_key ].each do |method|
-    class_eval <<-RUBY
-    def self.#{method}
-      ActiveSupport::Deprecation.warn "Devise.#{method} is deprecated " \
-        "and has no effect"
-    end
-
-    def self.#{method}=(val)
-      ActiveSupport::Deprecation.warn "Devise.#{method}= is deprecated " \
-        "and has no effect"
-    end
-    RUBY
-  end
-
-  # Custom domain or key for cookies. Not set by default
+  # Custom domain for cookies. Not set by default
  mattr_accessor :rememberable_options
  @@rememberable_options = {}

@@ -81,10 +69,6 @@ module Devise
  mattr_accessor :stretches
  @@stretches = 10

-  # The default key used when authenticating over http auth.
-  mattr_accessor :http_authentication_key
-  @@http_authentication_key = nil
-
  # Keys used when authenticating a user.
  mattr_accessor :authentication_keys
  @@authentication_keys = [ :email ]
@@ -94,12 +78,14 @@ module Devise
  @@request_keys = []

  # Keys that should be case-insensitive.
+  # False by default for backwards compatibility.
  mattr_accessor :case_insensitive_keys
-  @@case_insensitive_keys = [ :email ]
+  @@case_insensitive_keys = false

  # Keys that should have whitespace stripped.
+  # False by default for backwards compatibility.
  mattr_accessor :strip_whitespace_keys
-  @@strip_whitespace_keys = []
+  @@strip_whitespace_keys = false

  # If http authentication is enabled by default.
  mattr_accessor :http_authenticatable
@@ -121,7 +107,7 @@ module Devise
  # an one (and only one) @ exists in the given string. This is mainly
  # to give user feedback and not to assert the e-mail validity.
  mattr_accessor :email_regexp
-  @@email_regexp = /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+  @@email_regexp = /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/

  # Range validation for password length
  mattr_accessor :password_length
@@ -135,19 +121,10 @@ 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
  @@allow_unconfirmed_access_for = 0.days

-  # Time interval the confirmation token is valid. nil = unlimited
-  mattr_accessor :confirm_within
-  @@confirm_within = nil
-
  # Defines which key will be used when confirming an account.
  mattr_accessor :confirmation_keys
  @@confirmation_keys = [ :email ]
@@ -161,14 +138,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 define the password encryption algorithm.
+  mattr_accessor :encryptor
+  @@encryptor = nil
+
  # Scoped views. Since it relies on fallbacks to render default views, it's
  # turned off by default.
  mattr_accessor :scoped_views
@@ -201,8 +178,9 @@ module Devise
  @@reset_password_keys = [ :email ]

  # Time interval you can reset your password with a reset password key
+  # Nil by default for backwards compatibility.
  mattr_accessor :reset_password_within
-  @@reset_password_within = 6.hours
+  @@reset_password_within = nil

  # The default scope which is used by warden.
  mattr_accessor :default_scope
@@ -212,6 +190,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 = []
@@ -234,26 +216,43 @@ module Devise
  mattr_accessor :parent_controller
  @@parent_controller = "ApplicationController"

-  # The parent mailer all Devise mailers inherit from.
-  # Defaults to ActionMailer::Base. This should be set early
-  # in the initialization process and should be set to a string.
-  mattr_accessor :parent_mailer
-  @@parent_mailer = "ActionMailer::Base"
-
  # The router Devise should use to generate routes. Defaults
-  # to :main_app. Should be 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
-  # Devise is used in a mountable engine
-  mattr_accessor :omniauth_path_prefix
-  @@omniauth_path_prefix = nil
+  # DEPRECATED CONFIG

-  # Set if we should clean up the CSRF Token on authentication
-  mattr_accessor :clean_up_csrf_token_on_authentication
-  @@clean_up_csrf_token_on_authentication = true
+  # If true, uses salt as remember token and does not create it in the database.
+  # By default is false for backwards compatibility.
+  mattr_accessor :use_salt_as_remember_token
+  @@use_salt_as_remember_token = false
+
+  # Tells if devise should apply the schema in ORMs where devise declaration
+  # and schema belongs to the same class (as Datamapper and Mongoid).
+  mattr_accessor :apply_schema
+  @@apply_schema = true
+
+  def self.remember_across_browsers=(value)
+    warn "\n[DEVISE] Devise.remember_across_browsers is deprecated and has no effect. Please remove it.\n"
+  end
+
+  def self.confirm_within=(value)
+    warn "\n[DEVISE] Devise.confirm_within= is deprecated. Please set Devise.allow_unconfirmed_access_for= instead.\n"
+    Devise.allow_unconfirmed_access_for = value
+  end
+
+  def self.cookie_options=(value)
+    warn "\n[DEVISE] Devise.cookie_options= is deprecated. Please set Devise.rememberable_options= instead.\n"
+    Devise.rememberable_options = value
+  end
+
+  def self.stateless_token=(value)
+    warn "\n[DEVISE] Devise.stateless_token= is deprecated. Please append :token_auth to Devise.skip_session_storage " \
+      "instead, for example: Devise.skip_session_storage << :token_auth\n"
+    Devise.skip_session_storage << :token_auth
+  end

  # PRIVATE CONFIGURATION

@@ -273,20 +272,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
@@ -345,7 +336,7 @@ module Devise
  # == Options:
  #
  #   +model+      - String representing the load path to a custom *model* for this module (to autoload.)
-  #   +controller+ - Symbol representing the name of an existing or custom *controller* for this module.
+  #   +controller+ - Symbol representing the name of an exisiting or custom *controller* for this module.
  #   +route+      - Symbol representing the named *route* helper for this module.
  #   +strategy+   - Symbol representing if this module got a custom *strategy*.
  #
@@ -355,8 +346,8 @@ 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, :strategy => true, :controller => :sessions)
+  #   Devise.add_module(:party_module, :model => 'party_module/model')
  #
  def self.add_module(module_name, options = {})
    ALL << module_name
@@ -405,7 +396,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|
@@ -414,7 +405,7 @@ module Devise
  #    end
  #  end
  def self.warden(&block)
-    @@warden_config_blocks << block
+    @@warden_config_block = block
  end

  # Specify an omniauth provider.
@@ -454,28 +445,17 @@ module Devise
      warden_config.intercept_401 = false

      Devise.mappings.each_value do |mapping|
-        warden_config.scope_defaults mapping.name, strategies: mapping.strategies
-
-        warden_config.serialize_into_session(mapping.name) do |record|
-          mapping.to.serialize_into_session(record)
-        end
-
-        warden_config.serialize_from_session(mapping.name) do |key|
-          # Previous versions contained an additional entry at the beginning of
-          # key with the record's class name.
-          args = key[-2, 2]
-          mapping.to.serialize_from_session(*args)
-        end
+        warden_config.scope_defaults mapping.name, :strategies => mapping.strategies
      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.
+  # Generate a friendly string randomically to be used as token.
  def self.friendly_token
-    SecureRandom.urlsafe_base64(15).tr('lIO0', 'sxyz')
+    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,76 +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
        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
-
-            helper_method "current_#{group_name}", "current_#{group_name.to_s.pluralize}", "#{group_name}_signed_in?"
-          METHODS
-        end
-
        def log_process_action(payload)
          payload[:status] ||= 401 unless payload[:exception]
          super
@@ -117,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
@@ -139,20 +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)
-      end
-
-      # Setup a param sanitizer to filter parameters using strong_parameters. See
-      # lib/devise/parameter_sanitizer.rb for more info. Override this
-      # method in your application controller to use your own parameter sanitizer.
-      def devise_parameter_sanitizer
-        @devise_parameter_sanitizer ||= if defined?(ActionController::StrongParameters)
-          Devise::ParameterSanitizer.new(resource_class, resource_name, params)
-        else
-          Devise::BaseSanitizer.new(resource_class, resource_name, params)
-        end
+        is_a?(DeviseController)
      end

      # Tell warden that params authentication is allowed for that specific page.
@@ -160,20 +85,99 @@ 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)
+        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
+        users = Devise.mappings.keys.map { |s| warden.user(:scope => s, :run_callbacks => false) }
+
+        warden.raw_session.inspect
+        warden.logout
+        expire_devise_cached_variables!
+        
+        users.any?
+      end
+
+      # Returns and delete 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)
+        session.delete("#{scope}_return_to")
+      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
@@ -190,10 +194,10 @@ module Devise
      # root path. For a user scope, you can define the default url in
      # the following way:
      #
-      #   map.user_root '/users', controller: 'users' # creates user_root_path
+      #   map.user_root '/users', :controller => 'users' # creates user_root_path
      #
      #   map.namespace :user do |user|
-      #     user.root controller: 'users' # creates user_root_path
+      #     user.root :controller => 'users' # creates user_root_path
      #   end
      #
      # If the resource root path is not defined, root_path is used. However,
@@ -204,7 +208,7 @@ module Devise
      #       if resource.is_a?(User) && resource.can_publish?
      #         publisher_url
      #       else
-      #         super
+      #         signed_in_root_path(resource)
      #       end
      #   end
      #
@@ -219,10 +223,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
@@ -236,6 +237,15 @@ module Devise
        redirect_to after_sign_in_path_for(resource)
      end

+      def redirect_location(scope, resource) #:nodoc:
+        ActiveSupport::Deprecation.warn "redirect_location in Devise is deprecated. Please use after_sign_in_path_for instead.", caller
+        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)
@@ -248,36 +258,16 @@ 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)
-      end
-
-      def request_format
-        @request_format ||= request.format.try(:ref)
-      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?
+        sign_out_all_scopes
+        warden.clear_strategies_cache!
+        expire_devise_cached_variables!
+        super # call the default behaviour which resets the session
      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,27 +1,36 @@
 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

+      # 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.extend_remember_period)
-        cookies.signed[remember_key(resource, scope)] = remember_cookie_values(resource)
+        cookies.signed["remember_#{scope}_token"] = remember_cookie_values(resource)
      end

      # Forgets the given resource by deleting a cookie
      def forget_me(resource)
        scope = Devise::Mapping.find_scope!(resource)
        resource.forget_me!
-        cookies.delete(remember_key(resource, scope), forget_cookie_values(resource))
+        cookies.delete("remember_#{scope}_token", forget_cookie_values(resource))
      end

      protected
@@ -31,17 +40,13 @@ 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
-
-      def remember_key(resource, scope)
-        resource.rememberable_options.fetch(:key, "remember_#{scope}_token")
-      end
    end
  end
-end
+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,102 +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
-
-      def expire_data_after_sign_out!
-        # 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
-    end
-  end
-end
--- a/lib/devise/controllers/store_location.rb
+++ b/lib/devise/controllers/store_location.rb
@@ -1,56 +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
-          session[session_key] = [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
-        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
@@ -47,9 +47,7 @@ module Devise
              class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
                def #{method}(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)
+                  _devise_route_context.send("#{action}\#{scope}_#{module_name}_#{path_or_url}", *args)
                end
              URL_HELPERS
            end
--- a/lib/devise/encryptors/authlogic_sha512.rb
+++ b/lib/devise/encryptors/authlogic_sha512.rb
@@ -0,0 +1,19 @@
+require "digest/sha2"
+
+module Devise
+  module Encryptors
+    # = AuthlogicSha512
+    # Simulates Authlogic's default encryption mechanism.
+    # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to simulate
+    #  the default behavior.
+    class AuthlogicSha512 < Base
+      # Generates a default password digest based on salt, pepper and the
+      # incoming password.
+      def self.digest(password, stretches, salt, pepper)
+        digest = [password, salt].flatten.join('')
+        stretches.times { digest = Digest::SHA512.hexdigest(digest) }
+        digest
+      end
+    end
+  end
+end
--- a/lib/devise/encryptors/base.rb
+++ b/lib/devise/encryptors/base.rb
@@ -0,0 +1,20 @@
+module Devise
+  # Implements a way of adding different encryptions.
+  # The class should implement a self.digest method that taks the following params:
+  #   - password
+  #   - stretches: the number of times the encryption will be applied
+  #   - salt: the password salt as defined by devise
+  #   - pepper: Devise config option
+  #
+  module Encryptors
+    class Base
+      def self.digest
+        raise NotImplemented
+      end
+
+      def self.salt(stretches)
+        Devise.friendly_token[0,20]
+      end
+    end
+  end
+end
--- a/lib/devise/encryptors/clearance_sha1.rb
+++ b/lib/devise/encryptors/clearance_sha1.rb
@@ -0,0 +1,17 @@
+require "digest/sha1"
+
+module Devise
+  module Encryptors
+    # = ClearanceSha1
+    # Simulates Clearance's default encryption mechanism.
+    # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
+    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES
+    class ClearanceSha1 < Base
+      # Generates a default password digest based on salt, pepper and the
+      # incoming password.
+      def self.digest(password, stretches, salt, pepper)
+        Digest::SHA1.hexdigest("--#{salt}--#{password}--")
+      end
+    end
+  end
+end
--- a/lib/devise/encryptors/restful_authentication_sha1.rb
+++ b/lib/devise/encryptors/restful_authentication_sha1.rb
@@ -0,0 +1,22 @@
+require "digest/sha1"
+
+module Devise
+  module Encryptors
+    # = RestfulAuthenticationSha1
+    # Simulates Restful Authentication's default encryption mechanism.
+    # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
+    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES. Should be set to 10 in
+    # the initializer to simulate the default behavior.
+    class RestfulAuthenticationSha1 < Base
+
+      # Generates a default password digest based on salt, pepper and the
+      # incoming password.
+      def self.digest(password, stretches, salt, pepper)
+        digest = pepper
+        stretches.times { digest = Digest::SHA1.hexdigest([digest, salt, password, pepper].flatten.join('--')) }
+        digest
+      end
+
+    end
+  end
+end
--- a/lib/devise/encryptors/sha1.rb
+++ b/lib/devise/encryptors/sha1.rb
@@ -0,0 +1,25 @@
+require "digest/sha1"
+
+module Devise
+  module Encryptors
+    # = Sha1
+    # Uses the Sha1 hash algorithm to encrypt passwords.
+    class Sha1 < Base
+      # Generates a default password digest based on stretches, salt, pepper and the
+      # incoming password.
+      def self.digest(password, stretches, salt, pepper)
+        digest = pepper
+        stretches.times { digest = self.secure_digest(salt, digest, password, pepper) }
+        digest
+      end
+
+    private
+
+      # Generate a SHA1 digest joining args. Generated token is something like
+      #   --arg1--arg2--arg3--argN--
+      def self.secure_digest(*tokens)
+        ::Digest::SHA1.hexdigest('--' << tokens.flatten.join('--') << '--')
+      end
+    end
+  end
+end
--- a/lib/devise/encryptors/sha512.rb
+++ b/lib/devise/encryptors/sha512.rb
@@ -0,0 +1,25 @@
+require "digest/sha2"
+
+module Devise
+  module Encryptors
+    # = Sha512
+    # Uses the Sha512 hash algorithm to encrypt passwords.
+    class Sha512 < Base
+      # Generates a default password digest based on salt, pepper and the
+      # incoming password.
+      def self.digest(password, stretches, salt, pepper)
+        digest = pepper
+        stretches.times { digest = self.secure_digest(salt, digest, password, pepper) }
+        digest
+      end
+
+    private
+
+      # Generate a Sha512 digest joining args. Generated token is something like
+      #   --arg1--arg2--arg3--argN--
+      def self.secure_digest(*tokens)
+        ::Digest::SHA512.hexdigest('--' << tokens.flatten.join('--') << '--')
+      end
+    end
+  end
+end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -13,9 +13,7 @@ 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)
@@ -66,24 +64,12 @@ module Devise

  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
@@ -92,33 +78,23 @@ module Devise
    def redirect_url
      if warden_message == :timeout
        flash[:timedout] = true
-
-        path = if request.get?
-          attempted_path
-        else
-          request.referrer
-        end
-
-        path || scope_url
+        attempted_path || scope_path
      else
-        scope_url
+        scope_path
      end
    end

-    def scope_url
+    def scope_path
      opts  = {}
-      route = :"new_#{scope}_session_url"
+      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))
-
      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
@@ -147,16 +123,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
@@ -185,10 +161,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
@@ -198,7 +170,7 @@ 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?
--- 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 +0,0 @@
-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
-    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 +0,0 @@
-# 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|
-  if record.respond_to?(:failed_attempts) && warden.authenticated?(options[:scope])
-    record.update_attribute(:failed_attempts, 0) unless record.failed_attempts.to_i.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
@@ -5,31 +5,17 @@
 # verify timeout in the following request.
 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
    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)
+    if record.timedout?(last_request_at)
+      warden.logout(scope)
+      throw :warden, :scope => scope, :message => :timeout
    end

-    proxy = Devise::Hooks::Proxy.new(warden)
-
-    if record.timedout?(last_request_at) && !env['devise.skip_timeout']
-      Devise.sign_out_all_scopes ? proxy.sign_out : proxy.sign_out(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
+    unless warden.request.env['devise.skip_trackable']
+      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
@@ -11,9 +11,9 @@ module Devise
      protected

      # Configure default email options
-      def devise_mail(record, action, opts={})
+      def devise_mail(record, action)
        initialize_from_record(record)
-        mail headers_for(action, opts)
+        mail headers_for(action)
      end

      def initialize_from_record(record)
@@ -25,32 +25,28 @@ module Devise
        @devise_mapping ||= Devise.mappings[scope_name]
      end

-      def headers_for(action, opts)
+      def headers_for(action)
        headers = {
-          subject: subject_for(action),
-          to: resource.email,
-          from: mailer_sender(devise_mapping),
-          reply_to: mailer_reply_to(devise_mapping),
-          template_path: template_paths,
-          template_name: action
-        }.merge(opts)
+          :subject       => translate(devise_mapping, action),
+          :from          => mailer_sender(devise_mapping),
+          :to            => resource.email,
+          :template_path => template_paths
+        }
+
+        if resource.respond_to?(:headers_for)
+          headers.merge!(resource.headers_for(action))
+        end
+
+        unless headers.key?(:reply_to)
+          headers[:reply_to] = headers[:from]
+        end

-        @email = headers[:to]
        headers
      end

-      def mailer_reply_to(mapping)
-        mailer_sender(mapping, :reply_to)
-      end
-
-      def mailer_from(mapping)
-        mailer_sender(mapping, :from)
-      end
-
-      def mailer_sender(mapping, sender = :from)
-        default_sender = default_params[sender]
-        if default_sender.present?
-          default_sender.respond_to?(:to_proc) ? instance_eval(&default_sender) : default_sender
+      def mailer_sender(mapping)
+        if default_params[:from].present?
+          default_params[:from]
        elsif Devise.mailer_sender.is_a?(Proc)
          Devise.mailer_sender.call(mapping.name)
        else
@@ -59,12 +55,12 @@ module Devise
      end

      def template_paths
-        template_path = _prefixes.dup
+        template_path = [self.class.mailer_name]
        template_path.unshift "#{@devise_mapping.scoped_path}/mailer" if self.class.scoped_views?
        template_path
      end

-      # Setup a subject doing an I18n lookup. At first, it attempts to set a subject
+      # Setup a subject doing an I18n lookup. At first, it attemps to set a subject
      # based on the current mapping:
      #
      #   en:
@@ -81,9 +77,9 @@ module Devise
      #         confirmation_instructions:
      #           subject: '...'
      #
-      def subject_for(key)
-        I18n.t(:"#{devise_mapping.name}_subject", scope: [:devise, :mailer, key],
-          default: [:subject, key.to_s.humanize])
+      def translate(mapping, key)
+        I18n.t(:"#{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,24 +23,23 @@ 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)
-      case obj
+    def self.find_scope!(duck)
+      case duck
      when String, Symbol
-        return obj.to_sym
+        return duck
      when Class
-        Devise.mappings.each_value { |m| return m.name if obj <= m.to }
+        Devise.mappings.each_value { |m| return m.name if duck <= m.to }
      else
-        Devise.mappings.each_value { |m| return m.name if obj.is_a?(m.to) }
+        Devise.mappings.each_value { |m| return m.name if duck.is_a?(m.to) }
      end

-      raise "Could not find a valid mapping for #{obj.inspect}"
+      raise "Could not find a valid mapping for #{duck.inspect}"
    end

    def self.find_by_path!(path, path_type=:fullpath)
@@ -61,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
@@ -1,15 +1,5 @@
 module Devise
  module Models
-    class MissingAttribute < StandardError
-      def initialize(attributes)
-        @attributes = attributes
-      end
-
-      def message
-        "The following attribute(s) is (are) missing on your model: #{@attributes.join(", ")}"
-      end
-    end
-
    # Creates configuration values for Devise and for the given module.
    #
    #   Devise::Models.config(Devise::Authenticatable, :stretches, 10)
@@ -27,7 +17,7 @@ module Devise
    # inside the given class.
    #
    def self.config(mod, *accessors) #:nodoc:
-      class << mod; attr_accessor :available_configs; end
+      (class << mod; self; end).send :attr_accessor, :available_configs
      mod.available_configs = accessors

      accessors.each do |accessor|
@@ -49,23 +39,6 @@ module Devise
      end
    end

-    def self.check_fields!(klass)
-      failed_attributes = []
-      instance = klass.new
-
-      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)
-        end
-      end
-
-      if failed_attributes.any?
-        fail Devise::Models::MissingAttribute.new(failed_attributes)
-      end
-    end
-
    # Include the chosen devise modules in your model:
    #
    #   devise :database_authenticatable, :confirmable, :recoverable
@@ -83,7 +56,6 @@ module Devise

      devise_modules_hook! do
        include Devise::Models::Authenticatable
-
        selected_modules.each do |m|
          mod = Devise::Models.const_get(m.to_s.classify)

@@ -94,7 +66,7 @@ module Devise
            if class_mod.respond_to?(:available_configs)
              available_configs = class_mod.available_configs
              available_configs.each do |config|
-                next unless options.key?(config)
+                next unless options.key?(config)                
                send(:"#{config}=", options.delete(config))
              end
            end
@@ -108,12 +80,12 @@ module Devise
      end
    end

-    # The hook which is called inside devise.
-    # So your ORM can include devise compatibility stuff.
+    # The hook which is called inside devise. So your ORM can include devise
+    # compatibility stuff.
    def devise_modules_hook!
      yield
    end
  end
 end

-require 'devise/models/authenticatable'
+require 'devise/models/authenticatable'
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -1,5 +1,4 @@
 require 'devise/hooks/activatable'
-require 'devise/hooks/csrf_cleaner'

 module Devise
  module Models
@@ -11,30 +10,29 @@ module Devise
    #
    #   * +authentication_keys+: parameters used for authentication. By default [:email].
    #
-    #   * +http_authentication_key+: map the username passed via HTTP Auth to this parameter. Defaults to
-    #     the first element in +authentication_keys+.
-    #
    #   * +request_keys+: parameters from the request object used for authentication.
    #     By specifying a symbol (which should be a request method), it will automatically be
    #     passed to find_for_authentication method and considered in your model lookup.
    #
    #     For instance, if you set :request_keys to [:subdomain], :subdomain will be considered
-    #     as key on authentication. This can also be a hash where the value is a boolean specifying
+    #     as key on authentication. This can also be a hash where the value is a boolean expliciting
    #     if the value is required or not.
    #
-    #   * +http_authenticatable+: if this model allows http authentication. By default false.
+    #   * +http_authenticatable+: if this model allows http authentication. By default true.
    #     It also accepts an array specifying the strategies that should allow http.
    #
    #   * +params_authenticatable+: if this model allows authentication through request params. By default true.
    #     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?
    #
    # After authenticating a user and in each request, Devise checks if your model is active by
-    # calling model.active_for_authentication?. This method is overwritten by other devise modules. For instance,
+    # calling model.active_for_authentication?. This method is overwriten by other devise modules. For instance,
    # :confirmable overwrites .active_for_authentication? to only return true if your model was confirmed.
    #
    # You overwrite this method yourself, but if you do, don't forget to call super:
@@ -56,20 +54,16 @@ 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]
+        :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
        before_validation :strip_whitespace
      end

-      def self.required_fields(klass)
-        []
-      end
-
      # Check if the current object is valid for authentication. This method and
      # find_for_authentication are the methods used in a Warden::Strategy to check
      # if a model should be signed in or not.
@@ -80,10 +74,6 @@ module Devise
        block_given? ? yield : true
      end

-      def unauthenticated_message
-        :invalid
-      end
-
      def active_for_authentication?
        true
      end
@@ -95,6 +85,22 @@ module Devise
      def authenticatable_salt
      end

+      def devise_mailer
+        Devise.mailer
+      end
+
+      def headers_for(name)
+        {}
+      end
+
+      def downcase_keys
+        (self.class.case_insensitive_keys || []).each { |k| self[k].try(:downcase!) }
+      end
+
+      def strip_whitespace
+        (self.class.strip_whitespace_keys || []).each { |k| self[k].try(:strip!) }
+      end
+
      array = %w(serializable_hash)
      # to_xml does not call serializable_hash on 3.1
      array << "to_xml" if Rails::VERSION::STRING[0,3] == "3.1"
@@ -120,91 +126,9 @@ module Devise
        RUBY
      end

-      protected
-
-      def devise_mailer
-        Devise.mailer
-      end
-
-      # This is an internal method called every time Devise needs
-      # to send a notification/mail. This can be overridden 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
-      # just after the transaction was committed. To achieve this,
-      # you can override send_devise_notification to store the
-      # deliveries until the after_commit callback is triggered:
-      #
-      #     class User
-      #       devise :database_authenticatable, :confirmable
-      #
-      #       after_commit :send_pending_notifications
-      #
-      #       protected
-      #
-      #       def send_devise_notification(notification, *args)
-      #         # 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]
-      #         else
-      #           devise_mailer.send(notification, self, *args).deliver
-      #         end
-      #       end
-      #
-      #       def send_pending_notifications
-      #         pending_notifications.each do |notification, args|
-      #           devise_mailer.send(notification, self, *args).deliver
-      #         end
-      #
-      #         # Empty the pending notifications array because the
-      #         # after_commit hook can be called multiple times which
-      #         # could cause multiple emails to be sent.
-      #         pending_notifications.clear
-      #       end
-      #
-      #       def pending_notifications
-      #         @pending_notifications ||= []
-      #       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
-      end
-
-      def downcase_keys
-        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) }
-      end
-
-      def apply_to_attribute_or_variable(attr, method)
-        if self[attr]
-          self[attr] = self[attr].try(method)
-
-        # Use respond_to? here to avoid a regression where globally
-        # configured strip_whitespace_keys or case_insensitive_keys were
-        # attempting to strip or downcase when a model didn't have the
-        # globally configured key.
-        elsif respond_to?(attr) && respond_to?("#{attr}=")
-          new_value = send(attr).try(method)
-          send("#{attr}=", new_value)
-        end
-      end
-
      module ClassMethods
        Devise::Models.config(self, :authentication_keys, :request_keys, :strip_whitespace_keys,
-          :case_insensitive_keys, :http_authenticatable, :params_authenticatable, :skip_session_storage,
-          :http_authentication_key)
+          :case_insensitive_keys, :http_authenticatable, :params_authenticatable, :skip_session_storage)

        def serialize_into_session(record)
          [record.to_key, record.authenticatable_salt]
@@ -226,18 +150,12 @@ module Devise
        end

        # Find first record based on conditions given (ie by the sign in form).
-        # This method is always called during an authentication process but
-        # it may be wrapped as well. For instance, database authenticatable
-        # provides a `find_for_database_authentication` that wraps a call to
-        # this method. This allows you to customize both database authenticatable
-        # or the whole authenticate stack by customize `find_for_authentication.`
-        #
        # Overwrite to add customized conditions, create a join, or maybe use a
        # namedscope to filter records while authenticating.
        # 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
@@ -249,7 +167,7 @@ module Devise
        end

        def find_first_by_auth_conditions(tainted_conditions, opts={})
-          to_adapter.find_first(devise_parameter_filter.filter(tainted_conditions).merge(opts))
+          to_adapter.find_first(devise_param_filter.filter(tainted_conditions).merge(opts))
        end

        # Find an initialize a record setting an error if it can't be found.
@@ -259,7 +177,7 @@ module Devise

        # 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
@@ -281,8 +199,16 @@ module Devise

        protected

-        def devise_parameter_filter
-          @devise_parameter_filter ||= Devise::ParameterFilter.new(case_insensitive_keys, strip_whitespace_keys)
+        def devise_param_filter
+          @devise_param_filter ||= Devise::ParamFilter.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
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -7,9 +7,9 @@ module Devise
    #
    # == 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).
@@ -19,8 +19,6 @@ module Devise
    #     db field to be setup (t.reconfirmable in migrations). Until confirmed new email is
    #     stored in unconfirmed email column, and copied to email column on successful
    #     confirmation.
-    #   * +confirm_within+: the time before a sent confirmation token becomes invalid.
-    #     You can use this to force the user to confirm within a set period of time.
    #
    # == Examples
    #
@@ -30,27 +28,12 @@ module Devise
    #
    module Confirmable
      extend ActiveSupport::Concern
-      include ActionView::Helpers::DateHelper

      included do
-        before_create :generate_confirmation_token, if: :confirmation_required?
-        after_create  :send_on_create_confirmation_instructions, if: :send_confirmation_notification?
-        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
-        @reconfirmation_required = false
-        @skip_confirmation_notification = false
-        @raw_confirmation_token = nil
-        super
-      end
-
-      def self.required_fields(klass)
-        required_methods = [:confirmation_token, :confirmed_at, :confirmation_sent_at]
-        required_methods << :unconfirmed_email if klass.reconfirmable
-        required_methods
+        before_create :generate_confirmation_token, :if => :confirmation_required?
+        after_create  :send_on_create_confirmation_instructions, :if => :confirmation_required?
+        before_update :postpone_email_change_until_confirmation, :if => :postpone_email_change?
+        after_update :send_confirmation_instructions, :if => :reconfirmation_required?
      end

      # Confirm a user by setting it's confirmed_at to actual time. If the user
@@ -58,28 +41,19 @@ module Devise
      # add errors
      def confirm!
        pending_any_confirmation do
-          if confirmation_period_expired?
-            self.errors.add(:email, :confirmation_period_expired,
-              period: Devise::TimeInflector.time_ago_in_words(self.class.confirm_within.ago))
-            return false
-          end
-
          self.confirmation_token = nil
          self.confirmed_at = Time.now.utc

-          saved = if self.class.reconfirmable && unconfirmed_email.present?
-            skip_reconfirmation!
+          if self.class.reconfirmable && unconfirmed_email.present?
+            @bypass_postpone = true
            self.email = unconfirmed_email
            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: false)
+            save(:validate => false)
          end
-
-          after_confirmation if saved
-          saved
        end
      end

@@ -94,28 +68,16 @@ module Devise

      # Send confirmation instructions by email
      def send_confirmation_instructions
-        unless @raw_confirmation_token
-          generate_confirmation_token!
-        end
-
-        opts = pending_reconfirmation? ? { to: unconfirmed_email } : { }
-        send_devise_notification(:confirmation_instructions, @raw_confirmation_token, opts)
-      end
-
-      def send_reconfirmation_instructions
+        self.confirmation_token = nil if reconfirmation_required?
        @reconfirmation_required = false

-        unless @skip_confirmation_notification
-          send_confirmation_instructions
-        end
+        generate_confirmation_token! if self.confirmation_token.blank?
+        self.devise_mailer.confirmation_instructions(self).deliver
      end

-      # Resend confirmation token.
-      # Regenerates the token if the period is expired.
-      def resend_confirmation_instructions
-        pending_any_confirmation do
-          send_confirmation_instructions
-        end
+      # Resend confirmation token. This method does not need to generate a new token.
+      def resend_confirmation_token
+        pending_any_confirmation { send_confirmation_instructions }
      end

      # Overwrites active_for_authentication? for confirmation
@@ -137,25 +99,21 @@ module Devise
        self.confirmed_at = Time.now.utc
      end

-      # Skips sending the confirmation/reconfirmation notification email after_create/after_update. Unlike
-      # #skip_confirmation!, record still requires confirmation.
-      def skip_confirmation_notification!
-        @skip_confirmation_notification = true
-      end
-
-      # If you don't want reconfirmation to be sent, neither a code
-      # to be generated, call skip_reconfirmation!
-      def skip_reconfirmation!
-        @bypass_confirmation_postpone = true
+      def headers_for(action)
+        headers = super
+        if action == :confirmation_instructions && pending_reconfirmation?
+          headers[:to] = unconfirmed_email
+        end
+        headers
      end

      protected

        # A callback method used to deliver confirmation
-        # 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
+          self.devise_mailer.confirmation_instructions(self).deliver
        end

        # Callback to overwrite if confirmation is required or not.
@@ -182,32 +140,13 @@ module Devise
        #   # allow_unconfirmed_access_for = 0.days
        #   confirmation_period_valid?   # will always return false
        #
-        #   # allow_unconfirmed_access_for = nil
-        #   confirmation_period_valid?   # will always return true
-        #
        def confirmation_period_valid?
-          self.class.allow_unconfirmed_access_for.nil? || (confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago)
-        end
-
-        # Checks if the user confirmation happens before the token becomes invalid
-        # Examples:
-        #
-        #   # confirm_within = 3.days and confirmation_sent_at = 2.days.ago
-        #   confirmation_period_expired?  # returns false
-        #
-        #   # confirm_within = 3.days and confirmation_sent_at = 4.days.ago
-        #   confirmation_period_expired?  # returns true
-        #
-        #   # confirm_within = nil
-        #   confirmation_period_expired?  # will always return false
-        #
-        def confirmation_period_expired?
-          self.class.confirm_within && (Time.now > self.confirmation_sent_at + self.class.confirm_within )
+          confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago
        end

        # Checks whether the record requires any confirmation.
        def pending_any_confirmation
-          if (!confirmed? || pending_reconfirmation?)
+          if !confirmed? || pending_reconfirmation?
            yield
          else
            self.errors.add(:email, :already_confirmed)
@@ -215,41 +154,31 @@ module Devise
          end
        end

-        # Generates a new random token for confirmation, and stores
-        # the time this token is being generated
+        # Generates a new random token for confirmation, and stores the time
+        # this token is being generated
        def generate_confirmation_token
-          raw, enc = Devise.token_generator.generate(self.class, :confirmation_token)
-          @raw_confirmation_token   = raw
-          self.confirmation_token   = enc
+          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

-        def postpone_email_change_until_confirmation_and_regenerate_confirmation_token
+        def postpone_email_change_until_confirmation
          @reconfirmation_required = true
          self.unconfirmed_email = self.email
          self.email = self.email_was
-          generate_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
+          @bypass_postpone = nil
          postpone
        end

        def reconfirmation_required?
-          self.class.reconfirmable && @reconfirmation_required && self.email.present?
-        end
-
-        def send_confirmation_notification?
-          confirmation_required? && !@skip_confirmation_notification && self.email.present?
-        end
-
-        def after_confirmation
+          self.class.reconfirmable && @reconfirmation_required
        end

      module ClassMethods
@@ -262,7 +191,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

@@ -271,15 +200,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)
-          original_token     = confirmation_token
-          confirmation_token = Devise.token_generator.digest(self, :confirmation_token, confirmation_token)
-
          confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
          confirmable.confirm! if confirmable.persisted?
-          confirmable.confirmation_token = original_token
          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 }
@@ -288,7 +218,7 @@ module Devise
          find_or_initialize_with_errors(unconfirmed_required_attributes, unconfirmed_attributes, :not_found)
        end

-        Devise::Models.config(self, :allow_unconfirmed_access_for, :confirmation_keys, :reconfirmable, :confirm_within)
+        Devise::Models.config(self, :allow_unconfirmed_access_for, :confirmation_keys, :reconfirmable)
      end
    end
  end
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -2,11 +2,6 @@ require 'devise/strategies/database_authenticatable'
 require 'bcrypt'

 module Devise
-  # Digests the password using bcrypt.
-  def self.bcrypt(klass, password)
-    ::BCrypt::Password.create("#{password}#{klass.pepper}", cost: klass.stretches).to_s
-  end
-
  module Models
    # Authenticatable Module, responsible for encrypting password and validating
    # authenticity of a user while signing in.
@@ -32,10 +27,6 @@ module Devise
        attr_accessor :password_confirmation
      end

-      def self.required_fields(klass)
-        [:encrypted_password] + klass.authentication_keys
-      end
-
      # Generates password encryption based on the given value.
      def password=(new_password)
        @password = new_password
@@ -45,9 +36,9 @@ module Devise
      # Verifies whether an password (ie from sign in) is the user password.
      def valid_password?(password)
        return false if encrypted_password.blank?
-        bcrypt   = ::BCrypt::Password.new(encrypted_password)
+        bcrypt   = ::BCrypt::Password.new(self.encrypted_password)
        password = ::BCrypt::Engine.hash_secret("#{password}#{self.class.pepper}", bcrypt.salt)
-        Devise.secure_compare(password, encrypted_password)
+        Devise.secure_compare(password, self.encrypted_password)
      end

      # Set password and password confirmation to nil
@@ -55,13 +46,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)

@@ -73,7 +60,7 @@ module Devise
        result = if valid_password?(current_password)
          update_attributes(params, *options)
        else
-          self.assign_attributes(params, *options)
+          self.attributes = params
          self.valid?
          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
          false
@@ -84,13 +71,13 @@ module Devise
      end

      # Updates record attributes without asking for the current password.
-      # Never allows a change to the current password. If you are using this
+      # Never allows to change the current password. If you are using this
      # method, you should probably override this method to protect other
      # attributes you would not like to be updated without a password.
      #
      # Example:
      #
-      #   def update_without_password(params, *options)
+      #   def update_without_password(params={})
      #     params.delete(:email)
      #     super(params)
      #   end
@@ -104,48 +91,19 @@ module Devise
        result
      end

-      # Destroy record when :current_password matches, otherwise returns
-      # error on :current_password. It also automatically rejects
-      # :current_password if it is blank.
-      def destroy_with_password(current_password)
-        result = if valid_password?(current_password)
-          destroy
-        else
-          self.valid?
-          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
-          false
-        end
-
-        result
-      end
-
-      # 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

      # A reliable way to expose the salt regardless of the implementation.
      def authenticatable_salt
-        encrypted_password[0,29] if encrypted_password
+        self.encrypted_password[0,29] if self.encrypted_password
      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.bcrypt(self.class, password)
+        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
      end

      module ClassMethods
--- a/lib/devise/models/encryptable.rb
+++ b/lib/devise/models/encryptable.rb
@@ -0,0 +1,72 @@
+require 'devise/strategies/database_authenticatable'
+
+module Devise
+  module Models
+    # Encryptable Module adds support to several encryptors.
+    #
+    # == Options
+    #
+    # Encryptable adds the following options to devise_for:
+    #
+    #   * +pepper+: a random string used to provide a more secure hash.
+    #
+    #   * +encryptor+: the encryptor going to be used. By default is nil.
+    #
+    # == Examples
+    #
+    #    User.find(1).valid_password?('password123') # returns true/false
+    #
+    module Encryptable
+      extend ActiveSupport::Concern
+
+      included do
+        attr_reader :password, :current_password
+        attr_accessor :password_confirmation
+      end
+
+      # Generates password salt.
+      def password=(new_password)
+        self.password_salt = self.class.password_salt if new_password.present?
+        super
+      end
+
+      def authenticatable_salt
+        self.password_salt
+      end
+
+      # Verifies whether an incoming_password (ie from sign in) is the user password.
+      def valid_password?(incoming_password)
+        Devise.secure_compare(password_digest(incoming_password), self.encrypted_password)
+      end
+
+    protected
+
+      # Digests the password using the configured encryptor.
+      def password_digest(password)
+        if self.password_salt.present?
+          self.class.encryptor_class.digest(password, self.class.stretches, self.password_salt, self.class.pepper)
+        end
+      end
+
+      module ClassMethods
+        Devise::Models.config(self, :encryptor)
+
+        # Returns the class for the configured encryptor.
+        def encryptor_class
+          @encryptor_class ||= case encryptor
+            when :bcrypt
+              raise "In order to use bcrypt as encryptor, simply remove :encryptable from your devise model"
+            when nil
+              raise "You need to give an :encryptor as option in order to use :encryptable"
+            else
+              ::Devise::Encryptors.const_get(encryptor.to_s.classify)
+          end
+        end
+
+        def password_salt
+          self.encryptor_class.salt(self.stretches)
+        end
+      end
+    end
+  end
+end
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -1,5 +1,3 @@
-require "devise/hooks/lockable"
-
 module Devise
  module Models
    # Handles blocking a user access after a certain number of attempts.
@@ -22,55 +20,40 @@ module Devise
    module Lockable
      extend  ActiveSupport::Concern

-      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, to: "self.class"
-
-      def self.required_fields(klass)
-        attributes = []
-        attributes << :failed_attempts if klass.lock_strategy_enabled?(:failed_attempts)
-        attributes << :locked_at if klass.unlock_strategy_enabled?(:time)
-        attributes << :unlock_token if klass.unlock_strategy_enabled?(:email)
-
-        attributes
-      end
+      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, :to => "self.class"

      # 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)
        end
+
+        save(:validate => false)
      end

-      # Unlock a user by cleaning locked_at and failed_attempts.
+      # Unlock a user by cleaning locket_at and failed_attempts.
      def unlock_access!
        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.
      def access_locked?
-        !!locked_at && !lock_expired?
+        locked_at && !lock_expired?
      end

      # 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
+        self.devise_mailer.unlock_instructions(self).deliver
      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

@@ -97,41 +80,31 @@ module Devise
        unlock_access! if lock_expired?

        if super && !access_locked?
+          self.failed_attempts = 0
+          save(:validate => false)
          true
        else
          self.failed_attempts ||= 0
          self.failed_attempts += 1
          if attempts_exceeded?
            lock_access! unless access_locked?
+            return :locked
          else
-            save(validate: false)
+            save(:validate => false)
          end
          false
        end
      end

-      def unauthenticated_message
-        # If set to paranoid mode, do not show the locked message because it
-        # leaks the existence of an account.
-        if Devise.paranoid
-          super
-        elsif access_locked? || (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
-      end
-
      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

        # Tells if the lock is expired if :time unlock strategy is active
@@ -149,20 +122,20 @@ module Devise
          if access_locked?
            yield
          else
-            self.errors.add(Devise.unlock_keys.first, :not_locked)
+            self.errors.add(:email, :not_locked)
            false
          end
        end

      module ClassMethods
-        # Attempt to find a user by its unlock keys. If a record is found, send new
+        # Attempt to find a user by its email. If a record is found, send new
        # unlock instructions to it. If not user is found, returns a new user
        # with an email not found error.
-        # Options must contain the user's unlock keys
+        # Options must contain the user email
        def send_unlock_instructions(attributes={})
-          lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
-          lockable.resend_unlock_instructions if lockable.persisted?
-          lockable
+         lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
+         lockable.resend_unlock_token if lockable.persisted?
+         lockable
        end

        # Find a user by its unlock token and try to unlock it.
@@ -170,12 +143,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 +158,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
@@ -8,20 +8,16 @@ module Devise
    #
    # Oauthable adds the following options to devise_for:
    #
-    #   * +omniauth_providers+: Which providers are available to this model. It expects an array:
+    #   * +omniauth_providers+: Which providers are avaialble to this model. It expects an array:
    #
-    #       devise_for :database_authenticatable, :omniauthable, omniauth_providers: [:twitter]
+    #       devise_for :database_authenticatable, :omniauthable, :omniauth_providers => [:twitter]
    #
    module Omniauthable
      extend ActiveSupport::Concern

-      def self.required_fields(klass)
-        []
-      end
-
      module ClassMethods
        Devise::Models.config(self, :omniauth_providers)
      end
    end
  end
-end
+end
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -1,7 +1,7 @@
 module Devise
  module Models

-    # Recoverable takes care of resetting the user password and send reset instructions.
+    # Recoverable takes care of reseting the user password and send reset instructions.
    #
    # ==Options
    #
@@ -24,10 +24,6 @@ module Devise
    module Recoverable
      extend ActiveSupport::Concern

-      def self.required_fields(klass)
-        [:reset_password_sent_at, :reset_password_token]
-      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)
@@ -42,13 +38,10 @@ module Devise
        save
      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
+        generate_reset_password_token! if should_generate_reset_token?
+        self.devise_mailer.reset_password_instructions(self).deliver
      end

      # Checks if the reset password token sent is within the limit time.
@@ -77,6 +70,23 @@ module Devise

      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
@@ -86,48 +96,29 @@ module Devise
        def after_password_reset
        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, {})
-        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
+        # password instructions to it. If not user is found, returns a new user
        # with an email not found error.
-        # Attributes must contain the user's email
+        # Attributes must contain the user email
        def send_reset_password_instructions(attributes={})
          recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
          recoverable.send_reset_password_instructions if recoverable.persisted?
          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])
@@ -135,8 +126,6 @@ module Devise
              recoverable.errors.add(:reset_password_token, :expired)
            end
          end
-
-          recoverable.reset_password_token = original_token
          recoverable
        end

--- a/lib/devise/models/registerable.rb
+++ b/lib/devise/models/registerable.rb
@@ -5,10 +5,6 @@ module Devise
    module Registerable
      extend ActiveSupport::Concern

-      def self.required_fields(klass)
-        []
-      end
-
      module ClassMethods
        # A convenience method that receives both parameters and session to
        # initialize a user. This can be used by OAuth, for example, to send
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -17,14 +17,14 @@ 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.
    #
    #   * +extend_remember_period+: if true, extends the user's remember period
    #     when remembered via cookie. False by default.
    #
-    #   * +rememberable_options+: configuration options passed to the created cookie.
+    #   * +cookie_options+: configuration options passed to the created cookie.
    #
    # == Examples
    #
@@ -41,16 +41,12 @@ module Devise

      attr_accessor :remember_me, :extend_remember_period

-      def self.required_fields(klass)
-        [:remember_created_at]
-      end
-
      # 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?
+        save(:validate => false)
      end

      # If the record is persisted, remove the remember token (but only if
@@ -58,8 +54,8 @@ module Devise
      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_created_at = nil
+        save(:validate => false)
      end

      # Remember token should be expired if expiration time not overpass now.
@@ -75,7 +71,7 @@ module Devise
      def rememberable_value
        if respond_to?(:remember_token)
          remember_token
-        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt)
+        elsif salt = authenticatable_salt
          salt
        else
          raise "authenticable_salt returned nil for the #{self.class.name} model. " \
@@ -91,7 +87,7 @@ module Devise

    protected

-      def generate_remember_token? #:nodoc:
+      def generate_remember_token?
        respond_to?(:remember_token) && remember_expired?
      end

@@ -110,19 +106,15 @@ module Devise
        # Recreate the user based on the stored cookie
        def serialize_from_cookie(id, remember_token)
          record = to_adapter.get(id)
-          record if record && !record.remember_expired? &&
-                    Devise.secure_compare(record.rememberable_value, remember_token)
+          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
+        def remember_token
+          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 veryfing whether a user session has already
    # expired or not. When a session expires after the configured time, the user
-    # will be asked for credentials again, it means, they will be redirected
+    # will be asked for credentials again, it means, he/she will be redirected
    # to the sign in page.
    #
    # == Options
@@ -20,10 +20,6 @@ module Devise
    module Timeoutable
      extend ActiveSupport::Concern

-      def self.required_fields(klass)
-        []
-      end
-
      # Checks whether the user session has expired based on configured time.
      def timedout?(last_access)
        return false if remember_exists_and_not_expired?
@@ -37,7 +33,7 @@ module Devise
      private

      def remember_exists_and_not_expired?
-        return false unless respond_to?(:remember_created_at) && respond_to?(:remember_expired?)
+        return false unless respond_to?(:remember_created_at)
        remember_created_at && !remember_expired?
      end

--- a/lib/devise/models/token_authenticatable.rb
+++ b/lib/devise/models/token_authenticatable.rb
@@ -0,0 +1,69 @@
+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.
+    #
+    # == 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
+
+      # 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
+
+      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)
+      end
+    end
+  end
+end
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -11,26 +11,19 @@ module Devise
    # * last_sign_in_ip    - Holds the remote ip of the previous sign in
    #
    module Trackable
-      def self.required_fields(klass)
-        [: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

-        old_current, new_current = self.current_sign_in_ip, request.remote_ip
+        old_current, new_current = self.current_sign_in_ip, request.ip
        self.last_sign_in_ip     = old_current || new_current
        self.current_sign_in_ip  = new_current

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

-      def update_tracked_fields!(request)
-        update_tracked_fields(request)
-        save(validate: false) or raise "Devise trackable could not save #{inspect}." \
+        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
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -10,29 +10,25 @@ module Devise
    # Validatable adds the following options to devise_for:
    #
    #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 8..128.
+    #   * +password_length+: a range expressing password length. Defaults to 6..128.
    #
    module Validatable
      # All validations used by this module.
      VALIDATIONS = [ :validates_presence_of, :validates_uniqueness_of, :validates_format_of,
                      :validates_confirmation_of, :validates_length_of ].freeze

-      def self.required_fields(klass)
-        []
-      end
-
      def self.included(base)
        base.extend ClassMethods
        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,30 @@
 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 :encryptable
+  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.rb
+++ b/lib/devise/omniauth.rb
@@ -1,7 +1,7 @@
 begin
  require "omniauth"
  require "omniauth/version"
-rescue LoadError
+rescue LoadError => e
  warn "Could not load 'omniauth'. Please ensure you have the omniauth gem >= 1.0.0 installed and listed in your Gemfile."
  raise
 end
--- a/lib/devise/omniauth/url_helpers.rb
+++ b/lib/devise/omniauth/url_helpers.rb
@@ -2,16 +2,31 @@ module Devise
  module OmniAuth
    module UrlHelpers
      def self.define_helpers(mapping)
+        return unless mapping.omniauthable?
+
+        class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
+          def #{mapping.name}_omniauth_authorize_path(provider, params = {})
+            if Devise.omniauth_configs[provider.to_sym]
+              script_name = request.env["SCRIPT_NAME"]
+
+              path = "\#{script_name}/#{mapping.path}/auth/\#{provider}\".squeeze("/")
+              path << '?' + params.to_param if params.present?
+              path
+            else
+              raise ArgumentError, "Could not find omniauth provider \#{provider.inspect}"
+            end
+          end
+        URL_HELPERS
      end

      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,44 @@
 require 'orm_adapter/adapters/active_record'

+module Devise
+  module Orm
+    # This module contains some helpers and handle schema (migrations):
+    #
+    #   create_table :accounts do |t|
+    #     t.database_authenticatable
+    #     t.confirmable
+    #     t.recoverable
+    #     t.rememberable
+    #     t.trackable
+    #     t.lockable
+    #     t.timestamps
+    #   end
+    #
+    # However this method does not add indexes. If you need them, here is the declaration:
+    #
+    #   add_index "accounts", ["email"],                :name => "email",                :unique => true
+    #   add_index "accounts", ["confirmation_token"],   :name => "confirmation_token",   :unique => true
+    #   add_index "accounts", ["reset_password_token"], :name => "reset_password_token", :unique => true
+    #
+    module ActiveRecord
+      module Schema
+        include Devise::Schema
+
+        # Tell how to apply schema methods.
+        def apply_devise_schema(name, type, options={})
+          @__devise_warning_raised ||= begin
+            $stderr.puts "\n[DEVISE] You are using t.database_authenticatable and others in your migration " \
+              "and this feature is deprecated. Please simply use Rails helpers instead as mentioned here:\n" \
+              "https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style\n\n"
+            true
+          end
+          column name, type.to_s.downcase.to_sym, options
+        end
+      end
+    end
+  end
+end
+
 ActiveRecord::Base.extend Devise::Models
+ActiveRecord::ConnectionAdapters::Table.send :include, Devise::Orm::ActiveRecord::Schema
+ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Orm::ActiveRecord::Schema
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,3 +1,31 @@
 require 'orm_adapter/adapters/mongoid'

-Mongoid::Document::ClassMethods.send :include, Devise::Models
+module Devise
+  module Orm
+    module Mongoid
+      module Hook
+        def devise_modules_hook!
+          extend Schema
+          yield
+          return unless Devise.apply_schema
+          devise_modules.each { |m| send(m) if respond_to?(m, true) }
+        end
+      end
+
+      module Schema
+        include Devise::Schema
+
+        # Tell how to apply schema methods
+        def apply_devise_schema(name, type, options={})
+          type = Time if type == DateTime
+          field name, { :type => type }.merge!(options)
+        end
+      end
+    end
+  end
+end
+
+Mongoid::Document::ClassMethods.class_eval do
+  include Devise::Models
+  include Devise::Orm::Mongoid::Hook
+end
--- a/lib/devise/parameter_filter.rb
+++ b/lib/devise/parameter_filter.rb
@@ -1,5 +1,5 @@
 module Devise
-  class ParameterFilter
+  class ParamFilter
    def initialize(case_insensitive_keys, strip_whitespace_keys)
      @case_insensitive_keys = case_insensitive_keys || []
      @strip_whitespace_keys = strip_whitespace_keys || []
@@ -8,16 +8,16 @@ module Devise
    def filter(conditions)
      conditions = stringify_params(conditions.dup)

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

      conditions
--- a/lib/devise/parameter_sanitizer.rb
+++ b/lib/devise/parameter_sanitizer.rb
@@ -1,99 +0,0 @@
-module Devise
-  class BaseSanitizer
-    attr_reader :params, :resource_name, :resource_class
-
-    def initialize(resource_class, resource_name, params)
-      @resource_class = resource_class
-      @resource_name  = resource_name
-      @params         = params
-      @blocks         = Hash.new
-    end
-
-    def for(kind, &block)
-      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)
-      end
-    end
-
-    private
-
-    def default_for(kind)
-      raise ArgumentError, "a block is expected in Devise base sanitizer"
-    end
-
-    def default_sanitize(kind)
-      default_params
-    end
-
-    def default_params
-      params.fetch(resource_name, {})
-    end
-  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)
-      if respond_to?(kind, true)
-        send(kind)
-      else
-        raise NotImplementedError, "Devise 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
-    end
-
-    def auth_keys
-      @auth_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
@@ -29,28 +29,83 @@ 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 Rails > 3.2
      ActionDispatch::Routing::RoutesProxy.class_eval do
        def respond_to?(method, include_private = false)
          super || routes.url_helpers.respond_to?(method)
        end
      end
    end
+
+    initializer "devise.deprecations" do
+      unless defined?(Rails::Generators)
+        if Devise.case_insensitive_keys == false
+          warn "\n[DEVISE] Devise.case_insensitive_keys is false which is no longer " \
+            "supported. Recent Devise versions automatically downcase the e-mail before " \
+            "saving it to the database but your app isn't using this feature. You can solve " \
+            "this issue by either:\n\n" \
+            "1) Setting config.case_insensitive_keys = [:email] in your Devise initializer and " \
+            "running a migration that will downcase all emails already in the database;\n\n" \
+            "2) Setting config.case_insensitive_keys = [] (so nothing will be downcased) and " \
+            "making sure you are not using Devise :validatable (since validatable assumes case" \
+            "insensitivity)\n"
+        end
+
+        if Devise.apply_schema && defined?(Mongoid)
+          warn "\n[DEVISE] Devise.apply_schema is true. This means Devise was " \
+            "automatically configuring your DB. This no longer happens. You should " \
+            "set Devise.apply_schema to false and manually set the fields used by Devise as shown here: " \
+            "https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0-migration-schema-style\n"
+        end
+
+        # TODO: Deprecate the true value of this option as well
+        if Devise.use_salt_as_remember_token == false
+          warn "\n[DEVISE] Devise.use_salt_as_remember_token is false which is no longer " \
+            "supported. Devise now only uses the salt as remember token and the remember_token " \
+            "column can be removed from your models.\n"
+        end
+
+        if Devise.reset_password_within.nil?
+          warn "\n[DEVISE] Devise.reset_password_within is nil. Please set this value to " \
+            "an interval (for example, 6.hours) and add a reset_password_sent_at field to " \
+            "your Devise models (if they don't have one already).\n"
+        end
+      end
+
+      config.after_initialize do
+        example = <<-YAML
+en:
+  devise:
+    registrations:
+      signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+      signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+      signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
+        YAML
+
+        if I18n.t(:"devise.registrations.reasons", :default => {}).present?
+          warn "\n[DEVISE] devise.registrations.reasons in yml files is deprecated, " \
+            "please use devise.registrations.signed_up_but_REASON instead. The default values are:\n\n#{example}\n"
+        end
+
+        if I18n.t(:"devise.registrations.inactive_signed_up", :default => "").present?
+          warn "\n[DEVISE] devise.registrations.inactive_signed_up in yml files is deprecated, " \
+            "please use devise.registrations.signed_up_but_REASON instead. The default values are:\n\n#{example}\n"
+        end
+      end
+    end
  end
 end
--- a/lib/devise/rails/routes.rb
+++ b/lib/devise/rails/routes.rb
@@ -1,5 +1,4 @@
 require "active_support/core_ext/object/try"
-require "active_support/core_ext/hash/slice"

 module ActionDispatch::Routing
  class RouteSet #:nodoc:
@@ -43,118 +42,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 GET  /users/sign_out                   {:controller=>"devise/sessions", :action=>"destroy"}
    #
    #  # Password routes for Recoverable, if User model has :recoverable configured
-    #      new_user_password GET    /users/password/new(.:format)     {controller:"devise/passwords", action:"new"}
-    #     edit_user_password GET    /users/password/edit(.:format)    {controller:"devise/passwords", action:"edit"}
-    #          user_password PUT    /users/password(.:format)         {controller:"devise/passwords", action:"update"}
-    #                        POST   /users/password(.:format)         {controller:"devise/passwords", action:"create"}
+    #      new_user_password GET  /users/password/new(.:format)     {:controller=>"devise/passwords", :action=>"new"}
+    #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"devise/passwords", :action=>"edit"}
+    #          user_password PUT  /users/password(.:format)         {:controller=>"devise/passwords", :action=>"update"}
+    #                        POST /users/password(.:format)         {:controller=>"devise/passwords", :action=>"create"}
    #
    #  # Confirmation routes for Confirmable, if User model has :confirmable configured
-    #  new_user_confirmation GET    /users/confirmation/new(.:format) {controller:"devise/confirmations", action:"new"}
-    #      user_confirmation GET    /users/confirmation(.:format)     {controller:"devise/confirmations", action:"show"}
-    #                        POST   /users/confirmation(.:format)     {controller:"devise/confirmations", action:"create"}
-    #
-    # ==== 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 instance variable
+    #  * :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 :users, singular: :user
+    #      devise_for :users, :singular => :user
    #
-    #  * 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' contraints
    #
-    #  * 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
    #
@@ -176,7 +160,7 @@ module ActionDispatch::Routing
    #
    #   class ApplicationController < ActionController::Base
    #     def self.default_url_options
-    #       { locale: I18n.locale }
+    #       { :locale => I18n.locale }
    #     end
    #   end
    #
@@ -198,15 +182,14 @@ module ActionDispatch::Routing
    #      end
    #    end
    #
-    # In order to get Devise to recognize the deactivate action, your devise_scope entry should look like this:
+    # In order to get Devise to recognize the deactivate action, your devise_for entry should look like this,
    #
-    #     devise_scope :owner do
-    #       post "deactivate", to: "registrations#deactivate", as: "deactivate_registration"
+    #     devise_for :owners, :controllers => { :registrations => "registrations" } do
+    #       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?
@@ -215,8 +198,7 @@ module ActionDispatch::Routing
      options[:path_names]    = (@scope[:path_names] || {}).merge(options[:path_names] || {})
      options[:constraints]   = (@scope[:constraints] || {}).merge(options[:constraints] || {})
      options[:defaults]      = (@scope[:defaults] || {}).merge(options[:defaults] || {})
-      options[:options]       = @scope[:options] || {}
-      options[:options][:format] = false if options[:format] == false
+      options[:options]       = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false

      resources.map!(&:to_sym)

@@ -227,7 +209,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
@@ -235,16 +217,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
@@ -252,9 +235,7 @@ module ActionDispatch::Routing
      end
    end

-    # Allow you to add authentication request from the router.
-    # Takes an optional scope and block to provide constraints
-    # on the model instance itself.
+    # Allow you to add authentication request from the router:
    #
    #   authenticate do
    #     resources :post
@@ -264,36 +245,35 @@ module ActionDispatch::Routing
    #     resources :users
    #   end
    #
-    #   authenticate :user, lambda {|u| u.role == "admin"} do
-    #     root to: "admin/dashboard#show", as: :user_root
-    #   end
-    #
-    def authenticate(scope=nil, block=nil)
-      constraints_for(:authenticate!, scope, block) do
+    def authenticate(scope=nil)
+      constraint = lambda do |request|
+        request.env["warden"].authenticate!(:scope => scope)
+      end
+
+      constraints(constraint) do
        yield
      end
    end

    # Allow you to route based on whether a scope is authenticated. You
-    # can optionally specify which scope and a block. The block accepts
-    # a model and allows extra constraints to be done on the instance.
+    # can optionally specify which scope.
    #
    #   authenticated :admin do
-    #     root to: 'admin/dashboard#show', as: :admin_root
+    #     root :to => 'admin/dashboard#show'
    #   end
    #
    #   authenticated do
-    #     root to: 'dashboard#show', as: :authenticated_root
+    #     root :to => 'dashboard#show'
    #   end
    #
-    #   authenticated :user, lambda {|u| u.role == "admin"} do
-    #     root to: "admin/dashboard#show", as: :user_root
-    #   end
+    #   root :to => 'landing#show'
    #
-    #   root to: 'landing#show'
-    #
-    def authenticated(scope=nil, block=nil)
-      constraints_for(:authenticate?, scope, block) do
+    def authenticated(scope=nil)
+      constraint = lambda do |request|
+        request.env["warden"].authenticate? :scope => scope
+      end
+
+      constraints(constraint) do
        yield
      end
    end
@@ -303,15 +283,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
@@ -324,7 +304,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
@@ -336,7 +316,7 @@ module ActionDispatch::Routing
    # good and working example.
    #
    #  devise_scope :user do
-    #    get "/some/route" => "some_devise_controller"
+    #    match "/some/route" => "some_devise_controller"
    #  end
    #  devise_for :users
    #
@@ -356,116 +336,46 @@ 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]
-        }
-
-        resource :registration, options do
+        resource :registration, :only => [:new, :create, :edit, :update, :destroy], :path => mapping.path_names[:registration],
+                 :path_names => path_names, :controller => controllers[:registrations] do
          get :cancel
        end
      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` and manually defining the routes. Here is an example:
-
-    match "/users/auth/:provider",
-      constraints: { provider: /google|facebook/ },
-      to: "devise/omniauth_callbacks#passthru",
-      as: :omniauth_authorize,
-      via: [:get, :post]
-
-    match "/users/auth/:action/callback",
-      constraints: { action: /google|facebook/ },
-      to: "devise/omniauth_callbacks",
-      as: :omniauth_callback,
-      via: [:get, :post]
-ERROR
-        end
-
        path, @scope[:path] = @scope[:path], nil
-        path_prefix = Devise.omniauth_path_prefix || "/#{mapping.fullpath}/auth".squeeze("/")
+        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]
-
-        match "#{path_prefix}/:action/callback",
-          constraints: { action: providers },
-          to: "#{controllers[:omniauth_callbacks]}#:action",
-          as: :omniauth_callback,
-          via: [:get, :post]
-      ensure
-        @scope[:path] = path
-      end
-
-      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
-        current_scope = @scope.dup
-
-        exclusive = { as: new_as, path: new_path, module: nil }
-        exclusive.merge!(options.slice(:constraints, :defaults, :options))
-
-        exclusive.each_pair { |key, value| @scope[key] = value }
-        yield
-      ensure
-        @scope = current_scope
-      end
-
-      def constraints_for(method_to_apply, scope=nil, block=nil)
-        constraint = lambda do |request|
-          request.env['warden'].send(method_to_apply, scope: scope) &&
-            (block.nil? || block.call(request.env["warden"].user(scope)))
-        end
-
-        constraints(constraint) do
-          yield
-        end
-      end
-
-      def set_omniauth_path_prefix!(path_prefix) #:nodoc:
        if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
          raise "Wrong OmniAuth configuration. If you are getting this exception, it means that either:\n\n" \
            "1) You are manually setting OmniAuth.config.path_prefix and it doesn't match the Devise one\n" \
@@ -474,16 +384,22 @@ ERROR
        else
          ::OmniAuth.config.path_prefix = path_prefix
        end
+
+        match "#{path_prefix}/:action/callback", :constraints => { :action => Regexp.union(mapping.to.omniauth_providers.map(&:to_s)) },
+          :to => controllers[:omniauth_callbacks], :as => :omniauth_callback
+      ensure
+        @scope[:path] = path
      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
+      def with_devise_exclusive_scope(new_path, new_as, options) #:nodoc:
+        old_as, old_path, old_module, old_constraints, old_defaults, old_options =
+          *@scope.values_at(:as, :path, :module, :constraints, :defaults, :options)
+        @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults], @scope[:options] =
+          new_as, new_path, nil, *options.values_at(:constraints, :defaults, :options)
+        yield
+      ensure
+        @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults], @scope[:options] =
+          old_as, old_path, old_module, old_constraints, old_defaults, old_options
      end

      def raise_no_devise_method_error!(klass) #:nodoc:
--- a/lib/devise/rails/warden_compat.rb
+++ b/lib/devise/rails/warden_compat.rb
@@ -3,20 +3,35 @@ 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
-
+  # This is called internally by Warden on logout
  def reset_session!
-    # Calling reset_session on NULL_STORE causes it fail.
-    # This is a bug that needs to be fixed in Rails.
-    unless NULL_STORE && request.session.is_a?(NULL_STORE)
-      request.reset_session
-    end
+    request.reset_session
  end

  def cookies
    request.cookie_jar
  end
 end
+
+class Warden::SessionSerializer
+  def serialize(record)
+    klass = record.class
+    array = klass.serialize_into_session(record)
+    array.unshift(klass.name)
+  end
+
+  def deserialize(keys)
+    klass, *args = keys
+
+    begin
+      ActiveSupport::Inflector.constantize(klass).serialize_from_session(*args)
+    rescue NameError => e
+      if e.message =~ /uninitialized constant/
+        Rails.logger.debug "[Devise] Trying to deserialize invalid class #{klass}"
+        nil
+      else
+        raise
+      end
+    end
+  end
+end
--- a/lib/devise/schema.rb
+++ b/lib/devise/schema.rb
@@ -0,0 +1,109 @@
+module Devise
+  # Holds devise schema information. To use it, just include its methods
+  # and overwrite the apply_schema method.
+  module Schema
+
+    # Creates encrypted_password, and email when it is used as an authentication
+    # key (default).
+    #
+    # == Options
+    # * :null - When true, allow columns to be null.
+    # * :default - Set to "" when :null is false, unless overridden.
+    #
+    # == Notes
+    # For Datamapper compatibility, we explicitly hardcode the limit for the
+    # encrypter password field in 128 characters.
+    def database_authenticatable(options={})
+      null    = options[:null] || false
+      default = options.key?(:default) ? options[:default] : ("" if null == false)
+      include_email = !respond_to?(:authentication_keys) || self.authentication_keys.include?(:email)
+
+      apply_devise_schema :email,              String, :null => null, :default => default if include_email
+      apply_devise_schema :encrypted_password, String, :null => null, :default => default, :limit => 128
+    end
+
+    # Creates password salt for encryption support when using encryptors other
+    # than the database_authenticable default of bcrypt.
+    def encryptable
+      apply_devise_schema :password_salt, String
+    end
+
+    # Creates authentication_token.
+    def token_authenticatable
+      apply_devise_schema :authentication_token, String
+    end
+
+    # Creates confirmation_token, confirmed_at and confirmation_sent_at.
+    def confirmable
+      apply_devise_schema :confirmation_token,   String
+      apply_devise_schema :confirmed_at,         DateTime
+      apply_devise_schema :confirmation_sent_at, DateTime
+    end
+
+    # Creates unconfirmed_email
+    def reconfirmable
+      apply_devise_schema :unconfirmed_email,    String
+    end
+
+    # Creates reset_password_token and reset_password_sent_at.
+    #
+    # == Options
+    # * :reset_within - When true, adds a column that reset passwords within some date
+    def recoverable(options={})
+      use_within = options.fetch(:reset_within, Devise.reset_password_within.present?)
+      apply_devise_schema :reset_password_token, String
+      apply_devise_schema :reset_password_sent_at, DateTime if use_within
+    end
+
+    # Creates remember_token and remember_created_at.
+    #
+    # == Options
+    # * :use_salt - When true, does not create a remember_token and use password_salt instead.
+    def rememberable(options={})
+      use_salt = options.fetch(:use_salt, Devise.use_salt_as_remember_token)
+      apply_devise_schema :remember_token,      String unless use_salt
+      apply_devise_schema :remember_created_at, DateTime
+    end
+
+    # Creates sign_in_count, current_sign_in_at, last_sign_in_at,
+    # current_sign_in_ip, last_sign_in_ip.
+    def trackable
+      apply_devise_schema :sign_in_count,      Integer, :default => 0
+      apply_devise_schema :current_sign_in_at, DateTime
+      apply_devise_schema :last_sign_in_at,    DateTime
+      apply_devise_schema :current_sign_in_ip, String
+      apply_devise_schema :last_sign_in_ip,    String
+    end
+
+    # Creates failed_attempts, unlock_token and locked_at depending on the options given.
+    #
+    # == Options
+    # * :unlock_strategy - The strategy used for unlock. Can be :time, :email, :both (default), :none.
+    #   If :email or :both, creates a unlock_token field.
+    # * :lock_strategy - The strategy used for locking. Can be :failed_attempts (default) or :none.
+    def lockable(options={})
+      unlock_strategy   = options[:unlock_strategy]
+      unlock_strategy ||= self.unlock_strategy if respond_to?(:unlock_strategy)
+      unlock_strategy ||= :both
+
+      lock_strategy   = options[:lock_strategy]
+      lock_strategy ||= self.lock_strategy if respond_to?(:lock_strategy)
+      lock_strategy ||= :failed_attempts
+
+      if lock_strategy == :failed_attempts
+        apply_devise_schema :failed_attempts, Integer, :default => 0
+      end
+
+      if [:both, :email].include?(unlock_strategy)
+        apply_devise_schema :unlock_token, String
+      end
+
+      apply_devise_schema :locked_at, DateTime
+    end
+
+    # Overwrite with specific modification to create your own schema.
+    def apply_devise_schema(name, type, options={})
+      raise NotImplementedError
+    end
+  end
+end
--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -9,44 +9,33 @@ module Devise
      attr_accessor :authentication_hash, :authentication_type, :password

      def store?
-        super && !mapping.to.skip_session_storage.include?(authentication_type)
+        !mapping.to.skip_session_storage.include?(authentication_type)
      end

      def valid?
        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::Authenticable.valid_for_authentication?
-      # for more information.
-      #
-      # In case the resource can't be validated, it will fail with the given
-      # unauthenticated_message.
+      # Simply invokes valid_for_authentication? with the given block and deal with the result.
      def validate(resource, &block)
        result = resource && resource.valid_for_authentication?(&block)

-        if result
+        case result
+        when String, Symbol
+          fail!(result)
+          false
+        when TrueClass
+          decorate(resource)
          true
        else
-          if resource
-            fail!(resource.unauthenticated_message)
-          end
-          false
+          result
        end
      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,7 +44,7 @@ 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 params authentication;
      #   * If any of the authorization headers were sent;
@@ -65,7 +54,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;
@@ -89,12 +78,12 @@ module Devise

      # Extract the appropriate subhash for authentication from params.
      def params_auth_hash
-        params[scope]
-      end
+         params[scope]
+       end

      # Extract a hash with attributes:values from the http params.
      def http_auth_hash
-        keys = [http_authentication_key, :password]
+        keys = [authentication_keys.first, :password]
        Hash[*keys.zip(decode_credentials).flatten]
      end

@@ -108,9 +97,9 @@ module Devise
        params_auth_hash.is_a?(Hash)
      end

-      # Check if password is present.
+      # 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.
@@ -128,27 +117,24 @@ module Devise
        parse_authentication_key_values(request_values, request_keys)
      end

+      # Holds the authentication keys.
      def authentication_keys
        @authentication_keys ||= mapping.to.authentication_keys
      end

-      def http_authentication_key
-        @http_authentication_key ||= mapping.to.http_authentication_key || case authentication_keys
-          when Array then authentication_keys.first
-          when Hash then authentication_keys.keys.first
-        end
-      end
-
+      # Holds request keys.
      def request_keys
        @request_keys ||= mapping.to.request_keys
      end

+      # Returns values from the request object.
      def request_values
        keys = request_keys.respond_to?(:keys) ? request_keys.keys : request_keys
        values = keys.map { |k| self.request.send(k) }
        Hash[keys.zip(values)]
      end

+      # Parse authentication keys considering if they should be enforced or not.
      def parse_authentication_key_values(hash, keys)
        keys.each do |key, enforce|
          value = hash[key].presence
--- a/lib/devise/strategies/base.rb
+++ b/lib/devise/strategies/base.rb
@@ -2,11 +2,6 @@ module Devise
  module Strategies
    # Base strategy for Devise. Responsible for verifying correct scope and mapping.
    class Base < ::Warden::Strategies::Base
-      # Whenever CSRF cannot be verified, we turn off any kind of storage
-      def store?
-        !env["devise.skip_storage"]
-      end
-
      # Checks if a valid scope was given for devise and find mapping based on this scope.
      def mapping
        @mapping ||= begin
@@ -17,4 +12,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/strategies/database_authenticatable.rb
+++ b/lib/devise/strategies/database_authenticatable.rb
@@ -2,20 +2,17 @@ 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  = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
-        encrypted = false
+        resource = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)

-        if validate(resource){ encrypted = true; resource.valid_password?(password) }
-          remember_me(resource)
+        if validate(resource){ resource.valid_password?(password) }
          resource.after_database_authentication
          success!(resource)
+        elsif !halted?
+          fail(:invalid)
        end
-
-        mapping.to.new.password = password if !encrypted && Devise.paranoid
-        fail(:not_found_in_database) unless resource
      end
    end
  end
--- a/lib/devise/strategies/rememberable.rb
+++ b/lib/devise/strategies/rememberable.rb
@@ -1,4 +1,4 @@
-require 'devise/strategies/authenticatable'
+require 'devise/strategies/base'

 module Devise
  module Strategies
@@ -19,24 +19,19 @@ module Devise
      def authenticate!
        resource = mapping.to.serialize_from_cookie(*remember_cookie)

-        unless resource
-          cookies.delete(remember_key)
-          return pass
-        end
-
        if validate(resource)
-          remember_me(resource)
-          extend_remember_me_period(resource)
          success!(resource)
+        elsif !halted?
+          cookies.delete(remember_key)
+          pass
        end
      end

    private

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

      def remember_me?
@@ -44,7 +39,7 @@ module Devise
      end

      def remember_key
-        mapping.to.rememberable_options.fetch(:key, "remember_#{scope}_token")
+        "remember_#{scope}_token"
      end

      def remember_cookie
@@ -55,4 +50,4 @@ module Devise
  end
 end

-Warden::Strategies.add(:rememberable, Devise::Strategies::Rememberable)
+Warden::Strategies.add(:rememberable, Devise::Strategies::Rememberable)
--- a/lib/devise/strategies/token_authenticatable.rb
+++ b/lib/devise/strategies/token_authenticatable.rb
@@ -0,0 +1,57 @@
+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 HTTP, you can pass the token as username and blank password. Since some clients may require
+    # a password, you can pass "X" as password and it will simply be ignored.
+    class TokenAuthenticatable < Authenticatable
+      def store?
+        super && !mapping.to.skip_session_storage.include?(:token_auth)
+      end
+
+      def authenticate!
+        resource = mapping.to.find_for_token_authentication(authentication_hash)
+
+        if validate(resource)
+          resource.after_token_authentication
+          success!(resource)
+        elsif !halted?
+          fail(:invalid_token)
+        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
+
+      # 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
@@ -45,7 +45,6 @@ module Devise
    def sign_in(resource_or_scope, resource=nil)
      scope    ||= Devise::Mapping.find_scope!(resource_or_scope)
      resource ||= resource_or_scope
-      warden.instance_variable_get(:@users).delete(scope)
      warden.session_serializer.store(resource, scope)
    end

@@ -71,62 +70,22 @@ module Devise
    def _catch_warden(&block)
      result = catch(:warden, &block)

-      env = @controller.request.env
+      if result.is_a?(Hash) && !warden.custom_failure? && !@controller.send(:performed?)
+        result[:action] ||= :unauthenticated

-      result ||= {}
+        env = @controller.request.env
+        env["PATH_INFO"] = "/#{result[:action]}"
+        env["warden.options"] = result
+        Warden::Manager._run_callbacks(:before_failure, env, result)

-      # Set the response. In production, the rack result is returned
-      # from Warden::Manager#call, which the following is modelled on.
-      case result
-      when Array
-        if result.first == 401 && intercept_401?(env) # does this happen during testing?
-          _process_unauthenticated(env)
-        else
-          result
-        end
-      when Hash
-        _process_unauthenticated(env, result)
+        status, headers, body = Devise.warden_config[:failure_app].call(env).to_a
+        @controller.send :render, :status => status, :text => body,
+          :content_type => headers["Content-Type"], :location => headers["Location"]
+
+        nil
      else
        result
      end
    end
-
-    def _process_unauthenticated(env, options = {})
-      options[:action] ||= :unauthenticated
-      proxy = env['warden']
-      result = options[:result] || proxy.result
-
-      ret = case result
-      when :redirect
-        body = proxy.message || "You are being redirected to #{proxy.headers['Location']}"
-        [proxy.status, proxy.headers, [body]]
-      when :custom
-        proxy.custom_response
-      else
-        env["PATH_INFO"] = "/#{options[:action]}"
-        env["warden.options"] = options
-        Warden::Manager._run_callbacks(:before_failure, env, options)
-
-        status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
-        @controller.response.headers.merge!(headers)
-        @controller.send :render, status: status, text: response.body,
-          content_type: headers["Content-Type"], location: headers["Location"]
-        nil # causes process return @response
-      end
-
-      # ensure that the controller response is set up. In production, this is
-      # not necessary since warden returns the results to rack. However, at
-      # testing time, we want the response to be available to the testing
-      # framework to verify what would be returned to rack.
-      if ret.is_a?(Array)
-        # ensure the controller response is set to our response.
-        @controller.response ||= @response
-        @response.status = ret.first
-        @response.headers = ret.second
-        @response.body = ret.third
-      end
-
-      ret
-    end
  end
 end
--- a/lib/devise/time_inflector.rb
+++ b/lib/devise/time_inflector.rb
@@ -1,14 +0,0 @@
-require "active_support/core_ext/module/delegation"
-
-module Devise
-  class TimeInflector
-    include ActionView::Helpers::DateHelper
-
-    class << self
-      attr_reader :instance
-      delegate :time_ago_in_words, to: :instance
-    end
-
-    @instance = new
-  end
-end
--- 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.4.1".freeze
+  VERSION = "2.0.6".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -4,43 +4,35 @@ 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
-        content = model_contents
-
-        class_path = if namespaced?
-          class_name.to_s.split("::")
-        else
-          [class_name]
-        end
-
-        indent_depth = class_path.size - 1
-        content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
-
-        inject_into_class(model_path, class_path.last, content) if model_exists?
+        inject_into_class(model_path, class_name, model_contents + <<CONTENT) if model_exists?
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation, :remember_me
+CONTENT
      end

      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 +42,14 @@ 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
+
+      ## Encryptable
+      # t.string :password_salt

      ## Confirmable
      # t.string   :confirmation_token
@@ -63,29 +58,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/Show More
+++ b/Show More
Author	SHA1	Message	Date
José Valim	b78519e154	Release 2.0.6	2013-08-18 10:43:33 +02:00
Rafael Mendonça França	0430689b01	Use the Ruby 1.8 hash syntax. Yes we still support Ruby 1.8 😢 Conflicts: Gemfile.lock	2013-01-28 13:26:29 -02:00
José Valim	bc82165ee3	Release v2.0.5	2013-01-26 11:53:34 -07:00
José Valim	eecb2c1695	Require string conversion for all values	2013-01-26 11:52:15 -07:00
José Valim	8fc18b49eb	Release 2.0.4	2012-02-17 12:49:21 +01:00
José Valim	b4af49cc38	Update CHANGELOG.	2012-02-17 12:49:14 +01:00
José Valim	4c654e71be	Fix regression where warden was being configured too early.	2012-02-17 12:49:07 +01:00