Update CHANGELOG, release 2.0.2

Ensure Devise.available_router_name is never nil, closes #1648
Set autocomplete to off by default on password field.
2026-01-09 23:58:06 -05:00 · 2012-02-15 17:26:23 +01:00 · 2012-02-15 17:13:57 +01:00 · 2012-02-15 17:07:58 +01:00 · 2012-02-15 17:07:46 +01:00 · 2012-02-15 16:58:23 +01:00
112 changed files with 1898 additions and 1283 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-**/*/log/*
-**/*/tmp/*
+test/rails_app/log/*
+test/rails_app/tmp/*
 *~
 coverage/*
 *.sqlite3
@@ -8,5 +8,3 @@ rdoc/*
 pkg
 log
 test/tmp/*
-Gemfile.lock
-
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,13 @@
 script: "bundle exec rake test"
+before_install: gem update --system
 rvm:
  - 1.8.7
  - 1.9.2
+  - 1.9.3
  - ree
-  - rbx
-  - rbx-2.0
+gemfile:
+  - gemfiles/Gemfile.rails-3.1.x
+  - Gemfile
 notifications:
  recipients:
    - jose.valim@plataformatec.com.br
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,8 +1,63 @@
+== 2.0.2
+
+Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
+
+* enhancements
+  * Add devise_i18n_options to customize I18n message
+
+* bug fix
+  * Ensure Devise.available_router_name defaults to :main_app
+  * Set autocomplete to off for password on edit forms
+  * Better error messages in case a trackable model can't be saved
+  * 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
+
+* enhancements
+  * Improved error messages on deprecation warnings
+  * Hide Devise's internal generators from `rails g` command
+
+* bug fix
+  * Removed tmp and log files from gem
+
+== 2.0.0
+
+* enhancements
+  * Add support for e-mail reconfirmation on change (by @Mandaryn and @heimidal)
+  * Redirect users to sign in page after unlock (by @nashby)
+  * Redirect to the previous URL on timeout
+  * Inherit from the same Devise parent controller (by @sj26)
+  * Allow parent_controller to be customizable via Devise.parent_controller, useful for engines
+  * Allow router_name to be customizable via Devise.router_name, useful for engines
+  * Allow alternate ORMs to run compatibility setup code before Authenticatable is included (by @jm81)
+
+* deprecation
+  * Devise now only supports Rails 3.1 forward
+  * Devise.confirm_within was deprecated in favor Devise.allow_unconfirmed_access_for
+  * Devise.stateless_token= is deprecated in favor of appending :token_auth to Devise.skip_session_storage
+  * Usage of Devise.apply_schema is deprecated
+  * Usage of Devise migration helpers are deprecated
+  * Usage of Devise.remember_across_browsers was deprecated
+  * Usage of rememberable with remember_token was removed
+  * Usage of recoverable without reset_password_sent_at was removed
+  * Usage of Devise.case_insensitive_keys equals to false was removed
+  * 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_*
+
+== 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

 * enhancements
-  * Add support for rails 3.1 new mass assignment conventions (by github.com/kirs)
-  * Add timeout_in method to Timeoutable, it can be overriden in a model (by github.com/lest)
+  * Add support for Rails 3.1 new mass assignment conventions (by @kirs)
+  * Add timeout_in method to Timeoutable, it can be overridden in a model (by @lest)

 * bug fix
  * OmniAuth error message now shows the proper option (:strategy_class instead of :klass)
@@ -17,10 +72,10 @@
 * enhancements
  * Timeoutable also skips tracking if skip_trackable is given
  * devise_for now accepts :failure_app as an option
-  * Models can select the proper mailer via devise_mailer method (by github.com/locomotivecms)
-  * Migration generator now uses the change method (by github.com/nashby)
-  * Support to markerb templates on the mailer generator (by github.com/sbounmy)
-  * Support for Omniauth 1.0 (older versions are no longer supported) (by github.com/TamiasSibiricus)
+  * Models can select the proper mailer via devise_mailer method (by @locomotivecms)
+  * Migration generator now uses the change method (by @nashby)
+  * Support to markerb templates on the mailer generator (by @sbounmy)
+  * Support for Omniauth 1.0 (older versions are no longer supported) (by @TamiasSibiricus)

 * bug fix
  * Allow idempotent API requests
@@ -63,7 +118,7 @@

 * bug fix
  * Failure app tries the root path if a session one does not exist
-  * No need to finalize Devise helpers all the time (by github.com/bradleypriest)
+  * No need to finalize Devise helpers all the time (by @bradleypriest)
  * Reset password shows proper message if user is not active
  * `clean_up_passwords` sets the accessors to nil to skip validations

@@ -98,7 +153,7 @@
 * enhancements
  * Add :defaults and :format support on router
  * Add simple form generators
-  * Better localization for devise_error_messages! (by github.com/zedtux)
+  * Better localization for devise_error_messages! (by @zedtux)

 * bug fix
  * Ensure to_xml is properly white listened
@@ -107,20 +162,20 @@
 == 1.4.0

 * enhancements
-  * Added authenticated and unauthenticated to the router to route the used based on his status (by github.com/sj26)
-  * Improve e-mail regexp (by github.com/rodrigoflores)
-  * Add strip_whitespace_keys and default to e-mail (by github.com/swrobel)
-  * Do not run format and uniqueness validations on e-mail if it hasn't changed (by github.com/Thibaut)
-  * Added update_without_password to update models but not allowing the password to change (by github.com/fschwahn)
-  * Added config.paranoid, check the generator for more information (by github.com/rodrigoflores)
+  * 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)
+  * Added update_without_password to update models but not allowing the password to change (by @fschwahn)
+  * Added config.paranoid, check the generator for more information (by @rodrigoflores)

 * bug fix
  * password_required? should not affect length validation
  * 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 github.com/xavier)
-  * Run validations even if current_password fails (by github.com/crx)
-  * Devise now honors routes constraints (by github.com/macmartine)
-  * Do not return the user resource when requesting instructions (by github.com/rodrigoflores)
+  * 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

@@ -135,31 +190,31 @@
 == 1.3.2

 * bug fix
-  * Fix another regression related to reset_password_sent_at (by github.com/alexdreher)
+  * Fix another regression related to reset_password_sent_at (by @alexdreher)

 == 1.3.1

 * enhancements
-  * Improve failure_app responses (by github.com/indirect)
+  * Improve failure_app responses (by @indirect)
  * sessions/new and registrations/new also respond to xml and json now

 * bug fix
-  * Fix a regression that occurred if reset_password_sent_at is not present (by github.com/stevehodgkiss)
+  * Fix a regression that occurred if reset_password_sent_at is not present (by @stevehodgkiss)

 == 1.3.0

 * enhancements
-  * All controllers can now handle different mime types than html using Responders (by github.com/sikachu)
-  * Added reset_password_within as configuration option to send the token for recovery (by github.com/jdguyot)
-  * Bump password length to 128 characters (by github.com/k33l0r)
-  * Add :only as option to devise_for (by github.com/timoschilling)
-  * Allow to override path after sending password instructions (by github.com/irohiroki)
-  * require_no_authentication has its own flash message (by github.com/jackdempsey)
+  * All controllers can now handle different mime types than html using Responders (by @sikachu)
+  * Added reset_password_within as configuration option to send the token for recovery (by @jdguyot)
+  * Bump password length to 128 characters (by @k33l0r)
+  * Add :only as option to devise_for (by @timoschilling)
+  * Allow to override path after sending password instructions (by @irohiroki)
+  * require_no_authentication has its own flash message (by @jackdempsey)

 * bug fix
  * Fix a bug where configuration options were being included too late
-  * Ensure Devise::TestHelpers can be used to tests Devise internal controllers (by github.com/jwilger)
-  * valid_password? should not choke on empty passwords (by github.com/mikel)
+  * Ensure Devise::TestHelpers can be used to tests Devise internal controllers (by @jwilger)
+  * valid_password? should not choke on empty passwords (by @mikel)
  * Calling devise more than once does not include previously added modules anymore
  * downcase_keys before validation

@@ -186,16 +241,16 @@

 * bug fix
  * Fix an issue causing infinite redirects in production
-  * rails g destroy works properly with devise generators (by github.com/andmej)
-  * before_failure callbacks should work on test helpers (by github.com/twinge)
-  * rememberable cookie now is httponly by default (by github.com/JamesFerguson)
-  * Add missing confirmation_keys (by github.com/JohnPlummer)
+  * rails g destroy works properly with devise generators (by @andmej)
+  * before_failure callbacks should work on test helpers (by @twinge)
+  * rememberable cookie now is httponly by default (by @JamesFerguson)
+  * Add missing confirmation_keys (by @JohnPlummer)
  * Ensure after_* hooks are called on RegistrationsController
  * When using database_authenticatable Devise will now only create an email field when appropriate (if using default authentication_keys or custom authentication_keys with email included)
-  * Ensure stateless token does not trigger timeout (by github.com/pixelauthority)
+  * Ensure stateless token does not trigger timeout (by @pixelauthority)
  * Implement handle_unverified_request for Rails 3.0.4 compatibility and improve FailureApp reliance on symbols
  * Consider namespaces while generating routes
-  * Custom failure apps no longer ignored in test mode (by github.com/jaghion)
+  * Custom failure apps no longer ignored in test mode (by @jaghion)
  * Do not depend on ActiveModel::Dirty
  * Manual sign_in now triggers remember token
  * Be sure to halt strategies on failures
@@ -204,7 +259,7 @@
  * Ensure there is no Mongoid injection

 * deprecations
-  * Deprecated anybody_signed_in? in favor of signed_in? (by github.com/gavinhughes)
+  * Deprecated anybody_signed_in? in favor of signed_in? (by @gavinhughes)
  * Removed --haml and --slim view templates
  * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode

@@ -217,11 +272,11 @@
 * enhancements
  * Added OmniAuth support
  * Added ORM adapter to abstract ORM iteraction
-  * sign_out_via is available in the router to configure the method used for sign out (by github.com/martinrehfeld)
-  * Improved Ajax requests handling in failure app (by github.com/spastorino)
+  * sign_out_via is available in the router to configure the method used for sign out (by @martinrehfeld)
+  * Improved Ajax requests handling in failure app (by @spastorino)
  * Added request_keys to easily use request specific values (like subdomain) in authentication
  * Increased the size of friendly_token to 60 characters (reduces the chances of a successful brute attack)
-  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by github.com/rymai)
+  * 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 his password
@@ -230,7 +285,7 @@
  * 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 github.com/adahl)
+  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by @adahl)

 * default behavior changes
  * sign_out_all_scopes defaults to true as security measure
@@ -239,12 +294,12 @@

 * bugfix
  * after_sign_in_path_for always receives a resource
-  * Do not execute Warden::Callbacks on Devise::TestHelpers (by github.com/sgronblo)
-  * Allow password recovery and account unlocking to change used keys (by github.com/RStankov)
+  * Do not execute Warden::Callbacks on Devise::TestHelpers (by @sgronblo)
+  * Allow password recovery and account unlocking to change used keys (by @RStankov)
  * FailureApp now properly handles nil request.format
  * Fix a bug causing FailureApp to return with HTTP Auth Headers for IE7
  * Ensure namespaces has proper scoped views
-  * Ensure Devise does not set empty flash messages (by github.com/sxross)
+  * Ensure Devise does not set empty flash messages (by @sxross)

 == 1.1.6

@@ -269,11 +324,11 @@

 * bugfix
  * Add reply-to to e-mail headers by default
-  * Updated the views generator to respect the rails :template_engine option (by github.com/fredwu)
+  * Updated the views generator to respect the rails :template_engine option (by @fredwu)
  * Check the type of HTTP Authentication before using Basic headers
-  * Avoid invalid_salt errors by checking salt presence (by github.com/thibaudgg)
-  * Forget user deletes the right cookie before logout, not remembering the user anymore (by github.com/emtrane)
-  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by github.com/bensie)
+  * Avoid invalid_salt errors by checking salt presence (by @thibaudgg)
+  * Forget user deletes the right cookie before logout, not remembering the user anymore (by @emtrane)
+  * 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
@@ -289,16 +344,16 @@
 == 1.1.0

 * enhancements
-  * Rememberable module allows user to be remembered across browsers and is enabled by default (by github.com/trevorturk)
-  * Rememberable module allows you to activate the period the remember me token is extended (by github.com/trevorturk)
+  * Rememberable module allows user to be remembered across browsers and is enabled by default (by @trevorturk)
+  * Rememberable module allows you to activate the period the remember me token is extended (by @trevorturk)
  * devise_for can now be used together with scope method in routes but with a few limitations (check the documentation)
  * Support `as` or `devise_scope` in the router to specify controller access scope
-  * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by github.com/pellja)
+  * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by @pellja)

 * bug fix
  * Fix a bug in Devise::TestHelpers where current_user was returning a Response object for non active accounts
  * Devise should respect script_name and path_info contracts
-  * Fix a bug when accessing a path with (.:format) (by github.com/klacointe)
+  * Fix a bug when accessing a path with (.:format) (by @klacointe)
  * Do not add unlock routes unless unlock strategy is email or both
  * Email should be case insensitive
  * Store classes as string in session, to avoid serialization and stale data issues
@@ -309,10 +364,10 @@
 == 1.1.rc2

 * enhancements
-  * Allow to set cookie domain for the remember token. (by github.com/mantas)
+  * Allow to set cookie domain for the remember token. (by @mantas)
  * Added navigational formats to specify when it should return a 302 and when a 401.
-  * Added authenticate(scope) support in routes (by github.com/wildchild)
-  * Added after_update_path_for to registrations controller (by github.com/thedelchop)
+  * Added authenticate(scope) support in routes (by @wildchild)
+  * Added after_update_path_for to registrations controller (by @thedelchop)
  * Allow the mailer object to be replaced through config.mailer = "MyOwnMailer"

 * bug fix
@@ -360,10 +415,10 @@

 * enhancements
  * Support for latest MongoMapper
-  * Added anybody_signed_in? helper (by github.com/SSDany)
+  * Added anybody_signed_in? helper (by @SSDany)

 * bug fix
-  * confirmation_required? is properly honored on active? calls. (by github.com/paulrosania)
+  * confirmation_required? is properly honored on active? calls. (by @paulrosania)

 == 1.0.7

@@ -404,7 +459,7 @@
 == 1.0.2

 * enhancements
-  * Allows you set mailer content type (by github.com/glennr)
+  * Allows you set mailer content type (by @glennr)

 * bug fix
  * Uses the same content type as request on http authenticatable 401 responses
@@ -437,12 +492,12 @@

 * enhancements
  * Added gemspec to repo
-  * Added token authenticatable (by github.com/grimen)
+  * Added token authenticatable (by @grimen)

 == 0.9.1

 * bug fix
-  * Allow bigger salt size (by github.com/jgeiger)
+  * Allow bigger salt size (by @jgeiger)
  * Fix relative url root

 == 0.9.0
@@ -452,11 +507,11 @@
  * :success and :failure flash messages are now :notice and :alert

 * enhancements
-  * Added devise lockable (by github.com/mhfs)
+  * Added devise lockable (by @mhfs)
  * Warden 0.9.0 compatibility
  * Mongomapper 0.6.10 compatibility
-  * Added Devise.add_module as hooks for extensions (by github.com/grimen)
-  * Ruby 1.9.1 compatibility (by github.com/grimen)
+  * Added Devise.add_module as hooks for extensions (by @grimen)
+  * Ruby 1.9.1 compatibility (by @grimen)

 * bug fix
  * Accept path prefix not starting with slash
@@ -465,10 +520,10 @@
 == 0.8.2

 * enhancements
-  * Allow Devise.mailer_sender to be a proc (by github.com/grimen)
+  * Allow Devise.mailer_sender to be a proc (by @grimen)

 * bug fix
-  * Fix bug with passenger, update is required to anyone deploying on passenger (by github.com/dvdpalm)
+  * Fix bug with passenger, update is required to anyone deploying on passenger (by @dvdpalm)

 == 0.8.1

@@ -485,11 +540,11 @@
 * enhancements
  * Warden 0.8.0 compatibility
  * Add an easy for map.connect "sign_in", :controller => "sessions", :action => "new" to work
-  * Added :bcrypt encryptor (by github.com/capotej)
+  * Added :bcrypt encryptor (by @capotej)

 * bug fix
  * sign_in_count is also increased when user signs in via password change, confirmation, etc..
-  * More DataMapper compatibility (by github.com/lancecarlson)
+  * More DataMapper compatibility (by @lancecarlson)

 * deprecation
  * Removed DeviseMailer.sender
@@ -529,7 +584,7 @@
 == 0.7.1

 * enhancements
-  * Small enhancements for other plugins compatibility (by github.com/grimen)
+  * Small enhancements for other plugins compatibility (by @grimen)

 == 0.7.0

@@ -623,9 +678,9 @@
  * Fixed a bug where remember me module was not working properly

 * enhancements
-  * Moved encryption strategy into the Encryptors module to allow several algorithms (by github.com/mhfs)
-  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by github.com/mhfs)
-  * Added support for MongoMapper (by github.com/shingara)
+  * Moved encryption strategy into the Encryptors module to allow several algorithms (by @mhfs)
+  * Implemented encryptors for Clearance, Authlogic and Restful-Authentication (by @mhfs)
+  * Added support for MongoMapper (by @shingara)

 == 0.4.3

--- a/2
+++ b/2
@@ -2,7 +2,7 @@ source "http://rubygems.org"

 gemspec

-gem "rails", "~> 3.1.0"
+gem "rails", "~> 3.2.0"
 gem "omniauth", "~> 1.0.0"
 gem "omniauth-oauth2", "~> 1.0.0"
 gem "rdoc"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -0,0 +1,167 @@
+PATH
+  remote: .
+  specs:
+    devise (2.0.1)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      railties (~> 3.1)
+      warden (~> 1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    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)
+      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.0.1)
+    bson (1.5.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    columnize (0.3.5)
+    erubis (2.7.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)
+    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)
+    orm_adapter (0.0.6)
+    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-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    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)
+      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.1.2)
+      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.0)
+      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.2.0)
+  rdoc
+  ruby-debug (>= 0.10.3)
+  sqlite3-ruby
+  webrat (= 0.7.2)
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2009-2011 Plataforma Tecnologia. http://blog.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.rdoc
+++ b/README.rdoc
@@ -1,6 +1,10 @@
-== Devise
+*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

-{<img src="https://secure.travis-ci.org/plataformatec/devise.png" />}[http://travis-ci.org/plataformatec/devise]
+## Devise
+
+INFO: 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:

@@ -24,15 +28,15 @@ It's comprised of 12 modules:
 * 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
+## Information

-=== The Devise wiki
+### The Devise wiki

 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://wiki.github.com/plataformatec/devise

-=== Bug reports
+### Bug reports

 If you discover a problem with Devise, we would like to know about it. However, we ask that you please review these guidelines before submitting a bug report:

@@ -40,59 +44,41 @@ https://github.com/plataformatec/devise/wiki/Bug-reports

 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
+### Mailing list

 If you have any questions, comments, or concerns, please use the Google Group instead of the GitHub issue tracker:

 https://groups.google.com/group/plataformatec-devise

-=== RDocs
+### RDocs

 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 Rails 2.3, 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
+### Example applications

 There are a few example applications available on GitHub that demonstrate various features of Devise with different versions of Rails. You can view them here:

 https://github.com/plataformatec/devise/wiki/Example-Applications

-=== Extensions
+### Extensions

 Our community has created a number of extensions that add functionality above and beyond what is included with Devise. You can view a list of available extensions and add your own here:

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

-=== Contributing
+### Contributing

 We hope that you will consider contributing to Devise. Please read this short overview for some information about how to get started:

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

-You will usually want to write tests for your changes.  To run the test suite, `cd` into Devise's top-level directory and run `bundle install` and `rake`.  For the tests to pass, you will need to have a MongoDB server (version 2.0 or newer) running on your system.
+You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run "bundle install" and "rake".  For the tests to pass, you will need to have a MongoDB server (version 2.0 or newer) running on your system.

-== Installation
-
-You can use the latest Rails 3 gem with the latest Devise gem:
-
-  gem install devise
-
-After you install Devise and add it to your Gemfile, you need to run the generator:
-
-  rails generate devise:install
-
-The generator will install an initializer which describes ALL Devise's configuration options and you MUST take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:
-
-  rails generate devise MODEL
-
-Replace MODEL by the class name used for the applications users, it's frequently 'User' but could also be 'Admin'. This will create a model (if one does not exist) and configure it with default Devise modules. Next, you'll usually run 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, continue reading this file to understand exactly what the generator produces and how to use it. Finally, if your server was already running, then restart it as Rails doesn't automatically load methods from a new gem.
-
-Support for Rails 2.3.x can be found by installing Devise 1.0.x from the v1.0 branch.
-
-== Starting with Rails?
+## Starting with Rails?

 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:

@@ -101,266 +87,302 @@ If you are building your first Rails application, we recommend you to *not* use

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

-== Getting started
+## Getting started

-This is a walkthrough with all steps you need to setup a devise resource, including model, migration, route files, and optional configuration.
+Devise 2.0 works with Rails 3.1 onwards. You can add it to your Gemfile with:

-Devise must be set up within the model (or models) you want to use. Devise routes must be created inside your config/routes.rb file.
+  gem 'devise'

-We're assuming here you want a User model with some Devise modules, as outlined below:
+Run the bundle command to install it.

-  class User < ActiveRecord::Base
-    devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable, :trackable, :validatable
-  end
+After you install Devise and add it to your Gemfile, you need to run the generator:

-After you choose which modules to use, you need to set up your migrations. Luckily, Devise has some helpers to save you from this boring work:
+```console
+rails generate devise:install
+```

-  create_table :users do |t|
-    t.database_authenticatable
-    t.confirmable
-    t.recoverable
-    t.rememberable
-    t.trackable
-    t.timestamps
-  end
+The generator will install an initializer which describes ALL Devise's configuration options and you MUST take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:

-Devise doesn't use _attr_accessible_ or _attr_protected_ inside its modules, so be sure to define attributes as accessible or protected in your model.
+```console
+rails generate devise MODEL
+```

-Configure your routes after setting up your model. Open your config/routes.rb file and add:
+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.

-  devise_for :users
-
-This will use your User model to create a set of needed routes (you can see them by running `rake routes`). If you invoked the devise generator, you noticed that this is exactly what the generator produces for us: model, routes and migrations.
-
-Don't forget to run rake db:migrate and you are ready to go! But don't stop reading here, we still have a lot to tell you.
-
-=== Controller filters and helpers
+### 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_filter:

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

 To verify if a user is signed in, use the following helper:

-  user_signed_in?
+```ruby
+user_signed_in?
+```

 For the current signed-in user, this helper is available:

-  current_user
+```ruby
+current_user
+```

 You can access the session for this scope:

-  user_session
+```ruby
+user_session
+```

-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:
+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:

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

-You can also overwrite 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.

-Finally, you need to set up default url options for the mailer in each environment. Here is the configuration for config/environments/development.rb:
+Finally, you need to set up default url options for the mailer in each environment. Here is the configuration for "config/environments/development.rb":

-  config.action_mailer.default_url_options = { :host => 'localhost:3000' }
+```ruby
+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:

-  before_filter :authenticate_member!
+```ruby
+before_filter :authenticate_member!

-  member_signed_in?
+member_signed_in?

-  current_member
+current_member

-  member_session
+member_session
+```

-=== Configuring Models
+### Configuring Models

-The devise method in your models also accepts some options to configure its modules. For example, you can choose which encryptor to use in database_authenticatable:
+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:

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

 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.

-=== Configuring multiple models
+### Configuring multiple models

-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, trackable, lockable and timeoutable features and no confirmation or password-recovery features. Just follow these steps:
+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:

-  # Create a migration with the required fields
-  create_table :admins do |t|
-    t.database_authenticatable
-    t.lockable
-    t.trackable
-    t.timestamps
-  end
+```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, :trackable, :timeoutable, :lockable
+# Inside your Admin model
+devise :database_authenticatable, :timeoutable

-  # Inside your routes
-  devise_for :admins
+# Inside your routes
+devise_for :admins

-  # Inside your protected controller
-  before_filter :authenticate_admin!
+# Inside your protected controller
+before_filter :authenticate_admin!

-  # Inside your controllers and views
-  admin_signed_in?
-  current_admin
-  admin_session
+# Inside your controllers and views
+admin_signed_in?
+current_admin
+admin_session
+```

-=== Configuring views
+On the other hand, you can simply run the generator!
+
+### Configuring views

 We built Devise to help you quickly develop an application that uses authentication. However, we don't want to be in your way when you need to customize it.

-Since Devise is an engine, all its views are packaged inside the gem. These views will help you get started, but after sometime you may want to change them. If this is the case, you just need to invoke the following generator, and it will copy all views to your application:
+Since Devise is an engine, all its views are packaged inside the gem. These views will help you get started, but after some time you may want to change them. If this is the case, you just need to invoke the following generator, and it will copy all views to your application:

-  rails generate devise:views
+```console
+rails generate devise:views
+```

 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:

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

-=== Configuring controllers
+### 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 controller, for example a Admins::SessionsController:

-    class Admins::SessionsController < Devise::SessionsController
-    end
+```ruby
+class Admins::SessionsController < Devise::SessionsController
+end
+```

 2) Tell the router to use this controller:

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

 3) And since we changed the controller, it won't use the "devise/sessions" views, so remember to copy "devise/sessions" to "admin/sessions".

 Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call "flash[:notice]" and "flash[:alert]" as appropriate.

-=== Configuring routes
+### 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:

-  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' }
+```ruby
+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:

-  devise_scope :user do
-    get "sign_in", :to => "devise/sessions#new"
-  end
+```ruby
+devise_scope :user do
+  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+ and you can also give a block to +devise_for+, resulting in the same behavior:

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

 Feel free to choose the one you prefer!

-=== I18n
+### I18n

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

-  en:
-    devise:
-      sessions:
-        signed_in: 'Signed in successfully.'
+```yaml
+en:
+  devise:
+    sessions:
+      signed_in: 'Signed in successfully.'
+```

 You can also create distinct messages based on the resource you've configured using the singular name given in routes:

-  en:
-    devise:
-      sessions:
-        user:
-          signed_in: 'Welcome user, you are signed in.'
-        admin:
-          signed_in: 'Hello admin!'
+```yaml
+en:
+  devise:
+    sessions:
+      user:
+        signed_in: 'Welcome user, you are signed in.'
+      admin:
+        signed_in: 'Hello admin!'
+```

 The Devise mailer uses a similar pattern to create subject messages:

-  en:
-    devise:
-      mailer:
-        confirmation_instructions:
-          subject: 'Hello everybody!'
-          user_subject: 'Hello User! Please confirm your email'
-        reset_password_instructions:
-          subject: 'Reset instructions'
+```yaml
+en:
+  devise:
+    mailer:
+      confirmation_instructions:
+        subject: 'Hello everybody!'
+        user_subject: 'Hello User! Please confirm your email'
+      reset_password_instructions:
+        subject: 'Reset instructions'
+```

 Take a look at our locale file to check all available messages. You may also be interested in one of the many translations that are available on our wiki:

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

-=== Test helpers
+### Test helpers

 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:

-  sign_in :user, @user   # sign_in(scope, resource)
-  sign_in @user          # sign_in(resource)
+```ruby
+sign_in :user, @user   # sign_in(scope, resource)
+sign_in @user          # sign_in(resource)

-  sign_out :user         # sign_out(scope)
-  sign_out @user         # sign_out(resource)
+sign_out :user         # sign_out(scope)
+sign_out @user         # sign_out(resource)
+```

 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:

-  class ActionController::TestCase
-    include Devise::TestHelpers
-  end
+```ruby
+class ActionController::TestCase
+  include Devise::TestHelpers
+end
+```

 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:

-  RSpec.configure do |config|
-    config.include Devise::TestHelpers, :type => :controller
-  end
+```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
+### Omniauth

 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

-=== Other ORMs
+### Other ORMs

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

-=== Migrating from other solutions
+### 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
+## Troubleshooting

-=== Heroku
+### Heroku

 Using devise on Heroku with Ruby on Rails 3.1 requires setting:

-  config.assets.initialize_on_precompile = false
+```ruby
+config.assets.initialize_on_precompile = false
+```

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

-== Additional information
+## Additional information

-=== Warden
+### 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:

 https://github.com/hassox/warden

-=== Contributors
+### Contributors

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

 https://github.com/plataformatec/devise/contributors

-=== Maintainers
+### Maintainers

 * José Valim (https://github.com/josevalim)
 * Carlos Antônio da Silva (https://github.com/carlosantoniodasilva)
 * Rodrigo Flores (https://github.com/rodrigoflores)

-== License
+## License

-MIT License. Copyright 2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2012 Plataforma Tecnologia. http://blog.plataformatec.com.br
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,10 +1,7 @@
-class Devise::ConfirmationsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
+class Devise::ConfirmationsController < DeviseController
  # GET /resource/confirmation/new
  def new
    build_resource({})
-    render_with_scope :new
  end

  # POST /resource/confirmation
@@ -14,7 +11,7 @@ class Devise::ConfirmationsController < ApplicationController
    if successfully_sent?(resource)
      respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
    else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
    end
  end

@@ -27,7 +24,7 @@ class Devise::ConfirmationsController < ApplicationController
      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_with_scope :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end

--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -1,6 +1,4 @@
-class Devise::OmniauthCallbacksController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
+class Devise::OmniauthCallbacksController < DeviseController
  def failure
    set_flash_message :alert, :failure, :kind => failed_strategy.name.to_s.humanize, :reason => failure_message
    redirect_to after_omniauth_failure_path_for(resource_name)
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,11 +1,9 @@
-class Devise::PasswordsController < ApplicationController
+class Devise::PasswordsController < DeviseController
  prepend_before_filter :require_no_authentication
-  include Devise::Controllers::InternalHelpers

  # GET /resource/password/new
  def new
    build_resource({})
-    render_with_scope :new
  end

  # POST /resource/password
@@ -15,7 +13,7 @@ class Devise::PasswordsController < ApplicationController
    if successfully_sent?(resource)
      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
    else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
    end
  end

@@ -23,7 +21,6 @@ class Devise::PasswordsController < ApplicationController
  def edit
    self.resource = resource_class.new
    resource.reset_password_token = params[:reset_password_token]
-    render_with_scope :edit
  end

  # PUT /resource/password
@@ -36,7 +33,7 @@ class Devise::PasswordsController < ApplicationController
      sign_in(resource_name, resource)
      respond_with resource, :location => after_sign_in_path_for(resource)
    else
-      respond_with_navigational(resource){ render_with_scope :edit }
+      respond_with resource
    end
  end

--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,12 +1,11 @@
-class Devise::RegistrationsController < ApplicationController
+class Devise::RegistrationsController < DeviseController
  prepend_before_filter :require_no_authentication, :only => [ :new, :create, :cancel ]
  prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]
-  include Devise::Controllers::InternalHelpers

  # GET /resource/sign_up
  def new
    resource = build_resource({})
-    respond_with_navigational(resource){ render_with_scope :new }
+    respond_with resource
  end

  # POST /resource
@@ -19,19 +18,19 @@ class Devise::RegistrationsController < ApplicationController
        sign_in(resource_name, resource)
        respond_with resource, :location => after_sign_up_path_for(resource)
      else
-        set_flash_message :notice, :inactive_signed_up, :reason => inactive_reason(resource) if is_navigational_format?
+        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)
-      respond_with_navigational(resource) { render_with_scope :new }
+      clean_up_passwords resource
+      respond_with resource
    end
  end

  # GET /resource/edit
  def edit
-    render_with_scope :edit
+    render :edit
  end

  # PUT /resource
@@ -41,12 +40,17 @@ class Devise::RegistrationsController < ApplicationController
    self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)

    if resource.update_with_password(params[resource_name])
-      set_flash_message :notice, :updated if is_navigational_format?
+      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)
    else
-      clean_up_passwords(resource)
-      respond_with_navigational(resource){ render_with_scope :edit }
+      clean_up_passwords resource
+      respond_with resource
    end
  end

@@ -70,40 +74,34 @@ class Devise::RegistrationsController < ApplicationController

  protected

-    # Build a devise resource passing in the session. Useful to move
-    # temporary session data to the newly created user.
-    def build_resource(hash=nil)
-      hash ||= params[resource_name] || {}
-      self.resource = resource_class.new_with_session(hash, session)
-    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)
+    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
-    # in your own RegistrationsController.
-    def after_sign_up_path_for(resource)
-      after_sign_in_path_for(resource)
-    end
+  # The path used after sign up. You need to overwrite this method
+  # in your own RegistrationsController.
+  def after_sign_up_path_for(resource)
+    after_sign_in_path_for(resource)
+  end

-    # Returns the inactive reason translated.
-    def inactive_reason(resource)
-      reason = resource.inactive_message.to_s
-      I18n.t("devise.registrations.reasons.#{reason}", :default => reason)
-    end
+  # 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)
+    respond_to?(:root_path) ? root_path : "/"
+  end

-    # 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)
-      root_path
-    end
+  # The default url to be used after updating a resource. You need to overwrite
+  # this method in your own RegistrationsController.
+  def after_update_path_for(resource)
+    signed_in_root_path(resource)
+  end

-    # The default url to be used after updating a resource. You need to overwrite
-    # this method in your own RegistrationsController.
-    def after_update_path_for(resource)
-      signed_in_root_path(resource)
-    end
-
-    # Authenticates the current scope and gets the current resource from the session.
-    def authenticate_scope!
-      send(:"authenticate_#{resource_name}!", :force => true)
-      self.resource = send(:"current_#{resource_name}")
-    end
+  # Authenticates the current scope and gets the current resource from the session.
+  def authenticate_scope!
+    send(:"authenticate_#{resource_name}!", :force => true)
+    self.resource = send(:"current_#{resource_name}")
+  end
 end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,18 +1,17 @@
-class Devise::SessionsController < ApplicationController
+class Devise::SessionsController < DeviseController
  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
  prepend_before_filter :allow_params_authentication!, :only => :create
-  include Devise::Controllers::InternalHelpers

  # GET /resource/sign_in
  def new
    resource = build_resource
    clean_up_passwords(resource)
-    respond_with_navigational(resource, stub_options(resource)){ render_with_scope :new }
+    respond_with(resource, serialize_options(resource))
  end

  # POST /resource/sign_in
  def create
-    resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
+    resource = warden.authenticate!(auth_options)
    set_flash_message(:notice, :signed_in) if is_navigational_format?
    sign_in(resource_name, resource)
    respond_with resource, :location => after_sign_in_path_for(resource)
@@ -39,11 +38,15 @@ class Devise::SessionsController < ApplicationController

  protected

-  def stub_options(resource)
+  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] }
  end
+
+  def auth_options
+    { :scope => resource_name, :recall => "#{controller_path}#new" }
+  end
 end

--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -1,11 +1,9 @@
-class Devise::UnlocksController < ApplicationController
+class Devise::UnlocksController < DeviseController
  prepend_before_filter :require_no_authentication
-  include Devise::Controllers::InternalHelpers

  # GET /resource/unlock/new
  def new
    build_resource({})
-    render_with_scope :new
  end

  # POST /resource/unlock
@@ -15,7 +13,7 @@ class Devise::UnlocksController < ApplicationController
    if successfully_sent?(resource)
      respond_with({}, :location => new_session_path(resource_name))
    else
-      respond_with_navigational(resource){ render_with_scope :new }
+      respond_with(resource)
    end
  end

@@ -25,10 +23,9 @@ class Devise::UnlocksController < ApplicationController

    if resource.errors.empty?
      set_flash_message :notice, :unlocked if is_navigational_format?
-      sign_in(resource_name, resource)
-      respond_with_navigational(resource){ redirect_to after_sign_in_path_for(resource) }
+      respond_with_navigational(resource){ redirect_to new_session_path(resource) }
    else
-      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new }
+      respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render :new }
    end
  end
 end
--- a/app/controllers/devise_controller.rb
+++ b/app/controllers/devise_controller.rb
@@ -0,0 +1,165 @@
+# All Devise controllers are inherited from here.
+class DeviseController < Devise.parent_controller.constantize
+  include Devise::Controllers::ScopedViews
+
+  helper DeviseHelper
+
+  helpers = %w(resource scope_name resource_name signed_in_resource
+               resource_class devise_mapping)
+  hide_action *helpers
+  helper_method *helpers
+
+  prepend_before_filter :assert_is_devise_resource!
+  respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?
+
+  # Gets the actual resource stored in the instance variable
+  def resource
+    instance_variable_get(:"@#{resource_name}")
+  end
+
+  # Proxy to devise map name
+  def resource_name
+    devise_mapping.name
+  end
+  alias :scope_name :resource_name
+
+  # Proxy to devise map class
+  def resource_class
+    devise_mapping.to
+  end
+
+  # Returns a signed in resource from session (if one exists)
+  def signed_in_resource
+    warden.authenticate(:scope => resource_name)
+  end
+
+  # Attempt to find the mapped route for devise based on request path
+  def devise_mapping
+    @devise_mapping ||= request.env["devise.mapping"]
+  end
+
+  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}.
+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
+
+  # Returns real navigational formats which are supported by Rails
+  def navigational_formats
+    @navigational_formats ||= Devise.navigational_formats.select { |format| Mime::EXTENSION_LOOKUP[format.to_s] }
+  end
+
+  def unknown_action!(msg)
+    logger.debug "[Devise] #{msg}" if logger
+    raise AbstractController::ActionNotFound, msg
+  end
+
+  # Sets the resource creating an instance variable
+  def resource=(new_resource)
+    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
+  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
+      warden.authenticate?(*args)
+    else
+      warden.authenticated?(resource_name)
+    end
+
+    if authenticated
+      resource = warden.user(resource_name)
+      flash[:alert] = I18n.t("devise.failure.already_authenticated")
+      redirect_to after_sign_in_path_for(resource)
+    end
+  end
+
+  # Helper for use after calling send_*_instructions methods on a resource.
+  # If we are in paranoid mode, we always act as if the resource was valid
+  # and instructions were sent.
+  def successfully_sent?(resource)
+    notice = if Devise.paranoid
+      resource.errors.clear
+      :send_paranoid_instructions
+    elsif resource.errors.empty?
+      :send_instructions
+    end
+
+    if notice
+      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 one is
+  # found we look to default scope.
+  # Example (i18n locale file):
+  #
+  #   en:
+  #     devise:
+  #       passwords:
+  #         #default_scope_messages - only if resource_scope is not found
+  #         user:
+  #           #resource_scope_messages
+  #
+  # Please refer to README or en.yml locale file to check what messages are
+  # available.
+  def set_flash_message(key, kind, options={})
+    options[:scope] = "devise.#{controller_name}"
+    options[:default] = Array(options[:default]).unshift(kind.to_sym)
+    options[:resource_name] = resource_name
+    options = devise_i18n_options(options) if respond_to?(:devise_i18n_options, true)
+    message = I18n.t("#{resource_name}.#{kind}", options)
+    flash[key] = message if message.present?
+  end
+
+  def clean_up_passwords(object)
+    object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
+  end
+
+  def respond_with_navigational(*args, &block)
+    respond_with(*args) do |format|
+      format.any(*navigational_formats, &block)
+    end
+  end
+
+  def request_format
+    @request_format ||= request.format.try(:ref)
+  end
+
+  def is_navigational_format?
+    Devise.navigational_formats.include?(request.format.try(:ref))
+  end
+
+  # 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/views/devise/_links.erb
+++ b/app/views/devise/_links.erb
@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= 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' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- 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 -%>
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -9,4 +9,4 @@
  <div><%= f.submit "Resend confirmation instructions" %></div>
 <% end %>

-<%= render :partial => "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 <%= @resource.email %>!</p>

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

 <p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -13,4 +13,4 @@
  <div><%= f.submit "Change my password" %></div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -9,4 +9,4 @@
  <div><%= f.submit "Send me reset password instructions" %></div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -7,7 +7,7 @@
  <%= f.email_field :email %></div>

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

  <div><%= f.label :password_confirmation %><br />
  <%= f.password_field :password_confirmation %></div>
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -15,4 +15,4 @@
  <div><%= f.submit "Sign up" %></div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -14,4 +14,4 @@
  <div><%= f.submit "Sign in" %></div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -1,25 +1,3 @@
-<%- if controller_name != 'sessions' %>
-  <%= 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' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- 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 -%>
+<% 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
@@ -9,4 +9,4 @@
  <div><%= f.submit "Resend unlock instructions" %></div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -35,16 +35,15 @@ en:
      confirmed: 'Your account was successfully confirmed. You are now signed in.'
    registrations:
      signed_up: 'Welcome! You have signed up successfully.'
-      inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+      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.'
-      reasons:
-        inactive: 'inactive'
-        unconfirmed: 'unconfirmed'
-        locked: 'locked'
    unlocks:
      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
-      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+      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.'
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -5,7 +5,7 @@ require "devise/version"
 Gem::Specification.new do |s|
  s.name        = "devise"
  s.version     = Devise::VERSION.dup
-  s.platform    = Gem::Platform::RUBY  
+  s.platform    = Gem::Platform::RUBY
  s.summary     = "Flexible authentication solution for Rails with Warden"
  s.email       = "contact@plataformatec.com.br"
  s.homepage    = "http://github.com/plataformatec/devise"
@@ -15,11 +15,11 @@ Gem::Specification.new do |s|
  s.rubyforge_project = "devise"

  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.test_files    = `git ls-files -- test/*`.split("\n")
  s.require_paths = ["lib"]

  s.add_dependency("warden", "~> 1.1")
  s.add_dependency("orm_adapter", "~> 0.0.3")
  s.add_dependency("bcrypt-ruby", "~> 3.0")
-end
+  s.add_dependency("railties", "~> 3.1")
+end
--- 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/lib/devise.rb
+++ b/lib/devise.rb
@@ -16,10 +16,8 @@ module Devise

  module Controllers
    autoload :Helpers, 'devise/controllers/helpers'
-    autoload :InternalHelpers, 'devise/controllers/internal_helpers'
    autoload :Rememberable, 'devise/controllers/rememberable'
    autoload :ScopedViews, 'devise/controllers/scoped_views'
-    autoload :SharedHelpers, 'devise/controllers/shared_helpers'
    autoload :UrlHelpers, 'devise/controllers/url_helpers'
  end

@@ -84,7 +82,7 @@ module Devise
  # False by default for backwards compatibility.
  mattr_accessor :case_insensitive_keys
  @@case_insensitive_keys = false
-  
+
  # Keys that should have whitespace stripped.
  # False by default for backwards compatibility.
  mattr_accessor :strip_whitespace_keys
@@ -120,27 +118,23 @@ module Devise
  mattr_accessor :remember_for
  @@remember_for = 2.weeks

-  # If true, a valid remember token can be re-used between multiple browsers.
-  mattr_accessor :remember_across_browsers
-  @@remember_across_browsers = true
-
  # If true, extends the user's remember period when remembered via cookie.
  mattr_accessor :extend_remember_period
  @@extend_remember_period = false

-  # 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
-
  # Time interval you can access your account before confirming your account.
-  mattr_accessor :confirm_within
-  @@confirm_within = 0.days
+  mattr_accessor :allow_unconfirmed_access_for
+  @@allow_unconfirmed_access_for = 0.days

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

+  # Defines if email should be reconfirmable.
+  # False by default for backwards compatibility.
+  mattr_accessor :reconfirmable
+  @@reconfirmable = false
+
  # Time interval to timeout the user session without activity.
  mattr_accessor :timeout_in
  @@timeout_in = 30.minutes
@@ -153,11 +147,6 @@ module Devise
  mattr_accessor :encryptor
  @@encryptor = nil

-  # 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
-
  # Scoped views. Since it relies on fallbacks to render default views, it's
  # turned off by default.
  mattr_accessor :scoped_views
@@ -190,6 +179,7 @@ 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 = nil

@@ -205,14 +195,13 @@ module Devise
  mattr_accessor :token_authentication_key
  @@token_authentication_key = :auth_token

-  # If true, authentication through token does not store user in session
-  mattr_accessor :stateless_token
-  @@stateless_token = false
+  # Skip session storage for the following strategies
+  mattr_accessor :skip_session_storage
+  @@skip_session_storage = []

  # Which formats should be treated as navigational.
-  # We need both :"*/*" and "*/*" to work on different Rails versions.
  mattr_accessor :navigational_formats
-  @@navigational_formats = [:"*/*", "*/*", :html]
+  @@navigational_formats = ["*/*", :html]

  # When set to true, signing out a user signs out all other scopes.
  mattr_accessor :sign_out_all_scopes
@@ -222,6 +211,45 @@ module Devise
  mattr_accessor :sign_out_via
  @@sign_out_via = :get

+  # The parent controller all Devise controllers inherits from.
+  # Defaults to ApplicationController. This should be set early
+  # in the initialization process and should be set to a string.
+  mattr_accessor :parent_controller
+  @@parent_controller = "ApplicationController"
+
+  # The router Devise should use to generate routes. Defaults
+  # to :main_app. Should be overriden by engines in order
+  # to provide custom routes.
+  mattr_accessor :router_name
+  @@router_name = nil
+
+  # DEPRECATED CONFIG
+
+  # 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.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

  # Store scopes mappings.
@@ -271,6 +299,10 @@ module Devise
    end
  end

+  def self.available_router_name
+    router_name || :main_app
+  end
+
  def self.omniauth_providers
    omniauth_configs.keys
  end
@@ -315,7 +347,7 @@ module Devise
  #
  def self.add_module(module_name, options = {})
    ALL << module_name
-    options.assert_valid_keys(:strategy, :model, :controller, :route)
+    options.assert_valid_keys(:strategy, :model, :controller, :route, :no_input)

    if strategy = options[:strategy]
      strategy = (strategy == true ? module_name : strategy)
@@ -327,7 +359,7 @@ module Devise
      CONTROLLERS[module_name] = controller
    end

-    NO_INPUT << strategy if strategy && controller != :sessions
+    NO_INPUT << strategy if options[:no_input]

    if route = options[:route]
      case route
@@ -361,7 +393,7 @@ module Devise
  # initialization.
  #
  #  Devise.initialize do |config|
-  #    config.confirm_within = 2.days
+  #    config.allow_unconfirmed_access_for = 2.days
  #
  #    config.warden do |manager|
  #      # Configure warden to use other strategies, like oauth.
@@ -394,11 +426,6 @@ module Devise
    end
  end

-  # Returns true if Rails version is bigger than 3.0.x
-  def self.rack_session?
-    Rails::VERSION::STRING[0,3] != "3.0"
-  end
-
  # Regenerates url helpers considering Devise.mapping
  def self.regenerate_helpers!
    Devise::Controllers::UrlHelpers.remove_helpers!
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -75,9 +75,9 @@ module Devise
      # the controllers defined inside devise. Useful if you want to apply a before
      # filter to all controllers, except the ones in devise:
      #
-      #   before_filter :my_filter, :unless => { |c| c.devise_controller? }
+      #   before_filter :my_filter, :unless => :devise_controller?
      def devise_controller?
-        false
+        is_a?(DeviseController)
      end

      # Tell warden that params authentication is allowed for that specific page.
@@ -168,7 +168,13 @@ module Devise
      def signed_in_root_path(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
        home_path = "#{scope}_root_path"
-        respond_to?(home_path, true) ? send(home_path) : root_path
+        if respond_to?(home_path, true)
+          send(home_path)
+        elsif respond_to?(:root_path)
+          root_path
+        else
+          "/"
+        end
      end

      # The default url to be used after signing in. This is used by all Devise
@@ -209,7 +215,7 @@ module Devise
      #
      # By default it is the root_path.
      def after_sign_out_path_for(resource_or_scope)
-        root_path
+        respond_to?(:root_path) ? root_path : "/"
      end

      # Sign in a user and tries to redirect first to the stored location and
--- a/lib/devise/controllers/internal_helpers.rb
+++ b/lib/devise/controllers/internal_helpers.rb
@@ -1,154 +0,0 @@
-module Devise
-  module Controllers
-    # Those helpers are used only inside Devise controllers and should not be
-    # included in ApplicationController since they all depend on the url being
-    # accessed.
-    module InternalHelpers #:nodoc:
-      extend ActiveSupport::Concern
-      include Devise::Controllers::ScopedViews
-      include Devise::Controllers::SharedHelpers
-
-      included do
-        helper DeviseHelper
-
-        helpers = %w(resource scope_name resource_name signed_in_resource
-                     resource_class devise_mapping devise_controller?)
-        hide_action *helpers
-        helper_method *helpers
-
-        prepend_before_filter :is_devise_resource?
-        respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?
-      end
-
-      # Gets the actual resource stored in the instance variable
-      def resource
-        instance_variable_get(:"@#{resource_name}")
-      end
-
-      # Proxy to devise map name
-      def resource_name
-        devise_mapping.name
-      end
-      alias :scope_name :resource_name
-
-      # Proxy to devise map class
-      def resource_class
-        devise_mapping.to
-      end
-
-      # Returns a signed in resource from session (if one exists)
-      def signed_in_resource
-        warden.authenticate(:scope => resource_name)
-      end
-
-      # Attempt to find the mapped route for devise based on request path
-      def devise_mapping
-        @devise_mapping ||= request.env["devise.mapping"]
-      end
-
-      # Overwrites devise_controller? to return true
-      def devise_controller?
-        true
-      end
-
-    protected
-
-      # Checks whether it's a devise mapped resource or not.
-      def is_devise_resource? #:nodoc:
-        unknown_action! <<-MESSAGE unless devise_mapping
-Could not find devise mapping for path #{request.fullpath.inspect}.
-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
-
-      # Returns real navigational formats which are supported by Rails
-      def navigational_formats
-        @navigational_formats ||= Devise.navigational_formats.select{ |format| Mime::EXTENSION_LOOKUP[format.to_s] }
-      end
-
-      def unknown_action!(msg)
-        logger.debug "[Devise] #{msg}" if logger
-        raise ActionController::UnknownAction, msg
-      end
-
-      # Sets the resource creating an instance variable
-      def resource=(new_resource)
-        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
-      def require_no_authentication
-        return unless is_navigational_format?
-        no_input = devise_mapping.no_input_strategies
-        args = no_input.dup.push :scope => resource_name
-        if no_input.present? && warden.authenticate?(*args)
-          resource = warden.user(resource_name)
-          flash[:alert] = I18n.t("devise.failure.already_authenticated")
-          redirect_to after_sign_in_path_for(resource)
-        end
-      end
-
-      # Helper for use after calling send_*_instructions methods on a resource.
-      # If we are in paranoid mode, we always act as if the resource was valid
-      # and instructions were sent.
-      def successfully_sent?(resource)
-        notice = if Devise.paranoid
-          resource.errors.clear
-          :send_paranoid_instructions
-        elsif resource.errors.empty?
-          :send_instructions
-        end
-
-        if notice
-          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 one is
-      # found we look to default scope.
-      # Example (i18n locale file):
-      #
-      #   en:
-      #     devise:
-      #       passwords:
-      #         #default_scope_messages - only if resource_scope is not found
-      #         user:
-      #           #resource_scope_messages
-      #
-      # Please refer to README or en.yml locale file to check what messages are
-      # available.
-      def set_flash_message(key, kind, options={}) #:nodoc:
-        options[:scope] = "devise.#{controller_name}"
-        options[:default] = Array(options[:default]).unshift(kind.to_sym)
-        options[:resource_name] = resource_name
-        message = I18n.t("#{resource_name}.#{kind}", options)
-        flash[key] = message if message.present?
-      end
-
-      def clean_up_passwords(object) #:nodoc:
-        object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
-      end
-
-      def respond_with_navigational(*args, &block)
-        respond_with(*args) do |format|
-          format.any(*navigational_formats, &block)
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -12,22 +12,6 @@ module Devise
          @scoped_views = value
        end
      end
-
-    protected
-
-      # Render a view for the specified scope. Turned off by default.
-      # Accepts just :controller as option.
-      def render_with_scope(action, path=self.controller_path)
-        if self.class.scoped_views?
-          begin
-            render :template => "#{devise_mapping.scoped_path}/#{path.split("/").last}/#{action}"
-          rescue ActionView::MissingTemplate
-            render :template => "#{path}/#{action}"
-          end
-        else
-          render :template => "#{path}/#{action}"
-        end
-      end
    end
  end
 end
--- a/lib/devise/controllers/shared_helpers.rb
+++ b/lib/devise/controllers/shared_helpers.rb
@@ -1,26 +0,0 @@
-module Devise
-  module Controllers
-    # Helpers used in both FailureApp and Devise controllers.
-    module SharedHelpers
-      MIME_REFERENCES = Mime::HTML.respond_to?(:ref)
-
-      protected
-
-      # Helper used by FailureApp and Devise controllers to retrieve proper formats.
-      def request_format
-        @request_format ||= if request.format.respond_to?(:ref)
-          request.format.ref
-        elsif MIME_REFERENCES
-          request.format
-        elsif request.format # Rails < 3.0.4
-          request.format.to_sym
-        end
-      end
-
-      # Check whether it's navigational format, such as :html or :iphone, or not.
-      def is_navigational_format?
-        Devise.navigational_formats.include?(request_format)
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -16,7 +16,15 @@ module Devise
    #   new_confirmation_path(:user) => new_user_confirmation_path
    #   confirmation_path(:user)     => user_confirmation_path
    #
-    # Those helpers are added to your ApplicationController.
+    # Those helpers are included by default to ActionController::Base.
+    #
+    # In case you want to add such helpers to another class, you can do
+    # that as long as this new class includes both url_helpers and
+    # mounted_helpers. Example:
+    #
+    #     include Rails.application.routes.url_helpers
+    #     include Rails.application.routes.mounted_helpers
+    #
    module UrlHelpers
      def self.remove_helpers!
        self.instance_methods.map(&:to_s).grep(/_(url|path)$/).each do |method|
@@ -39,7 +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)
-                  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
@@ -48,6 +56,12 @@ module Devise
      end

      generate_helpers!(Devise::URL_HELPERS)
+
+      private
+
+      def _devise_route_context
+        @_devise_route_context ||= send(Devise.available_router_name)
+      end
    end
  end
 end
--- a/lib/devise/delegator.rb
+++ b/lib/devise/delegator.rb
@@ -8,9 +8,9 @@ module Devise
    def failure_app(env)
      app = env["warden.options"] &&
        (scope = env["warden.options"][:scope]) &&
-        Devise.mappings[scope].failure_app
+        Devise.mappings[scope.to_sym].failure_app

      app || Devise::FailureApp
    end
  end
-end
+end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -9,8 +9,9 @@ module Devise
    include ActionController::RackDelegation
    include ActionController::UrlFor
    include ActionController::Redirecting
+
    include Rails.application.routes.url_helpers
-    include Devise::Controllers::SharedHelpers
+    include Rails.application.routes.mounted_helpers

    delegate :flash, :to => :request

@@ -20,7 +21,11 @@ module Devise
    end

    def self.default_url_options(*args)
-      ApplicationController.default_url_options(*args)
+      if defined?(ApplicationController)
+        ApplicationController.default_url_options(*args)
+      else
+        {}
+      end
    end

    def respond
@@ -48,32 +53,50 @@ module Devise

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

  protected

    def i18n_message(default = nil)
-      message = warden.message || warden_options[:message] || default || :unauthenticated
+      message = warden_message || default || :unauthenticated

      if message.is_a?(Symbol)
        I18n.t(:"#{scope}.#{message}", :resource_name => scope,
-               :scope => "devise.failure", :default => [message, message.to_s])
+               :scope => "devise.failure", :default => [message])
      else
        message.to_s
      end
    end

    def redirect_url
+      if warden_message == :timeout
+        flash[:timedout] = true
+        attempted_path || scope_path
+      else
+        scope_path
+      end
+    end
+
+    def scope_path
      opts  = {}
      route = :"new_#{scope}_session_path"
      opts[:format] = request_format unless skip_format?

-      if respond_to?(route)
-        send(route, opts)
-      else
+      context = send(Devise.available_router_name)
+
+      if context.respond_to?(route)
+        context.send(route, opts)
+      elsif respond_to?(:root_path)
        root_path(opts)
+      else
+        "/"
      end
    end

@@ -130,6 +153,10 @@ module Devise
      env['warden.options']
    end

+    def warden_message
+      @message ||= warden.message || warden_options[:message]
+    end
+
    def scope
      @scope ||= warden_options[:scope] || Devise.default_scope
    end
@@ -145,5 +172,13 @@ module Devise
    def store_location!
      session["#{scope}_return_to"] = attempted_path if request.get? && !http_auth?
    end
+
+    def is_navigational_format?
+      Devise.navigational_formats.include?(request_format)
+    end
+
+    def request_format
+      @request_format ||= request.format.try(:ref)
+    end
  end
 end
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -23,8 +23,7 @@ module Devise
  #
  class Mapping #:nodoc:
    attr_reader :singular, :scoped_path, :path, :controllers, :path_names,
-                :class_name, :sign_out_via, :format, :used_routes, :used_helpers,
-                :constraints, :defaults, :failure_app
+                :class_name, :sign_out_via, :format, :used_routes, :used_helpers, :failure_app

    alias :name :singular

@@ -64,8 +63,6 @@ module Devise
      default_failure_app(options)
      default_controllers(options)
      default_path_names(options)
-      default_constraints(options)
-      default_defaults(options)
      default_used_route(options)
      default_used_helpers(options)
    end
--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -48,7 +48,6 @@ module Devise
    # for a complete description on those values.
    #
    def devise(*modules)
-      include Devise::Models::Authenticatable
      options = modules.extract_options!.dup

      selected_modules = modules.map(&:to_sym).uniq.sort_by do |s|
@@ -56,6 +55,7 @@ module Devise
      end

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

--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -25,6 +25,11 @@ module Devise
    #   * +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.
+    #     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
@@ -52,6 +57,9 @@ module Devise
      included do
        class_attribute :devise_modules, :instance_writer => false
        self.devise_modules ||= []
+
+        before_validation :downcase_keys
+        before_validation :strip_whitespace
      end

      # Check if the current object is valid for authentication. This method and
@@ -79,8 +87,21 @@ module Devise
        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
+
      module ClassMethods
-        Devise::Models.config(self, :authentication_keys, :request_keys, :strip_whitespace_keys, :case_insensitive_keys, :http_authenticatable, :params_authenticatable)
+        Devise::Models.config(self, :authentication_keys, :request_keys, :strip_whitespace_keys,
+          :case_insensitive_keys, :http_authenticatable, :params_authenticatable, :skip_session_storage)

        def serialize_into_session(record)
          [record.to_key, record.authenticatable_salt]
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -9,11 +9,16 @@ module Devise
    #
    # Confirmable adds the following options to devise_for:
    #
-    #   * +confirm_within+: the time you want to allow the user to access his account
+    #   * +allow_unconfirmed_access_for+: the time you want to allow the user to access his account
    #     before confirming it. After this period, the user access is denied. You can
    #     use this to let your user access some features of your application without
    #     confirming the account, but blocking it after a certain period (ie 7 days).
-    #     By default confirm_within is zero, it means users always have to confirm to sign in.
+    #     By default allow_unconfirmed_access_for is zero, it means users always have to confirm to sign in.
+    #   * +reconfirmable+: requires any email changes to be confirmed (exactly the same way as
+    #     initial account confirmation) to be applied. Requires additional unconfirmed_email
+    #     db field to be setup (t.reconfirmable in migrations). Until confirmed new email is
+    #     stored in unconfirmed email column, and copied to email column on successful
+    #     confirmation.
    #
    # == Examples
    #
@@ -26,16 +31,29 @@ module Devise

      included do
        before_create :generate_confirmation_token, :if => :confirmation_required?
-        after_create  :send_confirmation_instructions, :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 its confirmed_at to actual time. If the user
-      # is already confirmed, add en error to email field
+      # Confirm a user by setting it's confirmed_at to actual time. If the user
+      # is already confirmed, add an error to email field. If the user is invalid
+      # add errors
      def confirm!
-        unless_confirmed do
+        pending_any_confirmation do
          self.confirmation_token = nil
          self.confirmed_at = Time.now.utc
-          save(:validate => false)
+
+          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)
+          else
+            save(:validate => false)
+          end
        end
      end

@@ -44,15 +62,22 @@ module Devise
        !!confirmed_at
      end

+      def pending_reconfirmation?
+        self.class.reconfirmable && unconfirmed_email.present?
+      end
+
      # Send confirmation instructions by email
      def send_confirmation_instructions
-        generate_confirmation_token! if self.confirmation_token.nil?
+        self.confirmation_token = nil if reconfirmation_required?
+        @reconfirmation_required = false
+
+        generate_confirmation_token! if self.confirmation_token.blank?
        self.devise_mailer.confirmation_instructions(self).deliver
      end

      # Resend confirmation token. This method does not need to generate a new token.
      def resend_confirmation_token
-        unless_confirmed { send_confirmation_instructions }
+        pending_any_confirmation { send_confirmation_instructions }
      end

      # Overwrites active_for_authentication? for confirmation
@@ -74,8 +99,23 @@ module Devise
        self.confirmed_at = Time.now.utc
      end

+      def headers_for(action)
+        headers = super
+        if action == :confirmation_instructions && pending_reconfirmation?
+          headers[:to] = unconfirmed_email
+        end
+        headers
+      end
+
      protected

+        # A callback method used to deliver confirmation
+        # instructions on creation. This can be overriden
+        # in models to map to a nice sign up e-mail.
+        def send_on_create_confirmation_instructions
+          self.devise_mailer.confirmation_instructions(self).deliver
+        end
+
        # Callback to overwrite if confirmation is required or not.
        def confirmation_required?
          !confirmed?
@@ -88,26 +128,25 @@ module Devise
        #
        # Example:
        #
-        #   # confirm_within = 1.day and confirmation_sent_at = today
+        #   # allow_unconfirmed_access_for = 1.day and confirmation_sent_at = today
        #   confirmation_period_valid?   # returns true
        #
-        #   # confirm_within = 5.days and confirmation_sent_at = 4.days.ago
+        #   # allow_unconfirmed_access_for = 5.days and confirmation_sent_at = 4.days.ago
        #   confirmation_period_valid?   # returns true
        #
-        #   # confirm_within = 5.days and confirmation_sent_at = 5.days.ago
+        #   # allow_unconfirmed_access_for = 5.days and confirmation_sent_at = 5.days.ago
        #   confirmation_period_valid?   # returns false
        #
-        #   # confirm_within = 0.days
+        #   # allow_unconfirmed_access_for = 0.days
        #   confirmation_period_valid?   # will always return false
        #
        def confirmation_period_valid?
-          confirmation_sent_at && confirmation_sent_at.utc >= self.class.confirm_within.ago
+          confirmation_sent_at && confirmation_sent_at.utc >= self.class.allow_unconfirmed_access_for.ago
        end

-        # Checks whether the record is confirmed or not, yielding to the block
-        # if it's already confirmed, otherwise adds an error to email.
-        def unless_confirmed
-          unless confirmed?
+        # Checks whether the record requires any confirmation.
+        def pending_any_confirmation
+          if !confirmed? || pending_reconfirmation?
            yield
          else
            self.errors.add(:email, :already_confirmed)
@@ -118,7 +157,6 @@ module Devise
        # Generates a new random token for confirmation, and stores the time
        # this token is being generated
        def generate_confirmation_token
-          self.confirmed_at = nil
          self.confirmation_token = self.class.confirmation_token
          self.confirmation_sent_at = Time.now.utc
        end
@@ -132,13 +170,32 @@ module Devise
          confirm! unless confirmed?
        end

+        def postpone_email_change_until_confirmation
+          @reconfirmation_required = true
+          self.unconfirmed_email = self.email
+          self.email = self.email_was
+        end
+
+        def postpone_email_change?
+          postpone = self.class.reconfirmable && email_changed? && !@bypass_postpone
+          @bypass_postpone = nil
+          postpone
+        end
+
+        def reconfirmation_required?
+          self.class.reconfirmable && @reconfirmation_required
+        end
+
      module ClassMethods
        # Attempt to find a user by its email. If a record is found, send new
-        # confirmation instructions to it. If not user is found, returns a new user
-        # with an email not found error.
+        # confirmation instructions to it. If not, try searching for a user by unconfirmed_email
+        # field. If no user is found, returns a new user with an email not found error.
        # Options must contain the user email
        def send_confirmation_instructions(attributes={})
-          confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
+          confirmable = find_by_unconfirmed_email_with_errors(attributes) if reconfirmable
+          unless confirmable.try(:persisted?)
+            confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
+          end
          confirmable.resend_confirmation_token if confirmable.persisted?
          confirmable
        end
@@ -158,7 +215,15 @@ module Devise
          generate_token(:confirmation_token)
        end

-        Devise::Models.config(self, :confirm_within, :confirmation_keys)
+        # 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 }
+          unconfirmed_attributes = attributes.symbolize_keys
+          unconfirmed_attributes[:unconfirmed_email] = unconfirmed_attributes.delete(:email)
+          find_or_initialize_with_errors(unconfirmed_required_attributes, unconfirmed_attributes, :not_found)
+        end
+
+        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
@@ -25,8 +25,6 @@ module Devise
      included do
        attr_reader :password, :current_password
        attr_accessor :password_confirmation
-        before_validation :downcase_keys
-        before_validation :strip_whitespace
      end

      # Generates password encryption based on the given value.
@@ -103,15 +101,6 @@ module Devise

    protected

-      # Downcase case-insensitive keys
-      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
-
      # Digests the password using bcrypt.
      def password_digest(password)
        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -79,7 +79,7 @@ module Devise
        # if the user can login or not (wrong password, etc)
        unlock_access! if lock_expired?

-        if super
+        if super && !access_locked?
          self.failed_attempts = 0
          save(:validate => false)
          true
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -29,6 +29,7 @@ module Devise
      def reset_password!(new_password, new_password_confirmation)
        self.password = new_password
        self.password_confirmation = new_password_confirmation
+
        if valid?
          clear_reset_password_token
          after_password_reset
@@ -39,7 +40,7 @@ module Devise

      # Resets reset password token and send reset password instructions by email
      def send_reset_password_instructions
-        generate_reset_password_token! if should_generate_token?
+        generate_reset_password_token! if should_generate_reset_token?
        self.devise_mailer.reset_password_instructions(self).deliver
      end

@@ -64,20 +65,19 @@ module Devise
      #   reset_password_period_valid?   # will always return false
      #
      def reset_password_period_valid?
-        return true unless respond_to?(:reset_password_sent_at)
        reset_password_sent_at && reset_password_sent_at.utc >= self.class.reset_password_within.ago
      end

      protected

-        def should_generate_token?
+        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 if respond_to?(:reset_password_sent_at=)
+          self.reset_password_sent_at = Time.now.utc
          self.reset_password_token
        end

@@ -90,7 +90,7 @@ module Devise
        # Removes reset_password token
        def clear_reset_password_token
          self.reset_password_token = nil
-          self.reset_password_sent_at = nil if respond_to?(:reset_password_sent_at=)
+          self.reset_password_sent_at = nil
        end

        def after_password_reset
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -21,11 +21,6 @@ module Devise
    #     used to calculate the expires time for the cookie created to remember
    #     the user. By default remember_for is 2.weeks.
    #
-    #   * +remember_across_browsers+: if a valid remember token can be re-used
-    #     between multiple browsers. By default remember_across_browsers is true
-    #     and cannot be turned off if you are using password salt instead of remember
-    #     token.
-    #
    #   * +extend_remember_period+: if true, extends the user's remember period
    #     when remembered via cookie. False by default.
    #
@@ -49,7 +44,6 @@ module Devise
      # 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 respond_to?(:remember_token) && generate_remember_token?
        self.remember_created_at = Time.now.utc if generate_remember_timestamp?(extend_period)
        save(:validate => false)
      end
@@ -75,14 +69,12 @@ module Devise
      end

      def rememberable_value
-        if respond_to?(:remember_token)
-          remember_token
-        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt)
+        if salt = authenticatable_salt
          salt
        else
-          raise "The #{self.class.name} class does not respond to remember_token and " <<
-            "authenticatable_salt returns nil. In order to use rememberable, you must " <<
-            "add a remember_token field to your model or ensure a password is always set."
+          raise "authenticable_salt returned nil for the #{self.class.name} model. " \
+            "In order to use rememberable, you must ensure a password is always set " \
+            "or implement rememberable_value in your model with your own logic."
        end
      end

@@ -92,12 +84,6 @@ module Devise

    protected

-      # Generate a token unless remember_across_browsers is true and there is
-      # an existing remember_token or the existing remember_token has expried.
-      def generate_remember_token? #:nodoc:
-        !(self.class.remember_across_browsers && remember_token) || remember_expired?
-      end
-
      # Generate a timestamp if extend_remember_period is true, if no remember_token
      # exists, or if an existing remember token has expired.
      def generate_remember_timestamp?(extend_period) #:nodoc:
@@ -121,8 +107,7 @@ module Devise
          generate_token(:remember_token)
        end

-        Devise::Models.config(self, :remember_for, :remember_across_browsers,
-          :extend_remember_period, :cookie_options)
+        Devise::Models.config(self, :remember_for, :extend_remember_period, :cookie_options)
      end
    end
  end
--- a/lib/devise/models/serializable.rb
+++ b/lib/devise/models/serializable.rb
@@ -9,8 +9,11 @@ module Devise
    module Serializable
      extend ActiveSupport::Concern

-      # TODO: to_xml does not call serializable_hash. Hopefully someone will fix this in AR.
-      %w(to_xml serializable_hash).each do |method|
+      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"
+
+      array.each do |method|
        class_eval <<-RUBY, __FILE__, __LINE__
          def #{method}(options=nil)
            options ||= {}
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -23,7 +23,6 @@ module Devise
      # Checks whether the user session has expired based on configured time.
      def timedout?(last_access)
        return false if remember_exists_and_not_expired?
-
        !timeout_in.nil? && last_access && last_access <= timeout_in.ago
      end

@@ -34,8 +33,7 @@ module Devise
      private

      def remember_exists_and_not_expired?
-        return false unless 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
@@ -24,9 +24,6 @@ module Devise
    #
    #   * +token_authentication_key+: Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
    #
-    #   * +stateless_token+: By default, when you sign up with a token, Devise will store the user in session
-    #     as any other authentication strategy. You can set stateless_token to true to avoid this.
-    #
    module TokenAuthenticatable
      extend ActiveSupport::Concern

@@ -65,7 +62,7 @@ module Devise
          generate_token(:authentication_token)
        end

-        ::Devise::Models.config(self, :token_authentication_key, :stateless_token)
+        ::Devise::Models.config(self, :token_authentication_key)
      end
    end
  end
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -23,7 +23,8 @@ module Devise
        self.sign_in_count ||= 0
        self.sign_in_count += 1

-        save(:validate => false)
+        save(:validate => false) or raise "Devise trackable could not save #{inspect}." \
+          "Please make sure a model using trackable can be saved at sign in."
      end
    end
  end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -23,7 +23,7 @@ module Devise

        base.class_eval do
          validates_presence_of   :email, :if => :email_required?
-          validates_uniqueness_of :email, :case_sensitive => (case_insensitive_keys != false), :allow_blank => true, :if => :email_changed?
+          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?
--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -5,8 +5,8 @@ Devise.with_options :model => true do |d|
  d.with_options :strategy => true do |s|
    routes = [nil, :new, :destroy]
    s.add_module :database_authenticatable, :controller => :sessions, :route => { :session => routes }
-    s.add_module :token_authenticatable
-    s.add_module :rememberable
+    s.add_module :token_authenticatable,    :controller => :sessions, :route => { :session => routes }, :no_input => true
+    s.add_module :rememberable, :no_input => true
  end

  # Other authentications
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -26,6 +26,12 @@ module Devise

        # 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
--- a/lib/devise/param_filter.rb
+++ b/lib/devise/param_filter.rb
@@ -35,7 +35,7 @@ module Devise

    # Determine which values should be transformed to string or passed as-is to the query builder underneath
    def param_requires_string_conversion?(value)
-      true unless value.is_a?(TrueClass) || value.is_a?(FalseClass) || value.is_a?(Fixnum)
+      [Fixnum, TrueClass, FalseClass, Regexp].none? {|clz| value.is_a? clz }
    end
  end
 end
--- a/lib/devise/path_checker.rb
+++ b/lib/devise/path_checker.rb
@@ -3,7 +3,11 @@ module Devise
    include Rails.application.routes.url_helpers

    def self.default_url_options(*args)
-      ApplicationController.default_url_options(*args)
+      if defined?(ApplicationController)
+        ApplicationController.default_url_options(*args)
+      else
+        {}
+      end
    end

    def initialize(env, scope)
@@ -12,7 +16,8 @@ module Devise
    end

    def signing_out?
-      @current_path == send("destroy_#{@scope}_session_path")
+      route = "destroy_#{@scope}_session_path"
+      respond_to?(route) && @current_path == send(route)
    end
  end
 end
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -41,5 +41,71 @@ module Devise
        end
      end
    end
+
+    initializer "devise.fix_routes_proxy_missing_respond_to_bug" do
+      # 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,3 +1,5 @@
+require "active_support/core_ext/object/try"
+
 module ActionDispatch::Routing
  class RouteSet #:nodoc:
    # Ensure Devise modules are included only after loading routes, because we
@@ -6,6 +8,14 @@ module ActionDispatch::Routing
      finalize_without_devise!

      @devise_finalized ||= begin
+        if Devise.router_name.nil? && self != Rails.application.try(:routes)
+          warn "[DEVISE] We have detected that you are using devise_for inside engine routes. " \
+            "In this case, you probably want to set Devise.router_name = MOUNT_POINT, where "   \
+            "MOUNT_POINT is a symbol representing where this engine will be mounted at. For "   \
+            "now Devise will default the mount point to :main_app. You can explicitly set it"   \
+            " to :main_app as well in case you want to keep the current behavior."
+        end
+
        Devise.configure_warden!
        Devise.regenerate_helpers!
        true
@@ -84,15 +94,16 @@ module ActionDispatch::Routing
    #
    #    You need to make sure that your sign_out controls trigger a request with a matching HTTP method.
    #
-    #  * :module => the namespace to find controlers. By default, devise will access devise/sessions,
-    #    devise/registrations and so on. If you want to namespace all at once, use module:
+    #  * :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"
    #
    #    Notice that whenever you use namespace in the router DSL, it automatically sets the module.
    #    So the following setup:
    #
-    #      namespace :publisher
+    #      namespace :publisher do
    #        devise_for :account
    #      end
    #
@@ -135,15 +146,15 @@ module ActionDispatch::Routing
    #     devise_for :users
    #   end
    #
-    # However, since Devise uses the request path to retrieve the current user, it has one caveats.
-    # If you are using a dynamic segment, as below:
+    # However, since Devise uses the request path to retrieve the current user,
+    # this has one caveat: If you are using a dynamic segment, like so ...
    #
    #   scope ":locale" do
    #     devise_for :users
    #   end
    #
-    # You are required to configure default_url_options in your ApplicationController class level, so
-    # Devise can pick it:
+    # you are required to configure default_url_options in your
+    # ApplicationController class, so Devise can pick it:
    #
    #   class ApplicationController < ActionController::Base
    #     def self.default_url_options
@@ -185,7 +196,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] || {})
-      @scope[:options]        = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false
+      options[:options]       = (@scope[:options] || {}).merge({:format => false}) if options[:format] == false

      resources.map!(&:to_sym)

@@ -207,8 +218,15 @@ module ActionDispatch::Routing
        routes  = mapping.used_routes

        devise_scope mapping.name do
-          yield if block_given?
-          with_devise_exclusive_scope mapping.fullpath, mapping.name, mapping.constraints, mapping.defaults 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
        end
@@ -357,7 +375,10 @@ module ActionDispatch::Routing
        path_prefix = "/#{mapping.path}/auth".squeeze("/")

        if ::OmniAuth.config.path_prefix && ::OmniAuth.config.path_prefix != path_prefix
-          raise "You can only add :omniauthable behavior to one Devise model"
+          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" \
+            "2) You are setting :omniauthable in more than one model\n" \
+            "3) You changed your Devise routes/OmniAuth setting and haven't restarted your server"
        else
          ::OmniAuth.config.path_prefix = path_prefix
        end
@@ -368,12 +389,15 @@ module ActionDispatch::Routing
        @scope[:path] = path
      end

-      def with_devise_exclusive_scope(new_path, new_as, new_constraints, new_defaults) #:nodoc:
-        old_as, old_path, old_module, old_constraints, old_defaults = @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults]
-        @scope[:as], @scope[:path], @scope[:module], @scope[:constraints], @scope[:defaults] = new_as, new_path, nil, new_constraints, new_defaults
+      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] = old_as, old_path, old_module, old_constraints, old_defaults
+        @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
@@ -34,87 +34,4 @@ class Warden::SessionSerializer
      end
    end
  end
-end
-
-unless Devise.rack_session?
-  # We cannot use Rails Indifferent Hash because it messes up the flash object.
-  class Devise::IndifferentHash < Hash
-    alias_method :regular_writer, :[]= unless method_defined?(:regular_writer)
-    alias_method :regular_update, :update unless method_defined?(:regular_update)
-
-    def [](key)
-      super(convert_key(key))
-    end
-
-    def []=(key, value)
-      regular_writer(convert_key(key), value)
-    end
-
-    alias_method :store, :[]=
-
-    def update(other_hash)
-      other_hash.each_pair { |key, value| regular_writer(convert_key(key), value) }
-      self
-    end
-
-    alias_method :merge!, :update
-
-    def key?(key)
-      super(convert_key(key))
-    end
-
-    alias_method :include?, :key?
-    alias_method :has_key?, :key?
-    alias_method :member?, :key?
-
-    def fetch(key, *extras)
-      super(convert_key(key), *extras)
-    end
-
-    def values_at(*indices)
-      indices.collect {|key| self[convert_key(key)]}
-    end
-
-    def merge(hash)
-      self.dup.update(hash)
-    end
-
-    def delete(key)
-      super(convert_key(key))
-    end
-
-    def stringify_keys!; self end
-    def stringify_keys; dup end
-
-    undef :symbolize_keys!
-    def symbolize_keys; to_hash.symbolize_keys end
-
-    def to_options!; self end
-    def to_hash; Hash.new.update(self) end
-
-    protected
-
-    def convert_key(key)
-      key.kind_of?(Symbol) ? key.to_s : key
-    end
-  end
-
-  class ActionDispatch::Request
-    def reset_session
-      session.destroy if session && session.respond_to?(:destroy)
-      self.session = {}
-      @env['action_dispatch.request.flash_hash'] = nil
-    end
-  end
-
-  Warden::Manager.after_set_user :event => [:set_user, :authentication] do |record, warden, options|
-    if options[:scope] && warden.authenticated?(options[:scope])
-      request, flash = warden.request, warden.env['action_dispatch.request.flash_hash']
-      backup = request.session.to_hash
-      backup.delete("session_id")
-      request.reset_session
-      warden.env['action_dispatch.request.flash_hash'] = flash
-      request.session = Devise::IndifferentHash.new.update(backup)
-    end
-  end
 end
--- a/lib/devise/schema.rb
+++ b/lib/devise/schema.rb
@@ -40,6 +40,11 @@ module Devise
      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
--- a/lib/devise/strategies/authenticatable.rb
+++ b/lib/devise/strategies/authenticatable.rb
@@ -6,7 +6,11 @@ module Devise
    # parameters both from params or from http authorization headers. See database_authenticatable
    # for an example.
    class Authenticatable < Base
-      attr_accessor :authentication_hash, :password
+      attr_accessor :authentication_hash, :authentication_type, :password
+
+      def store?
+        !mapping.to.skip_session_storage.include?(authentication_type)
+      end

      def valid?
        valid_for_params_auth? || valid_for_http_auth?
@@ -47,7 +51,7 @@ module Devise
      #   * If all authentication keys are present;
      #
      def valid_for_http_auth?
-        http_authenticatable? && request.authorization && with_authentication_hash(http_auth_hash)
+        http_authenticatable? && request.authorization && with_authentication_hash(:http_auth, http_auth_hash)
      end

      # Check if this is strategy is valid for params authentication by:
@@ -58,8 +62,8 @@ module Devise
      #   * If all authentication keys are present;
      #
      def valid_for_params_auth?
-        params_authenticatable? && valid_request? &&
-          valid_params? && with_authentication_hash(params_auth_hash)
+        params_authenticatable? && valid_params_request? &&
+          valid_params? && with_authentication_hash(:params_auth, params_auth_hash)
      end

      # Check if the model accepts this strategy as http authenticatable.
@@ -83,8 +87,8 @@ module Devise
        Hash[*keys.zip(decode_credentials).flatten]
      end

-      # By default, a request is valid  if the controller is allowed and the VERB is POST.
-      def valid_request?
+      # By default, a request is valid if the controller set the proper env variable.
+      def valid_params_request?
        !!env["devise.allow_params_authentication"]
      end

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

      # Sets the authentication hash and the password from params_auth_hash or http_auth_hash.
-      def with_authentication_hash(auth_values)
-        self.authentication_hash = {}
+      def with_authentication_hash(auth_type, auth_values)
+        self.authentication_hash, self.authentication_type = {}, auth_type
        self.password = auth_values[:password]

        parse_authentication_key_values(auth_values, authentication_keys) &&
@@ -152,4 +156,4 @@ module Devise
      end
    end
  end
-end
+end
--- a/lib/devise/strategies/token_authenticatable.rb
+++ b/lib/devise/strategies/token_authenticatable.rb
@@ -11,7 +11,7 @@ module Devise
    # a password, you can pass "X" as password and it will simply be ignored.
    class TokenAuthenticatable < Authenticatable
      def store?
-        !mapping.to.stateless_token
+        super && !mapping.to.skip_session_storage.include?(:token_auth)
      end

      def authenticate!
@@ -27,8 +27,8 @@ module Devise

    private

-      # TokenAuthenticatable request is valid for any controller and any verb.
-      def valid_request?
+      # Token Authenticatable can be authenticated with params in any controller and any verb.
+      def valid_params_request?
        true
      end

--- a/lib/devise/test_helpers.rb
+++ b/lib/devise/test_helpers.rb
@@ -15,9 +15,8 @@ module Devise

    # Override process to consider warden.
    def process(*)
-      result = nil
-      _catch_warden { result = super }
-      result
+      # Make sure we always return @response, a la ActionController::TestCase::Behaviour#process, even if warden interrupts
+      _catch_warden { super } || @response
    end

    # We need to setup the environment variables and the response in the controller.
@@ -66,6 +65,8 @@ module Devise

    protected

+    # Catch warden continuations and handle like the middleware would.
+    # Returns nil when interrupted, otherwise the normal result of the block.
    def _catch_warden(&block)
      result = catch(:warden, &block)

--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.5.2".freeze
+  VERSION = "2.0.2".freeze
 end
--- a/lib/generators/active_record/devise_generator.rb
+++ b/lib/generators/active_record/devise_generator.rb
@@ -1,7 +1,6 @@
 require 'rails/generators/active_record'
 require 'generators/devise/orm_helpers'

-
 module ActiveRecord
  module Generators
    class DeviseGenerator < ActiveRecord::Generators::Base
@@ -21,13 +20,52 @@ module ActiveRecord
      def generate_model
        invoke "active_record:model", [name], :migration => false unless model_exists? && behavior == :invoke
      end
-      
+
      def inject_devise_content
        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 => ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Encryptable
+      # t.string :password_salt
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # 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
    end
  end
 end
--- a/lib/generators/active_record/templates/migration.rb
+++ b/lib/generators/active_record/templates/migration.rb
@@ -1,19 +1,7 @@
 class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
-<% if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1 -%>
  def change
-<% else -%>
-  def self.up
-<% end  -%>
    create_table(:<%= table_name %>) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
-
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %>
-      # t.token_authenticatable
+<%= migration_data -%>

 <% attributes.each  do |attribute| -%>
      t.<%= attribute.type %> :<%= attribute.name %>
@@ -28,10 +16,4 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
    # add_index :<%= table_name %>, :unlock_token,         :unique => true
    # add_index :<%= table_name %>, :authentication_token, :unique => true
  end
-
-<% unless  ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR >= 1 -%>
-  def self.down
-    drop_table :<%= table_name %>
-  end
-<% end  -%>
 end
--- a/lib/generators/active_record/templates/migration_existing.rb
+++ b/lib/generators/active_record/templates/migration_existing.rb
@@ -1,15 +1,7 @@
 class AddDeviseTo<%= table_name.camelize %> < ActiveRecord::Migration
  def self.up
    change_table(:<%= table_name %>) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
-
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %>
-      # t.token_authenticatable
+<%= migration_data -%>

 <% attributes.each  do |attribute| -%>
      t.<%= attribute.type %> :<%= attribute.name %>
--- a/lib/generators/devise/devise_generator.rb
+++ b/lib/generators/devise/devise_generator.rb
@@ -1,6 +1,8 @@
 module Devise
  module Generators
    class DeviseGenerator < Rails::Generators::NamedBase
+      include Rails::Generators::ResourceHelpers
+
      namespace "devise"
      source_root File.expand_path("../templates", __FILE__)

--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -13,6 +13,13 @@ module Devise
        public_task :copy_views
      end

+      # TODO: Add this to Rails itslef
+      module ClassMethods
+        def hide!
+          Rails::Generators.hide_namespace self.namespace
+        end
+      end
+
      def copy_views
        view_directory :confirmations
        view_directory :passwords
@@ -32,33 +39,25 @@ module Devise
      end
    end

-    class SharedViewsGenerator < Rails::Generators::Base #:nodoc:
-      include ViewPathTemplates
-      source_root File.expand_path("../../../../app/views/devise", __FILE__)
-      desc "Copies shared Devise views to your application."
-
-      # Override copy_views to just copy mailer and shared.
-      def copy_views
-        view_directory :shared
-      end
-    end
-
    class FormForGenerator < Rails::Generators::Base #:nodoc:
      include ViewPathTemplates
      source_root File.expand_path("../../../../app/views/devise", __FILE__)
      desc "Copies default Devise views to your application."
+      hide!
    end

    class SimpleFormForGenerator < Rails::Generators::Base #:nodoc:
      include ViewPathTemplates
      source_root File.expand_path("../../templates/simple_form_for", __FILE__)
      desc "Copies simple form enabled views to your application."
+      hide!
    end

    class ErbGenerator < Rails::Generators::Base #:nodoc:
      include ViewPathTemplates
      source_root File.expand_path("../../../../app/views/devise", __FILE__)
      desc "Copies Devise mail erb views to your application."
+      hide!

      def copy_views
        view_directory :mailer
@@ -69,6 +68,7 @@ module Devise
      include ViewPathTemplates
      source_root File.expand_path("../../templates", __FILE__)
      desc "Copies Devise mail markerb views to your application."
+      hide!

      def copy_views
        view_directory :markerb, target_path
@@ -80,12 +80,15 @@ module Devise
    end

    class ViewsGenerator < Rails::Generators::Base
+      include ViewPathTemplates
+
+      source_root File.expand_path("../../../../app/views/devise", __FILE__)
      desc "Copies Devise views to your application."

-      argument :scope, :required => false, :default => nil,
-                       :desc => "The scope to copy views to"
+      def copy_views
+        copy_file "_links.erb", "#{target_path}/_links.erb"
+      end

-      invoke SharedViewsGenerator
      hook_for :form_builder, :aliases => "-b",
                              :desc => "Form builder to be used",
                              :default => defined?(SimpleForm) ? "simple_form_for" : "form_for"
--- a/lib/generators/mongoid/devise_generator.rb
+++ b/lib/generators/mongoid/devise_generator.rb
@@ -9,9 +9,52 @@ module Mongoid
        invoke "mongoid:model", [name] unless model_exists? && behavior == :invoke
      end

+      def inject_field_types
+        inject_into_file model_path, migration_data, :after => "include Mongoid::Document\n" if model_exists?
+      end
+
      def inject_devise_content
        inject_into_file model_path, model_contents, :after => "include Mongoid::Document\n" if model_exists?
      end
+
+      def migration_data
+<<RUBY
+  ## Database authenticatable
+  field :email,              :type => String, :null => false, :default => ""
+  field :encrypted_password, :type => String, :null => false, :default => ""
+
+  ## Recoverable
+  field :reset_password_token,   :type => String
+  field :reset_password_sent_at, :type => Time
+
+  ## Rememberable
+  field :remember_created_at, :type => Time
+
+  ## Trackable
+  field :sign_in_count,      :type => Integer, :default => 0
+  field :current_sign_in_at, :type => Time
+  field :last_sign_in_at,    :type => Time
+  field :current_sign_in_ip, :type => String
+  field :last_sign_in_ip,    :type => String
+
+  ## Encryptable
+  # field :password_salt, :type => String
+
+  ## Confirmable
+  # field :confirmation_token,   :type => String
+  # field :confirmed_at,         :type => Time
+  # field :confirmation_sent_at, :type => Time
+  # field :unconfirmed_email,    :type => String # Only if using reconfirmable
+
+  ## Lockable
+  # field :failed_attempts, :type => Integer, :default => 0 # Only if lock strategy is :failed_attempts
+  # field :unlock_token,    :type => String # Only if unlock strategy is :email or :both
+  # field :locked_at,       :type => Time
+
+  ## Token authenticatable
+  # field :authentication_token, :type => String
+RUBY
+      end
    end
  end
 end
--- a/lib/generators/templates/README
+++ b/lib/generators/templates/README
@@ -1,15 +1,14 @@
-
 ===============================================================================

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

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

       config.action_mailer.default_url_options = { :host => 'localhost:3000' }

-     This is a required Rails configuration. In production it must be the
-     actual host of your application
+     In production, :host should be set to the actual host of your application.

  2. Ensure you have defined root_url to *something* in your config/routes.rb.
     For example:
--- a/lib/generators/templates/devise.rb
+++ b/lib/generators/templates/devise.rb
@@ -9,6 +9,9 @@ Devise.setup do |config|
  # Configure the class responsible to send e-mails.
  # config.mailer = "Devise::Mailer"

+  # Automatically apply schema changes in tableless databases
+  config.apply_schema = false
+
  # ==> ORM configuration
  # Load and configure the ORM. Supports :active_record (default) and
  # :mongoid (bson_ext recommended) by default. Other ORMs may be
@@ -43,9 +46,15 @@ Devise.setup do |config|
  config.strip_whitespace_keys = [ :email ]

  # Tell if authentication through request.params is enabled. True by default.
+  # It can be set to an array that will enable params authentication only for the
+  # given strategies, for example, `config.params_authenticatable = [:database]` will
+  # enable it only for database (email + password) authentication.
  # config.params_authenticatable = true

  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+  # It can be set to an array that will enable http authentication only for the
+  # given strategies, for example, `config.http_authenticatable = [:token]` will
+  # enable it only for token authentication.
  # config.http_authenticatable = false

  # If http headers should be returned for AJAX requests. True by default.
@@ -59,6 +68,13 @@ Devise.setup do |config|
  # Does not affect registerable.
  # config.paranoid = true

+  # By default Devise will store the user in session. You can skip storage for
+  # :http_auth and :token_auth by adding those symbols to the array below.
+  # Notice that if you are skipping storage for all authentication paths, you
+  # may want to disable generating routes to Devise's sessions controller by
+  # passing :skip => :sessions to `devise_for` in your config/routes.rb
+  config.skip_session_storage = [:http_auth]
+
  # ==> Configuration for :database_authenticatable
  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
  # using other encryptors, it sets how many times you want the password re-encrypted.
@@ -77,7 +93,13 @@ Devise.setup do |config|
  # able to access the website for two days without confirming his account,
  # access will be blocked just in the third day. Default is 0.days, meaning
  # the user cannot access the website without confirming his account.
-  # config.confirm_within = 2.days
+  # config.allow_unconfirmed_access_for = 2.days
+
+  # If true, requires any email changes to be confirmed (exctly the same way as
+  # initial account confirmation) to be applied. Requires additional unconfirmed_email
+  # db field (see migrations). Until confirmed new email is stored in
+  # unconfirmed email column, and copied to email column on successful confirmation.
+  config.reconfirmable = true

  # Defines which key will be used when confirming an account
  # config.confirmation_keys = [ :email ]
@@ -86,9 +108,6 @@ Devise.setup do |config|
  # The time the user will be remembered without asking for credentials again.
  # config.remember_for = 2.weeks

-  # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
-
  # If true, extends the user's remember period when remembered via cookie.
  # config.extend_remember_period = false

@@ -145,7 +164,7 @@ Devise.setup do |config|
  # Time interval you can reset your password with a reset password key.
  # Don't put a too small interval or your users won't have the time to
  # change their passwords.
-  config.reset_password_within = 2.hours
+  config.reset_password_within = 6.hours

  # ==> Configuration for :encryptable
  # Allow you to use another encryption algorithm besides bcrypt (default). You can use
@@ -159,10 +178,6 @@ Devise.setup do |config|
  # Defines name of the authentication token params key
  # config.token_authentication_key = :auth_token

-  # If true, authentication through token does not store user in session and needs
-  # to be supplied on each request. Useful if you are using the token as API token.
-  # config.stateless_token = false
-
  # ==> Scopes configuration
  # Turn scoped views on. Before rendering "sessions/new", it will first check for
  # "users/sessions/new". It's turned off by default because it's slower if you
@@ -186,9 +201,8 @@ Devise.setup do |config|
  # If you have any extra navigational formats, like :iphone or :mobile, you
  # should add them to the navigational formats lists.
  #
-  # The :"*/*" and "*/*" formats below is required to match Internet
-  # Explorer requests.
-  # config.navigational_formats = [:"*/*", "*/*", :html]
+  # The "*/*" below is required to match Internet Explorer requests.
+  # config.navigational_formats = ["*/*", :html]

  # The default HTTP method used to sign out a resource. Default is :delete.
  config.sign_out_via = :delete
--- a/lib/generators/templates/simple_form_for/confirmations/new.html.erb
+++ b/lib/generators/templates/simple_form_for/confirmations/new.html.erb
@@ -12,4 +12,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/lib/generators/templates/simple_form_for/passwords/edit.html.erb
+++ b/lib/generators/templates/simple_form_for/passwords/edit.html.erb
@@ -16,4 +16,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/lib/generators/templates/simple_form_for/passwords/new.html.erb
+++ b/lib/generators/templates/simple_form_for/passwords/new.html.erb
@@ -12,4 +12,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/lib/generators/templates/simple_form_for/registrations/edit.html.erb
+++ b/lib/generators/templates/simple_form_for/registrations/edit.html.erb
@@ -5,7 +5,7 @@

  <div class="inputs">
    <%= f.input :email, :required => true, :autofocus => true %>
-    <%= f.input :password, :hint => "leave it blank if you don't want to change it", :required => false %>
+    <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %>
    <%= f.input :password_confirmation, :required => false %>
    <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
  </div>
--- a/lib/generators/templates/simple_form_for/registrations/new.html.erb
+++ b/lib/generators/templates/simple_form_for/registrations/new.html.erb
@@ -14,4 +14,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/lib/generators/templates/simple_form_for/sessions/new.html.erb
+++ b/lib/generators/templates/simple_form_for/sessions/new.html.erb
@@ -12,4 +12,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/lib/generators/templates/simple_form_for/unlocks/new.html.erb
+++ b/lib/generators/templates/simple_form_for/unlocks/new.html.erb
@@ -12,4 +12,4 @@
  </div>
 <% end %>

-<%= render :partial => "devise/shared/links" %>
+<%= render "links" %>
--- a/test/controllers/internal_helpers_test.rb
+++ b/test/controllers/internal_helpers_test.rb
@@ -1,7 +1,6 @@
 require 'test_helper'

-class MyController < ApplicationController
-  include Devise::Controllers::InternalHelpers
+class MyController < DeviseController
 end

 class HelpersTest < ActionController::TestCase
@@ -45,10 +44,12 @@ class HelpersTest < ActionController::TestCase
    @controller.send :require_no_authentication
  end

-  test 'require no authentication skips if no inputs are available' do
+  test 'require no authentication only checks if already authenticated if no inputs strategies are available' do
    Devise.mappings[:user].expects(:no_input_strategies).returns([])
    @mock_warden.expects(:authenticate?).never
-    @controller.expects(:redirect_to).never
+    @mock_warden.expects(:authenticated?).with(:user).once.returns(true)
+    @mock_warden.expects(:user).with(:user).returns(User.new)
+    @controller.expects(:redirect_to).with(root_path)
    @controller.send :require_no_authentication
  end

@@ -70,19 +71,21 @@ class HelpersTest < ActionController::TestCase
  end

  test 'does not issue blank flash messages' do
-    MyController.send(:public, :set_flash_message)
    I18n.stubs(:t).returns('   ')
-    @controller.set_flash_message :notice, :send_instructions
+    @controller.send :set_flash_message, :notice, :send_instructions
    assert flash[:notice].nil?
-    MyController.send(:protected, :set_flash_message)
  end

  test 'issues non-blank flash messages normally' do
-    MyController.send(:public, :set_flash_message)
    I18n.stubs(:t).returns('non-blank')
-    @controller.set_flash_message :notice, :send_instructions
-    assert flash[:notice] == 'non-blank'
-    MyController.send(:protected, :set_flash_message)
+    @controller.send :set_flash_message, :notice, :send_instructions
+    assert_equal 'non-blank', flash[:notice]
+  end
+
+  test 'uses custom i18n options' do
+    @controller.stubs(:devise_i18n_options).returns(:default => "devise custom options")
+    @controller.send :set_flash_message, :notice, :invalid_i18n_messagesend_instructions
+    assert_equal 'devise custom options', flash[:notice]
  end

  test 'navigational_formats not returning a wild card' do
--- a/test/delegator_test.rb
+++ b/test/delegator_test.rb
@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class DelegatorTest < ActiveSupport::TestCase
+  def delegator
+    Devise::Delegator.new
+  end
+
+  test 'failure_app returns default failure app if no warden options in env' do
+    assert_equal Devise::FailureApp, delegator.failure_app({})
+  end
+
+  test 'failure_app returns default failure app if no scope in warden options' do
+    assert_equal Devise::FailureApp, delegator.failure_app({"warden.options" => {}})
+  end
+
+  test 'failure_app returns associated failure app by scope in the given environment' do
+    assert_kind_of Proc, delegator.failure_app({"warden.options" => {:scope => "manager"}})
+  end
+end
--- a/test/devise_test.rb
+++ b/test/devise_test.rb
@@ -12,8 +12,8 @@ end

 class DeviseTest < ActiveSupport::TestCase
  test 'model options can be configured through Devise' do
-    swap Devise, :confirm_within => 113, :pepper => "foo" do
-      assert_equal 113, Devise.confirm_within
+    swap Devise, :allow_unconfirmed_access_for => 113, :pepper => "foo" do
+      assert_equal 113, Devise.allow_unconfirmed_access_for
      assert_equal "foo", Devise.pepper
    end
  end
--- a/test/failure_app_test.rb
+++ b/test/failure_app_test.rb
@@ -3,7 +3,9 @@ require 'ostruct'

 class FailureTest < ActiveSupport::TestCase
  class RootFailureApp < Devise::FailureApp
-    undef_method :new_user_session_path
+    def fake_app
+      Object.new
+    end
  end

  def self.context(name, &block)
@@ -41,15 +43,17 @@ class FailureTest < ActiveSupport::TestCase
    end

    test 'return to the root path if no session path is available' do
-      call_failure :app => RootFailureApp
-      assert_equal 302, @response.first
-      assert_equal 'You need to sign in or sign up before continuing.', @request.flash[:alert]
-      assert_equal 'http://test.host/', @response.second['Location']
+      swap Devise, :router_name => :fake_app do
+        call_failure :app => RootFailureApp
+        assert_equal 302, @response.first
+        assert_equal 'You need to sign in or sign up before continuing.', @request.flash[:alert]
+        assert_equal 'http://test.host/', @response.second['Location']
+      end
    end

    test 'uses the proxy failure message as symbol' do
-      call_failure('warden' => OpenStruct.new(:message => :test))
-      assert_equal 'test', @request.flash[:alert]
+      call_failure('warden' => OpenStruct.new(:message => :invalid))
+      assert_equal 'Invalid email or password.', @request.flash[:alert]
      assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
    end

@@ -73,14 +77,14 @@ class FailureTest < ActiveSupport::TestCase

    test 'works for any navigational format' do
      swap Devise, :navigational_formats => [:xml] do
-        call_failure('formats' => :xml)
+        call_failure('formats' => Mime::XML)
        assert_equal 302, @response.first
      end
    end

    test 'redirects the correct format if it is a non-html format request' do
      swap Devise, :navigational_formats => [:js] do
-        call_failure('formats' => :js)
+        call_failure('formats' => Mime::JS)
        assert_equal 'http://test.host/users/sign_in.js', @response.second["Location"]
      end
    end
@@ -88,18 +92,18 @@ class FailureTest < ActiveSupport::TestCase

  context 'For HTTP request' do
    test 'return 401 status' do
-      call_failure('formats' => :xml)
+      call_failure('formats' => Mime::XML)
      assert_equal 401, @response.first
    end

    test 'return appropriate body for xml' do
-      call_failure('formats' => :xml)
+      call_failure('formats' => Mime::XML)
      result = %(<?xml version="1.0" encoding="UTF-8"?>\n<errors>\n  <error>You need to sign in or sign up before continuing.</error>\n</errors>\n)
      assert_equal result, @response.last.body
    end

    test 'return appropriate body for json' do
-      call_failure('formats' => :json)
+      call_failure('formats' => Mime::JSON)
      result = %({"error":"You need to sign in or sign up before continuing."})
      assert_equal result, @response.last.body
    end
@@ -110,26 +114,26 @@ class FailureTest < ActiveSupport::TestCase
    end

    test 'return WWW-authenticate headers if model allows' do
-      call_failure('formats' => :xml)
+      call_failure('formats' => Mime::XML)
      assert_equal 'Basic realm="Application"', @response.second["WWW-Authenticate"]
    end

    test 'does not return WWW-authenticate headers if model does not allow' do
      swap Devise, :http_authenticatable => false do
-        call_failure('formats' => :xml)
+        call_failure('formats' => Mime::XML)
        assert_nil @response.second["WWW-Authenticate"]
      end
    end

    test 'works for any non navigational format' do
      swap Devise, :navigational_formats => [] do
-        call_failure('formats' => :html)
+        call_failure('formats' => Mime::HTML)
        assert_equal 401, @response.first
      end
    end

    test 'uses the failure message as response body' do
-      call_failure('formats' => :xml, 'warden' => OpenStruct.new(:message => :invalid))
+      call_failure('formats' => Mime::XML, 'warden' => OpenStruct.new(:message => :invalid))
      assert_match '<error>Invalid email or password.</error>', @response.third.body
    end

@@ -137,7 +141,7 @@ class FailureTest < ActiveSupport::TestCase
      context 'when http_authenticatable_on_xhr is false' do
        test 'dont return 401 with navigational formats' do
          swap Devise, :http_authenticatable_on_xhr => false do
-            call_failure('formats' => :html, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+            call_failure('formats' => Mime::HTML, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
            assert_equal 302, @response.first
            assert_equal 'http://test.host/users/sign_in', @response.second["Location"]
          end
@@ -145,7 +149,7 @@ class FailureTest < ActiveSupport::TestCase

        test 'dont return 401 with non navigational formats' do
          swap Devise, :http_authenticatable_on_xhr => false do
-            call_failure('formats' => :json, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+            call_failure('formats' => Mime::JSON, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
            assert_equal 302, @response.first
            assert_equal 'http://test.host/users/sign_in.json', @response.second["Location"]
          end
@@ -155,14 +159,14 @@ class FailureTest < ActiveSupport::TestCase
      context 'when http_authenticatable_on_xhr is true' do
        test 'return 401' do
          swap Devise, :http_authenticatable_on_xhr => true do
-            call_failure('formats' => :html, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+            call_failure('formats' => Mime::HTML, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
            assert_equal 401, @response.first
          end
        end

        test 'skip WWW-Authenticate header' do
          swap Devise, :http_authenticatable_on_xhr => true do
-            call_failure('formats' => :html, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
+            call_failure('formats' => Mime::HTML, 'HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest')
            assert_nil @response.second['WWW-Authenticate']
          end
        end
--- a/test/generators/active_record_generator_test.rb
+++ b/test/generators/active_record_generator_test.rb
@@ -8,20 +8,10 @@ if DEVISE_ORM == :active_record
    destination File.expand_path("../../tmp", __FILE__)
    setup :prepare_destination

-    test "all files are properly created" do
-      with_rails_version :MAJOR => 3, :MINOR => 0 do
-        run_generator %w(monster)
-        assert_file "app/models/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
-        assert_migration "db/migrate/devise_create_monsters.rb", /def self\.up/
-      end
-    end
-
    test "all files are properly created with rails31 migration syntax" do
-      with_rails_version :MAJOR => 3, :MINOR => 1 do
-        run_generator %w(monster)
-        assert_file "app/models/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
-        assert_migration "db/migrate/devise_create_monsters.rb", /def change/
-      end
+      run_generator %w(monster)
+      assert_file "app/models/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
+      assert_migration "db/migrate/devise_create_monsters.rb", /def change/
    end

    test "update model migration when model exists" do
--- a/test/generators/views_generator_test.rb
+++ b/test/generators/views_generator_test.rb
@@ -46,7 +46,7 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
    assert_file "app/views/#{scope}/registrations/new.html.erb"
    assert_file "app/views/#{scope}/registrations/edit.html.erb"
    assert_file "app/views/#{scope}/sessions/new.html.erb"
-    assert_file "app/views/#{scope}/shared/_links.erb"
    assert_file "app/views/#{scope}/unlocks/new.html.erb"
+    assert_file "app/views/#{scope}/_links.erb"
  end
 end
--- a/test/integration/authenticatable_test.rb
+++ b/test/integration/authenticatable_test.rb
@@ -407,7 +407,10 @@ class AuthenticationOthersTest < ActionController::IntegrationTest

  test 'sign in stub in xml format' do
    get new_user_session_path(:format => 'xml')
-    assert_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>\n  <email></email>\n  <password nil=\"true\"></password>\n</user>\n", response.body
+    assert_match '<?xml version="1.0" encoding="UTF-8"?>', response.body
+    assert_match /<user>.*<\/user>/m, response.body
+    assert_match '<email></email>', response.body
+    assert_match '<password nil="true"></password>', response.body
  end

  test 'sign in stub in json format' do
@@ -432,12 +435,6 @@ class AuthenticationOthersTest < ActionController::IntegrationTest
    assert_not warden.authenticated?(:admin)
  end

-  test 'uses the mapping from nested devise_for call' do
-    sign_in_as_user :visit => "/devise_for/sign_in"
-    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
-  end
-
  test 'sign in with xml format returns xml response' do
    create_user
    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
--- a/test/integration/confirmable_test.rb
+++ b/test/integration/confirmable_test.rb
@@ -98,7 +98,7 @@ class ConfirmationTest < ActionController::IntegrationTest
  end

  test 'not confirmed user with setup to block without confirmation should not be able to sign in' do
-    swap Devise, :confirm_within => 0.days do
+    swap Devise, :allow_unconfirmed_access_for => 0.days do
      sign_in_as_user(:confirm => false)

      assert_contain 'You have to confirm your account before continuing'
@@ -107,7 +107,7 @@ class ConfirmationTest < ActionController::IntegrationTest
  end

  test 'not confirmed user should not see confirmation message if invalid credentials are given' do
-    swap Devise, :confirm_within => 0.days do
+    swap Devise, :allow_unconfirmed_access_for => 0.days do
      sign_in_as_user(:confirm => false) do
        fill_in 'password', :with => 'invalid'
      end
@@ -118,7 +118,7 @@ class ConfirmationTest < ActionController::IntegrationTest
  end

  test 'not confirmed user but configured with some days to confirm should be able to sign in' do
-    swap Devise, :confirm_within => 1.day do
+    swap Devise, :allow_unconfirmed_access_for => 1.day do
      sign_in_as_user(:confirm => false)

      assert_response :success
@@ -201,3 +201,55 @@ class ConfirmationTest < ActionController::IntegrationTest
    end
  end
 end
+
+class ConfirmationOnChangeTest < ActionController::IntegrationTest
+  def create_second_admin(options={})
+    @admin = nil
+    create_admin(options)
+  end
+
+  def visit_admin_confirmation_with_token(confirmation_token)
+    visit admin_confirmation_path(:confirmation_token => confirmation_token)
+  end
+
+  test 'admin should be able to request a new confirmation after email changed' do
+    admin = create_admin
+    admin.update_attributes(:email => 'new_test@example.com')
+
+    visit new_admin_session_path
+    click_link "Didn't receive confirmation instructions?"
+
+    fill_in 'email', :with => admin.unconfirmed_email
+    assert_difference "ActionMailer::Base.deliveries.size" do
+      click_button 'Resend confirmation instructions'
+    end
+
+    assert_current_url '/admin_area/sign_in'
+    assert_contain 'You will receive an email with instructions about how to confirm your account in a few minutes'
+  end
+
+  test 'admin with valid confirmation token should be able to confirm email after email changed' do
+    admin = create_admin
+    admin.update_attributes(:email => 'new_test@example.com')
+    assert_equal 'new_test@example.com', admin.unconfirmed_email
+    visit_admin_confirmation_with_token(admin.confirmation_token)
+
+    assert_contain 'Your account was successfully confirmed.'
+    assert_current_url '/admin_area/home'
+    assert admin.reload.confirmed?
+    assert_not admin.reload.pending_reconfirmation?
+  end
+
+  test 'admin email should be unique also within unconfirmed_email' do
+    admin = create_admin
+    admin.update_attributes(:email => 'new_admin_test@example.com')
+    assert_equal 'new_admin_test@example.com', admin.unconfirmed_email
+
+    create_second_admin(:email => "new_admin_test@example.com")
+
+    visit_admin_confirmation_with_token(admin.confirmation_token)
+    assert_have_selector '#error_explanation'
+    assert_contain /Email.*already.*taken/
+    assert admin.reload.pending_reconfirmation?
+  end
+end
--- a/test/integration/http_authenticatable_test.rb
+++ b/test/integration/http_authenticatable_test.rb
@@ -4,7 +4,7 @@ class HttpAuthenticationTest < ActionController::IntegrationTest
  test 'handles unverified requests gets rid of caches but continues signed in' do
    swap UsersController, :allow_forgery_protection => true do
      create_user
-      post exhibit_user_url(1), {}, "HTTP_AUTHORIZATION" => "Basic #{ActiveSupport::Base64.encode64("user@test.com:123456")}"
+      post exhibit_user_url(1), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("user@test.com:123456")}"
      assert warden.authenticated?(:user)
      assert_equal "User is authenticated", response.body
    end
@@ -12,9 +12,24 @@ class HttpAuthenticationTest < ActionController::IntegrationTest

  test 'sign in should authenticate with http' do
    sign_in_as_new_user_with_http
-    assert_response :success
+    assert_response 200
    assert_match '<email>user@test.com</email>', response.body
    assert warden.authenticated?(:user)
+
+    get users_path(:format => :xml)
+    assert_response 200
+  end
+
+  test 'sign in should authenticate with http but not emit a cookie if skipping session storage' do
+    swap Devise, :skip_session_storage => [:http_auth] do
+      sign_in_as_new_user_with_http
+      assert_response 200
+      assert_match '<email>user@test.com</email>', response.body
+      assert warden.authenticated?(:user)
+
+      get users_path(:format => :xml)
+      assert_response 401
+    end
  end

  test 'returns a custom response with www-authenticate header on failures' do
@@ -59,7 +74,7 @@ class HttpAuthenticationTest < ActionController::IntegrationTest
    token = "token_containing_so_many_characters_that_the_base64_encoding_will_wrap"
    user = create_user
    user.update_attribute :authentication_token, token
-    get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{ActiveSupport::Base64.encode64("#{token}:x")}"
+    get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{token}:x")}"
    assert_response :success
    assert_match "<email>user@test.com</email>", response.body
    assert warden.authenticated?(:user)
@@ -69,14 +84,14 @@ class HttpAuthenticationTest < ActionController::IntegrationTest

    def sign_in_as_new_user_with_http(username="user@test.com", password="123456")
      user = create_user
-      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{ActiveSupport::Base64.encode64("#{username}:#{password}")}"
+      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "Basic #{Base64.encode64("#{username}:#{password}")}"
      user
    end

    # Sign in with oauth2 token. This is just to test that it isn't misinterpreted as basic authentication
    def add_oauth2_header
      user = create_user
-      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{ActiveSupport::Base64.encode64("#{user.email}:123456")}"
+      get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => "OAuth #{Base64.encode64("#{user.email}:123456")}"
    end

 end
--- a/test/integration/lockable_test.rb
+++ b/test/integration/lockable_test.rb
@@ -80,22 +80,15 @@ class LockTest < ActionController::IntegrationTest

    visit_user_unlock_with_token(user.unlock_token)

-    assert_current_url '/'
-    assert_contain 'Your account was successfully unlocked.'
+    assert_current_url "/users/sign_in"
+    assert_contain 'Your account has been unlocked successfully. Please sign in to continue.'

    assert_not user.reload.access_locked?
  end

-  test "sign in user automatically after unlocking its account" do
+  test "redirect user to sign in page after unlocking its account" do
    user = create_user(:locked => true)
    visit_user_unlock_with_token(user.unlock_token)
-    assert warden.authenticated?(:user)
-  end
-
-  test "user should not be able to sign in when locked" do
-    user = sign_in_as_user(:locked => true)
-    assert_template 'sessions/new'
-    assert_contain 'Your account is locked.'
    assert_not warden.authenticated?(:user)
  end

@@ -113,10 +106,29 @@ class LockTest < ActionController::IntegrationTest

  test 'error message is configurable by resource name' do
    store_translations :en, :devise => {
-      :failure => { :user => { :locked => "You are locked!" } }
+        :failure => {:user => {:locked => "You are locked!"}}
    } do
-      user = sign_in_as_user(:locked => true)
-      assert_contain 'You are locked!'
+
+      user = create_user(:locked => true)
+      user.failed_attempts = User.maximum_attempts + 1
+      user.save!
+
+      sign_in_as_user(:password => "invalid")
+      assert_contain "You are locked!"
+    end
+  end
+
+  test "user should not be able to sign in when locked" do
+    store_translations :en, :devise => {
+        :failure => {:user => {:locked => "You are locked!"}}
+    } do
+
+      user = create_user(:locked => true)
+      user.failed_attempts = User.maximum_attempts + 1
+      user.save!
+
+      sign_in_as_user(:password => "123456")
+      assert_contain "You are locked!"
    end
  end

@@ -157,7 +169,7 @@ class LockTest < ActionController::IntegrationTest

  test "when using json to ask a unlock request, should not return the user" do
    user = create_user(:locked => true)
-    post  user_unlock_path(:format => "json", :user => {:email => user.email})
+    post user_unlock_path(:format => "json", :user => {:email => user.email})
    assert_response :success
    assert_equal response.body, {}.to_json
  end
--- a/test/integration/registerable_test.rb
+++ b/test/integration/registerable_test.rb
@@ -13,7 +13,7 @@ class RegistrationTest < ActionController::IntegrationTest
    fill_in 'password confirmation', :with => 'new_user123'
    click_button 'Sign up'

-    assert_contain 'Welcome! You have signed up successfully.'
+    assert_contain 'You have signed up successfully'
    assert warden.authenticated?(:admin)
    assert_current_url "/admin_area/home"

@@ -50,7 +50,7 @@ class RegistrationTest < ActionController::IntegrationTest
  test 'a guest user should be able to sign up successfully and be blocked by confirmation' do
    user_sign_up

-    assert_contain 'You have signed up successfully. However, we could not sign you in because your account is unconfirmed.'
+    assert_contain 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
    assert_not_contain 'You have to confirm your account before continuing'
    assert_current_url "/"

@@ -291,3 +291,34 @@ class RegistrationTest < ActionController::IntegrationTest
    assert_equal User.count, 0
  end
 end
+
+class ReconfirmableRegistrationTest < ActionController::IntegrationTest
+  test 'a signed in admin should see a more appropriate flash message when editing his account if reconfirmable is enabled' do
+    sign_in_as_admin
+    get edit_admin_registration_path
+
+    fill_in 'email', :with => 'admin.new@example.com'
+    fill_in 'current password', :with => '123456'
+    click_button 'Update'
+
+    assert_current_url '/admin_area/home'
+    assert_contain 'but we need to verify your new email address'
+
+    assert_equal "admin.new@example.com", Admin.first.unconfirmed_email
+  end
+
+  test 'a signed in admin should not see a reconfirmation message if they did not change their password' do
+    sign_in_as_admin
+    get edit_admin_registration_path
+
+    fill_in 'password', :with => 'pas123'
+    fill_in 'password confirmation', :with => 'pas123'
+    fill_in 'current password', :with => '123456'
+    click_button 'Update'
+
+    assert_current_url '/admin_area/home'
+    assert_contain 'You updated your account successfully.'
+
+    assert Admin.first.valid_password?('pas123')
+  end
+end
--- a/test/integration/rememberable_test.rb
+++ b/test/integration/rememberable_test.rb
@@ -9,14 +9,6 @@ class RememberMeTest < ActionController::IntegrationTest
    user
  end

-  def create_admin_and_remember
-    admin = create_admin
-    admin.remember_me!
-    raw_cookie = Admin.serialize_into_cookie(admin)
-    cookies['remember_admin_token'] = generate_signed_cookie(raw_cookie)
-    admin
-  end
-
  def generate_signed_cookie(raw_cookie)
    request = ActionDispatch::TestRequest.new
    request.cookie_jar.signed['raw_cookie'] = raw_cookie
@@ -117,34 +109,6 @@ class RememberMeTest < ActionController::IntegrationTest
    end
  end

-  test 'if both extend_remember_period and remember_across_browsers are true, sends the same token with a new expire date' do
-    swap Devise, :remember_across_browsers => true, :extend_remember_period => true, :remember_for => 1.year do
-      admin = create_admin_and_remember
-      token = admin.remember_token
-
-      admin.remember_created_at = old = 10.minutes.ago
-      admin.save!
-
-      get root_path
-      assert (cookie_expires("remember_admin_token") - 1.year) > (old + 5.minutes)
-      assert_equal token, signed_cookie("remember_admin_token").last
-    end
-  end
-
-  test 'if both extend_remember_period and remember_across_browsers are false, sends a new token with old expire date' do
-    swap Devise, :remember_across_browsers => false, :extend_remember_period => false, :remember_for => 1.year do
-      admin = create_admin_and_remember
-      token = admin.remember_token
-
-      admin.remember_created_at = old = 10.minutes.ago
-      admin.save!
-
-      get root_path
-      assert (cookie_expires("remember_admin_token") - 1.year) < (old + 5.minutes)
-      assert_not_equal token, signed_cookie("remember_admin_token").last
-    end
-  end
-
  test 'do not remember other scopes' do
    user = create_user_and_remember
    get root_path
@@ -182,20 +146,6 @@ class RememberMeTest < ActionController::IntegrationTest
    assert_not warden.authenticated?(:user)
  end

-  test 'do not remember the admin anymore after forget' do
-    admin = create_admin_and_remember
-    get root_path
-    assert warden.authenticated?(:admin)
-
-    get destroy_admin_session_path
-    assert_not warden.authenticated?(:admin)
-    assert_nil admin.reload.remember_token
-    assert_nil warden.cookies['remember_admin_token']
-
-    get root_path
-    assert_not warden.authenticated?(:admin)
-  end
-
  test 'changing user password expires remember me token' do
    user = create_user_and_remember
    user.password = "another_password"
--- a/test/integration/timeoutable_test.rb
+++ b/test/integration/timeoutable_test.rb
@@ -41,7 +41,7 @@ class SessionTimeoutTest < ActionController::IntegrationTest
    assert_not_nil last_request_at

    get users_path
-    assert_redirected_to new_user_session_path
+    assert_redirected_to users_path
    assert_not warden.authenticated?(:user)
  end

@@ -68,7 +68,7 @@ class SessionTimeoutTest < ActionController::IntegrationTest

      get expire_user_path(user)
      get users_path
-      assert_redirected_to new_user_session_path
+      assert_redirected_to users_path
      assert_not warden.authenticated?(:user)
    end
  end
@@ -80,17 +80,31 @@ class SessionTimeoutTest < ActionController::IntegrationTest
      user = sign_in_as_user

      get expire_user_path(user)
-      get users_path
+      get root_path
      follow_redirect!
      assert_contain 'Session expired!'
    end
  end
-  
+
+  test 'error message with i18n with double redirect' do
+    store_translations :en, :devise => {
+      :failure => { :user => { :timeout => 'Session expired!' } }
+    } do
+      user = sign_in_as_user
+
+      get expire_user_path(user)
+      get users_path
+      follow_redirect!
+      follow_redirect!
+      assert_contain 'Session expired!'
+    end
+  end
+
  test 'time out not triggered if remembered' do
    user = sign_in_as_user :remember_me => true
    get expire_user_path(user)
    assert_not_nil last_request_at
-    
+
    get users_path
    assert_response :success
    assert warden.authenticated?(:user)
--- a/test/integration/token_authenticatable_test.rb
+++ b/test/integration/token_authenticatable_test.rb
@@ -25,7 +25,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
  end

  test 'authenticate with valid authentication token key but does not store if stateless' do
-    swap Devise, :token_authentication_key => :secret_token, :stateless_token => true do
+    swap Devise, :token_authentication_key => :secret_token, :skip_session_storage => [:token_auth] do
      sign_in_as_new_user_with_token
      assert warden.authenticated?(:user)

@@ -88,7 +88,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
  end

  test 'authenticate with valid authentication token key and do not store if stateless and timeoutable are enabled' do
-    swap Devise, :token_authentication_key => :secret_token, :stateless_token => true, :timeout_in => (0.1).second do
+    swap Devise, :token_authentication_key => :secret_token, :skip_session_storage => [:token_auth], :timeout_in => (0.1).second do
      user = sign_in_as_new_user_with_token
      assert warden.authenticated?(:user)

@@ -112,7 +112,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest

      assert_not_equal user1, user2
      visit users_path(Devise.token_authentication_key.to_s + '[$ne]' => user1.authentication_token)
-      assert_nil warden.user(:user) 
+      assert_nil warden.user(:user)
    end
  end

@@ -125,7 +125,7 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
      options[:auth_token]     ||= user.authentication_token

      if options[:http_auth]
-        header = "Basic #{ActiveSupport::Base64.encode64("#{VALID_AUTHENTICATION_TOKEN}:X")}"
+        header = "Basic #{Base64.encode64("#{VALID_AUTHENTICATION_TOKEN}:X")}"
        get users_path(:format => :xml), {}, "HTTP_AUTHORIZATION" => header
      else
        visit users_path(options[:auth_token_key].to_sym => options[:auth_token])
@@ -145,4 +145,4 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
      sign_in_as_new_user_with_token(:user => user)
    end

-end
+end
--- a/test/integration/trackable_test.rb
+++ b/test/integration/trackable_test.rb
@@ -36,11 +36,11 @@ class TrackableHooksTest < ActionController::IntegrationTest
    assert_equal "127.0.0.1", user.current_sign_in_ip
    assert_equal "127.0.0.1", user.last_sign_in_ip
  end
-  
+
  test "current remote ip returns original ip behind a non transparent proxy" do
    user = create_user
-    
-    arbitrary_ip = '192.168.1.69'
+
+    arbitrary_ip = '200.121.1.69'
    sign_in_as_user do
      header 'HTTP_X_FORWARDED_FOR', arbitrary_ip
    end
@@ -63,7 +63,7 @@ class TrackableHooksTest < ActionController::IntegrationTest
  end

  test "does not update anything if user has signed out along the way" do
-    swap Devise, :confirm_within => 0 do
+    swap Devise, :allow_unconfirmed_access_for => 0 do
      user = create_user(:confirm => false)
      sign_in_as_user

@@ -72,7 +72,7 @@ class TrackableHooksTest < ActionController::IntegrationTest
      assert_nil user.last_sign_in_at
    end
  end
-  
+
  test "do not track if devise.skip_trackable is set" do
    user = create_user
    sign_in_as_user do
@@ -81,7 +81,7 @@ class TrackableHooksTest < ActionController::IntegrationTest
    user.reload
    assert_equal 0, user.sign_in_count
    visit destroy_user_session_path
-    
+
    sign_in_as_user do
      header 'devise.skip_trackable', false
    end
--- a/test/mapping_test.rb
+++ b/test/mapping_test.rb
@@ -51,12 +51,12 @@ class MappingTest < ActiveSupport::TestCase

  test 'has strategies depending on the model declaration' do
    assert_equal [:rememberable, :token_authenticatable, :database_authenticatable], Devise.mappings[:user].strategies
-    assert_equal [:rememberable, :database_authenticatable], Devise.mappings[:admin].strategies
+    assert_equal [:database_authenticatable], Devise.mappings[:admin].strategies
  end

  test 'has no input strategies depending on the model declaration' do
    assert_equal [:rememberable, :token_authenticatable], Devise.mappings[:user].no_input_strategies
-    assert_equal [:rememberable], Devise.mappings[:admin].no_input_strategies
+    assert_equal [], Devise.mappings[:admin].no_input_strategies
  end

  test 'find scope for a given object' do
@@ -108,7 +108,6 @@ class MappingTest < ActiveSupport::TestCase
    assert mapping.authenticatable?
    assert mapping.recoverable?
    assert mapping.lockable?
-    assert_not mapping.confirmable?
    assert_not mapping.omniauthable?
  end
  
--- a/test/models/confirmable_test.rb
+++ b/test/models/confirmable_test.rb
@@ -80,8 +80,8 @@ class ConfirmableTest < ActiveSupport::TestCase
  end

  test 'should send confirmation instructions by email' do
-    assert_email_sent do
-      create_user
+    assert_email_sent "mynewuser@example.com" do
+      create_user :email => "mynewuser@example.com"
    end
  end

@@ -123,7 +123,7 @@ class ConfirmableTest < ActiveSupport::TestCase

  test 'should send email instructions for the user confirm its email' do
    user = create_user
-    assert_email_sent do
+    assert_email_sent user.email do
      User.send_confirmation_instructions(:email => user.email)
    end
  end
@@ -164,19 +164,19 @@ class ConfirmableTest < ActiveSupport::TestCase
  end

  test 'confirm time should fallback to devise confirm in default configuration' do
-    swap Devise, :confirm_within => 1.day do
+    swap Devise, :allow_unconfirmed_access_for => 1.day do
      user = new_user
      user.confirmation_sent_at = 2.days.ago
      assert_not user.active_for_authentication?

-      Devise.confirm_within = 3.days
+      Devise.allow_unconfirmed_access_for = 3.days
      assert user.active_for_authentication?
    end
  end

  test 'should be active when confirmation sent at is not overpast' do
-    swap Devise, :confirm_within => 5.days do
-      Devise.confirm_within = 5.days
+    swap Devise, :allow_unconfirmed_access_for => 5.days do
+      Devise.allow_unconfirmed_access_for = 5.days
      user = create_user

      user.confirmation_sent_at = 4.days.ago
@@ -198,7 +198,7 @@ class ConfirmableTest < ActiveSupport::TestCase
  end

  test 'should not be active when confirm in is zero' do
-    Devise.confirm_within = 0.days
+    Devise.allow_unconfirmed_access_for = 0.days
    user = create_user
    user.confirmation_sent_at = Date.today
    assert_not user.active_for_authentication?
@@ -236,3 +236,96 @@ class ConfirmableTest < ActiveSupport::TestCase
    end
  end
 end
+
+class ReconfirmableTest < ActiveSupport::TestCase
+  test 'should not worry about validations on confirm even with reconfirmable' do
+    admin = create_admin
+    admin.reset_password_token = "a"
+    assert admin.confirm!
+  end
+
+  test 'should generate confirmation token after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_nil admin.confirmation_token
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_nil admin.confirmation_token
+  end
+
+  test 'should regenerate confirmation token after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert admin.update_attributes(:email => 'old_test@example.com')
+    token = admin.confirmation_token
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_equal token, admin.confirmation_token
+  end
+
+  test 'should send confirmation instructions by email after changing email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_email_sent "new_test@example.com" do
+      assert admin.update_attributes(:email => 'new_test@example.com')
+    end
+  end
+
+  test 'should not send confirmation by email after changing password' do
+    admin = create_admin
+    assert admin.confirm!
+    assert_email_not_sent do
+      assert admin.update_attributes(:password => 'newpass', :password_confirmation => 'newpass')
+    end
+  end
+
+  test 'should stay confirmed when email is changed' do
+    admin = create_admin
+    assert admin.confirm!
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert admin.confirmed?
+  end
+
+  test 'should update email only when it is confirmed' do
+    admin = create_admin
+    assert admin.confirm!
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_equal 'new_test@example.com', admin.email
+    assert admin.confirm!
+    assert_equal 'new_test@example.com', admin.email
+  end
+
+  test 'should not allow admin to get past confirmation email by resubmitting their new address' do
+    admin = create_admin
+    assert admin.confirm!
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_equal 'new_test@example.com', admin.email
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    assert_not_equal 'new_test@example.com', admin.email
+  end
+
+  test 'should find a admin by send confirmation instructions with unconfirmed_email' do
+    admin = create_admin
+    assert admin.confirm!
+    assert admin.update_attributes(:email => 'new_test@example.com')
+    confirmation_admin = Admin.send_confirmation_instructions(:email => admin.unconfirmed_email)
+    assert_equal confirmation_admin, admin
+  end
+
+  test 'should return a new admin if no email or unconfirmed_email was found' do
+    confirmation_admin = Admin.send_confirmation_instructions(:email => "invalid@email.com")
+    assert_not confirmation_admin.persisted?
+  end
+
+  test 'should add error to new admin email if no email or unconfirmed_email was found' do
+    confirmation_admin = Admin.send_confirmation_instructions(:email => "invalid@email.com")
+    assert confirmation_admin.errors[:email]
+    assert_equal "not found", confirmation_admin.errors[:email].join
+  end
+
+  test 'should find admin with email in unconfirmed_emails' do
+    admin = create_admin
+    admin.unconfirmed_email = "new_test@email.com"
+    assert admin.save
+    admin = Admin.find_by_unconfirmed_email_with_errors(:email => "new_test@email.com")
+    assert admin.persisted?
+  end
+end
--- a/test/models/database_authenticatable_test.rb
+++ b/test/models/database_authenticatable_test.rb
@@ -28,6 +28,12 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
    assert_equal( { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => "1..10" }, conditions)
  end

+  test "param filter should not convert regular expressions to strings" do
+    conditions = { "regexp" => /expression/ }
+    conditions = Devise::ParamFilter.new([], []).filter(conditions)
+    assert_equal( { "regexp" => /expression/ }, conditions)
+  end
+
  test 'should respond to password and password confirmation' do
    user = new_user
    assert user.respond_to?(:password)
--- a/test/models/encryptable_test.rb
+++ b/test/models/encryptable_test.rb
@@ -31,7 +31,7 @@ class EncryptableTest < ActiveSupport::TestCase

  test 'should generate a base64 hash using SecureRandom for password salt' do
    swap_with_encryptor Admin, :sha1 do
-      SecureRandom.expects(:base64).with(15).returns('01lI')
+      SecureRandom.expects(:base64).with(15).returns('01lI').twice
      salt = create_admin.password_salt
      assert_not_equal '01lI', salt
      assert_equal 4, salt.size
--- a/test/models/lockable_test.rb
+++ b/test/models/lockable_test.rb
@@ -23,6 +23,19 @@ class LockableTest < ActiveSupport::TestCase
    assert_equal 0, user.reload.failed_attempts
  end

+  test "should increment failed_attempts on successfull validation if the user is already locked" do
+    user = create_user
+    user.confirm!
+
+    swap Devise, :maximum_attempts => 2 do
+      3.times { user.valid_for_authentication?{ false } }
+      assert user.reload.access_locked?
+    end
+
+    user.valid_for_authentication?{ true }
+    assert_equal 4, user.reload.failed_attempts
+  end
+
  test "should not touch failed_attempts if lock_strategy is none" do
    user = create_user
    user.confirm!
--- a/test/models/recoverable_test.rb
+++ b/test/models/recoverable_test.rb
@@ -195,31 +195,4 @@ class RecoverableTest < ActiveSupport::TestCase
      assert_equal "has expired, please request a new one", reset_password_user.errors[:reset_password_token].join
    end
  end
-
-  test 'should save the model when the reset_password_sent_at doesnt exist' do
-    user = create_user
-    def user.respond_to?(meth, *)
-      if meth == :reset_password_sent_at=
-        false
-      else
-        super
-      end
-    end
-    user.send_reset_password_instructions
-    user.reload
-    assert_not_nil user.reset_password_token
-  end
-
-  test 'should have valid period if does not respond to reset_password_sent_at' do
-    user = create_user
-    def user.respond_to?(meth, *)
-      if meth == :reset_password_sent_at
-        false
-      else
-        super
-      end
-    end
-    assert user.reset_password_period_valid?
-  end
-
 end
--- a/test/models/rememberable_test.rb
+++ b/test/models/rememberable_test.rb
@@ -1,7 +1,46 @@
 require 'test_helper'

-module SharedRememberableTest
-  extend ActiveSupport::Testing::Declarative
+class RememberableTest < ActiveSupport::TestCase
+  def resource_class
+    User
+  end
+
+  def create_resource
+    create_user
+  end
+
+  test 'remember_me should not generate a new token if using salt' do
+    user = create_user
+    user.expects(:valid?).never
+    user.remember_me!
+  end
+
+  test 'forget_me should not clear remember token if using salt' do
+    user = create_user
+    user.remember_me!
+    user.expects(:valid?).never
+    user.forget_me!
+  end
+
+  test 'serialize into cookie' do
+    user = create_user
+    user.remember_me!
+    assert_equal [user.to_key, user.authenticatable_salt], User.serialize_into_cookie(user)
+  end
+
+  test 'serialize from cookie' do
+    user = create_user
+    user.remember_me!
+    assert_equal user, User.serialize_from_cookie(user.to_key, user.authenticatable_salt)
+  end
+
+  test 'raises a RuntimeError if authenticatable_salt is nil' do
+    user = User.new
+    user.encrypted_password = nil
+    assert_raise RuntimeError do
+      user.rememberable_value
+    end
+  end

  test 'should respond to remember_me attribute' do
    assert resource_class.new.respond_to?(:remember_me)
@@ -127,161 +166,3 @@ module SharedRememberableTest
    end
  end
 end
-
-class RememberableTest < ActiveSupport::TestCase
-  include SharedRememberableTest
-
-  def resource_class
-    Admin
-  end
-
-  def create_resource
-    create_admin
-  end
-
-  test 'remember_me should generate a new token and save the record without validating' do
-    admin = create_admin
-    admin.expects(:valid?).never
-    token = admin.remember_token
-    admin.remember_me!
-    assert_not_equal token, admin.remember_token
-    assert_not admin.changed?
-  end
-
-  test 'forget_me should clear remember token and save the record without validating' do
-    admin = create_admin
-    admin.remember_me!
-    assert_not admin.remember_token.nil?
-    admin.expects(:valid?).never
-    admin.forget_me!
-    assert admin.remember_token.nil?
-    assert_not admin.changed?
-  end
-
-  test 'serialize into cookie' do
-    admin = create_admin
-    admin.remember_me!
-    assert_equal [admin.to_key, admin.remember_token], Admin.serialize_into_cookie(admin)
-  end
-
-  test 'serialize from cookie' do
-    admin = create_admin
-    admin.remember_me!
-    assert_equal admin, Admin.serialize_from_cookie(admin.to_key, admin.remember_token)
-  end
-
-  test 'if remember_across_browsers is true, remember_me! should create a new token if no token exists' do
-    swap Devise, :remember_across_browsers => true, :remember_for => 1.year do
-      admin = create_admin
-      assert_equal nil, admin.remember_token
-      admin.remember_me!
-      assert_not_equal nil, admin.remember_token
-    end
-  end
-
-  test 'if remember_across_browsers is true, remember_me! should create a new token if a token exists but has expired' do
-    swap Devise, :remember_across_browsers => true, :remember_for => 1.day do
-      admin = create_admin
-      admin.remember_me!
-      admin.remember_created_at = 2.days.ago
-      admin.save
-      token = admin.remember_token
-      admin.remember_me!
-      assert_not_equal token, admin.remember_token
-    end
-  end
-
-  test 'if remember_across_browsers is true, remember_me! should not create a new token if a token exists and has not expired' do
-    swap Devise, :remember_across_browsers => true, :remember_for => 2.days do
-      admin = create_admin
-      admin.remember_me!
-      admin.remember_created_at = 1.day.ago
-      admin.save
-      token = admin.remember_token
-      admin.remember_me!
-      assert_equal token, admin.remember_token
-    end
-  end
-
-  test 'if remember_across_browsers is false, remember_me! should create a new token if no token exists' do
-    swap Devise, :remember_across_browsers => false do
-      admin = create_admin
-      assert_equal nil, admin.remember_token
-      admin.remember_me!
-      assert_not_equal nil, admin.remember_token
-    end
-  end
-
-  test 'if remember_across_browsers is false, remember_me! should create a new token if a token exists but has expired' do
-    swap Devise, :remember_across_browsers => false, :remember_for => 1.day do
-      admin = create_admin
-      admin.remember_me!
-      admin.remember_created_at = 2.days.ago
-      admin.save
-      token = admin.remember_token
-      admin.remember_me!
-      assert_not_equal token, admin.remember_token
-    end
-  end
-
-  test 'if remember_across_browsers is false, remember_me! should create a new token if a token exists and has not expired' do
-    swap Devise, :remember_across_browsers => false, :remember_for => 2.days do
-      admin = create_admin
-      admin.remember_me!
-      admin.remember_created_at = 1.day.ago
-      admin.save
-      token = admin.remember_token
-      admin.remember_me!
-      assert_not_equal token, admin.remember_token
-    end
-  end
-end
-
-class WithSaltRememberableTest < ActiveSupport::TestCase
-  include SharedRememberableTest
-
-  setup do
-    assert_not User.new.respond_to?(:remember_token)
-  end
-
-  def resource_class
-    User
-  end
-
-  def create_resource
-    create_user
-  end
-
-  test 'remember_me should not generate a new token if using salt' do
-    user = create_user
-    user.expects(:valid?).never
-    user.remember_me!
-  end
-
-  test 'forget_me should not clear remember token if using salt' do
-    user = create_user
-    user.remember_me!
-    user.expects(:valid?).never
-    user.forget_me!
-  end
-
-  test 'serialize into cookie' do
-    user = create_user
-    user.remember_me!
-    assert_equal [user.to_key, user.authenticatable_salt], User.serialize_into_cookie(user)
-  end
-
-  test 'serialize from cookie' do
-    user = create_user
-    user.remember_me!
-    assert_equal user, User.serialize_from_cookie(user.to_key, user.authenticatable_salt)
-  end
-
-  test 'raises a RuntimeError if authenticatable_salt is nil' do
-    user = User.new
-    user.encrypted_password = nil
-    assert_raise RuntimeError do
-      user.rememberable_value
-    end
-  end
-end
--- a/test/models/serializable_test.rb
+++ b/test/models/serializable_test.rb
@@ -16,7 +16,7 @@ class SerializableTest < ActiveSupport::TestCase
  end

  test 'should include unsafe keys on XML if a force_except is provided' do
-    assert_no_match /email/, @user.to_xml(:force_except => :email)
+    assert_no_match /<email/, @user.to_xml(:force_except => :email)
    assert_match /confirmation-token/, @user.to_xml(:force_except => :email)
  end

--- a/test/models_test.rb
+++ b/test/models_test.rb
@@ -2,7 +2,7 @@ require 'test_helper'

 class Configurable < User
  devise :database_authenticatable, :encryptable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :confirm_within => 5.days,
+         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
 end

@@ -39,7 +39,7 @@ class ActiveRecordTest < ActiveSupport::TestCase
  end

  test 'can cherry pick modules' do
-    assert_include_modules Admin, :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :rememberable, :encryptable
+    assert_include_modules Admin, :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :encryptable, :confirmable
  end

  test 'validations options are not applied too late' do
@@ -55,12 +55,12 @@ class ActiveRecordTest < ActiveSupport::TestCase
  end

  test 'chosen modules are inheritable' do
-    assert_include_modules Inheritable, :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :rememberable, :encryptable
+    assert_include_modules Inheritable, :database_authenticatable, :registerable, :timeoutable, :recoverable, :lockable, :encryptable, :confirmable
  end

  test 'order of module inclusion' do
-    correct_module_order   = [:database_authenticatable, :rememberable, :encryptable, :recoverable, :registerable, :lockable, :timeoutable]
-    incorrect_module_order = [:database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :encryptable, :rememberable]
+    correct_module_order   = [:database_authenticatable, :encryptable, :recoverable, :registerable, :confirmable, :lockable, :timeoutable]
+    incorrect_module_order = [:database_authenticatable, :timeoutable, :registerable, :recoverable, :lockable, :encryptable, :confirmable]

    assert_include_modules Admin, *incorrect_module_order

@@ -87,8 +87,8 @@ class ActiveRecordTest < ActiveSupport::TestCase
    assert_equal 'abcdef', Configurable.pepper
  end

-  test 'set a default value for confirm_within' do
-    assert_equal 5.days, Configurable.confirm_within
+  test 'set a default value for allow_unconfirmed_access_for' do
+    assert_equal 5.days, Configurable.allow_unconfirmed_access_for
  end

  test 'set a default value for remember_for' do
--- a/test/path_checker_test.rb
+++ b/test/path_checker_test.rb
@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class PathCheckerTest < ActiveSupport::TestCase
+  test 'check if sign out path matches' do
+    path_checker = Devise::PathChecker.new({"PATH_INFO" => "/users/sign_out"}, :user)
+    assert path_checker.signing_out?
+
+    path_checker = Devise::PathChecker.new({"PATH_INFO" => "/users/sign_in"}, :user)
+    assert_not path_checker.signing_out?
+  end
+
+  test 'considers script name' do
+    path_checker = Devise::PathChecker.new({"SCRIPT_NAME" => "/users", "PATH_INFO" => "/sign_out"}, :user)
+    assert path_checker.signing_out?
+  end
+
+  test 'ignores invalid routes' do
+    path_checker = Devise::PathChecker.new({"PATH_INFO" => "/users/sign_in"}, :omg)
+    assert_not path_checker.signing_out?
+  end
+end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
José Valim	2e27d1f763	Update CHANGELOG, release 2.0.2	2012-02-15 17:26:23 +01:00
José Valim	27a83f3dd3	Ensure Devise.available_router_name is never nil, closes #1648	2012-02-15 17:13:57 +01:00
José Valim	79aadb4bc9	Set autocomplete to off by default on password field.	2012-02-15 17:07:58 +01:00
José Valim	43d0715238	Better error message in case a trackable module can't be saved.	2012-02-15 17:07:46 +01:00
José Valim	fb8e093389	Accept devise_i18n_options to handle custom i18n values, closes #1633	2012-02-15 16:58:23 +01:00
José Valim	4b47c3ab73	Clean up devise_controller? related code.	2012-02-15 16:58:23 +01:00
José Valim	a0eff85d73	Use ResourceHelpers so we get a warning in case someone passes a plural name, closes #1651 .	2012-02-15 16:58:23 +01:00
Rodrigo Flores	aa36719bd9	Merge branch 'ysiadf-integrating'	2012-02-13 18:24:38 -02:00
Ysiad Ferreiras	33aa71c38f	Update lib/generators/templates/README	2012-02-13 18:24:11 -02:00
Ysiad Ferreiras	1f20d7da25	Update lib/generators/templates/README	2012-02-13 18:23:45 -02:00
Ysiad Ferreiras	dfcf825721	Update README.doc to specify adding devise to the Gemfile.	2012-02-13 18:23:07 -02:00
José Valim	eaae041b4c	Merge pull request #1635 from sj26/test-helpers-process-should-return-response Fix test behaviour for rspec subject requests	2012-02-11 22:32:35 -08:00
Samuel Cochran	dbd79746b1	Fix test behaviour for rspec subject requests	2012-02-10 21:42:20 +08:00
José Valim	f1a27b8f33	Release 2.0.1.	2012-02-09 11:11:12 +01:00
José Valim	86c8e5455a	Fix gemspec to not include tmp or log files, closes #1632 .	2012-02-09 11:07:03 +01:00
José Valim	dc37b82298	Show a warning message in case routes are not mounted in the main app.	2012-02-07 10:56:30 +01:00
José Valim	7d09b84ded	Split send_on_create_confirmation_instructions, closes #1621	2012-02-03 17:35:55 +01:00
José Valim	53894e1e2b	Better exception message.	2012-02-03 17:29:22 +01:00
José Valim	7e3ccbe835	Better implementation for hide!	2012-02-03 09:12:15 +01:00
José Valim	8b8b6a866d	Hide internal generators, closes #1586	2012-02-03 09:04:05 +01:00
Rodrigo Flores	222e606f89	Added a documentup link on README	2012-02-03 00:39:28 -02:00
José Valim	83c47552e8	Extract auth_options into its own method.	2012-02-01 09:37:33 +01:00
José Valim	03851cab90	Update lib/devise/rails/routes.rb	2012-02-01 07:26:39 +01:00
Carlos Antonio da Silva	bb6d89bbc3	Change README do markdown	2012-01-30 18:58:04 -02:00
José Valim	b061f985cf	Update README to remove reference to old migration helpers.	2012-01-27 19:43:47 +01:00
José Valim	ecd7c17ffd	Improve the message for case_insensitive_keys.	2012-01-27 17:53:44 +01:00
José Valim	a71a352822	Release 2.0.0	2012-01-26 19:40:04 +01:00
José Valim	c08c921b3f	Update README.rdoc	2012-01-26 18:19:02 +01:00
Carlos Antonio da Silva	95399f1286	2012 [ci skip] Hope we can do the same bump next year :)	2012-01-24 19:35:14 -02:00
José Valim	b5fd15c2e1	Let's show the default values for convenience.	2012-01-24 17:34:18 +01:00
José Valim	85e9dab370	Release 2.0.0.rc2.	2012-01-24 14:29:26 +01:00
José Valim	8c9cf7d671	Add deprecations, update changelog.	2012-01-24 14:23:34 +01:00
José Valim	82da877863	Merge pull request #1565 from joliss/unconfirmed-message More helpful sign-up message for Confirmable	2012-01-24 05:06:51 -08:00
José Valim	275c480f89	Redirect to the previous URL on timeout, closes #1596	2012-01-24 14:00:36 +01:00
José Valim	477d9fbcba	Do not fallback to string on failure app, easier for debugging, closes #1587	2012-01-24 13:46:25 +01:00
José Valim	b88524027c	Get rid of deprecation warning.	2012-01-24 13:41:19 +01:00
José Valim	55be93d5c4	Deprecated support for nested devise_for blocks	2012-01-24 13:40:04 +01:00
Jo Liss	c78c196423	More helpful sign-up message for Confirmable This is also better for translations, because we can translate paragraph-wise. signed_up_but_inactive and signed_up_but_locked are likely not needed, but I wasn't sure how to best remove them.	2012-01-23 13:52:32 +01:00
José Valim	d8656427fd	Merge pull request #1591 from kaleemullah/master fix unlock message	2012-01-23 03:29:29 -08:00
Kaleem Ullah	41b1e87105	fix unlock message	2012-01-23 15:20:05 +04:00
José Valim	37678ac5ec	Merge pull request #1588 from nashby/fix-travis-build fix travis build	2012-01-23 02:46:24 -08:00
Vasiliy Ermolovich	7832d90077	fix travis build	2012-01-22 22:12:28 +03:00
José Valim	3bd78cabd8	Update to 3.2.0	2012-01-20 19:03:22 +01:00
José Valim	fff75b1904	Merge pull request #1579 from masterkain/patch-1 Fix typos in devise.rb	2012-01-17 14:18:10 -08:00
Claudio Poli	97c0339f66	Fix typos in devise.rb	2012-01-17 23:14:26 +01:00
Rafael Mendonça França	5b3f14df3b	Fix README	2012-01-17 15:59:50 -02:00
José Valim	07cdba349d	Merge pull request #1563 from asynchrony/handle_regexp_param_filtering Allow regex to avoid string conversion for parameter filtering	2012-01-16 03:20:17 -08:00
José Valim	197e837e5b	Merge pull request #1564 from pcantrell/patch-1 Grammar fix.	2012-01-11 23:09:17 -08:00
pcantrell	13bd4ce46a	Grammar fix.	2012-01-11 23:18:04 -06:00
José Valim	a43d1af23e	Merge pull request #1557 from plataformatec/rails-3-2-fixes Rails 3.2 fixes	2012-01-10 12:26:58 -08:00
Rafael Mendonça França	cbf483143f	Remove rubinius from travis-ci matrix	2012-01-10 11:59:59 -03:00
Rafael Mendonça França	cf5fbb9d65	Fix order specific test	2012-01-10 11:59:20 -03:00
Rafael Mendonça França	d699b80254	Do not use a local network ip as HTTP_X_FORWARDED_FOR header If HTTP_X_FORWARDED_FOR is a local network IP the HTTP_CLIENT_IP need to be set	2012-01-10 11:43:15 -03:00
Rafael Mendonça França	ead414d0a7	Use global Gemfile in travis-ci	2012-01-10 10:52:14 -03:00
Rafael Mendonça França	cfdabf874a	Change gemspec to avoid subshells and remove unneeded files More informations at http://tenderlovemaking.com/2011/12/05/profiling-rails-startup-with-dtrace/	2012-01-09 23:47:35 -03:00
Rafael Mendonça França	e954254abb	Fix gemfiles	2012-01-09 23:18:03 -03:00
Rafael Mendonça França	93d4bb8361	Add travis-ci specific gemfiles	2012-01-09 22:59:13 -03:00
Rafael Mendonça França	edb0aac091	Whitespaces ✂️	2012-01-09 18:11:10 -03:00
Rafael Mendonça França	9549a32500	Do not use deprecated ActiveSupport::Base64. Closes #1554	2012-01-09 18:10:49 -03:00
José Valim	a949f9eca2	FailureApp shuold always consider Devise.router_name, closes #1544	2012-01-03 20:32:51 +01:00
Carlos Antonio da Silva	f4bbad6323	Merge pull request #1543 from joliss/doc Improve routing API docs	2012-01-03 06:39:41 -08:00
Jo Liss	8a4d4864ea	Improve routing API docs	2012-01-03 15:33:19 +01:00
José Valim	a8de38d0b0	Fix http://@ from CHANGELOG	2012-01-02 23:18:57 +01:00
José Valim	18dc82c6b6	add a test that :module => :devise overrides previous configs.	2012-01-02 22:47:28 +01:00
José Valim	897c1c684e	Allow router_name to be customizable via Devise.router_name, useful for engines	2012-01-02 22:43:07 +01:00
José Valim	1ebcb09fc1	Do not rely on root_path. Redirect to / if not available.	2012-01-02 22:43:07 +01:00
José Valim	0f11226ced	Merge pull request #1540 from michaelklishin/master Bring .travis.yml up to date	2012-01-02 13:21:51 -08:00
José Valim	dada404a6b	Support 3.2 as well.	2012-01-02 22:19:05 +01:00
Michael Klishin	e4a37d6a5e	Bring .travis.yml up to date * rbx and rbx-2.0 are now both aliases for rbx-18mode (master in 1.8 mode) * 1.9.3 final is available	2012-01-03 01:14:59 +04:00
José Valim	66b93e8fd2	Clean up as we don't need to call render_with_scope anymore.	2012-01-02 22:12:09 +01:00
José Valim	d9df632671	Get rid of InternalHelpers, refactor scoped views for more performant behavior.	2012-01-02 22:01:28 +01:00
José Valim	aa2d15aa33	Move devise/shared/_links.erb to devise/_links.erb	2012-01-02 21:26:26 +01:00
José Valim	0b55ebb150	Remove 3.0 related code.	2012-01-02 21:04:54 +01:00
José Valim	7c11564613	Remove Rails 3.0 only code.	2012-01-02 20:43:39 +01:00
José Valim	c3f864f2b6	Allow parent controller to be customizable.	2012-01-02 20:39:22 +01:00
José Valim	a29a30effc	Move InternalHelpers to parent controller.	2012-01-02 20:30:56 +01:00
José Valim	0af2722926	Let's depend on 3.1 forward.	2012-01-02 20:24:42 +01:00
José Valim	78efec09d5	Move notes to the top.	2012-01-02 20:24:42 +01:00
José Valim	1fdeadd113	Merge pull request #1188 from sj26/controller-inheritence Make all controllers inherit from a single DeviseController	2012-01-02 11:24:33 -08:00
José Valim	a1464dbad7	Replace github.com/ by @	2012-01-02 20:16:40 +01:00
José Valim	dd2a66d00c	Update CHANGELOG.	2012-01-02 20:16:11 +01:00
José Valim	1152fda687	Only proxy to application controller if it exists.	2012-01-02 20:00:38 +01:00
José Valim	fd0e929087	Generate session routes for token authentication, but mark it as no_input.	2012-01-02 19:38:02 +01:00
José Valim	8b3e0e52f1	Generate routes again for token, closes #1526 .	2012-01-02 19:27:05 +01:00
José Valim	8ff080fb99	Improve docs for params/http authenticatable.	2012-01-02 19:24:48 +01:00
José Valim	6bca228888	Merge pull request #1527 from joliss/generator Use consistent number of hash signs	2012-01-02 10:21:41 -08:00
José Valim	fd1e588645	Merge pull request #1534 from jigyasa/master Fix for a bug: Incorrect message for locked account	2012-01-02 10:04:17 -08:00
José Valim	024d9e6df7	Merge pull request #1537 from nashby/fix-issue-1530 regenerate confirmation token on reconfirmation	2011-12-31 04:03:14 -08:00
Vasiliy Ermolovich	aca8d3f34c	regenerate confirmation token on reconfirmation, closes #1530	2011-12-31 14:22:58 +03:00
Jigyasa Makkar	e2030a740d	Fixed a bug in lockable wherein when a user tries to login with correct password after being locked, failed attempts count gets reset. When the user tries to login with an incorrect password next, the message shown is for invalid password instead of locked account since this check depended mainly on failed attempts count.	2011-12-29 23:57:39 +05:30
Jo Liss	27b745d04f	Use consistent number of hash signs	2011-12-28 17:26:57 +01:00
José Valim	f712d07b23	Merge pull request #1516 from jm81/master Move "include Devise::Models::Authenticatable" inside devise_modules_hook! call	2011-12-20 14:00:36 -08:00
Jared Morgan	f8ea5e0942	move include Devise::Models::Authenticatable inside devise_modules_hook! call This allows alternate ORMs to run compatibility setup code before Authenticatable is included. The particular issue for dm-devise is that DataMapper does not have a before_validation method, which is called when Authenticatable is included (as of plataformatec/devise@bd27bf76). dm-devise adds before_validation in it's devise_modules_hook!	2011-12-20 15:52:26 -06:00
José Valim	89db0dd44d	Do not run validatins unless on reconfirmable branch, closes #1515 .	2011-12-20 20:54:49 +01:00
José Valim	94e5a589b6	Update README.rdoc	2011-12-19 13:35:54 +01:00
José Valim	2dbb23f973	Update README.rdoc	2011-12-19 13:34:31 +01:00
José Valim	b71028dc73	Add a note to the README.	2011-12-19 13:33:33 +01:00
José Valim	f5aab14766	Release Devise 2.0.0.rc.	2011-12-19 13:31:24 +01:00
José Valim	273c5e99c1	Add space between messages.	2011-12-19 13:30:33 +01:00
José Valim	7ba37b5dc0	Improve messages.	2011-12-19 13:21:17 +01:00
José Valim	059d3856cf	Update CHANGELOG.	2011-12-19 12:58:34 +01:00
José Valim	9dbd265fdd	Update messages.	2011-12-19 12:55:41 +01:00
José Valim	09ae63f822	Update CHANGELOG.rdoc	2011-12-19 12:32:32 +01:00
T1D	c9becd3ea1	Allow regular expressions to avoid string conversion for parameter filtering.	2011-12-14 10:41:24 -06:00
José Valim	5a245b3d55	Merge pull request #1508 from spagalloco/patch-1 Fixed gemnasium link in README to link to the web page and not the image	2011-12-12 13:57:06 -08:00
Steve Agalloco	7d3b16fe73	Fixed gemnasium link in README to link to the web page and not the image	2011-12-12 15:08:13 -05:00
José Valim	fd85b25d29	PathChecker should not attempt to validate invalid routes, closes #1505	2011-12-12 11:35:41 +01:00
José Valim	5eebf74f69	Fix a bug where passing :format => false to devise_for was permanent, closes #1504	2011-12-12 09:25:19 +01:00
José Valim	5a11c6597c	Usage of Devise.stateless_token= is deprecated in favor of appending :token_auth to Devise.skip_session_storage	2011-12-11 20:39:41 +01:00
José Valim	930b324c15	Usage of confirm_within was deprecated in favor allow_unconfirmed_access_for	2011-12-11 20:18:02 +01:00
José Valim	d952dea32b	Remove the code that was dynamically adding columns to active record	2011-12-11 20:07:50 +01:00
José Valim	9a6ac7ab69	Add confirmable to admin.	2011-12-11 20:07:50 +01:00
José Valim	df43ee640d	Add Gemfile back to repository.	2011-12-11 20:07:50 +01:00
José Valim	309b57f4ea	Merge pull request #1496 from laserlemon/patch-1 Add dependency status to README	2011-12-10 14:29:36 -08:00
José Valim	cc839caba5	Update CHANGELOG, rename method.	2011-12-10 23:28:23 +01:00
Steve Richert	d734648b15	Add dependency status to README	2011-12-09 15:46:52 -05:00
José Valim	006400905b	Merge pull request #1493 from nashby/fix-issue-1486 redirect users to sign in page after unlock, closes #1486	2011-12-08 11:13:24 -08:00
Vasiliy Ermolovich	1e1e964d25	redirect users to sign in page after unlock, closes #1486	2011-12-08 22:06:09 +03:00
José Valim	263e0b7692	Fix failing test.	2011-12-07 13:23:55 +01:00
José Valim	01d4d0131b	Merge pull request #1489 from dmitriy-kiriyenko/fix_delegator Fix taking associated failure app from the scope in the given env.	2011-12-07 04:12:26 -08:00
Dmitriy Kiriyenko	f41e4befde	Fix taking associated failure app from the scope in the given env. There is a delegator to get failure app, introduced in `4629bee` and tuned in `24b26026`. The latter commit introduced a bit of logic, however, no tests are included into commit. Needless to say this resulted in a broken code. The point is that `env["warden.options"][:scope]` returns a string. However, `Devise.mappings` is a hash with symbol keys. Adding tests and converting scope to symbol here.	2011-12-07 14:09:00 +02:00
Rodrigo Flores	94fca31be8	Improving the unconfirmed message	2011-12-06 09:24:06 -02:00
Rodrigo Flores	19db459fca	typo	2011-12-06 08:35:02 -02:00
José Valim	7693173ecd	Final tidy up on removing schema helpers.	2011-12-05 12:17:02 +01:00
José Valim	a0294cbae8	Improve fields.	2011-12-05 12:02:25 +01:00
José Valim	1cf008cbe3	Remove apply schema from mongoid as well.	2011-12-05 11:48:27 +01:00
José Valim	87b84ffded	Remove schema fields from Devise.	2011-12-05 11:28:04 +01:00
José Valim	035e56215d	Enable reconfirmable by default and disable apply_schema.	2011-12-05 00:03:53 +01:00
José Valim	fa4d420fdb	Update CHANGELOG.	2011-12-05 00:01:25 +01:00
José Valim	bd27bf7677	Deprecate and disable old behavior accumulated with time.	2011-12-04 23:58:19 +01:00
José Valim	03d9ebb56e	Merge branch 'reconfirm'	2011-12-04 22:19:07 +01:00
José Valim	113b48a2ad	Update CHANGELOG.	2011-12-04 22:18:58 +01:00
José Valim	6aed8f1c87	Clean up reconfirmable behavior.	2011-12-04 22:14:44 +01:00
José Valim	6d681c5b8a	Merge remote-tracking branch 'heimidal/updates' into reconfirm Conflicts: lib/devise/models/confirmable.rb test/support/helpers.rb	2011-12-04 20:58:41 +01:00
José Valim	b3034292f2	Ensure admin is running with manual lock strategy.	2011-12-01 13:19:05 +01:00
Brian Rose	7f754caba3	Merge branch 'master' into updates	2011-10-12 10:56:08 -06:00
Brian Rose	8c0f74f036	Add better message when user updates while reconfirmable is enabled.	2011-08-30 22:19:18 -06:00
Brian Rose	5a820262f9	Fix double-submit reconfirmation bug Previously, if a user submitted their new email twice, they would bypass the reconfirmation requirement and wind up auto-confirmed.	2011-08-30 22:19:18 -06:00
Brian Rose	3906456993	Clean up copy and use the Devise API a bit better.	2011-08-30 22:19:18 -06:00
Brian Rose	a1407565c8	Selectively add reconfirmable field in tests when necessary.	2011-08-30 22:19:18 -06:00
Brian Rose	a7c5a2e65d	Fix up implementation of reconfirmable.	2011-08-30 22:19:17 -06:00
mandaryn	10ac4dbc35	reconfirmable uniqueness validations	2011-08-30 22:19:17 -06:00
mandaryn	6469cbc62a	renamed confirmation_on_email_change property to reconfirmable and added reconfirmable explanations	2011-08-30 22:19:17 -06:00
mandaryn	1961de6b5d	Add email confirmation when it is changed by a user	2011-08-30 22:19:17 -06:00
Samuel Cochran	2b64c6d951	Make all controllers inherit from a single DeviseController	2011-06-25 03:34:13 +08:00