Update CHANGELOG.

Conflicts:

	Gemfile.lock

.gitignore

@@ -7,6 +7,4 @@ coverage/*
 rdoc/*
 pkg
 log
-test/tmp/*
-Gemfile.lock
-
+test/tmp/*

.travis.yml

@@ -1,12 +1,6 @@
-script: "bundle exec rake test"
+script: "rake test"
 rvm:
   - 1.8.7
   - 1.9.2
   - ree
-  - rbx
-  - rbx-2.0
-notifications:
-  recipients:
-    - jose.valim@plataformatec.com.br
-    - carlos@plataformatec.com.br
-    - rodrigo.flores@plataformatec.com.br
+  - jruby

CHANGELOG.rdoc

@@ -1,118 +1,3 @@
-== 1.5.0
-
-* 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)
-
-* bug fix
-  * Allow idempotent API requests
-  * Fix bug where logs did not show 401 as status code
-  * Change paranoid settings to behave as success instead of as failure
-  * Fix bug where activation messages were shown first than the credentials error message
-  * Instance variables are expired after sign out
-
-* deprecation
-  * redirect_location is deprecated, please use after_sign_in_path_for
-  * after_sign_in_path_for now redirects to session[scope_return_to] if any value is stored in it
-
-== 1.4.9
-
-* bug fix
-  * url helpers were not being set under some circumstances
-
-== 1.4.8
-
-* enhancements
-  * Add docs for assets pipeline and Heroku
-
-* bug fix
-  * confirmation_url was not being set under some circumstances
-
-== 1.4.7
-
-* bug fix
-  * Fix backward incompatible change from 1.4.6 for those using custom controllers
-
-== 1.4.6
-
-* enhancements
-  * Allow devise_for :skip => :all
-  * Allow options to be passed to authenticate_user!
-  * Allow --skip-routes to devise generator
-  * Add allow_params_authentication! to make it explicit when params authentication is allowed in a controller
-
-== 1.4.5
-
-* 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)
-  * Reset password shows proper message if user is not active
-  * `clean_up_passwords` sets the accessors to nil to skip validations
-
-== 1.4.4
-
-* bug fix
-  * Do not always skip helpers, instead provide :skip_helpers as option to trigger it manually
-
-== 1.4.3
-
-* enhancements
-  * Improve Rails 3.1 compatibility
-  * Use serialize_into_session and serialize_from_session in Warden serialize to improve extensibility
-
-* bug fix
-  * Generator properly generates a change_table migration if a model already exists
-  * Properly deprecate setup_mail
-  * Fix encoding issues with email regexp
-  * Only generate helpers for the used mappings
-  * Wrap :action constraints in the proper hash
-
-* deprecations
-  * Loosened the used email regexp to simply assert the existent of "@". If someone relies on a more strict regexp, they may use https://github.com/SixArm/sixarm_ruby_email_address_validation
-
-== 1.4.2
-
-* bug fix
-  * Provide a more robust behavior to serializers and add :force_except option
-
-== 1.4.1
-
-* enhancements
-  * Add :defaults and :format support on router
-  * Add simple form generators
-  * Better localization for devise_error_messages! (by github.com/zedtux)
-
-* bug fix
-  * Ensure to_xml is properly white listened
-  * Ensure handle_unverified_request clean up any cached signed-in user
-
-== 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)
-
-* 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)
-
-== 1.3.4
-
-* bug fix
-  * Do not add formats if html or "*/*"
-
 == 1.3.3
 
 * bug fix

Gemfile

@@ -2,37 +2,28 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 3.1.0"
-gem 'omniauth', '~> 1.0.0'
-gem 'omniauth-oauth2', '~> 1.0.0'
-
-gem "rdoc"
+gem "rails", "~> 3.0.4"
+gem "oa-oauth", '~> 0.2.0', :require => "omniauth/oauth"
+gem "oa-openid", '~> 0.2.0', :require => "omniauth/openid"
 
 group :test do
-  gem 'omniauth-facebook'
-  gem 'omniauth-openid', '~> 1.0.1'
   gem "webrat", "0.7.2", :require => false
   gem "mocha", :require => false
 end
 
 platforms :jruby do
-  gem 'activerecord-jdbc-adapter'
   gem 'activerecord-jdbcsqlite3-adapter'
-  gem 'jruby-openssl'
-end
-
-platforms :mri_18 do
-  group :test do
-    gem "ruby-debug", ">= 0.10.3"
-  end
 end
 
 platforms :ruby do
-  gem "sqlite3-ruby"
+  group :test do
+    gem "sqlite3-ruby"
+    gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+  end
 
   group :mongoid do
-    gem "mongo", "~> 1.3.0"
-    gem "mongoid", "~> 2.0"
-    gem "bson_ext", "~> 1.3.0"
+    gem "mongo", "1.1.2"
+    gem "mongoid", "2.0.0.beta.20"
+    gem "bson_ext", "1.2.1"
   end
 end

Gemfile.lock

@@ -0,0 +1,158 @@
+PATH
+  remote: .
+  specs:
+    devise (1.3.1)
+      bcrypt-ruby (~> 2.1.2)
+      orm_adapter (~> 0.0.3)
+      warden (~> 1.0.3)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.1.1)
+    activerecord-jdbcsqlite3-adapter (1.1.1)
+      activerecord-jdbc-adapter (= 1.1.1)
+      jdbc-sqlite3 (~> 3.6.0)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    addressable (2.2.4)
+    arel (2.0.8)
+    bcrypt-ruby (2.1.4)
+    bson (1.2.1)
+    bson_ext (1.2.1)
+    builder (2.1.2)
+    columnize (0.3.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    faraday (0.5.7)
+      addressable (~> 2.2.4)
+      multipart-post (~> 1.1.0)
+      rack (>= 1.1.0, < 2)
+    i18n (0.5.0)
+    jdbc-sqlite3 (3.6.14.2.056-java)
+    linecache (0.43)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    mocha (0.9.12)
+    mongo (1.1.2)
+      bson (>= 1.1.1)
+    mongoid (2.0.0.beta.20)
+      activemodel (~> 3.0)
+      mongo (~> 1.1)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
+    multi_json (0.0.5)
+    multipart-post (1.1.0)
+    nokogiri (1.4.4)
+    nokogiri (1.4.4-java)
+      weakling (>= 0.0.3)
+    oa-core (0.2.0)
+      rack (~> 1.1)
+    oa-oauth (0.2.0)
+      multi_json (~> 0.0.2)
+      nokogiri (~> 1.4.2)
+      oa-core (= 0.2.0)
+      oauth (~> 0.4.0)
+      oauth2 (~> 0.1.1)
+    oa-openid (0.2.0)
+      oa-core (= 0.2.0)
+      rack-openid (~> 1.2.0)
+      ruby-openid-apps-discovery
+    oauth (0.4.4)
+    oauth2 (0.1.1)
+      faraday (~> 0.5.0)
+      multi_json (~> 0.0.4)
+    orm_adapter (0.0.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-openid (1.2.0)
+      rack (>= 1.1.0)
+      ruby-openid (>= 2.1.8)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
+      bundler (~> 1.0)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    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)
+    ruby-openid-apps-discovery (1.2.0)
+      ruby-openid (>= 2.1.7)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+    warden (1.0.3)
+      rack (>= 1.0.0)
+    weakling (0.0.4-java)
+    webrat (0.7.2)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    will_paginate (3.0.pre2)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
+  bson_ext (= 1.2.1)
+  devise!
+  mocha
+  mongo (= 1.1.2)
+  mongoid (= 2.0.0.beta.20)
+  oa-oauth (~> 0.2.0)
+  oa-openid (~> 0.2.0)
+  rails (~> 3.0.4)
+  ruby-debug (>= 0.10.3)
+  sqlite3-ruby
+  webrat (= 0.7.2)

README.rdoc

@@ -1,7 +1,5 @@
 == Devise
 
-{<img src="https://secure.travis-ci.org/plataformatec/devise.png" />}[http://travis-ci.org/plataformatec/devise]
-
 Devise is a flexible authentication solution for Rails based on Warden. It:
 
 * Is Rack based;
@@ -9,7 +7,7 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 * Allows you to have multiple roles (or models/scopes) signed in at the same time;
 * Is based on a modularity concept: use just what you really need.
 
-It's comprised of 12 modules:
+It's composed of 12 modules:
 
 * Database Authenticatable: encrypts and stores a password in the database to validate the authenticity of a user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
 * Token Authenticatable: signs in a user based on an authentication token (also known as "single access token"). The token can be given both through query string or HTTP Basic Authentication.
@@ -30,13 +28,13 @@ It's comprised of 12 modules:
 
 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
+http://wiki.github.com/plataformatec/devise
 
 === 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:
 
-https://github.com/plataformatec/devise/wiki/Bug-reports
+http://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.
 
@@ -44,7 +42,7 @@ If you found a security bug, do *NOT* use the GitHub issue tracker. Send email o
 
 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
+http://groups.google.com/group/plataformatec-devise
 
 === RDocs
 
@@ -58,19 +56,19 @@ If you need to use Devise with Rails 2.3, you can always run `gem server` from t
 
 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
+http://github.com/plataformatec/devise/wiki/Example-Applications
 
 === 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
+http://github.com/plataformatec/devise/wiki/Extensions
 
 === 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
+http://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 1.6 or newer) running on your system.
 
@@ -99,7 +97,7 @@ If you are building your first Rails application, we recommend you to *not* use
 * Michael Hartl's online book: http://railstutorial.org/chapters/modeling-and-viewing-users-two#top
 * Ryan Bates' Railscast: http://railscasts.com/episodes/250-authentication-from-scratch
 
-Once you have solidified your understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :)
+Once you have solidified you understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :)
 
 == Getting started
 
@@ -110,7 +108,7 @@ Devise must be set up within the model (or models) you want to use. Devise route
 We're assuming here you want a User model with some Devise modules, as outlined below:
 
   class User < ActiveRecord::Base
-    devise :database_authenticatable, :registerable, :confirmable, :recoverable, :rememberable, :trackable, :validatable
+    devise :database_authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :validatable
   end
 
 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:
@@ -176,7 +174,7 @@ Notice that if your devise model is not called "user" but "member", then the hel
 
 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:
 
-  devise :database_authenticatable, :registerable, :confirmable, :recoverable, :stretches => 20
+  devise :database_authenticatable, :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.
 
@@ -291,7 +289,7 @@ The Devise mailer uses a similar pattern to create subject messages:
 
 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
+http://github.com/plataformatec/devise/wiki/I18n
 
 === Test helpers
 
@@ -315,7 +313,7 @@ If you're using RSpec and want the helpers automatically included within all +de
     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).
+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 (http://wiki.github.com/plataformatec/devise).
 
 === Omniauth
 
@@ -331,35 +329,25 @@ Devise supports ActiveRecord (default) and Mongoid. To choose other ORM, you jus
 
 Devise implements encryption strategies for Clearance, Authlogic and Restful-Authentication. To make use of these strategies, you need set the desired encryptor in the encryptor initializer config option and add :encryptable to your model. You might also need to rename your encrypted password and salt columns to match Devise's fields (encrypted_password and password_salt).
 
-== Troubleshooting
-
-=== Heroku
-
-Using devise on Heroku with Ruby on Rails 3.1 requires setting:
-
-  config.assets.initialize_on_precompile = false
-
-Read more about the potential issues at http://guides.rubyonrails.org/asset_pipeline.html
-
 == Additional information
 
 === Warden
 
 Devise is based on Warden, which is a general Rack authentication framework created by Daniel Neighman. We encourage you to read more about Warden here:
 
-https://github.com/hassox/warden
+http://github.com/hassox/warden
 
 === Contributors
 
 We have a long list of valued contributors. Check them all at:
 
-https://github.com/plataformatec/devise/contributors
+http://github.com/plataformatec/devise/contributors
 
 === Maintainers
 
-* José Valim (https://github.com/josevalim)
-* Carlos Antônio da Silva (https://github.com/carlosantoniodasilva)
+* José Valim (http://github.com/josevalim)
+* Carlos Antônio da Silva (http://github.com/carlosantoniodasilva)
 
 == License
 
-MIT License. Copyright 2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2010 Plataforma Tecnologia. http://blog.plataformatec.com.br

Rakefile

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 desc 'Default: run tests for all ORMs.'
-task :default => :test
+task :default => :pre_commit
 
 desc 'Run Devise tests for all ORMs.'
 task :pre_commit do

app/controllers/devise/confirmations_controller.rb

@@ -11,8 +11,9 @@ class Devise::ConfirmationsController < ApplicationController
   def create
     self.resource = resource_class.send_confirmation_instructions(params[resource_name])
 
-    if successfully_sent?(resource)
-      respond_with({}, :location => after_resending_confirmation_instructions_path_for(resource_name))
+    if resource.errors.empty?
+      set_flash_message(:notice, :send_instructions) if is_navigational_format?
+      respond_with resource, :location => after_resending_confirmation_instructions_path_for(resource_name)
     else
       respond_with_navigational(resource){ render_with_scope :new }
     end
@@ -25,7 +26,7 @@ class Devise::ConfirmationsController < ApplicationController
     if resource.errors.empty?
       set_flash_message(:notice, :confirmed) if is_navigational_format?
       sign_in(resource_name, resource)
-      respond_with_navigational(resource){ redirect_to after_confirmation_path_for(resource_name, resource) }
+      respond_with_navigational(resource){ redirect_to redirect_location(resource_name, resource) }
     else
       respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new }
     end
@@ -37,10 +38,4 @@ class Devise::ConfirmationsController < ApplicationController
     def after_resending_confirmation_instructions_path_for(resource_name)
       new_session_path(resource_name)
     end
-
-    # The path used after confirmation.
-    def after_confirmation_path_for(resource_name, resource)
-      after_sign_in_path_for(resource)
-    end
-
 end

app/controllers/devise/passwords_controller.rb

@@ -12,8 +12,9 @@ class Devise::PasswordsController < ApplicationController
   def create
     self.resource = resource_class.send_reset_password_instructions(params[resource_name])
 
-    if successfully_sent?(resource)
-      respond_with({}, :location => after_sending_reset_password_instructions_path_for(resource_name))
+    if resource.errors.empty?
+      set_flash_message(:notice, :send_instructions) if is_navigational_format?
+      respond_with resource, :location => new_session_path(resource_name)
     else
       respond_with_navigational(resource){ render_with_scope :new }
     end
@@ -31,20 +32,11 @@ class Devise::PasswordsController < ApplicationController
     self.resource = resource_class.reset_password_by_token(params[resource_name])
 
     if resource.errors.empty?
-      flash_message = resource.active_for_authentication? ? :updated : :updated_not_active
-      set_flash_message(:notice, flash_message) if is_navigational_format?
+      set_flash_message(:notice, :updated) if is_navigational_format?
       sign_in(resource_name, resource)
-      respond_with resource, :location => after_sign_in_path_for(resource)
+      respond_with resource, :location => redirect_location(resource_name, resource)
     else
       respond_with_navigational(resource){ render_with_scope :edit }
     end
   end
-
-  protected
-
-    # The path used after sending reset password instructions
-    def after_sending_reset_password_instructions_path_for(resource_name)
-      new_session_path(resource_name)
-    end
-
 end

app/controllers/devise/registrations_controller.rb

@@ -17,9 +17,9 @@ class Devise::RegistrationsController < ApplicationController
       if resource.active_for_authentication?
         set_flash_message :notice, :signed_up if is_navigational_format?
         sign_in(resource_name, resource)
-        respond_with resource, :location => after_sign_up_path_for(resource)
+        respond_with resource, :location => redirect_location(resource_name, resource)
       else
-        set_flash_message :notice, :inactive_signed_up, :reason => inactive_reason(resource) if is_navigational_format?
+        set_flash_message :notice, :inactive_signed_up, :reason => resource.inactive_message.to_s if is_navigational_format?
         expire_session_data_after_sign_in!
         respond_with resource, :location => after_inactive_sign_up_path_for(resource)
       end
@@ -35,11 +35,7 @@ class Devise::RegistrationsController < ApplicationController
   end
 
   # PUT /resource
-  # We need to use a copy of the resource because we don't want to change
-  # the current user in place.
   def update
-    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?
       sign_in resource_name, resource, :bypass => true
@@ -83,10 +79,9 @@ class Devise::RegistrationsController < ApplicationController
       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)
+    # Overwrite redirect_for_sign_in so it takes uses after_sign_up_path_for.
+    def redirect_location(scope, resource) #:nodoc:
+      stored_location_for(scope) || after_sign_up_path_for(resource)
     end
 
     # The path used after sign up for inactive accounts. You need to overwrite
@@ -98,12 +93,20 @@ class Devise::RegistrationsController < ApplicationController
     # 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)
+      if defined?(super)
+        ActiveSupport::Deprecation.warn "Defining after_update_path_for in ApplicationController " <<
+          "is deprecated. Please add a RegistrationsController to your application and define it there."
+        super
+      else
+        after_sign_in_path_for(resource)
+      end
     end
 
-    # Authenticates the current scope and gets the current resource from the session.
+    # Authenticates the current scope and gets a copy of the current resource.
+    # We need to use a copy because we don't want actions like update changing
+    # the current user in place.
     def authenticate_scope!
-      send(:"authenticate_#{resource_name}!", :force => true)
-      self.resource = send(:"current_#{resource_name}")
+      send(:"authenticate_#{resource_name}!", true)
+      self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
     end
 end

app/controllers/devise/sessions_controller.rb

@@ -1,6 +1,5 @@
 class Devise::SessionsController < ApplicationController
   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
@@ -15,10 +14,10 @@ class Devise::SessionsController < ApplicationController
     resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
     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)
+    respond_with resource, :location => redirect_location(resource_name, resource)
   end
 
-  # DELETE /resource/sign_out
+  # GET /resource/sign_out
   def destroy
     signed_in = signed_in?(resource_name)
     Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
@@ -39,10 +38,8 @@ class Devise::SessionsController < ApplicationController
   protected
 
   def stub_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] }
+    array = resource_class.authentication_keys.dup
+    array << :password if resource.respond_to?(:password)
+    { :methods => array, :only => [:password] }
   end
-end
-
+end

app/controllers/devise/unlocks_controller.rb

@@ -12,8 +12,9 @@ class Devise::UnlocksController < ApplicationController
   def create
     self.resource = resource_class.send_unlock_instructions(params[resource_name])
 
-    if successfully_sent?(resource)
-      respond_with({}, :location => new_session_path(resource_name))
+    if resource.errors.empty?
+      set_flash_message :notice, :send_instructions if is_navigational_format?
+      respond_with resource, :location => new_session_path(resource_name)
     else
       respond_with_navigational(resource){ render_with_scope :new }
     end
@@ -26,7 +27,7 @@ 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 redirect_location(resource_name, resource) }
     else
       respond_with_navigational(resource.errors, :status => :unprocessable_entity){ render_with_scope :new }
     end

app/helpers/devise_helper.rb

@@ -11,7 +11,7 @@ module DeviseHelper
     messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
     sentence = I18n.t("errors.messages.not_saved",
                       :count => resource.errors.count,
-                      :resource => resource.class.model_name.human.downcase)
+                      :resource => resource_name)
 
     html = <<-HTML
     <div id="error_explanation">

app/mailers/devise/mailer.rb

@@ -1,15 +1,88 @@
 class Devise::Mailer < ::ActionMailer::Base
-  include Devise::Mailers::Helpers
+  include Devise::Controllers::ScopedViews
+  attr_reader :scope_name, :resource
 
   def confirmation_instructions(record)
-    devise_mail(record, :confirmation_instructions)
+    setup_mail(record, :confirmation_instructions)
   end
 
   def reset_password_instructions(record)
-    devise_mail(record, :reset_password_instructions)
+    setup_mail(record, :reset_password_instructions)
   end
 
   def unlock_instructions(record)
-    devise_mail(record, :unlock_instructions)
+    setup_mail(record, :unlock_instructions)
+  end
+
+  private
+
+  # Configure default email options
+  def setup_mail(record, action)
+    initialize_from_record(record)
+    mail headers_for(action)
+  end
+
+  def initialize_from_record(record)
+    @scope_name = Devise::Mapping.find_scope!(record)
+    @resource   = instance_variable_set("@#{devise_mapping.name}", record)
+  end
+
+  def devise_mapping
+    @devise_mapping ||= Devise.mappings[scope_name]
+  end
+
+  def headers_for(action)
+    headers = {
+      :subject       => translate(devise_mapping, action),
+      :from          => mailer_sender(devise_mapping),
+      :to            => resource.email,
+      :template_path => template_paths
+    }
+
+    if resource.respond_to?(:headers_for)
+      headers.merge!(resource.headers_for(action))
+    end
+
+    unless headers.key?(:reply_to)
+      headers[:reply_to] = headers[:from]
+    end
+
+    headers
+  end
+
+  def mailer_sender(mapping)
+    if Devise.mailer_sender.is_a?(Proc)
+      Devise.mailer_sender.call(mapping.name)
+    else
+      Devise.mailer_sender
+    end
+  end
+
+  def template_paths
+    template_path = [self.class.mailer_name]
+    template_path.unshift "#{@devise_mapping.scoped_path}/mailer" if self.class.scoped_views?
+    template_path
+  end
+
+  # Setup a subject doing an I18n lookup. At first, it attemps to set a subject
+  # based on the current mapping:
+  #
+  #   en:
+  #     devise:
+  #       mailer:
+  #         confirmation_instructions:
+  #           user_subject: '...'
+  #
+  # If one does not exist, it fallbacks to ActionMailer default:
+  #
+  #   en:
+  #     devise:
+  #       mailer:
+  #         confirmation_instructions:
+  #           subject: '...'
+  #
+  def translate(mapping, key)
+    I18n.t(:"#{mapping.name}_subject", :scope => [:devise, :mailer, key],
+      :default => [:subject, key.to_s.humanize])
   end
 end

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

@@ -3,10 +3,10 @@
 <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.submit "Resend confirmation instructions" %></div>
+  <p><%= f.submit "Resend confirmation instructions" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -4,13 +4,13 @@
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <div><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.submit "Change my password" %></div>
+  <p><%= f.submit "Change my password" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -3,10 +3,10 @@
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.submit "Send me reset password instructions" %></div>
+  <p><%= f.submit "Send me reset password instructions" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -3,19 +3,19 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></div>
+  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></p>
 
-  <div><%= f.submit "Update" %></div>
+  <p><%= f.submit "Update" %></p>
 <% end %>
 
 <h3>Cancel my account</h3>

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

@@ -3,16 +3,16 @@
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.submit "Sign up" %></div>
+  <p><%= f.submit "Sign up" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -1,17 +1,17 @@
 <h2>Sign in</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
 
   <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
   <% end -%>
 
-  <div><%= f.submit "Sign in" %></div>
+  <p><%= f.submit "Sign in" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

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

@@ -3,10 +3,10 @@
 <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.submit "Resend unlock instructions" %></div>
+  <p><%= f.submit "Resend unlock instructions" %></p>
 <% end %>
 
 <%= render :partial => "devise/shared/links" %>

config/locales/en.yml

@@ -1,4 +1,4 @@
-# Additional translations at https://github.com/plataformatec/devise/wiki/I18n
+# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
 
 en:
   errors:
@@ -27,25 +27,17 @@ en:
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
       updated: 'Your password was changed successfully. You are now signed in.'
-      updated_not_active: 'Your password was changed successfully.'
-      send_paranoid_instructions: "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
-      send_paranoid_instructions: 'If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes.'
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
     registrations:
       signed_up: 'Welcome! You have signed up successfully.'
       inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
       updated: 'You updated your account successfully.'
       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.'
-      send_paranoid_instructions: 'If your account exists, you will receive an email with instructions about how to unlock it in a few minutes.'
     omniauth_callbacks:
       success: 'Successfully authorized from %{kind} account.'
       failure: 'Could not authorize you from %{kind} because "%{reason}".'

devise.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("warden", "~> 1.1")
+  s.add_dependency("warden", "~> 1.0.3")
   s.add_dependency("orm_adapter", "~> 0.0.3")
-  s.add_dependency("bcrypt-ruby", "~> 3.0")
+  s.add_dependency("bcrypt-ruby", "~> 2.1.2")
 end

lib/devise.rb

@@ -3,15 +3,12 @@ require 'active_support/core_ext/numeric/time'
 require 'active_support/dependencies'
 require 'orm_adapter'
 require 'set'
-require 'securerandom'
 
 module Devise
-  autoload :Delegator,   'devise/delegator'
-  autoload :FailureApp,  'devise/failure_app'
-  autoload :OmniAuth,    'devise/omniauth'
-  autoload :ParamFilter, 'devise/param_filter'
+  autoload :FailureApp, 'devise/failure_app'
+  autoload :OmniAuth, 'devise/omniauth'
   autoload :PathChecker, 'devise/path_checker'
-  autoload :Schema,      'devise/schema'
+  autoload :Schema, 'devise/schema'
   autoload :TestHelpers, 'devise/test_helpers'
 
   module Controllers
@@ -32,10 +29,6 @@ module Devise
     autoload :Sha1, 'devise/encryptors/sha1'
   end
 
-  module Mailers
-    autoload :Helpers, 'devise/mailers/helpers'
-  end
-
   module Strategies
     autoload :Base, 'devise/strategies/base'
     autoload :Authenticatable, 'devise/strategies/authenticatable'
@@ -49,9 +42,6 @@ module Devise
   STRATEGIES  = ActiveSupport::OrderedHash.new
   URL_HELPERS = ActiveSupport::OrderedHash.new
 
-  # Strategies that do not require user input.
-  NO_INPUT = []
-
   # True values used to check params
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']
 
@@ -84,11 +74,6 @@ 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
-  @@strip_whitespace_keys = false
 
   # If http authentication is enabled by default.
   mattr_accessor :http_authenticatable
@@ -106,11 +91,9 @@ module Devise
   mattr_accessor :http_authentication_realm
   @@http_authentication_realm = "Application"
 
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
+  # Email regex used to validate email formats. Adapted from authlogic.
   mattr_accessor :email_regexp
-  @@email_regexp = /\A[^@]+@([^@\.]+\.)+[^@\.]+\z/
+  @@email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
 
   # Range validation for password length
   mattr_accessor :password_length
@@ -189,7 +172,7 @@ module Devise
   mattr_accessor :reset_password_keys
   @@reset_password_keys = [ :email ]
 
-  # Time interval you can reset your password with a reset password key
+  # Time interval you can reset your password with a reset password key 
   mattr_accessor :reset_password_within
   @@reset_password_within = nil
 
@@ -242,30 +225,15 @@ module Devise
   @@warden_config = nil
   @@warden_config_block = nil
 
-  # When true, enter in paranoid mode to avoid user enumeration.
-  mattr_accessor :paranoid
-  @@paranoid = false
-
   # Default way to setup Devise. Run rails generate devise_install to create
   # a fresh initializer with all configuration values.
   def self.setup
     yield self
   end
 
-  class Getter
-    def initialize name
-      @name = name
-    end
-
-    def get
-      ActiveSupport::Dependencies.constantize(@name)
-    end
-  end
-
   def self.ref(arg)
     if defined?(ActiveSupport::Dependencies::ClassCache)
-      ActiveSupport::Dependencies::reference(arg)
-      Getter.new(arg)
+      ActiveSupport::Dependencies::Reference.store(arg)
     else
       ActiveSupport::Dependencies.ref(arg)
     end
@@ -277,7 +245,11 @@ module Devise
 
   # Get the mailer class from the mailer reference object.
   def self.mailer
-    @@mailer_ref.get
+    if defined?(ActiveSupport::Dependencies::ClassCache)
+      @@mailer_ref.get "Devise::Mailer"
+    else
+      @@mailer_ref.get
+    end
   end
 
   # Set the mailer reference object to access the mailer.
@@ -318,17 +290,13 @@ module Devise
     options.assert_valid_keys(:strategy, :model, :controller, :route)
 
     if strategy = options[:strategy]
-      strategy = (strategy == true ? module_name : strategy)
-      STRATEGIES[module_name] = strategy
+      STRATEGIES[module_name] = (strategy == true ? module_name : strategy)
     end
 
     if controller = options[:controller]
-      controller = (controller == true ? module_name : controller)
-      CONTROLLERS[module_name] = controller
+      CONTROLLERS[module_name] = (controller == true ? module_name : controller)
     end
 
-    NO_INPUT << strategy if strategy && controller != :sessions
-
     if route = options[:route]
       case route
       when TrueClass
@@ -378,8 +346,7 @@ module Devise
   #
   def self.omniauth(provider, *args)
     @@helpers << Devise::OmniAuth::UrlHelpers
-    config = Devise::OmniAuth::Config.new(provider, args)
-    @@omniauth_configs[config.strategy_name.to_sym] = config
+    @@omniauth_configs[provider] = Devise::OmniAuth::Config.new(provider, args)
   end
 
   # Include helpers in the given scope to AC and AV.
@@ -399,17 +366,11 @@ module Devise
     Rails::VERSION::STRING[0,3] != "3.0"
   end
 
-  # Regenerates url helpers considering Devise.mapping
-  def self.regenerate_helpers!
-    Devise::Controllers::UrlHelpers.remove_helpers!
-    Devise::Controllers::UrlHelpers.generate_helpers!
-  end
-
   # A method used internally to setup warden manager from the Rails initialize
   # block.
   def self.configure_warden! #:nodoc:
     @@warden_configured ||= begin
-      warden_config.failure_app   = Devise::Delegator.new
+      warden_config.failure_app   = Devise::FailureApp
       warden_config.default_scope = Devise.default_scope
       warden_config.intercept_401 = false
 
@@ -424,7 +385,7 @@ module Devise
 
   # Generate a friendly string randomically to be used as token.
   def self.friendly_token
-    SecureRandom.base64(15).tr('+/=lIO0', 'pqrsxyz')
+    ActiveSupport::SecureRandom.base64(15).tr('+/=', 'xyz')
   end
 
   # constant-time comparison algorithm to prevent timing attacks

lib/devise/controllers/helpers.rb

@@ -5,14 +5,7 @@ module Devise
       extend ActiveSupport::Concern
 
       included do
-        helper_method :warden, :signed_in?, :devise_controller?
-      end
-
-      module ClassMethods
-        def log_process_action(payload)
-          payload[:status] ||= 401 unless payload[:exception]
-          super
-        end
+        helper_method :warden, :signed_in?, :devise_controller?, :anybody_signed_in?
       end
 
       # Define authentication filters and accessor helpers based on mappings.
@@ -43,9 +36,8 @@ module Devise
         mapping = mapping.name
 
         class_eval <<-METHODS, __FILE__, __LINE__ + 1
-          def authenticate_#{mapping}!(opts={})
-            opts[:scope] = :#{mapping}
-            warden.authenticate!(opts) if !devise_controller? || opts.delete(:force)
+          def authenticate_#{mapping}!(force = false)
+            warden.authenticate!(:scope => :#{mapping}) if !devise_controller? || force
           end
 
           def #{mapping}_signed_in?
@@ -80,15 +72,10 @@ module Devise
         false
       end
 
-      # Tell warden that params authentication is allowed for that specific page.
-      def allow_params_authentication!
-        request.env["devise.allow_params_authentication"] = true
-      end
-
       # Return true if the given scope is signed in session. If no scope given, return
       # true if any scope is signed in. Does not run authentication hooks.
       def signed_in?(scope=nil)
-        [ scope || Devise.mappings.keys ].flatten.any? do |scope|
+        [ scope || Devise.mappings.keys ].flatten.any? do |scope| 
           warden.authenticate?(:scope => scope)
         end
       end
@@ -107,7 +94,7 @@ module Devise
       #   sign_in @user                             # sign_in(resource)
       #   sign_in @user, :event => :authentication  # sign_in(resource, options)
       #   sign_in @user, :bypass => true            # sign_in(resource, options)
-      #
+      # 
       def sign_in(resource_or_scope, *args)
         options  = args.extract_options!
         scope    = Devise::Mapping.find_scope!(resource_or_scope)
@@ -119,7 +106,6 @@ module Devise
           warden.session_serializer.store(resource, scope)
         elsif warden.user(scope) == resource && !options.delete(:force)
           # Do nothing. User already signed in and we are not forcing it.
-          true
         else
           warden.set_user(resource, options.merge!(:scope => scope))
         end
@@ -139,7 +125,6 @@ module Devise
         warden.user(scope) # Without loading user here, before_logout hook is not called
         warden.raw_session.inspect # Without this inspect here. The session does not clear.
         warden.logout(scope)
-        instance_variable_set(:"@current_#{scope}", nil)
       end
 
       # Sign out all active users or scopes. This helper is useful for signing out all roles
@@ -148,7 +133,6 @@ module Devise
         Devise.mappings.keys.each { |s| warden.user(s) }
         warden.raw_session.inspect
         warden.logout
-        expire_devise_cached_variables!
       end
 
       # Returns and delete the url stored in the session for the given scope. Useful
@@ -163,21 +147,12 @@ module Devise
         session.delete("#{scope}_return_to")
       end
 
-      # The scope root url to be used when he's signed in. By default, it first
-      # tries to find a resource_root_path, otherwise it uses the root_path.
-      def signed_in_root_path(resource_or_scope)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        home_path = "#{scope}_root_path"
-        respond_to?(home_path, true) ? send(home_path) : root_path
-      end
-
       # The default url to be used after signing in. This is used by all Devise
       # controllers and you can overwrite it in your ApplicationController to
       # provide a custom hook for a custom resource.
       #
-      # By default, it first tries to find a valid resource_return_to key in the
-      # session, then it fallbacks to resource_root_path, otherwise it uses the
-      # root path. For a user scope, you can define the default url in
+      # By default, it first tries to find a resource_root_path, otherwise it
+      # uses the root path. For a user scope, you can define the default url in
       # the following way:
       #
       #   map.user_root '/users', :controller => 'users' # creates user_root_path
@@ -186,20 +161,22 @@ module Devise
       #     user.root :controller => 'users' # creates user_root_path
       #   end
       #
+      #
       # If the resource root path is not defined, root_path is used. However,
       # if this default is not enough, you can customize it, for example:
       #
       #   def after_sign_in_path_for(resource)
-      #     stored_location_for(resource) ||
-      #       if resource.is_a?(User) && resource.can_publish?
-      #         publisher_url
-      #       else
-      #         signed_in_root_path(resource)
-      #       end
+      #     if resource.is_a?(User) && resource.can_publish?
+      #       publisher_url
+      #     else
+      #       super
+      #     end
       #   end
       #
       def after_sign_in_path_for(resource_or_scope)
-        stored_location_for(resource_or_scope) || 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
       end
 
       # Method used by sessions controller to sign out a user. You can overwrite
@@ -220,16 +197,11 @@ module Devise
         scope    = Devise::Mapping.find_scope!(resource_or_scope)
         resource = args.last || resource_or_scope
         sign_in(scope, resource, options)
-        redirect_to after_sign_in_path_for(resource)
+        redirect_to redirect_location(scope, resource)
       end
 
       def redirect_location(scope, resource) #:nodoc:
-        ActiveSupport::Deprecation.warn "redirect_location in Devise is deprecated. Please use after_sign_in_path_for instead.", caller
-        after_sign_in_path_for(resource)
-      end
-
-      def expire_session_data_after_sign_in!
-        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
+        stored_location_for(scope) || after_sign_in_path_for(resource)
       end
 
       # Sign out a user and tries to redirect to the url specified by
@@ -240,19 +212,16 @@ module Devise
         redirect_to after_sign_out_path_for(scope)
       end
 
-      # Overwrite Rails' handle unverified request to sign out all scopes,
-      # clear run strategies and remove cached variables.
-      def handle_unverified_request
-        sign_out_all_scopes
-        warden.clear_strategies_cache!
-        expire_devise_cached_variables!
-        super # call the default behaviour which resets the session
+      # A hook called to expire session data after sign up/in. All keys
+      # stored under "devise." namespace are removed after sign in.
+      def expire_session_data_after_sign_in!
+        session.keys.grep(/^devise\./).each { |k| session.delete(k) }
       end
 
-      private
-
-      def expire_devise_cached_variables!
-        Devise.mappings.each { |_,m| instance_variable_set("@current_#{m.name}", nil) }
+      # Overwrite Rails' handle unverified request to sign out all scopes.
+      def handle_unverified_request
+        sign_out_all_scopes
+        super # call the default behaviour which resets the session
       end
     end
   end

lib/devise/controllers/internal_helpers.rb

@@ -91,33 +91,13 @@ MESSAGE
       # 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)
+        if warden.authenticated?(resource_name)
           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.

lib/devise/controllers/rememberable.rb

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

lib/devise/controllers/url_helpers.rb

@@ -18,36 +18,22 @@ module Devise
     #
     # Those helpers are added to your ApplicationController.
     module UrlHelpers
-      def self.remove_helpers!
-        self.instance_methods.map(&:to_s).grep(/_(url|path)$/).each do |method|
-          remove_method method
-        end
-      end
 
-      def self.generate_helpers!(routes=nil)
-        routes ||= begin
-          mappings = Devise.mappings.values.map(&:used_helpers).flatten.uniq
-          Devise::URL_HELPERS.slice(*mappings)
-        end
+      Devise::URL_HELPERS.each do |module_name, actions|
+        [:path, :url].each do |path_or_url|
+          actions.each do |action|
+            action = action ? "#{action}_" : ""
 
-        routes.each do |module_name, actions|
-          [:path, :url].each do |path_or_url|
-            actions.each do |action|
-              action = action ? "#{action}_" : ""
-              method = "#{action}#{module_name}_#{path_or_url}"
-
-              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)
-                end
-              URL_HELPERS
-            end
+            class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
+              def #{action}#{module_name}_#{path_or_url}(resource_or_scope, *args)
+                scope = Devise::Mapping.find_scope!(resource_or_scope)
+                send("#{action}\#{scope}_#{module_name}_#{path_or_url}", *args)
+              end
+            URL_HELPERS
           end
         end
       end
 
-      generate_helpers!(Devise::URL_HELPERS)
     end
   end
 end

lib/devise/delegator.rb

@@ -1,16 +0,0 @@
-module Devise
-  # Checks the scope in the given environment and returns the associated failure app.
-  class Delegator
-    def call(env)
-      failure_app(env).call(env)
-    end
-
-    def failure_app(env)
-      app = env["warden.options"] &&
-        (scope = env["warden.options"][:scope]) &&
-        Devise.mappings[scope].failure_app
-
-      app || Devise::FailureApp
-    end
-  end
-end

lib/devise/encryptors/authlogic_sha512.rb

@@ -7,7 +7,7 @@ module Devise
     # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to simulate
     #  the default behavior.
     class AuthlogicSha512 < Base
-      # Generates a default password digest based on salt, pepper and the
+      # Gererates a default password digest based on salt, pepper and the
       # incoming password.
       def self.digest(password, stretches, salt, pepper)
         digest = [password, salt].flatten.join('')

lib/devise/encryptors/clearance_sha1.rb

@@ -7,7 +7,7 @@ module Devise
     # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
     # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES
     class ClearanceSha1 < Base
-      # Generates a default password digest based on salt, pepper and the
+      # Gererates a default password digest based on salt, pepper and the
       # incoming password.
       def self.digest(password, stretches, salt, pepper)
         Digest::SHA1.hexdigest("--#{salt}--#{password}--")

lib/devise/encryptors/restful_authentication_sha1.rb

@@ -9,7 +9,7 @@ module Devise
     # the initializer to simulate the default behavior.
     class RestfulAuthenticationSha1 < Base
 
-      # Generates a default password digest based on salt, pepper and the
+      # Gererates a default password digest based on salt, pepper and the
       # incoming password.
       def self.digest(password, stretches, salt, pepper)
         digest = pepper

lib/devise/encryptors/sha1.rb

@@ -5,7 +5,7 @@ module Devise
     # = Sha1
     # Uses the Sha1 hash algorithm to encrypt passwords.
     class Sha1 < Base
-      # Generates a default password digest based on stretches, salt, pepper and the
+      # Gererates a default password digest based on stretches, salt, pepper and the
       # incoming password.
       def self.digest(password, stretches, salt, pepper)
         digest = pepper

lib/devise/encryptors/sha512.rb

@@ -5,7 +5,7 @@ module Devise
     # = Sha512
     # Uses the Sha512 hash algorithm to encrypt passwords.
     class Sha512 < Base
-      # Generates a default password digest based on salt, pepper and the
+      # Gererates a default password digest based on salt, pepper and the
       # incoming password.
       def self.digest(password, stretches, salt, pepper)
         digest = pepper

lib/devise/failure_app.rb

@@ -15,8 +15,7 @@ module Devise
     delegate :flash, :to => :request
 
     def self.call(env)
-      @respond ||= action(:respond)
-      @respond.call(env)
+      action(:respond).call(env)
     end
 
     def self.default_url_options(*args)
@@ -66,21 +65,13 @@ module Devise
     end
 
     def redirect_url
-      opts  = {}
-      route = :"new_#{scope}_session_path"
-      opts[:format] = request_format unless skip_format?
-
-      if respond_to?(route)
-        send(route, opts)
+      if request_format == :html
+        send(:"new_#{scope}_session_path")
       else
-        root_path(opts)
+        send(:"new_#{scope}_session_path", :format => request_format)
       end
     end
 
-    def skip_format?
-      %w(html */*).include? request_format.to_s
-    end
-
     # Choose whether we should respond in a http authentication fashion,
     # including 401 and optional headers.
     #

lib/devise/hooks/forgetable.rb

@@ -1,6 +1,6 @@
 # Before logout hook to forget the user in the given scope, if it responds
 # to forget_me! Also clear remember token to ensure the user won't be
-# remembered again. Notice that we forget the user unless the record is not persisted.
+# remembered again. Notice that we forget the user unless the record is frozen.
 # This avoids forgetting deleted users.
 Warden::Manager.before_logout do |record, warden, options|
   if record.respond_to?(:forget_me!)

lib/devise/hooks/timeoutable.rb

@@ -1,7 +1,7 @@
 # Each time a record is set we check whether its session has already timed out
 # or not, based on last request time. If so, the record is logged out and
 # redirected to the sign in page. Also, each time the request comes and the
-# record is set, we set the last request time inside its scoped session to
+# record is set, we set the last request time inside it's scoped session to
 # verify timeout in the following request.
 Warden::Manager.after_set_user do |record, warden, options|
   scope = options[:scope]
@@ -17,8 +17,6 @@ Warden::Manager.after_set_user do |record, warden, options|
       end
     end
 
-    unless warden.request.env['devise.skip_trackable']
-      warden.session(scope)['last_request_at'] = Time.now.utc
-    end
+    warden.session(scope)['last_request_at'] = Time.now.utc
   end
 end

lib/devise/hooks/trackable.rb

@@ -3,7 +3,7 @@
 # and on authentication. Retrieving the user from session (:fetch) does
 # not trigger it.
 Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
-  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope]) && !warden.request.env['devise.skip_trackable']
+  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope])
     record.update_tracked_fields!(warden.request)
   end
 end

lib/devise/mailers/helpers.rb

@@ -1,86 +0,0 @@
-module Devise
-  module Mailers
-    module Helpers
-      extend ActiveSupport::Concern
-
-      included do
-        include Devise::Controllers::ScopedViews
-        attr_reader :scope_name, :resource
-      end
-
-      protected
-
-      # Configure default email options
-      def devise_mail(record, action)
-        initialize_from_record(record)
-        mail headers_for(action)
-      end
-
-      def initialize_from_record(record)
-        @scope_name = Devise::Mapping.find_scope!(record)
-        @resource   = instance_variable_set("@#{devise_mapping.name}", record)
-      end
-
-      def devise_mapping
-        @devise_mapping ||= Devise.mappings[scope_name]
-      end
-
-      def headers_for(action)
-        headers = {
-          :subject       => translate(devise_mapping, action),
-          :from          => mailer_sender(devise_mapping),
-          :to            => resource.email,
-          :template_path => template_paths
-        }
-
-        if resource.respond_to?(:headers_for)
-          headers.merge!(resource.headers_for(action))
-        end
-
-        unless headers.key?(:reply_to)
-          headers[:reply_to] = headers[:from]
-        end
-
-        headers
-      end
-
-      def mailer_sender(mapping)
-        if default_params[:from].present?
-          default_params[:from]
-        elsif Devise.mailer_sender.is_a?(Proc)
-          Devise.mailer_sender.call(mapping.name)
-        else
-          Devise.mailer_sender
-        end
-      end
-
-      def template_paths
-        template_path = [self.class.mailer_name]
-        template_path.unshift "#{@devise_mapping.scoped_path}/mailer" if self.class.scoped_views?
-        template_path
-      end
-
-      # Setup a subject doing an I18n lookup. At first, it attemps to set a subject
-      # based on the current mapping:
-      #
-      #   en:
-      #     devise:
-      #       mailer:
-      #         confirmation_instructions:
-      #           user_subject: '...'
-      #
-      # If one does not exist, it fallbacks to ActionMailer default:
-      #
-      #   en:
-      #     devise:
-      #       mailer:
-      #         confirmation_instructions:
-      #           subject: '...'
-      #
-      def translate(mapping, key)
-        I18n.t(:"#{mapping.name}_subject", :scope => [:devise, :mailer, key],
-          :default => [:subject, key.to_s.humanize])
-      end
-    end
-  end
-end

lib/devise/mapping.rb

@@ -22,10 +22,7 @@ module Devise
   #   # is the modules included in the class
   #
   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
-
+    attr_reader :singular, :scoped_path, :path, :controllers, :path_names, :class_name, :sign_out_via
     alias :name :singular
 
     # Receives an object and find a scope for it. If a scope cannot be found,
@@ -53,21 +50,20 @@ module Devise
       @singular = (options[:singular] || @scoped_path.tr('/', '_').singularize).to_sym
 
       @class_name = (options[:class_name] || name.to_s.classify).to_s
-      @klass = Devise.ref(@class_name)
+      @ref = Devise.ref(@class_name)
 
       @path = (options[:path] || name).to_s
       @path_prefix = options[:path_prefix]
 
-      @sign_out_via = options[:sign_out_via] || Devise.sign_out_via
-      @format = options[:format]
+      mod = options[:module] || "devise"
+      @controllers = Hash.new { |h,k| h[k] = "#{mod}/#{k}" }
+      @controllers.merge!(options[:controllers] || {})
 
-      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)
+      @path_names = Hash.new { |h,k| h[k] = k.to_s }
+      @path_names.merge!(:registration => "")
+      @path_names.merge!(options[:path_names] || {})
+
+      @sign_out_via = options[:sign_out_via] || Devise.sign_out_via
     end
 
     # Return modules for the mapping.
@@ -77,17 +73,17 @@ module Devise
 
     # Gives the class the mapping points to.
     def to
-      @klass.get
+      if defined?(ActiveSupport::Dependencies::ClassCache)
+        @ref.get @class_name
+      else
+        @ref.get
+      end
     end
 
     def strategies
       @strategies ||= STRATEGIES.values_at(*self.modules).compact.uniq.reverse
     end
 
-    def no_input_strategies
-      self.strategies & Devise::NO_INPUT
-    end
-
     def routes
       @routes ||= ROUTES.values_at(*self.modules).compact.uniq
     end
@@ -114,62 +110,5 @@ module Devise
         end
       METHOD
     end
-
-    private
-
-    def default_failure_app(options)
-      @failure_app = options[:failure_app] || Devise::FailureApp
-      if @failure_app.is_a?(String)
-        ref = Devise.ref(@failure_app)
-        @failure_app = lambda { |env| ref.get.call(env) }
-      end
-    end
-
-    def default_controllers(options)
-      mod = options[:module] || "devise"
-      @controllers = Hash.new { |h,k| h[k] = "#{mod}/#{k}" }
-      @controllers.merge!(options[:controllers]) if options[:controllers]
-      @controllers.each { |k,v| @controllers[k] = v.to_s }
-    end
-
-    def default_path_names(options)
-      @path_names = Hash.new { |h,k| h[k] = k.to_s }
-      @path_names[:registration] = ""
-      @path_names.merge!(options[:path_names]) if options[:path_names]
-    end
-
-    def default_constraints(options)
-      @constraints = Hash.new
-      @constraints.merge!(options[:constraints]) if options[:constraints]
-    end
-
-    def default_defaults(options)
-      @defaults = Hash.new
-      @defaults.merge!(options[:defaults]) if options[:defaults]
-    end
-
-    def default_used_route(options)
-      singularizer = lambda { |s| s.to_s.singularize.to_sym }
-
-      if options.has_key?(:only)
-        @used_routes = self.routes & Array(options[:only]).map(&singularizer)
-      elsif options[:skip] == :all
-        @used_routes = []
-      else
-        @used_routes = self.routes - Array(options[:skip]).map(&singularizer)
-      end
-    end
-
-    def default_used_helpers(options)
-      singularizer = lambda { |s| s.to_s.singularize.to_sym }
-
-      if options[:skip_helpers] == true
-        @used_helpers = @used_routes
-      elsif skip = options[:skip_helpers]
-        @used_helpers = self.routes - Array(skip).map(&singularizer)
-      else
-        @used_helpers = self.routes
-      end
-    end
   end
 end

lib/devise/models/authenticatable.rb

@@ -1,5 +1,4 @@
 require 'devise/hooks/activatable'
-require 'devise/models/serializable'
 
 module Devise
   module Models
@@ -27,7 +26,7 @@ module Devise
     #
     # == active_for_authentication?
     #
-    # After authenticating a user and in each request, Devise checks if your model is active by
+    # Before authenticating a user and in each request, Devise checks if your model is active by
     # calling model.active_for_authentication?. This method is overwriten by other devise modules. For instance,
     # :confirmable overwrites .active_for_authentication? to only return true if your model was confirmed.
     #
@@ -47,8 +46,6 @@ module Devise
     module Authenticatable
       extend ActiveSupport::Concern
 
-      include Devise::Models::Serializable
-
       included do
         class_attribute :devise_modules, :instance_writer => false
         self.devise_modules ||= []
@@ -61,7 +58,11 @@ module Devise
       # However, you should not overwrite this method, you should overwrite active_for_authentication?
       # and inactive_message instead.
       def valid_for_authentication?
-        block_given? ? yield : true
+        if active_for_authentication?
+          block_given? ? yield : true
+        else
+          inactive_message
+        end
       end
 
       def active_for_authentication?
@@ -75,21 +76,21 @@ module Devise
       def authenticatable_salt
       end
 
-      def devise_mailer
-        Devise.mailer
+      %w(to_xml to_json).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__
+          def #{method}(options={})
+            if self.class.respond_to?(:accessible_attributes)
+              options = { :only => self.class.accessible_attributes.to_a }.merge(options || {})
+              super(options)
+            else
+              super
+            end
+          end
+        RUBY
       end
 
       module ClassMethods
-        Devise::Models.config(self, :authentication_keys, :request_keys, :strip_whitespace_keys, :case_insensitive_keys, :http_authenticatable, :params_authenticatable)
-
-        def serialize_into_session(record)
-          [record.to_key, record.authenticatable_salt]
-        end
-
-        def serialize_from_session(key, salt)
-          record = to_adapter.get(key)
-          record if record && record.authenticatable_salt == salt
-        end
+        Devise::Models.config(self, :authentication_keys, :request_keys, :case_insensitive_keys, :http_authenticatable, :params_authenticatable)
 
         def params_authenticatable?(strategy)
           params_authenticatable.is_a?(Array) ?
@@ -112,11 +113,9 @@ module Devise
         #   end
         #
         def find_for_authentication(conditions)
-          find_first_by_auth_conditions(conditions)
-        end
-
-        def find_first_by_auth_conditions(conditions)
-          to_adapter.find_first devise_param_filter.filter(conditions)
+          filter_auth_params(conditions)
+          (case_insensitive_keys || []).each { |k| conditions[k].try(:downcase!) }
+          to_adapter.find_first(conditions)
         end
 
         # Find an initialize a record setting an error if it can't be found.
@@ -126,13 +125,15 @@ module Devise
 
         # Find an initialize a group of attributes based on a list of required attributes.
         def find_or_initialize_with_errors(required_attributes, attributes, error=:invalid) #:nodoc:
+          (case_insensitive_keys || []).each { |k| attributes[k].try(:downcase!) }
+          
           attributes = attributes.slice(*required_attributes)
           attributes.delete_if { |key, value| value.blank? }
 
           if attributes.size == required_attributes.size
-            record = find_first_by_auth_conditions(attributes)
+            record = to_adapter.find_first(filter_auth_params(attributes))
           end
-
+          
           unless record
             record = new
 
@@ -148,8 +149,11 @@ module Devise
 
         protected
 
-        def devise_param_filter
-          @devise_param_filter ||= Devise::ParamFilter.new(case_insensitive_keys, strip_whitespace_keys)
+        # Force keys to be string to avoid injection on mongoid related database.
+        def filter_auth_params(conditions)
+          conditions.each do |k, v|
+            conditions[k] = v.to_s
+          end if conditions.is_a?(Hash)
         end
 
         # Generate a token by looping and ensuring does not already exist.

lib/devise/models/confirmable.rb

@@ -29,12 +29,12 @@ module Devise
         after_create  :send_confirmation_instructions, :if => :confirmation_required?
       end
 
-      # Confirm a user by setting its confirmed_at to actual time. If the user
+      # Confirm a user by setting it's confirmed_at to actual time. If the user
       # is already confirmed, add en error to email field
       def confirm!
         unless_confirmed do
           self.confirmation_token = nil
-          self.confirmed_at = Time.now.utc
+          self.confirmed_at = Time.now
           save(:validate => false)
         end
       end
@@ -47,7 +47,7 @@ module Devise
       # Send confirmation instructions by email
       def send_confirmation_instructions
         generate_confirmation_token! if self.confirmation_token.nil?
-        self.devise_mailer.confirmation_instructions(self).deliver
+        ::Devise.mailer.confirmation_instructions(self).deliver
       end
 
       # Resend confirmation token. This method does not need to generate a new token.
@@ -71,7 +71,7 @@ module Devise
       # If you don't want confirmation to be sent on create, neither a code
       # to be generated, call skip_confirmation!
       def skip_confirmation!
-        self.confirmed_at = Time.now.utc
+        self.confirmed_at = Time.now
       end
 
       protected
@@ -127,13 +127,8 @@ module Devise
           generate_confirmation_token && save(:validate => false)
         end
 
-        def after_password_reset
-          super
-          confirm! unless confirmed?
-        end
-
       module ClassMethods
-        # Attempt to find a user by its email. If a record is found, send new
+        # Attempt to find a user by it's 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.
         # Options must contain the user email
@@ -143,7 +138,7 @@ module Devise
           confirmable
         end
 
-        # Find a user by its confirmation token and try to confirm it.
+        # Find a user by it's confirmation token and try to confirm it.
         # If no user is found, returns a new user with an error.
         # If the user is already confirmed, create an error for the user
         # Options must have the confirmation_token

lib/devise/models/database_authenticatable.rb

@@ -10,9 +10,6 @@ module Devise
     #
     # DatabaseAuthenticable adds the following options to devise_for:
     #
-    #   * +pepper+: a random string used to provide a more secure hash. Use
-    #     `rake secret` to generate new keys.
-    #
     #   * +stretches+: the cost given to bcrypt.
     #
     # == Examples
@@ -26,7 +23,6 @@ module Devise
         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.
@@ -45,7 +41,7 @@ module Devise
 
       # Set password and password confirmation to nil
       def clean_up_passwords
-        self.password = self.password_confirmation = nil
+        self.password = self.password_confirmation = ""
       end
 
       # Update record attributes when :current_password matches, otherwise returns
@@ -62,9 +58,8 @@ module Devise
         result = if valid_password?(current_password)
           update_attributes(params)
         else
-          self.attributes = params
-          self.valid?
           self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          self.attributes = params
           false
         end
 
@@ -72,27 +67,6 @@ module Devise
         result
       end
 
-      # Updates record attributes without asking for the current password.
-      # Never allows to change the current password. If you are using this
-      # method, you should probably override this method to protect other
-      # attributes you would not like to be updated without a password.
-      #
-      # Example:
-      #
-      #   def update_without_password(params={})
-      #     params.delete(:email)
-      #     super(params)
-      #   end
-      #
-      def update_without_password(params={})
-        params.delete(:password)
-        params.delete(:password_confirmation)
-
-        result = update_attributes(params)
-        clean_up_passwords
-        result
-      end
-      
       def after_database_authentication
       end
 
@@ -107,10 +81,6 @@ module Devise
       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)

lib/devise/models/lockable.rb

@@ -3,13 +3,13 @@ module Devise
     # Handles blocking a user access after a certain number of attempts.
     # Lockable accepts two different strategies to unlock a user after it's
     # blocked: email and time. The former will send an email to the user when
-    # the lock happens, containing a link to unlock its account. The second
+    # the lock happens, containing a link to unlock it's account. The second
     # will unlock the user automatically after some configured time (ie 2.hours).
     # It's also possible to setup lockable to use both email and time strategies.
     #
     # == Options
     #
-    # Lockable adds the following options to +devise+:
+    # Lockable adds the following options to devise_for:
     #
     #   * +maximum_attempts+: how many attempts should be accepted before blocking the user.
     #   * +lock_strategy+: lock the user account by :failed_attempts or :none.
@@ -22,9 +22,9 @@ module Devise
 
       delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, :to => "self.class"
 
-      # Lock a user setting its locked_at to actual time.
+      # Lock a user setting it's locked_at to actual time.
       def lock_access!
-        self.locked_at = Time.now.utc
+        self.locked_at = Time.now
 
         if unlock_strategy_enabled?(:email)
           generate_unlock_token
@@ -49,7 +49,7 @@ module Devise
 
       # Send unlock instructions by email
       def send_unlock_instructions
-        self.devise_mailer.unlock_instructions(self).deliver
+        ::Devise.mailer.unlock_instructions(self).deliver
       end
 
       # Resend the unlock instructions if the user is locked.
@@ -79,21 +79,25 @@ module Devise
         # if the user can login or not (wrong password, etc)
         unlock_access! if lock_expired?
 
-        if super
+        case (result = super)
+        when Symbol
+          return result
+        when TrueClass
           self.failed_attempts = 0
           save(:validate => false)
-          true
-        else
+        when FalseClass
+          # PostgreSQL uses nil as the default value for integer columns set to 0
           self.failed_attempts ||= 0
           self.failed_attempts += 1
           if attempts_exceeded?
-            lock_access! unless access_locked?
+            lock_access!
             return :locked
           else
             save(:validate => false)
           end
-          false
         end
+
+        result
       end
 
       protected
@@ -128,7 +132,7 @@ module Devise
         end
 
       module ClassMethods
-        # Attempt to find a user by its email. If a record is found, send new
+        # Attempt to find a user by it's email. If a record is found, send new
         # unlock instructions to it. If not user is found, returns a new user
         # with an email not found error.
         # Options must contain the user email
@@ -138,7 +142,7 @@ module Devise
          lockable
         end
 
-        # Find a user by its unlock token and try to unlock it.
+        # Find a user by it's unlock token and try to unlock it.
         # If no user is found, returns a new user with an error.
         # If the user is not locked, creates an error for the user
         # Options must have the unlock_token

lib/devise/models/recoverable.rb

@@ -29,24 +29,20 @@ 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
-        end
-
+        clear_reset_password_token if valid?
         save
       end
 
       # Resets reset password token and send reset password instructions by email
       def send_reset_password_instructions
         generate_reset_password_token! if should_generate_token?
-        self.devise_mailer.reset_password_instructions(self).deliver
+        ::Devise.mailer.reset_password_instructions(self).deliver
       end
 
       # Checks if the reset password token sent is within the limit time.
       # We do this by calculating if the difference between today and the
       # sending date does not exceed the confirm in time configured.
-      # Returns true if the resource is not responding to reset_password_sent_at at all.
+      # Returns true if the ressource is not responding to reset_password_sent_at at all.
       # reset_password_within is a model configuration, must always be an integer value.
       #
       # Example:
@@ -64,7 +60,7 @@ module Devise
       #   reset_password_period_valid?   # will always return false
       #
       def reset_password_period_valid?
-        return true unless respond_to?(:reset_password_sent_at)
+        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
 
@@ -93,11 +89,8 @@ module Devise
           self.reset_password_sent_at = nil if respond_to?(:reset_password_sent_at=)
         end
 
-        def after_password_reset
-        end
-
       module ClassMethods
-        # Attempt to find a user by its email. If a record is found, send new
+        # Attempt to find a user by it's email. If a record is found, send new
         # password instructions to it. If not user is found, returns a new user
         # with an email not found error.
         # Attributes must contain the user email
@@ -112,7 +105,7 @@ module Devise
           generate_token(:reset_password_token)
         end
 
-        # Attempt to find a user by its reset_password_token to reset its
+        # Attempt to find a user by it's reset_password_token to reset its
         # password. If a user is found and token is still valid, reset its password and automatically
         # try saving the record. If not user is found, returns a new user
         # containing an error in reset_password_token attribute.
@@ -121,7 +114,7 @@ module Devise
           recoverable = find_or_initialize_with_error_by(:reset_password_token, attributes[:reset_password_token])
           if recoverable.persisted?
             if recoverable.reset_password_period_valid?
-              recoverable.reset_password!(attributes[:password], attributes[:password_confirmation])
+              recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) 
             else
               recoverable.errors.add(:reset_password_token, :expired)
             end

lib/devise/models/rememberable.rb

@@ -54,14 +54,12 @@ module Devise
         save(:validate => false)
       end
 
-      # If the record is persisted, remove the remember token (but only if
-      # it exists), and save the record without validations.
+      # Removes the remember token only if it exists, and save the record
+      # without validations.
       def forget_me!
-        if persisted?
-          self.remember_token = nil if respond_to?(:remember_token=)
-          self.remember_created_at = nil
-          save(:validate => false)
-        end
+        self.remember_token = nil if respond_to?(:remember_token=)
+        self.remember_created_at = nil
+        save(:validate => false)
       end
 
       # Remember token should be expired if expiration time not overpass now.

lib/devise/models/serializable.rb

@@ -1,43 +0,0 @@
-module Devise
-  module Models
-    # This module redefine to_xml and serializable_hash in models for more
-    # secure defaults. By default, it removes from the serializable model
-    # all attributes that are *not* accessible. You can remove this default
-    # by using :force_except and passing a new list of attributes you want
-    # to exempt. All attributes given to :except will simply add names to
-    # exempt to Devise internal list.
-    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|
-        class_eval <<-RUBY, __FILE__, __LINE__
-          def #{method}(options=nil)
-            options ||= {}
-            if options.key?(:force_except)
-              options[:except] = options.delete(:force_except)
-              super(options)
-            elsif self.class.blacklist_keys?
-              except = Array(options[:except])
-              super(options.merge(:except => except + self.class.blacklist_keys))
-            else
-              super
-            end
-          end
-        RUBY
-      end
-
-      module ClassMethods
-        # Return true if we can retrieve blacklist keys from the record.
-        def blacklist_keys?
-          @has_except_keys ||= respond_to?(:accessible_attributes) && !accessible_attributes.to_a.empty?
-        end
-
-        # Returns keys that should be removed when serializing the record.
-        def blacklist_keys
-          @blacklist_keys ||= to_adapter.column_names.map(&:to_s) - accessible_attributes.to_a.map(&:to_s)
-        end
-      end
-    end
-  end
-end

lib/devise/models/trackable.rb

@@ -5,18 +5,18 @@ module Devise
     # Track information about your user sign in. It tracks the following columns:
     #
     # * sign_in_count      - Increased every time a sign in is made (by form, openid, oauth)
-    # * current_sign_in_at - A timestamp updated when the user signs in
+    # * current_sign_in_at - A tiemstamp updated when the user signs in
     # * last_sign_in_at    - Holds the timestamp of the previous sign in
     # * current_sign_in_ip - The remote ip updated when the user sign in
-    # * last_sign_in_ip    - Holds the remote ip of the previous sign in
+    # * last_sign_in_at    - Holds the remote ip of the previous sign in
     #
     module Trackable
       def update_tracked_fields!(request)
-        old_current, new_current = self.current_sign_in_at, Time.now.utc
+        old_current, new_current = self.current_sign_in_at, Time.now
         self.last_sign_in_at     = old_current || new_current
         self.current_sign_in_at  = new_current
 
-        old_current, new_current = self.current_sign_in_ip, request.ip
+        old_current, new_current = self.current_sign_in_ip, request.remote_ip
         self.last_sign_in_ip     = old_current || new_current
         self.current_sign_in_ip  = new_current
 

lib/devise/models/validatable.rb

@@ -2,7 +2,7 @@ module Devise
   module Models
     # Validatable creates all needed validations for a user email and password.
     # It's optional, given you may want to create the validations by yourself.
-    # Automatically validate if the email is present, unique and its format is
+    # Automatically validate if the email is present, unique and it's format is
     # valid. Also tests presence of password, confirmation and length.
     #
     # == Options
@@ -23,12 +23,14 @@ 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_format_of     :email, :with  => email_regexp, :allow_blank => true, :if => :email_changed?
+          validates_uniqueness_of :email, :case_sensitive => (case_insensitive_keys != false), :allow_blank => true
+          validates_format_of     :email, :with  => email_regexp, :allow_blank => true
 
-          validates_presence_of     :password, :if => :password_required?
-          validates_confirmation_of :password, :if => :password_required?
-          validates_length_of       :password, :within => password_length, :allow_blank => true
+          with_options :if => :password_required? do |v|
+            v.validates_presence_of     :password
+            v.validates_confirmation_of :password
+            v.validates_length_of       :password, :within => password_length, :allow_blank => true
+          end
         end
       end
 

lib/devise/modules.rb

@@ -5,7 +5,7 @@ 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 :token_authenticatable,    :controller => :sessions, :route => { :session => routes }
     s.add_module :rememberable
   end
 

lib/devise/omniauth.rb

@@ -1,13 +1,12 @@
 begin
-  require "omniauth"
-  require 'omniauth/version'
+  require "omniauth/core"
 rescue LoadError => e
-  warn "Could not load 'omniauth'. Please ensure you have the omniauth gem >= 1.0.0 installed and listed in your Gemfile."
+  warn "Could not load 'omniauth/core'. Please ensure you have the oa-core gem installed and listed in your Gemfile."
   raise
 end
 
-unless OmniAuth::VERSION =~ /^1\./
-  raise "You are using an old OmniAuth version, please ensure you have 1.0.0.pr2 version or later installed."
+unless OmniAuth.config.respond_to? :test_mode
+  raise "You are using an old OmniAuth version, please ensure you have 0.2.0.beta version or later installed."
 end
 
 # Clean up the default path_prefix. It will be automatically set by Devise.
@@ -24,5 +23,10 @@ module Devise
   module OmniAuth
     autoload :Config,      "devise/omniauth/config"
     autoload :UrlHelpers,  "devise/omniauth/url_helpers"
+
+    class << self
+      delegate :short_circuit_authorizers!, :unshort_circuit_authorizers!,
+        :test_mode!, :stub!, :reset_stubs!, :to => "Devise::OmniAuth::TestHelpers"
+    end
   end
 end

lib/devise/omniauth/config.rb

@@ -2,45 +2,17 @@ module Devise
   module OmniAuth
     class Config
       attr_accessor :strategy
-      attr_reader :args, :options, :provider
+      attr_reader :args
 
       def initialize(provider, args)
         @provider = provider
         @args     = args
         @strategy = nil
-        @options = @args.last.is_a?(Hash) ? @args.last : {}
-      end
-
-      # open_id strategy can have configurable name
-      def strategy_name
-        options[:name] || @provider
       end
 
       def strategy_class
-        find_strategy || require_strategy
-      end
-
-      def find_strategy
-        ::OmniAuth.strategies.find do |strategy_class|
-          strategy_class.to_s =~ /#{::OmniAuth::Utils.camelize(strategy_name)}$/ ||
-            strategy_class.default_options[:name] == strategy_name
-        end
-      end
-
-      def require_strategy
-        if [:facebook, :github, :twitter].include?(provider.to_sym)
-          require "omniauth/strategies/#{provider}"
-        elsif options[:require]
-          require options[:require]
-        else
-          require "omniauth-#{provider}"
-        end
-        find_strategy || autoload_strategy
-      end
-
-      def autoload_strategy
-        ::OmniAuth::Strategies.const_get(::OmniAuth::Utils.camelize(provider.to_s))
+        ::OmniAuth::Strategies.const_get("#{::OmniAuth::Utils.camelize(@provider.to_s)}")
       end
     end
   end
-end     
+end     

lib/devise/param_filter.rb

@@ -1,41 +0,0 @@
-module Devise
-  class ParamFilter
-    def initialize(case_insensitive_keys, strip_whitespace_keys)
-      @case_insensitive_keys = case_insensitive_keys || []
-      @strip_whitespace_keys = strip_whitespace_keys || []
-    end
-
-    def filter(conditions)
-      conditions = stringify_params(conditions.dup)
-
-      @case_insensitive_keys.each do |k|
-        value = conditions[k]
-        next unless value.respond_to?(:downcase)
-        conditions[k] = value.downcase
-      end
-
-      @strip_whitespace_keys.each do |k|
-        value = conditions[k]
-        next unless value.respond_to?(:strip)
-        conditions[k] = value.strip
-      end
-
-      conditions
-    end
-
-    # Force keys to be string to avoid injection on mongoid related database.
-    def stringify_params(conditions)
-      return conditions unless conditions.is_a?(Hash)
-      conditions.each do |k, v|
-        conditions[k] = v.to_s if param_requires_string_conversion?(v)
-      end
-    end
-
-    private
-
-    # 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)
-    end
-  end
-end

lib/devise/rails.rb

@@ -17,6 +17,17 @@ module Devise
       Devise.include_helpers(Devise::Controllers)
     end
 
+    initializer "devise.auth_keys" do
+      if Devise.authentication_keys.size > 1
+        puts "[DEVISE] You are configuring Devise to use more than one authentication key. " \
+          "In previous versions, we automatically added #{Devise.authentication_keys[1..-1].inspect} " \
+          "as scope to your e-mail validation, but this was changed now. If you were relying in such " \
+          "behavior, you should remove :validatable from your models and add the validations manually. " \
+          "To get rid of this warning, you can comment config.authentication_keys in your initializer " \
+          "and pass the current values as key to the devise call in your model."
+      end
+    end
+
     initializer "devise.omniauth" do |app|
       Devise.omniauth_configs.each do |provider, config|
         app.middleware.use config.strategy_class, *config.args do |strategy|
@@ -28,18 +39,5 @@ module Devise
         Devise.include_helpers(Devise::OmniAuth)
       end
     end
-
-    initializer "devise.mongoid_version_warning" do
-      if defined?(Mongoid)
-        require 'mongoid/version'
-        if Mongoid::VERSION.to_f < 2.1
-          puts "\n[DEVISE] Please note that Mongoid versions prior to 2.1 handle dirty model " \
-            "object attributes in such a way that the Devise `validatable` module will not apply " \
-            "its usual uniqueness and format validations for the email field. It is recommended " \
-            "that you upgrade to Mongoid 2.1+ for this and other fixes, but if for some reason you " \
-            "are unable to do so, you should add these validations manually.\n"
-        end
-      end
-    end
   end
 end

lib/devise/rails/routes.rb

@@ -4,12 +4,7 @@ module ActionDispatch::Routing
     # need devise_for mappings already declared to create filters and helpers.
     def finalize_with_devise!
       finalize_without_devise!
-
-      @devise_finalized ||= begin
-        Devise.configure_warden!
-        Devise.regenerate_helpers!
-        true
-      end
+      Devise.configure_warden!
     end
     alias_method_chain :finalize!, :devise
   end
@@ -49,23 +44,23 @@ module ActionDispatch::Routing
     #
     # You can configure your routes with some options:
     #
-    #  * :class_name => setup a different class to be looked up by devise, if it cannot be
-    #    properly found by the route name.
+    #  * :class_name => setup a different class to be looked up by devise,
+    #                   if it cannot be correctly find by the route name.
     #
     #      devise_for :users, :class_name => 'Account'
     #
     #  * :path => allows you to setup path name that will be used, as rails routes does.
-    #    The following route configuration would setup your route as /accounts instead of /users:
+    #             The following route configuration would setup your route as /accounts instead of /users:
     #
     #      devise_for :users, :path => 'accounts'
     #
-    #  * :singular => setup the singular name for the given resource. This is used as the instance variable
-    #    name in controller, as the name in routes and the scope given to warden.
+    #  * :singular => setup the singular name for the given resource. This is used as the instance variable name in
+    #                 controller, as the name in routes and the scope given to warden.
     #
     #      devise_for :users, :singular => :user
     #
     #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
-    #    :password, :confirmation, :unlock.
+    #                   :password, :confirmation, :unlock.
     #
     #      devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
     #
@@ -74,9 +69,6 @@ module ActionDispatch::Routing
     #
     #      devise_for :users, :controllers => { :sessions => "users/sessions" }
     #
-    #  * :failure_app => a rack app which is invoked whenever there is a failure. Strings representing a given
-    #    are also allowed as parameter.
-    #
     #  * :sign_out_via => the HTTP method(s) accepted for the :sign_out action (default: :get),
     #    if you wish to restrict this to accept only :post or :delete requests you should do:
     #
@@ -101,7 +93,7 @@ module ActionDispatch::Routing
     #
     #    Also pay attention that when you use a namespace it will affect all the helpers and methods for controllers
     #    and views. For example, using the above setup you'll end with following methods:
-    #    current_publisher_account, authenticate_publisher_account!, publisher_account_signed_in, etc.
+    #    current_publisher_account, authenticate_publisher_account!, pusblisher_account_signed_in, etc.
     #
     #  * :skip => tell which controller you want to skip routes from being created:
     #
@@ -111,21 +103,6 @@ module ActionDispatch::Routing
     #
     #      devise_for :users, :only => :sessions
     #
-    #  * :skip_helpers => skip generating Devise url helpers like new_session_path(@user).
-    #    This is useful to avoid conflicts with previous routes and is false by default.
-    #    It accepts true as option, meaning it will skip all the helpers for the controllers
-    #    given in :skip but it also accepts specific helpers to be skipped:
-    #
-    #      devise_for :users, :skip => [:registrations, :confirmations], :skip_helpers => true
-    #      devise_for :users, :skip_helpers => [:registrations, :confirmations]
-    #
-    #  * :format => include "(.:format)" in the generated routes? true by default, set to false to disable:
-    #
-    #      devise_for :users, :format => false
-    #
-    #  * :constraints => works the same as Rails' contraints
-    #
-    #  * :defaults => works the same as Rails' defaults
     #
     # ==== Scoping
     #
@@ -152,9 +129,9 @@ module ActionDispatch::Routing
     #   end
     #
     # ==== Adding custom actions to override controllers
-    #
-    # You can pass a block to devise_for that will add any routes defined in the block to Devise's
-    # list of known actions.  This is important if you add a custom action to a controller that
+    # 
+    # You can pass a block to devise_for that will add any routes defined in the block to Devise's 
+    # list of known actions.  This is important if you add a custom action to a controller that 
     # overrides an out of the box Devise controller.
     # For example:
     #
@@ -176,16 +153,12 @@ module ActionDispatch::Routing
     #     end
     #
     def devise_for(*resources)
-      @devise_finalized = false
       options = resources.extract_options!
 
       options[:as]          ||= @scope[:as]     if @scope[:as].present?
       options[:module]      ||= @scope[:module] if @scope[:module].present?
       options[:path_prefix] ||= @scope[:path]   if @scope[:path].present?
       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
 
       resources.map!(&:to_sym)
 
@@ -204,11 +177,15 @@ module ActionDispatch::Routing
           raise_no_devise_method_error!(mapping.class_name)
         end
 
-        routes  = mapping.used_routes
+        routes  = mapping.routes
+        if options.has_key?(:only)
+          routes  = Array(options.delete(:only)).map { |s| s.to_s.singularize.to_sym } & mapping.routes
+        end
+        routes -= Array(options.delete(:skip)).map { |s| s.to_s.singularize.to_sym }
 
         devise_scope mapping.name do
           yield if block_given?
-          with_devise_exclusive_scope mapping.fullpath, mapping.name, mapping.constraints, mapping.defaults do
+          with_devise_exclusive_scope mapping.fullpath, mapping.name do
             routes.each { |mod| send("devise_#{mod}", mapping, mapping.controllers) }
           end
         end
@@ -217,15 +194,11 @@ module ActionDispatch::Routing
 
     # Allow you to add authentication request from the router:
     #
-    #   authenticate do
+    #   authenticate(:user) do
     #     resources :post
     #   end
     #
-    #   authenticate(:admin) do
-    #     resources :users
-    #   end
-    #
-    def authenticate(scope=nil)
+    def authenticate(scope)
       constraint = lambda do |request|
         request.env["warden"].authenticate!(:scope => scope)
       end
@@ -235,50 +208,6 @@ module ActionDispatch::Routing
       end
     end
 
-    # Allow you to route based on whether a scope is authenticated. You
-    # can optionally specify which scope.
-    #
-    #   authenticated :admin do
-    #     root :to => 'admin/dashboard#show'
-    #   end
-    #
-    #   authenticated do
-    #     root :to => 'dashboard#show'
-    #   end
-    #
-    #   root :to => 'landing#show'
-    #
-    def authenticated(scope=nil)
-      constraint = lambda do |request|
-        request.env["warden"].authenticate? :scope => scope
-      end
-
-      constraints(constraint) do
-        yield
-      end
-    end
-
-    # Allow you to route based on whether a scope is *not* authenticated.
-    # You can optionally specify which scope.
-    #
-    #   unauthenticated do
-    #     as :user do
-    #       root :to => 'devise/registrations#new'
-    #     end
-    #   end
-    #
-    #   root :to => 'dashboard#show'
-    #
-    def unauthenticated(scope=nil)
-      constraint = lambda do |request|
-        not request.env["warden"].authenticate? :scope => scope
-      end
-
-      constraints(constraint) do
-        yield
-      end
-    end
-
     # Sets the devise scope to be used in the controller. If you have custom routes,
     # you are required to call this method (also aliased as :as) in order to specify
     # to which controller it is targetted.
@@ -290,17 +219,6 @@ module ActionDispatch::Routing
     # Notice you cannot have two scopes mapping to the same URL. And remember, if
     # you try to access a devise controller without specifying a scope, it will
     # raise ActionNotFound error.
-    #
-    # Also be aware of that 'devise_scope' and 'as' use the singular form of the
-    # noun where other devise route commands expect the plural form. This would be a
-    # good and working example.
-    #
-    #  devise_scope :user do
-    #    match "/some/route" => "some_devise_controller"
-    #  end
-    #  devise_for :users
-    #
-    # Notice and be aware of the differences above between :user and :users
     def devise_scope(scope)
       constraint = lambda do |request|
         request.env["devise.mapping"] = Devise.mappings[scope]
@@ -346,7 +264,7 @@ module ActionDispatch::Routing
           :cancel => mapping.path_names[:cancel]
         }
 
-        resource :registration, :only => [:new, :create, :edit, :update, :destroy], :path => mapping.path_names[:registration],
+        resource :registration, :except => :show, :path => mapping.path_names[:registration],
                  :path_names => path_names, :controller => controllers[:registrations] do
           get :cancel
         end
@@ -357,28 +275,28 @@ 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"
+          warn "[DEVISE] You can only add :omniauthable behavior to one model."
         else
           ::OmniAuth.config.path_prefix = path_prefix
         end
 
-        match "#{path_prefix}/:action/callback", :constraints => { :action => Regexp.union(mapping.to.omniauth_providers.map(&:to_s)) },
+        match "#{path_prefix}/:action/callback", :action => Regexp.union(mapping.to.omniauth_providers.map(&:to_s)),
           :to => controllers[:omniauth_callbacks], :as => :omniauth_callback
       ensure
         @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) #:nodoc:
+        old_as, old_path, old_module = @scope[:as], @scope[:path], @scope[:module]
+        @scope[:as], @scope[:path], @scope[:module] = new_as, new_path, nil
         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] = old_as, old_path, old_module
       end
 
       def raise_no_devise_method_error!(klass) #:nodoc:
-        raise "#{klass} does not respond to 'devise' method. This usually means you haven't " \
-          "loaded your ORM file or it's being loaded too late. To fix it, be sure to require 'devise/orm/YOUR_ORM' " \
+        raise "#{klass} does not respond to 'devise' method. This usually means you haven't " <<
+          "loaded your ORM file or it's being loaded too late. To fix it, be sure to require 'devise/orm/YOUR_ORM' " <<
           "inside 'config/initializers/devise.rb' or before your application definition in 'config/application.rb'"
       end
   end

lib/devise/rails/warden_compat.rb

@@ -15,16 +15,21 @@ end
 
 class Warden::SessionSerializer
   def serialize(record)
-    klass = record.class
-    array = klass.serialize_into_session(record)
-    array.unshift(klass.name)
+    [record.class.name, record.to_key, record.authenticatable_salt]
   end
 
   def deserialize(keys)
-    klass, *args = keys
+    if keys.size == 2
+      raise "Devise changed how it stores objects in session. If you are seeing this message, " <<
+        "you can fix it by changing one character in your secret_token or cleaning up your " <<
+        "database sessions if you are using a db store."
+    end
+
+    klass, id, salt = keys
 
     begin
-      ActiveSupport::Inflector.constantize(klass).serialize_from_session(*args)
+      record = ActiveSupport::Inflector.constantize(klass).to_adapter.get(id)
+      record if record && record.authenticatable_salt == salt
     rescue NameError => e
       if e.message =~ /uninitialized constant/
         Rails.logger.debug "[Devise] Trying to deserialize invalid class #{klass}"

lib/devise/schema.rb

@@ -3,12 +3,11 @@ module Devise
   # and overwrite the apply_schema method.
   module Schema
 
-    # Creates encrypted_password, and email when it is used as an authentication
-    # key (default).
+    # Creates email when enabled (on by default), encrypted_password and password_salt.
     #
     # == Options
     # * :null - When true, allow columns to be null.
-    # * :default - Set to "" when :null is false, unless overridden.
+    # * :default - Should be set to "" when :null is false.
     #
     # == Notes
     # For Datamapper compatibility, we explicitly hardcode the limit for the
@@ -22,8 +21,7 @@ module Devise
       apply_devise_schema :encrypted_password, String, :null => null, :default => default, :limit => 128
     end
 
-    # Creates password salt for encryption support when using encryptors other
-    # than the database_authenticable default of bcrypt.
+    # Creates password salt for encryption support.
     def encryptable
       apply_devise_schema :password_salt, String
     end

lib/devise/strategies/authenticatable.rb

@@ -85,7 +85,17 @@ module Devise
 
       # By default, a request is valid  if the controller is allowed and the VERB is POST.
       def valid_request?
-        !!env["devise.allow_params_authentication"]
+        valid_controller? && valid_verb?
+      end
+
+      # Check if the controller is the one registered for authentication.
+      def valid_controller?
+        mapping.controllers[:sessions] == params[:controller]
+      end
+
+      # Check if it was a POST request.
+      def valid_verb?
+        request.post?
       end
 
       # If the request is valid, finally check if params_auth_hash returns a hash.

lib/devise/strategies/rememberable.rb

@@ -9,7 +9,6 @@ module Devise
     class Rememberable < Authenticatable
       # A valid strategy for rememberable needs a remember token in the cookies.
       def valid?
-        @remember_cookie = nil
         remember_cookie.present?
       end
 
@@ -42,10 +41,10 @@ module Devise
         "remember_#{scope}_token"
       end
 
+      # Accessor for remember cookie
       def remember_cookie
         @remember_cookie ||= cookies.signed[remember_key]
       end
-
     end
   end
 end

lib/devise/strategies/token_authenticatable.rb

@@ -39,11 +39,7 @@ module Devise
 
       # Try both scoped and non scoped keys.
       def params_auth_hash
-        if params[scope].kind_of?(Hash) && params[scope].has_key?(authentication_keys.first)
-          params[scope]
-        else
-          params
-        end
+        params[scope] || params
       end
 
       # Overwrite authentication keys to use token_authentication_key.

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.5.0".freeze
+  VERSION = "1.3.3".freeze
 end

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
@@ -10,18 +9,14 @@ module ActiveRecord
       include Devise::Generators::OrmHelpers
       source_root File.expand_path("../templates", __FILE__)
 
-      def copy_devise_migration
-        if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}"
-        else
-          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
-        end
-      end
-
       def generate_model
         invoke "active_record:model", [name], :migration => false unless model_exists? && behavior == :invoke
       end
-      
+
+      def copy_devise_migration
+        migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
+      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

lib/generators/active_record/templates/migration.rb

@@ -1,9 +1,5 @@
 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
@@ -15,7 +11,7 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
       # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %>
       # t.token_authenticatable
 
-<% attributes.each  do |attribute| -%>
+<% for  attribute in attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
 <% end -%>
 
@@ -29,9 +25,7 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
     # 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

lib/generators/active_record/templates/migration_existing.rb

@@ -1,34 +0,0 @@
-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
-
-<% attributes.each  do |attribute| -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end -%>
-
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
-    end
-
-    add_index :<%= table_name %>, :email,                :unique => true
-    add_index :<%= table_name %>, :reset_password_token, :unique => true
-    # add_index :<%= table_name %>, :confirmation_token,   :unique => true
-    # add_index :<%= table_name %>, :unlock_token,         :unique => true
-    # add_index :<%= table_name %>, :authentication_token, :unique => true
-  end
-
-  def self.down
-    # By default, we don't want to make any assumption about how to roll back a migration when your
-    # model already existed. Please edit below which fields you would like to remove in this migration.
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

lib/generators/devise/devise_generator.rb

@@ -9,12 +9,9 @@ module Devise
 
       hook_for :orm
 
-      class_option :routes, :desc => "Generate routes", :type => :boolean, :default => true
-
       def add_devise_routes
         devise_route  = "devise_for :#{plural_name}"
-        devise_route << %Q(, :class_name => "#{class_name}") if class_name.include?("::")
-        devise_route << %Q(, :skip => :all) unless options.routes?
+        devise_route += %Q(, :class_name => "#{class_name}") if class_name.include?("::")
         route devise_route
       end
     end

lib/generators/devise/install_generator.rb

@@ -1,4 +1,4 @@
-require 'securerandom'
+require 'active_support/secure_random'
 
 module Devise
   module Generators
@@ -21,4 +21,4 @@ module Devise
       end
     end
   end
-end
+end

lib/generators/devise/orm_helpers.rb

@@ -14,14 +14,6 @@ CONTENT
       def model_exists?
         File.exists?(File.join(destination_root, model_path))
       end
-      
-      def migration_exists?(table_name)
-        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_devise_to_#{table_name}.rb$/).first
-      end
-      
-      def migration_path
-        @migration_path ||= File.join("db", "migrate")
-      end
 
       def model_path
         @model_path ||= File.join("app", "models", "#{file_path}.rb")

lib/generators/devise/views_generator.rb

@@ -1,98 +1,20 @@
+require 'tmpdir'
+
 module Devise
   module Generators
-    # Include this module in your generator to generate Devise views.
-    # `copy_views` is the main method and by default copies all views
-    # with forms.
-    module ViewPathTemplates #:nodoc:
-      extend ActiveSupport::Concern
-
-      included do
-        argument :scope, :required => false, :default => nil,
-                         :desc => "The scope to copy views to"
-
-        public_task :copy_views
-      end
-
-      def copy_views
-        view_directory :confirmations
-        view_directory :passwords
-        view_directory :registrations
-        view_directory :sessions
-        view_directory :unlocks
-      end
-
-      protected
-
-      def view_directory(name, _target_path = nil)
-        directory name.to_s, _target_path || "#{target_path}/#{name}"
-      end
-
-      def target_path
-        @target_path ||= "app/views/#{scope || :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."
-    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."
-    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."
-
-      def copy_views
-        view_directory :mailer
-      end
-    end
-
-    class MarkerbGenerator < Rails::Generators::Base #:nodoc:
-      include ViewPathTemplates
-      source_root File.expand_path("../../templates", __FILE__)
-      desc "Copies Devise mail markerb views to your application."
-
-      def copy_views
-        view_directory :markerb, target_path
-      end
-
-      def target_path
-        "app/views/#{scope || :devise}/mailer"
-      end
-    end
-
     class ViewsGenerator < Rails::Generators::Base
-      desc "Copies Devise views to your application."
+      source_root File.expand_path("../../../../app/views", __FILE__)
+      desc "Copies all Devise views to your application."
 
       argument :scope, :required => false, :default => nil,
                        :desc => "The scope to copy views to"
 
-      invoke SharedViewsGenerator
-      hook_for :form_builder, :aliases => "-b",
-                              :desc => "Form builder to be used",
-                              :default => defined?(SimpleForm) ? "simple_form_for" : "form_for"
+      # class_option :template_engine, :type => :string, :aliases => "-t",
+      #                                :desc => "Template engine for the views. Available options are 'erb', 'haml' and 'slim'."
 
-      hook_for :markerb,  :desc => "Generate markerb instead of erb mail views",
-                          :default => defined?(Markerb) ? :markerb : :erb,
-                          :type => :boolean
+      def copy_views
+        directory "devise", "app/views/#{scope || :devise}"
+      end
     end
   end
 end

lib/generators/templates/README

@@ -22,11 +22,4 @@ Some setup you must do manually if you haven't yet:
        <p class="notice"><%= notice %></p>
        <p class="alert"><%= alert %></p>
 
-  4. If you are deploying Rails 3.1 on Heroku, you may want to set:
-
-       config.assets.initialize_on_precompile = false
-
-     On config/application.rb forcing your application to not access the DB
-     or load models when precompiling your assets.
-
 ===============================================================================

lib/generators/templates/devise.rb

@@ -2,8 +2,7 @@
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
   # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in Devise::Mailer,
-  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
+  # Configure the e-mail address which will be shown in DeviseMailer.
   config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"
 
   # Configure the class responsible to send e-mails.
@@ -37,11 +36,6 @@ Devise.setup do |config|
   # to authenticate or find a user. Default is :email.
   config.case_insensitive_keys = [ :email ]
 
-  # Configure which authentication keys should have whitespace stripped.
-  # These keys will have whitespace before and after removed upon creating or
-  # modifying a user and when used to authenticate or find a user. Default is :email.
-  config.strip_whitespace_keys = [ :email ]
-
   # Tell if authentication through request.params is enabled. True by default.
   # config.params_authenticatable = true
 
@@ -54,29 +48,21 @@ Devise.setup do |config|
   # The realm used in Http Basic Authentication. "Application" by default.
   # config.http_authentication_realm = "Application"
 
-  # It will change confirmation, password recovery and other workflows
-  # to behave the same regardless if the e-mail provided was right or wrong.
-  # Does not affect registerable.
-  # config.paranoid = true
-
   # ==> Configuration for :database_authenticatable
   # For bcrypt, this is the cost for hashing the password and defaults to 10. If
   # using other encryptors, it sets how many times you want the password re-encrypted.
-  #
-  # Limiting the stretches to just one in testing will increase the performance of
-  # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
-  # a value less than 10 in other environments.
-  config.stretches = Rails.env.test? ? 1 : 10
+  config.stretches = 10
 
   # Setup a pepper to generate the encrypted password.
-  # config.pepper = <%= SecureRandom.hex(64).inspect %>
+  # config.pepper = <%= ActiveSupport::SecureRandom.hex(64).inspect %>
 
   # ==> Configuration for :confirmable
-  # A period that the user is allowed to access the website even without
-  # confirming his account. For instance, if set to 2.days, the user will be
-  # 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.
+  # The time you want to give your user to confirm his account. During this time
+  # he will be able to access your application without confirming. Default is 0.days
+  # When confirm_within is zero, the user won't be able to sign in without confirming.
+  # 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 2 days).
   # config.confirm_within = 2.days
 
   # Defines which key will be used when confirming an account
@@ -104,10 +90,8 @@ Devise.setup do |config|
   # Range for password length. Default is 6..128.
   # config.password_length = 6..128
 
-  # Email regex used to validate email formats. It simply asserts that
-  # an one (and only one) @ exists in the given string. This is mainly
-  # to give user feedback and not to assert the e-mail validity.
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
+  # Regex to use to validate the email address
+  # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
 
   # ==> Configuration for :timeoutable
   # The time you want to timeout the user session without activity. After this
@@ -190,8 +174,8 @@ Devise.setup do |config|
   # Explorer requests.
   # config.navigational_formats = [:"*/*", "*/*", :html]
 
-  # The default HTTP method used to sign out a resource. Default is :delete.
-  config.sign_out_via = :delete
+  # The default HTTP method used to sign out a resource. Default is :get.
+  # config.sign_out_via = :get
 
   # ==> OmniAuth
   # Add a new OmniAuth provider. Check the wiki for more information on setting
@@ -203,6 +187,7 @@ Devise.setup do |config|
   # change the failure app, you can configure them inside the config.warden block.
   #
   # config.warden do |manager|
+  #   manager.failure_app   = AnotherApp
   #   manager.intercept_401 = false
   #   manager.default_strategies(:scope => :user).unshift :some_external_strategy
   # end

lib/generators/templates/markerb/confirmation_instructions.markerb

@@ -1,5 +0,0 @@
-Welcome <%= @resource.email %>!
-
-You can confirm your account through the link below:
-
-<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

lib/generators/templates/markerb/reset_password_instructions.markerb

@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password, and you can do this through the link below.
-
-<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>
-
-If you didn't request this, please ignore this email.
-Your password won't change until you access the link above and create a new one.

lib/generators/templates/markerb/unlock_instructions.markerb

@@ -1,7 +0,0 @@
-Hello <%= @resource.email %>!
-
-Your account has been locked due to an excessive amount of unsuccessful sign in attempts.
-
-Click the link below to unlock your account:
-
-<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>

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

@@ -1,15 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="inputs">
-    <%= f.input :email, :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Resend confirmation instructions" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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

@@ -1,19 +0,0 @@
-<h2>Change your password</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= f.error_notification %>
-
-  <%= f.input :reset_password_token, :as => :hidden %>
-  <%= f.full_error :reset_password_token %>
-
-  <div class="inputs">
-    <%= f.input :password, :label => "New password", :required => true %>
-    <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Change my password" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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

@@ -1,15 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="inputs">
-    <%= f.input :email, :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Send me reset password instructions" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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

@@ -1,22 +0,0 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= f.error_notification %>
-
-  <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_confirmation, :required => false %>
-    <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Update" %>
-  </div>
-<% end %>
-
-<h3>Cancel my account</h3>
-
-<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
-
-<%= link_to "Back", :back %>

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

@@ -1,17 +0,0 @@
-<h2>Sign up</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="inputs">
-    <%= f.input :email, :required => true, :autofocus => true %>
-    <%= f.input :password, :required => true %>
-    <%= f.input :password_confirmation, :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Sign up" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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

@@ -1,15 +0,0 @@
-<h2>Sign in</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div class="inputs">
-    <%= f.input :email, :required => false, :autofocus => true %>
-    <%= f.input :password, :required => false %>
-    <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Sign in" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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

@@ -1,15 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= f.error_notification %>
-
-  <div class="inputs">
-    <%= f.input :email, :required => true %>
-  </div>
-
-  <div class="actions">
-    <%= f.button :submit, "Resend unlock instructions" %>
-  </div>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

test/controllers/helpers_test.rb

@@ -45,11 +45,6 @@ class ControllerAuthenticatableTest < ActionController::TestCase
     @controller.authenticate_user!
   end
 
-  test 'proxy authenticate_user! options to authenticate with user scope' do
-    @mock_warden.expects(:authenticate!).with(:scope => :user, :recall => "foo")
-    @controller.authenticate_user!(:recall => "foo")
-  end
-
   test 'proxy authenticate_admin! to authenticate with admin scope' do
     @mock_warden.expects(:authenticate!).with(:scope => :admin)
     @controller.authenticate_admin!
@@ -111,7 +106,7 @@ class ControllerAuthenticatableTest < ActionController::TestCase
     user = User.new
     @mock_warden.expects(:user).returns(user)
     @mock_warden.expects(:set_user).never
-    assert @controller.sign_in(user)
+    @controller.sign_in(user)
   end
 
   test 'sign in again when the user is already in only if force is given' do
@@ -128,26 +123,6 @@ class ControllerAuthenticatableTest < ActionController::TestCase
     @controller.sign_in(user, :bypass => true)
   end
 
-  test 'sign out clears up any signed in user from all scopes' do
-    user = User.new
-    @mock_warden.expects(:user).times(Devise.mappings.size)
-    @mock_warden.expects(:logout).with().returns(true)
-    @controller.instance_variable_set(:@current_user, user)
-    @controller.instance_variable_set(:@current_admin, user)
-    @controller.sign_out
-    assert_equal nil, @controller.instance_variable_get(:@current_user)
-    assert_equal nil, @controller.instance_variable_get(:@current_admin)
-  end
-
-  test 'sign out clears up any signed in user by scope' do
-    user = User.new
-    @mock_warden.expects(:user).with(:user).returns(user)
-    @mock_warden.expects(:logout).with(:user).returns(true)
-    @controller.instance_variable_set(:@current_user, user)
-    @controller.sign_out(:user)
-    assert_equal nil, @controller.instance_variable_get(:@current_user)
-  end
-  
   test 'sign out proxy to logout on warden' do
     @mock_warden.expects(:user).with(:user).returns(true)
     @mock_warden.expects(:logout).with(:user).returns(true)
@@ -228,6 +203,17 @@ class ControllerAuthenticatableTest < ActionController::TestCase
     @controller.sign_in_and_redirect(admin)
   end
 
+  test 'redirect_location returns the stored location if set' do
+    user = User.new
+    @controller.session[:"user_return_to"] = "/foo.bar"
+    assert_equal '/foo.bar', @controller.redirect_location('user', user)
+  end
+
+  test 'redirect_location returns the after sign in path by default' do
+    user = User.new
+    assert_equal @controller.after_sign_in_path_for(:user), @controller.redirect_location('user', user)
+  end
+
   test 'sign out and redirect uses the configured after sign out path when signing out only the current scope' do
     swap Devise, :sign_out_all_scopes => false do
       @mock_warden.expects(:user).with(:admin).returns(true)

test/controllers/internal_helpers_test.rb

@@ -39,21 +39,14 @@ class HelpersTest < ActionController::TestCase
   end
 
   test 'require no authentication tests current mapping' do
-    @mock_warden.expects(:authenticate?).with(:rememberable, :token_authenticatable, :scope => :user).returns(true)
+    @mock_warden.expects(:authenticated?).with(:user).returns(true)
     @mock_warden.expects(:user).with(:user).returns(User.new)
     @controller.expects(:redirect_to).with(root_path)
     @controller.send :require_no_authentication
   end
 
-  test 'require no authentication skips if no inputs are available' do
-    Devise.mappings[:user].expects(:no_input_strategies).returns([])
-    @mock_warden.expects(:authenticate?).never
-    @controller.expects(:redirect_to).never
-    @controller.send :require_no_authentication
-  end
-
   test 'require no authentication sets a flash message' do
-    @mock_warden.expects(:authenticate?).with(:rememberable, :token_authenticatable, :scope => :user).returns(true)
+    @mock_warden.expects(:authenticated?).with(:user).returns(true)
     @mock_warden.expects(:user).with(:user).returns(User.new)
     @controller.expects(:redirect_to).with(root_path)
     @controller.send :require_no_authentication

test/devise_test.rb

@@ -25,7 +25,7 @@ class DeviseTest < ActiveSupport::TestCase
   end
 
   test 'stores warden configuration' do
-    assert_kind_of Devise::Delegator, Devise.warden_config.failure_app
+    assert_equal Devise::FailureApp, Devise.warden_config.failure_app
     assert_equal :user, Devise.warden_config.default_scope
   end
 

test/failure_app_test.rb

@@ -2,10 +2,6 @@ require 'test_helper'
 require 'ostruct'
 
 class FailureTest < ActiveSupport::TestCase
-  class RootFailureApp < Devise::FailureApp
-    undef_method :new_user_session_path
-  end
-
   def self.context(name, &block)
     instance_eval(&block)
   end
@@ -22,29 +18,25 @@ class FailureTest < ActiveSupport::TestCase
       'warden' => OpenStruct.new(:message => nil)
     }.merge!(env_params)
 
-    @response = (env.delete(:app) || Devise::FailureApp).call(env).to_a
+    @response = Devise::FailureApp.call(env).to_a
     @request  = ActionDispatch::Request.new(env)
   end
 
   context 'When redirecting' do
-    test 'return to the default redirect location' do
+    test 'return 302 status' do
       call_failure
       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/users/sign_in', @response.second['Location']
     end
 
-    test 'return to the default redirect location for wildcard requests' do
+    test 'return 302 status for wildcard requests' do
       call_failure 'action_dispatch.request.formats' => nil, 'HTTP_ACCEPT' => '*/*'
       assert_equal 302, @response.first
-      assert_equal 'http://test.host/users/sign_in', @response.second['Location']
     end
 
-    test 'return to the root path if no session path is available' do
-      call_failure :app => RootFailureApp
-      assert_equal 302, @response.first
+    test 'return to the default redirect location' do
+      call_failure
       assert_equal 'You need to sign in or sign up before continuing.', @request.flash[:alert]
-      assert_equal 'http://test.host/', @response.second['Location']
+      assert_equal 'http://test.host/users/sign_in', @response.second['Location']
     end
 
     test 'uses the proxy failure message as symbol' do
@@ -77,7 +69,7 @@ class FailureTest < ActiveSupport::TestCase
         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)
@@ -181,7 +173,7 @@ class FailureTest < ActiveSupport::TestCase
       assert @response.third.body.include?('<h2>Sign in</h2>')
       assert @response.third.body.include?('Invalid email or password.')
     end
-
+    
     test 'calls the original controller if not confirmed email' do
       env = {
         "warden.options" => { :recall => "devise/sessions#new", :attempted_path => "/users/sign_in", :message => :unconfirmed },
@@ -190,9 +182,9 @@ class FailureTest < ActiveSupport::TestCase
       }
       call_failure(env)
       assert @response.third.body.include?('<h2>Sign in</h2>')
-      assert @response.third.body.include?('You have to confirm your account before continuing.')
+      assert @response.third.body.include?('You have to confirm your account before continuing.')     
     end
-
+    
     test 'calls the original controller if inactive account' do
       env = {
         "warden.options" => { :recall => "devise/sessions#new", :attempted_path => "/users/sign_in", :message => :inactive },
@@ -201,7 +193,7 @@ class FailureTest < ActiveSupport::TestCase
       }
       call_failure(env)
       assert @response.third.body.include?('<h2>Sign in</h2>')
-      assert @response.third.body.include?('Your account was not activated yet.')
+      assert @response.third.body.include?('Your account was not activated yet.')     
     end
   end
 end

test/generators/active_record_generator_test.rb

@@ -7,38 +7,15 @@ if DEVISE_ORM == :active_record
     tests ActiveRecord::Generators::DeviseGenerator
     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
-    end
-
-    test "update model migration when model exists" do
       run_generator %w(monster)
-      assert_file "app/models/monster.rb"
-      run_generator %w(monster)
-      assert_migration "db/migrate/add_devise_to_monsters.rb"
+      assert_file "app/models/monster.rb", /devise/, /attr_accessible (:[a-z_]+(, )?)+/
+      assert_migration "db/migrate/devise_create_monsters.rb"
     end
-
+  
     test "all files are properly deleted" do
       run_generator %w(monster)
-      run_generator %w(monster)
-      assert_migration "db/migrate/devise_create_monsters.rb"
-      assert_migration "db/migrate/add_devise_to_monsters.rb"
-      run_generator %w(monster), :behavior => :revoke
-      assert_no_migration "db/migrate/add_devise_to_monsters.rb"
-      assert_migration "db/migrate/devise_create_monsters.rb"
       run_generator %w(monster), :behavior => :revoke
       assert_no_file "app/models/monster.rb"
       assert_no_migration "db/migrate/devise_create_monsters.rb"

test/generators/devise_generator_test.rb

@@ -22,12 +22,6 @@ class DeviseGeneratorTest < Rails::Generators::TestCase
     assert_file "config/routes.rb", match
   end
 
-  test "route generation with skip routes" do
-    run_generator %w(monster name:string --skip-routes)
-    match = /devise_for :monsters, :skip => :all/
-    assert_file "config/routes.rb", match
-  end
-
   def copy_routes
     routes = File.expand_path("../../rails_app/config/routes.rb", __FILE__)
     destination = File.join(destination_root, "config")

test/generators/mongoid_generator_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
-if DEVISE_ORM == :mongoid
-  require "generators/mongoid/devise_generator"
+if DEVISE_ORM == :mongo_id
+  require "generators/mongo_id/devise_generator"
 
   class MongoidGeneratorTest < Rails::Generators::TestCase
     tests Mongoid::Generators::DeviseGenerator
@@ -19,5 +19,4 @@ if DEVISE_ORM == :mongoid
       assert_no_file "app/models/monster.rb"
     end
   end
-end
-
+end

test/generators/views_generator_test.rb

@@ -18,29 +18,12 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
     assert_files "admins"
   end
 
-  test "Assert views with simple form" do
-    run_generator %w(-b simple_form_for)
-    assert_files
-    assert_file "app/views/devise/confirmations/new.html.erb", /simple_form_for/
-
-    run_generator %w(users -b simple_form_for)
-    assert_files "users"
-    assert_file "app/views/users/confirmations/new.html.erb", /simple_form_for/
-  end
-
-  test "Assert views with markerb" do
-    run_generator %w(--markerb)
-    assert_files nil, :mail_template_engine => "markerb"
-  end
-
-  def assert_files(scope = nil, options={})
+  def assert_files(scope = nil, template_engine = nil)
     scope = "devise" if scope.nil?
-    mail_template_engine = options[:mail_template_engine] || "html.erb"
-
     assert_file "app/views/#{scope}/confirmations/new.html.erb"
-    assert_file "app/views/#{scope}/mailer/confirmation_instructions.#{mail_template_engine}"
-    assert_file "app/views/#{scope}/mailer/reset_password_instructions.#{mail_template_engine}"
-    assert_file "app/views/#{scope}/mailer/unlock_instructions.#{mail_template_engine}"
+    assert_file "app/views/#{scope}/mailer/confirmation_instructions.html.erb"
+    assert_file "app/views/#{scope}/mailer/reset_password_instructions.html.erb"
+    assert_file "app/views/#{scope}/mailer/unlock_instructions.html.erb"
     assert_file "app/views/#{scope}/passwords/edit.html.erb"
     assert_file "app/views/#{scope}/passwords/new.html.erb"
     assert_file "app/views/#{scope}/registrations/new.html.erb"

test/helpers/devise_helper_test.rb

@@ -1,51 +0,0 @@
-require 'test_helper'
-
-class DeviseHelperTest < ActionController::IntegrationTest
-  setup do
-    model_labels = { :models => { :user => "utilisateur" } }
-
-    I18n.backend.store_translations :fr,
-    {
-      :errors => { :messages => { :not_saved => {
-        :one => "Erreur lors de l'enregistrement de '%{resource}': 1 erreur.",
-        :other => "Erreur lors de l'enregistrement de '%{resource}': %{count} erreurs."
-      } } },
-      :activerecord => model_labels,
-      :mongoid => model_labels
-    }
-
-    I18n.locale = 'fr'
-  end
-
-  teardown do
-    I18n.locale = 'en'
-  end
-
-  test 'test errors.messages.not_saved with single error from i18n' do
-    get new_user_registration_path
-
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user123'
-    click_button 'Sign up'
-
-    assert_have_selector '#error_explanation'
-    assert_contain "Erreur lors de l'enregistrement de 'utilisateur': 1 erreur"
-  end
-
-  test 'test errors.messages.not_saved with multiple errors from i18n' do
-    # Dirty tracking behavior prevents email validations from being applied:
-    #    https://github.com/mongoid/mongoid/issues/756
-    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
-
-    get new_user_registration_path
-
-    fill_in 'email', :with => 'invalid_email'
-    fill_in 'password', :with => 'new_user123'
-    fill_in 'password confirmation', :with => 'new_user321'
-    click_button 'Sign up'
-
-    assert_have_selector '#error_explanation'
-    assert_contain "Erreur lors de l'enregistrement de 'utilisateur': 2 erreurs"
-  end
-end
-

test/integration/authenticatable_test.rb

@@ -101,54 +101,6 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     assert_contain 'Private!'
   end
 
-  test 'signed in as admin should get admin dashboard' do
-    sign_in_as_admin
-    assert warden.authenticated?(:admin)
-    assert_not warden.authenticated?(:user)
-
-    get dashboard_path
-
-    assert_response :success
-    assert_template 'home/admin'
-    assert_contain 'Admin dashboard'
-  end
-
-  test 'signed in as user should get user dashboard' do
-    sign_in_as_user
-    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
-
-    get dashboard_path
-
-    assert_response :success
-    assert_template 'home/user'
-    assert_contain 'User dashboard'
-  end
-
-  test 'not signed in should get no dashboard' do
-    assert_raises ActionController::RoutingError do
-      get dashboard_path
-    end
-  end
-
-  test 'signed in user should not see unauthenticated page' do
-    sign_in_as_user
-    assert warden.authenticated?(:user)
-    assert_not warden.authenticated?(:admin)
-
-    assert_raises ActionController::RoutingError do
-      get join_path
-    end
-  end
-
-  test 'not signed in users should see unautheticated page' do
-    get join_path
-
-    assert_response :success
-    assert_template 'home/join'
-    assert_contain 'Join'
-  end
-
   test 'signed in as user should not be able to access admins actions' do
     sign_in_as_user
     assert warden.authenticated?(:user)
@@ -200,12 +152,6 @@ class AuthenticationSanityTest < ActionController::IntegrationTest
     get root_path
     assert_not_contain 'Signed out successfully'
   end
-
-  test 'scope uses custom failure app' do
-    put "/en/accounts/management"
-    assert_equal "Oops, not found", response.body
-    assert_equal 404, response.status
-  end
 end
 
 class AuthenticationRedirectTest < ActionController::IntegrationTest
@@ -318,7 +264,7 @@ class AuthenticationSessionTest < ActionController::IntegrationTest
   end
 end
 
-class AuthenticationWithScopedViewsTest < ActionController::IntegrationTest
+class AuthenticationWithScopesTest < ActionController::IntegrationTest
   test 'renders the scoped view if turned on and view is available' do
     swap Devise, :scoped_views => true do
       assert_raise Webrat::NotFoundError do
@@ -360,20 +306,6 @@ class AuthenticationWithScopedViewsTest < ActionController::IntegrationTest
 end
 
 class AuthenticationOthersTest < ActionController::IntegrationTest
-  test 'handles unverified requests gets rid of caches' do
-    swap UsersController, :allow_forgery_protection => true do
-      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
-
-      sign_in_as_user
-      assert warden.authenticated?(:user)
-
-      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
-      assert_equal "User is not authenticated", response.body
-    end
-  end
-
   test 'uses the custom controller with the custom controller view' do
     get '/admin_area/sign_in'
     assert_contain 'Sign in'
@@ -382,9 +314,8 @@ class AuthenticationOthersTest < ActionController::IntegrationTest
   end
 
   test 'render 404 on roles without routes' do
-    assert_raise ActionController::RoutingError do
-      get '/admin_area/password/new'
-    end
+    get '/admin_area/password/new'
+    assert_equal 404, response.status
   end
 
   test 'does not intercept Rails 401 responses' do
@@ -407,14 +338,14 @@ 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_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>\n  <email></email>\n  <password></password>\n</user>\n", response.body
   end
 
   test 'sign in stub in json format' do
     get new_user_session_path(:format => 'json')
     assert_match '{"user":{', response.body
     assert_match '"email":""', response.body
-    assert_match '"password":null', response.body
+    assert_match '"password":""', response.body
   end
 
   test 'sign in stub in json with non attribute key' do
@@ -422,7 +353,7 @@ class AuthenticationOthersTest < ActionController::IntegrationTest
       get new_user_session_path(:format => 'json')
       assert_match '{"user":{', response.body
       assert_match '"other_key":null', response.body
-      assert_match '"password":null', response.body
+      assert_match '"password":""', response.body
     end
   end
 
@@ -445,22 +376,6 @@ class AuthenticationOthersTest < ActionController::IntegrationTest
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
-  test 'sign in with xml format is idempotent' do
-    get new_user_session_path(:format => 'xml')
-    assert_response :success
-
-    create_user
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
-    assert_response :success
-
-    get new_user_session_path(:format => 'xml')
-    assert_response :success
-
-    post user_session_path(:format => 'xml'), :user => {:email => "user@test.com", :password => '123456'}
-    assert_response :success
-    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
-  end
-
   test 'sign out with xml format returns ok response' do
     sign_in_as_user
     get destroy_user_session_path(:format => 'xml')
@@ -476,23 +391,6 @@ class AuthenticationOthersTest < ActionController::IntegrationTest
   end
 end
 
-class AuthenticationKeysTest < ActionController::IntegrationTest
-  test 'missing authentication keys cause authentication to abort' do
-    swap Devise, :authentication_keys => [:subdomain] do
-      sign_in_as_user
-      assert_contain "Invalid email or password."
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
-  test 'missing authentication keys cause authentication to abort unless marked as not required' do
-    swap Devise, :authentication_keys => { :email => true, :subdomain => false } do
-      sign_in_as_user
-      assert warden.authenticated?(:user)
-    end
-  end
-end
-
 class AuthenticationRequestKeysTest < ActionController::IntegrationTest
   test 'request keys are used on authentication' do
     host! 'foo.bar.baz'
@@ -548,9 +446,7 @@ class AuthenticationSignOutViaTest < ActionController::IntegrationTest
 
   test 'do not allow sign out via get when sign_out_via provides only delete' do
     sign_in!(:sign_out_via_delete)
-    assert_raise ActionController::RoutingError do
-      get destroy_sign_out_via_delete_session_path
-    end
+    get destroy_sign_out_via_delete_session_path
     assert warden.authenticated?(:sign_out_via_delete)
   end
 
@@ -562,9 +458,7 @@ class AuthenticationSignOutViaTest < ActionController::IntegrationTest
 
   test 'do not allow sign out via get when sign_out_via provides only post' do
     sign_in!(:sign_out_via_post)
-    assert_raise ActionController::RoutingError do
-      get destroy_sign_out_via_delete_session_path
-    end
+    get destroy_sign_out_via_delete_session_path
     assert warden.authenticated?(:sign_out_via_post)
   end
 
@@ -582,9 +476,7 @@ class AuthenticationSignOutViaTest < ActionController::IntegrationTest
 
   test 'do not allow sign out via get when sign_out_via provides delete and post' do
     sign_in!(:sign_out_via_delete_or_post)
-    assert_raise ActionController::RoutingError do
-      get destroy_sign_out_via_delete_or_post_session_path
-    end
+    get destroy_sign_out_via_delete_or_post_session_path
     assert warden.authenticated?(:sign_out_via_delete_or_post)
   end
 end

test/integration/confirmable_test.rb

@@ -6,7 +6,7 @@ class ConfirmationTest < ActionController::IntegrationTest
     visit user_confirmation_path(:confirmation_token => confirmation_token)
   end
 
-  def resend_confirmation
+  test 'user should be able to request a new confirmation' do
     user = create_user(:confirm => false)
     ActionMailer::Base.deliveries.clear
 
@@ -15,23 +15,10 @@ class ConfirmationTest < ActionController::IntegrationTest
 
     fill_in 'email', :with => user.email
     click_button 'Resend confirmation instructions'
-  end
-
-  test 'user should be able to request a new confirmation' do
-    resend_confirmation
 
     assert_current_url '/users/sign_in'
     assert_contain 'You will receive an email with instructions about how to confirm your account in a few minutes'
     assert_equal 1, ActionMailer::Base.deliveries.size
-    assert_equal ['please-change-me@config-initializers-devise.com'], ActionMailer::Base.deliveries.first.from
-  end
-
-  test 'user should receive a confirmation from a custom mailer' do
-    User.any_instance.stubs(:devise_mailer).returns(Users::Mailer)
-
-    resend_confirmation
-
-    assert_equal ['custom@example.com'], ActionMailer::Base.deliveries.first.from
   end
 
   test 'user with invalid confirmation token should not be able to confirm an account' do
@@ -50,15 +37,6 @@ class ConfirmationTest < ActionController::IntegrationTest
     assert user.reload.confirmed?
   end
 
-  test 'user should be redirected to a custom path after confirmation' do
-    Devise::ConfirmationsController.any_instance.stubs(:after_confirmation_path_for).returns("/?custom=1")
-
-    user = create_user(:confirm => false)
-    visit_user_confirmation_with_token(user.confirmation_token)
-
-    assert_current_url "/?custom=1"
-  end
-
   test 'already confirmed user should not be able to confirm the account again' do
     user = create_user(:confirm => false)
     user.confirmed_at = Time.now
@@ -82,7 +60,7 @@ class ConfirmationTest < ActionController::IntegrationTest
     assert_contain 'already confirmed'
   end
 
-  test 'sign in user automatically after confirming its email' do
+  test 'sign in user automatically after confirming it\'s email' do
     user = create_user(:confirm => false)
     visit_user_confirmation_with_token(user.confirmation_token)
 
@@ -106,17 +84,6 @@ class ConfirmationTest < ActionController::IntegrationTest
     end
   end
 
-  test 'not confirmed user should not see confirmation message if invalid credentials are given' do
-    swap Devise, :confirm_within => 0.days do
-      sign_in_as_user(:confirm => false) do
-        fill_in 'password', :with => 'invalid'
-      end
-
-      assert_contain 'Invalid email or password'
-      assert_not warden.authenticated?(:user)
-    end
-  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
       sign_in_as_user(:confirm => false)
@@ -139,7 +106,7 @@ class ConfirmationTest < ActionController::IntegrationTest
     user = create_user(:confirm => false)
     post user_confirmation_path(:format => 'xml'), :user => { :email => user.email }
     assert_response :success
-    assert_equal response.body, {}.to_xml
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
   test 'resent confirmation token with invalid E-Mail in XML format should return invalid response' do
@@ -162,42 +129,4 @@ class ConfirmationTest < ActionController::IntegrationTest
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
-
-  test 'request an account confirmation account with JSON, should return an empty JSON' do
-    user = create_user(:confirm => false)
-
-    post user_confirmation_path, :user => { :email => user.email }, :format => :json
-    assert_response :success
-    assert_equal response.body, {}.to_json
-  end
-
-  test "when in paranoid mode and with a valid e-mail, should not say that the e-mail is valid" do
-    swap Devise, :paranoid => true do
-      user = create_user(:confirm => false)
-      visit new_user_session_path
-
-      click_link "Didn't receive confirmation instructions?"
-      fill_in 'email', :with => user.email
-      click_button 'Resend confirmation instructions'
-
-      assert_contain "If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes."
-      assert_current_url "/users/sign_in"
-    end
-  end
-
-  test "when in paranoid mode and with a invalid e-mail, should not say that the e-mail is invalid" do
-    swap Devise, :paranoid => true do
-      visit new_user_session_path
-
-      click_link "Didn't receive confirmation instructions?"
-      fill_in 'email', :with => "idonthavethisemail@gmail.com"
-      click_button 'Resend confirmation instructions'
-
-      assert_not_contain "1 error prohibited this user from being saved:"
-      assert_not_contain "Email not found"
-
-      assert_contain "If your e-mail exists on our database, you will receive an email with instructions about how to confirm your account in a few minutes."
-      assert_current_url "/users/sign_in"
-    end
-  end
 end

test/integration/database_authenticatable_test.rb

@@ -22,28 +22,6 @@ class DatabaseAuthenticationTest < ActionController::IntegrationTest
       assert_not warden.authenticated?(:user)
     end
   end
-  
-  test 'sign in with email including extra spaces should succeed when email is in the list of strip whitespace keys' do
-    create_user(:email => ' foo@bar.com ')
-    
-    sign_in_as_user do
-      fill_in 'email', :with => 'foo@bar.com'
-    end
-    
-    assert warden.authenticated?(:user)
-  end
-
-  test 'sign in with email including extra spaces should fail when email is NOT the list of strip whitespace keys' do
-    swap Devise, :strip_whitespace_keys => [] do
-      create_user(:email => 'foo@bar.com')
-      
-      sign_in_as_user do
-        fill_in 'email', :with => ' foo@bar.com '
-      end
-      
-      assert_not warden.authenticated?(:user)
-    end
-  end
 
   test 'sign in should not authenticate if not using proper authentication keys' do
     swap Devise, :authentication_keys => [:username] do

test/integration/http_authenticatable_test.rb

@@ -1,14 +1,6 @@
 require 'test_helper'
 
 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")}"
-      assert warden.authenticated?(:user)
-      assert_equal "User is authenticated", response.body
-    end
-  end
 
   test 'sign in should authenticate with http' do
     sign_in_as_new_user_with_http

test/integration/lockable_test.rb

@@ -6,7 +6,7 @@ class LockTest < ActionController::IntegrationTest
     visit user_unlock_path(:unlock_token => unlock_token)
   end
 
-  def send_unlock_request
+  test 'user should be able to request a new unlock token' do
     user = create_user(:locked => true)
     ActionMailer::Base.deliveries.clear
 
@@ -15,23 +15,10 @@ class LockTest < ActionController::IntegrationTest
 
     fill_in 'email', :with => user.email
     click_button 'Resend unlock instructions'
-  end
-
-  test 'user should be able to request a new unlock token' do
-    send_unlock_request
 
     assert_template 'sessions/new'
     assert_contain 'You will receive an email with instructions about how to unlock your account in a few minutes'
     assert_equal 1, ActionMailer::Base.deliveries.size
-    assert_equal ['please-change-me@config-initializers-devise.com'], ActionMailer::Base.deliveries.first.from
-  end
-
-  test 'user should receive the instructions from a custom mailer' do
-    User.any_instance.stubs(:devise_mailer).returns(Users::Mailer)
-
-    send_unlock_request
-
-    assert_equal ['custom@example.com'], ActionMailer::Base.deliveries.first.from
   end
 
   test 'unlocked user should not be able to request a unlock token' do
@@ -50,7 +37,7 @@ class LockTest < ActionController::IntegrationTest
   end
 
   test 'unlocked pages should not be available if email strategy is disabled' do
-    visit "/admin_area/sign_in"
+    visit "/admins/sign_in"
 
     assert_raise Webrat::NotFoundError do
       click_link "Didn't receive unlock instructions?"
@@ -60,9 +47,8 @@ class LockTest < ActionController::IntegrationTest
       visit new_admin_unlock_path
     end
 
-    assert_raise ActionController::RoutingError do
-      visit "/admin_area/unlock/new"
-    end
+    visit "/admins/unlock/new"
+    assert_response :not_found
   end
 
   test 'user with invalid unlock token should not be able to unlock an account' do
@@ -86,7 +72,7 @@ class LockTest < ActionController::IntegrationTest
     assert_not user.reload.access_locked?
   end
 
-  test "sign in user automatically after unlocking its account" do
+  test "sign in user automatically after unlocking it's account" do
     user = create_user(:locked => true)
     visit_user_unlock_with_token(user.unlock_token)
     assert warden.authenticated?(:user)
@@ -126,7 +112,7 @@ class LockTest < ActionController::IntegrationTest
 
     post user_unlock_path(:format => 'xml'), :user => {:email => user.email}
     assert_response :success
-    assert_equal response.body, {}.to_xml
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
     assert_equal 1, ActionMailer::Base.deliveries.size
   end
 
@@ -154,59 +140,4 @@ class LockTest < ActionController::IntegrationTest
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
-
-  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})
-    assert_response :success
-    assert_equal response.body, {}.to_json
-  end
-
-  test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is locked" do
-    swap Devise, :paranoid => true do
-      user = create_user(:locked => true)
-
-      visit new_user_session_path
-      click_link "Didn't receive unlock instructions?"
-
-      fill_in 'email', :with => user.email
-      click_button 'Resend unlock instructions'
-
-      assert_current_url "/users/sign_in"
-      assert_contain "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-    end
-  end
-
-  test "in paranoid mode, when trying to unlock an user that exists it should not say that it exists if it is not locked" do
-    swap Devise, :paranoid => true do
-      user = create_user(:locked => false)
-
-      visit new_user_session_path
-      click_link "Didn't receive unlock instructions?"
-
-      fill_in 'email', :with => user.email
-      click_button 'Resend unlock instructions'
-
-      assert_current_url "/users/sign_in"
-      assert_contain "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-    end
-  end
-
-  test "in paranoid mode, when trying to unlock an user that does not exists it should not say that it does not exists" do
-    swap Devise, :paranoid => true do
-      visit new_user_session_path
-      click_link "Didn't receive unlock instructions?"
-
-      fill_in 'email', :with => "arandomemail@hotmail.com"
-      click_button 'Resend unlock instructions'
-
-      assert_not_contain "1 error prohibited this user from being saved:"
-      assert_not_contain "Email not found"
-      assert_current_url "/users/sign_in"
-
-      assert_contain "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
-
-    end
-  end
-
 end

test/integration/omniauthable_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 
-
 class OmniauthableIntegrationTest < ActionController::IntegrationTest
   FACEBOOK_INFO = {
     "id" => '12345',
@@ -13,6 +12,14 @@ class OmniauthableIntegrationTest < ActionController::IntegrationTest
 
   setup do
     OmniAuth.config.test_mode = true
+    stub_facebook!
+  end
+
+  teardown do
+    OmniAuth.config.test_mode = false
+  end
+
+  def stub_facebook!
     OmniAuth.config.mock_auth[:facebook] = {
       "uid" => '12345',
       "provider" => 'facebook',
@@ -22,10 +29,6 @@ class OmniauthableIntegrationTest < ActionController::IntegrationTest
     }
   end
 
-  teardown do
-    OmniAuth.config.test_mode = false
-  end
-
   def stub_action!(name)
     Users::OmniauthCallbacksController.class_eval do
       alias_method :__old_facebook, :facebook
@@ -111,7 +114,9 @@ class OmniauthableIntegrationTest < ActionController::IntegrationTest
   test "generates a proper link when SCRIPT_NAME is set" do
     header 'SCRIPT_NAME', '/q'
     visit "/users/sign_in"
-    assert_select "a", :href => "/q/users/auth/facebook"
+    click_link "Sign in with Facebook"
+
+    assert_equal '/q/users/auth/facebook', current_url
   end
 
   test "handles callback error parameter according to the specification" do
@@ -125,7 +130,7 @@ class OmniauthableIntegrationTest < ActionController::IntegrationTest
     OmniAuth.config.mock_auth[:facebook] = :invalid_credentials
 
     visit "/users/sign_in"
-    click_link "Sign in with Facebook"
+    click_link "Sign in with facebook"
 
     assert_current_url "/users/sign_in"
     assert_contain 'Could not authorize you from Facebook because "Invalid credentials".'

test/integration/recoverable_test.rb

@@ -17,7 +17,7 @@ class PasswordTest < ActionController::IntegrationTest
     click_button 'Send me reset password instructions'
   end
 
-  def reset_password(options={}, &block)
+  def reset_password(options={}, &block)    
     visit edit_user_password_path(:reset_password_token => options[:reset_password_token]) unless options[:visit] == false
     assert_response :success
 
@@ -29,33 +29,23 @@ class PasswordTest < ActionController::IntegrationTest
 
   test 'reset password with email of different case should succeed when email is in the list of case insensitive keys' do
     create_user(:email => 'Foo@Bar.com')
-
+    
     request_forgot_password do
       fill_in 'email', :with => 'foo@bar.com'
     end
-
+    
     assert_current_url '/users/sign_in'
     assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
   end
 
-  test 'reset password with email should send an email from a custom mailer' do
-    create_user(:email => 'Foo@Bar.com')
-
-    User.any_instance.stubs(:devise_mailer).returns(Users::Mailer)
-    request_forgot_password do
-      fill_in 'email', :with => 'foo@bar.com'
-    end
-    assert_equal ['custom@example.com'], ActionMailer::Base.deliveries.last.from
-  end
-
   test 'reset password with email of different case should fail when email is NOT the list of case insensitive keys' do
     swap Devise, :case_insensitive_keys => [] do
       create_user(:email => 'Foo@Bar.com')
-
+      
       request_forgot_password do
         fill_in 'email', :with => 'foo@bar.com'
       end
-
+      
       assert_response :success
       assert_current_url '/users/password'
       assert_have_selector "input[type=email][value='foo@bar.com']"
@@ -63,32 +53,6 @@ class PasswordTest < ActionController::IntegrationTest
     end
   end
 
-  test 'reset password with email with extra whitespace should succeed when email is in the list of strip whitespace keys' do
-    create_user(:email => 'foo@bar.com')
-
-    request_forgot_password do
-      fill_in 'email', :with => ' foo@bar.com '
-    end
-
-    assert_current_url '/users/sign_in'
-    assert_contain 'You will receive an email with instructions about how to reset your password in a few minutes.'
-  end
-
-  test 'reset password with email with extra whitespace should fail when email is NOT the list of strip whitespace keys' do
-    swap Devise, :strip_whitespace_keys => [] do
-      create_user(:email => 'foo@bar.com')
-
-      request_forgot_password do
-        fill_in 'email', :with => ' foo@bar.com '
-      end
-
-      assert_response :success
-      assert_current_url '/users/password'
-      assert_have_selector "input[type=email][value=' foo@bar.com ']"
-      assert_contain 'not found'
-    end
-  end
-
   test 'authenticated user should not be able to visit forgot password page' do
     sign_in_as_user
     assert warden.authenticated?(:user)
@@ -157,7 +121,7 @@ class PasswordTest < ActionController::IntegrationTest
     reset_password :reset_password_token => user.reload.reset_password_token
 
     assert_current_url '/'
-    assert_contain 'Your password was changed successfully. You are now signed in.'
+    assert_contain 'Your password was changed successfully.'
     assert user.reload.valid_password?('987654321')
   end
 
@@ -176,7 +140,7 @@ class PasswordTest < ActionController::IntegrationTest
     assert user.reload.valid_password?('987654321')
   end
 
-  test 'sign in user automatically after changing its password' do
+  test 'sign in user automatically after changing it\'s password' do
     user = create_user
     request_forgot_password
     reset_password :reset_password_token => user.reload.reset_password_token
@@ -184,31 +148,20 @@ class PasswordTest < ActionController::IntegrationTest
     assert warden.authenticated?(:user)
   end
 
-  test 'does not sign in user automatically after changing its password if it\'s locked' do
-    user = create_user(:locked => true)
-    request_forgot_password
-    reset_password :reset_password_token => user.reload.reset_password_token
-
-    assert_contain 'Your password was changed successfully.'
-    assert_not_contain 'You are now signed in.'
-    assert_equal new_user_session_path, @request.path
-    assert !warden.authenticated?(:user)
-  end
-
-  test 'sign in user automatically and confirm after changing its password if it\'s not confirmed' do
+  test 'does not sign in user automatically after changing it\'s password if it\'s not active' do
     user = create_user(:confirm => false)
     request_forgot_password
     reset_password :reset_password_token => user.reload.reset_password_token
 
-    assert warden.authenticated?(:user)
-    assert user.reload.confirmed?
+    assert_equal new_user_session_path, @request.path
+    assert !warden.authenticated?(:user)
   end
 
   test 'reset password request with valid E-Mail in XML format should return valid response' do
     create_user
     post user_password_path(:format => 'xml'), :user => {:email => "user@test.com"}
     assert_response :success
-    assert_equal response.body, { }.to_xml
+    assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>)
   end
 
   test 'reset password request with invalid E-Mail in XML format should return valid response' do
@@ -218,15 +171,6 @@ class PasswordTest < ActionController::IntegrationTest
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
 
-  test 'reset password request with invalid E-Mail in XML format should return empty and valid response' do
-    swap Devise, :paranoid => true do
-      create_user
-      post user_password_path(:format => 'xml'), :user => {:email => "invalid@test.com"}
-      assert_response :success
-      assert_equal response.body, { }.to_xml
-    end
-  end
-
   test 'change password with valid parameters in XML format should return valid response' do
     user = create_user
     request_forgot_password
@@ -250,38 +194,4 @@ class PasswordTest < ActionController::IntegrationTest
     assert_response :unprocessable_entity
     assert response.body.include? %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<errors>)
   end
-
-  test "when using json requests to ask a confirmable request, should not return the object" do
-    user = create_user(:confirm => false)
-
-    post user_password_path(:format => :json), :user => { :email => user.email }
-
-    assert_response :success
-    assert_equal response.body, "{}"
-  end
-
-  test "when in paranoid mode and with an invalid e-mail, asking to reset a password should display a message that does not indicates that the e-mail does not exists in the database" do
-    swap Devise, :paranoid => true do
-      visit_new_password_path
-      fill_in "email", :with => "arandomemail@test.com"
-      click_button 'Send me reset password instructions'
-
-      assert_not_contain "1 error prohibited this user from being saved:"
-      assert_not_contain "Email not found"
-      assert_contain "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
-      assert_current_url "/users/sign_in"
-    end
-  end
-
-  test "when in paranoid mode and with a valid e-mail, asking to reset password should display a message that does not indicates that the email exists in the database and redirect to the failure route" do
-    swap Devise, :paranoid => true do
-      user = create_user
-      visit_new_password_path
-      fill_in 'email', :with => user.email
-      click_button 'Send me reset password instructions'
-
-      assert_contain "If your e-mail exists on our database, you will receive a password recovery link on your e-mail"
-      assert_current_url "/users/sign_in"
-    end
-  end
 end

test/integration/registerable_test.rb

@@ -36,19 +36,13 @@ class RegistrationTest < ActionController::IntegrationTest
     assert_current_url "/?custom=1"
   end
 
-  def user_sign_up
-    ActionMailer::Base.deliveries.clear
-
+  test 'a guest user should be able to sign up successfully and be blocked by confirmation' do
     get new_user_registration_path
 
     fill_in 'email', :with => 'new_user@test.com'
     fill_in 'password', :with => 'new_user123'
     fill_in 'password confirmation', :with => 'new_user123'
     click_button 'Sign up'
-  end
-
-  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_not_contain 'You have to confirm your account before continuing'
@@ -61,17 +55,6 @@ class RegistrationTest < ActionController::IntegrationTest
     assert_not user.confirmed?
   end
 
-  test 'a guest user should receive the confirmation instructions from the default mailer' do
-    user_sign_up
-    assert_equal ['please-change-me@config-initializers-devise.com'], ActionMailer::Base.deliveries.first.from
-  end
-
-  test 'a guest user should receive the confirmation instructions from a custom mailer' do
-    User.any_instance.stubs(:devise_mailer).returns(Users::Mailer)
-    user_sign_up
-    assert_equal ['custom@example.com'], ActionMailer::Base.deliveries.first.from
-  end
-
   test 'a guest user should be blocked by confirmation and redirected to a custom path' do
     Devise::RegistrationsController.any_instance.stubs(:after_inactive_sign_up_path_for).returns("/?custom=1")
     get new_user_registration_path
@@ -86,10 +69,6 @@ class RegistrationTest < ActionController::IntegrationTest
   end
 
   test 'a guest user cannot sign up with invalid information' do
-    # Dirty tracking behavior prevents email validations from being applied:
-    #    https://github.com/mongoid/mongoid/issues/756
-    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
-
     get new_user_registration_path
 
     fill_in 'email', :with => 'invalid_email'
@@ -108,10 +87,6 @@ class RegistrationTest < ActionController::IntegrationTest
   end
 
   test 'a guest should not sign up with email/password that already exists' do
-    # Dirty tracking behavior prevents email validations from being applied:
-    #    https://github.com/mongoid/mongoid/issues/756
-    (pending "Fails on Mongoid < 2.1"; break) if defined?(Mongoid) && Mongoid::VERSION.to_f < 2.1
-
     user = create_user
     get new_user_registration_path
 
@@ -236,14 +211,14 @@ class RegistrationTest < ActionController::IntegrationTest
     get new_user_registration_path(:format => 'xml')
     assert_response :success
     assert_match %(<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<user>), response.body
-    assert_no_match(/<confirmation-token/, response.body)
+    assert_no_match(/<confirmation_token>/, response.body) if DEVISE_ORM == :active_record
   end
 
   test 'a user with JSON sign up stub' do
     get new_user_registration_path(:format => 'json')
     assert_response :success
     assert_match %({"user":), response.body
-    assert_no_match(/"confirmation_token"/, response.body)
+    assert_no_match(/"confirmation_token"/, response.body) if DEVISE_ORM == :active_record
   end
 
   test 'an admin sign up with valid information in XML format should return valid response' do

test/integration/rememberable_test.rb

@@ -38,18 +38,6 @@ class RememberMeTest < ActionController::IntegrationTest
     assert_nil request.cookies["remember_user_cookie"]
   end
 
-  test 'handles unverified requests gets rid of caches' do
-    swap UsersController, :allow_forgery_protection => true do
-      post exhibit_user_url(1)
-      assert_not warden.authenticated?(:user)
-
-      create_user_and_remember
-      post exhibit_user_url(1)
-      assert_equal "User is not authenticated", response.body
-      assert_not warden.authenticated?(:user)
-    end
-  end
-
   test 'generate remember token after sign in' do
     user = sign_in_as_user :remember_me => true
     assert request.cookies["remember_user_token"]
@@ -81,14 +69,7 @@ class RememberMeTest < ActionController::IntegrationTest
     assert_response :success
     assert warden.authenticated?(:user)
     assert warden.user(:user) == user
-    assert_match /remember_user_token[^\n]*HttpOnly/, response.headers["Set-Cookie"], "Expected Set-Cookie header in response to set HttpOnly flag on remember_user_token cookie."
-  end
-
-  test 'remember the user before sign up and redirect him to his home' do
-    user = create_user_and_remember
-    get new_user_registration_path
-    assert warden.authenticated?(:user)
-    assert_redirected_to root_path
+    assert_match /remember_user_token[^\n]*HttpOnly\n/, response.headers["Set-Cookie"], "Expected Set-Cookie header in response to set HttpOnly flag on remember_user_token cookie."
   end
 
   test 'cookies are destroyed on unverified requests' do

test/integration/timeoutable_test.rb

@@ -16,15 +16,6 @@ class SessionTimeoutTest < ActionController::IntegrationTest
     assert_not_equal old_last_request, last_request_at
   end
 
-  test 'set last request at in user session after each request is skipped if tracking is disabled' do
-    sign_in_as_user
-    old_last_request = last_request_at
-    assert_not_nil last_request_at
-
-    get users_path, {}, 'devise.skip_trackable' => true
-    assert_equal old_last_request, last_request_at
-  end
-
   test 'not time out user session before default limit time' do
     sign_in_as_user
     assert_response :success

test/integration/token_authenticatable_test.rb

@@ -13,17 +13,6 @@ class TokenAuthenticationTest < ActionController::IntegrationTest
     end
   end
 
-  test 'authenticate with valid authentication token key and value through params, when params with the same key as scope exist' do
-    swap Devise, :token_authentication_key => :secret_token do
-      user = create_user_with_authentication_token
-      post exhibit_user_path(user), Devise.token_authentication_key => user.authentication_token, :user => { :some => "data" }
-
-      assert_response :success
-      assert_contain 'User is authenticated'
-      assert warden.authenticated?(:user)
-    end
-  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
       sign_in_as_new_user_with_token