Update gemspec with 1.0.9 release.

Fix deprecation warning in Rails 2.3.10
Work around a bug in Rails 2.3.10 where reset session cause Rack::Lint tests to fail.
2026-01-11 08:37:56 -05:00 · 2010-11-26 13:25:19 +01:00 · 2010-11-26 08:42:01 -02:00 · 2010-11-26 11:31:38 +01:00 · 2010-11-21 00:24:31 +01:00 · 2010-11-21 00:23:44 +01:00
231 changed files with 3948 additions and 7377 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,5 @@
 *~
 coverage/*
 *.sqlite3
-.bundle
 rdoc/*
 pkg
-log
-test/tmp/*
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +0,0 @@
-script: "rake test"
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - ree
-  - rbx
-  - jruby
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,213 +1,13 @@
-== 1.3.0
+== 1.0.9

 * enhancements
-  * All controllers can now handle different mime types than html using Responders (by github.com/sikachu)
-  * Added reset_password_within as configuration option to send the token for recovery (by github.com/jdguyot)
-  * Bump password length to 128 characters (by github.com/k33l0r)
-  * Add :only as option to devise_for (by github.com/timoschilling)
-  * Allow to override path after sending password instructions (by github.com/irohiroki)
-  * require_no_authentication has its own flash message (by github.com/jackdempsey)
+  * Extracted redirect path from Devise failure app to a new method, allowing override in custom failure apps
+  * Added sign_out_via

 * bug fix
-  * Fix a bug where configuration options were being included too late
-  * Ensure Devise::TestHelpers can be used to tests Devise internal controllers (by github.com/jwilger)
-  * valid_password? should not choke on empty passwords (by github.com/mikel)
-  * Calling devise more than once does not include previously added modules anymore
-  * downcase_keys before validation
-
-* backward incompatible changes
-  * authentication_keys are no longer considered when creating the e-mail validations, the previous behavior was buggy. You must double check if you were relying on such behavior.
-
-== 1.2.1
-
-* enhancements
-  * Improve update path messages
-
-== 1.2.0
-
-* bug fix
-  * Properly ignore path prefix on omniauthable
-  * Faster uniqueness queries
-  * Rename active? to active_for_authentication? to avoid conflicts
-
-== 1.2.rc2
-
-* enhancements
-  * Make friendly_token 20 chars long
-  * Use secure_compare
-
-* bug fix
-  * Fix an issue causing infinite redirects in production
-  * rails g destroy works properly with devise generators (by github.com/andmej)
-  * before_failure callbacks should work on test helpers (by github.com/twinge)
-  * rememberable cookie now is httponly by default (by github.com/JamesFerguson)
-  * Add missing confirmation_keys (by github.com/JohnPlummer)
-  * Ensure after_* hooks are called on RegistrationsController
-  * When using database_authenticatable Devise will now only create an email field when appropriate (if using default authentication_keys or custom authentication_keys with email included)
-  * Ensure stateless token does not trigger timeout (by github.com/pixelauthority)
-  * Implement handle_unverified_request for Rails 3.0.4 compatibility and improve FailureApp reliance on symbols
-  * Consider namespaces while generating routes
-  * Custom failure apps no longer ignored in test mode (by github.com/jaghion)
-  * Do not depend on ActiveModel::Dirty
-  * Manual sign_in now triggers remember token
-  * Be sure to halt strategies on failures
-  * Consider SCRIPT_NAME on Omniauth paths
-  * Reset failed attempts when lock is expired
-  * Ensure there is no Mongoid injection
-
-* deprecations
-  * Deprecated anybody_signed_in? in favor of signed_in? (by github.com/gavinhughes)
-  * Removed --haml and --slim view templates
-  * Devise::OmniAuth helpers were deprecated and removed in favor of Omniauth.config.test_mode
-
-== 1.2.rc
-
-* deprecations
-  * cookie_domain is deprecated in favor of cookie_options
-  * after_update_path_for can no longer be defined in ApplicationController
-
-* enhancements
-  * Added OmniAuth support
-  * Added ORM adapter to abstract ORM iteraction
-  * sign_out_via is available in the router to configure the method used for sign out (by github.com/martinrehfeld)
-  * Improved Ajax requests handling in failure app (by github.com/spastorino)
-  * Added request_keys to easily use request specific values (like subdomain) in authentication
-  * Increased the size of friendly_token to 60 characters (reduces the chances of a successful brute attack)
-  * Ensure the friendly token does not include "_" or "-" since some e-mails may not autolink it properly (by github.com/rymai)
-  * Extracted encryptors into :encryptable for better bcrypt support
-  * :rememberable is now able to use salt as token if no remember_token is provided
-  * Store the salt in session and expire the session if the user changes his password
-  * Allow :stateless_token to be set to true avoiding users to be stored in session through token authentication
-  * cookie_options uses session_options values by default
-  * Sign up now check if the user is active or not and redirect him accordingly setting the inactive_signed_up message
-  * Use ActiveModel#to_key instead of #id
-  * sign_out_all_scopes now destroys the whole session
-  * Added case_insensitive_keys that automatically downcases the given keys, by default downcases only e-mail (by github.com/adahl)
-
-* default behavior changes
-  * sign_out_all_scopes defaults to true as security measure
-  * http authenticatable is disabled by default
-  * Devise does not intercept 401 returned from applications
-
-* bugfix
-  * after_sign_in_path_for always receives a resource
-  * Do not execute Warden::Callbacks on Devise::TestHelpers (by github.com/sgronblo)
-  * Allow password recovery and account unlocking to change used keys (by github.com/RStankov)
-  * FailureApp now properly handles nil request.format
-  * Fix a bug causing FailureApp to return with HTTP Auth Headers for IE7
-  * Ensure namespaces has proper scoped views
-  * Ensure Devise does not set empty flash messages (by github.com/sxross)
-
-== 1.1.6
-
-* Use a more secure e-mail regexp
-* Implement Rails 3.0.4 handle unverified request
-* Use secure_compare to compare passwords
-
-== 1.1.5
-
-* bugfix
-  * Ensure to convert keys on indifferent hash
-
-* defaults
-  * Set config.http_authenticatable to false to avoid confusion
-
-== 1.1.4
-
-* bugfix
+  * Email is now case insensitive
  * Avoid session fixation attacks

-== 1.1.3
-
-* bugfix
-  * Add reply-to to e-mail headers by default
-  * Updated the views generator to respect the rails :template_engine option (by github.com/fredwu)
-  * Check the type of HTTP Authentication before using Basic headers
-  * Avoid invalid_salt errors by checking salt presence (by github.com/thibaudgg)
-  * Forget user deletes the right cookie before logout, not remembering the user anymore (by github.com/emtrane)
-  * Fix for failed first-ever logins on PostgreSQL where column default is nil (by github.com/bensie)
-  * :default options is now honored in migrations
-
-== 1.1.2
-
-* bugfix
-  * Compatibility with latest Rails routes schema
-
-== 1.1.1
-
-* bugfix
-  * Fix a small bug where generated locale file was empty on devise:install
-
-== 1.1.0
-
-* enhancements
-  * Rememberable module allows user to be remembered across browsers and is enabled by default (by github.com/trevorturk)
-  * Rememberable module allows you to activate the period the remember me token is extended (by github.com/trevorturk)
-  * devise_for can now be used together with scope method in routes but with a few limitations (check the documentation)
-  * Support `as` or `devise_scope` in the router to specify controller access scope
-  * HTTP Basic Auth can now be disabled/enabled for xhr(ajax) requests using http_authenticatable_on_xhr option (by github.com/pellja)
-
-* bug fix
-  * Fix a bug in Devise::TestHelpers where current_user was returning a Response object for non active accounts
-  * Devise should respect script_name and path_info contracts
-  * Fix a bug when accessing a path with (.:format) (by github.com/klacointe)
-  * Do not add unlock routes unless unlock strategy is email or both
-  * Email should be case insensitive
-  * Store classes as string in session, to avoid serialization and stale data issues
-
-* deprecations
-  * use_default_scope is deprecated and has no effect. Use :as or :devise_scope in the router instead
-
-== 1.1.rc2
-
-* enhancements
-  * Allow to set cookie domain for the remember token. (by github.com/mantas)
-  * Added navigational formats to specify when it should return a 302 and when a 401.
-  * Added authenticate(scope) support in routes (by github.com/wildchild)
-  * Added after_update_path_for to registrations controller (by github.com/thedelchop)
-  * Allow the mailer object to be replaced through config.mailer = "MyOwnMailer"
-
-* bug fix
-  * Fix a bug where session was timing out on sign out
-
-* deprecations
-  * bcrypt is now the default encryptor
-  * devise.mailer.confirmations_instructions now should be devise.mailer.confirmations_instructions.subject
-  * devise.mailer.user.confirmations_instructions now should be devise.mailer.confirmations_instructions.user_subject
-  * Generators now use Rails 3 syntax (devise:install) instead of devise_install
-
-== 1.1.rc1
-
-* enhancements
-  * Rails 3 compatibility
-  * All controllers and views are namespaced, for example: Devise::SessionsController and "devise/sessions"
-  * Devise.orm is deprecated. This reduces the required API to hook your ORM with devise
-  * Use metal for failure app
-  * HTML e-mails now have proper formatting
-  * Allow to give :skip and :controllers in routes
-  * Move trackable logic to the model
-  * E-mails now use any template available in the filesystem. Easy to create multipart e-mails
-  * E-mails asks headers_for in the model to set the proper headers
-  * Allow to specify haml in devise_views
-  * Compatibility with Mongoid
-  * Make config.devise available on config/application.rb
-  * TokenAuthenticatable now works with HTTP Basic Auth
-  * Allow :unlock_strategy to be :none and add :lock_strategy which can be :failed_attempts or none. Setting those values to :none means that you want to handle lock and unlocking by yourself
-  * No need to append ?unauthenticated=true in URLs anymore since Flash was moved to a middleware in Rails 3
-  * :activatable is included by default in your models
-
-* bug fix
-  * Fix a bug with STI
-
-* deprecations
-  * Rails 3 compatible only
-  * Removed support for MongoMapper
-  * Scoped views are no longer "sessions/users/new". Now use "users/sessions/new"
-  * Devise.orm is deprecated, just require "devise/orm/YOUR_ORM" instead
-  * Devise.default_url_options is deprecated, just modify ApplicationController.default_url_options
-  * All messages under devise.sessions, except :signed_in and :signed_out, should be moved to devise.failure
-  * :as and :scope in routes is deprecated. Use :path and :singular instead
-
 == 1.0.8

 * enhancements
@@ -280,6 +80,7 @@
  * Added Http Basic Authentication support
  * Allow scoped_views to be customized per controller/mailer class
  * [#99] Allow authenticatable to used in change_table statements
+  * Add mailer_content_type configuration parameter (by github.com/glennr)

 == 0.9.2

--- a/29
+++ b/29
@@ -1,29 +0,0 @@
-source "http://rubygems.org"
-
-gemspec
-
-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 "webrat", "0.7.2", :require => false
-  gem "mocha", :require => false
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-platforms :ruby do
-  group :test do
-    gem "sqlite3-ruby"
-    gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
-  end
-
-  group :mongoid do
-    gem "mongo", "1.1.2"
-    gem "mongoid", "2.0.0.beta.20"
-    gem "bson_ext", "1.2.1"
-  end
-end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,158 +0,0 @@
-PATH
-  remote: .
-  specs:
-    devise (1.3.0.dev)
-      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)
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright 2009-2011 Plataforma Tecnologia. http://blog.plataformatec.com.br
+Copyright 2009 Plataforma Tecnologia. http://blog.plataformatec.com.br

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
--- a/README.rdoc
+++ b/README.rdoc
@@ -7,111 +7,67 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 * Allows you to have multiple roles (or models/scopes) signed in at the same time;
 * Is based on a modularity concept: use just what you really need.

-It's composed of 12 modules:
+Right now 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.
-* Omniauthable: adds Omniauth (github.com/intridea/omniauth) support;
-* Confirmable: sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
-* Recoverable: resets the user password and sends reset instructions.
-* Registerable: handles signing up users through a registration process, also allowing them to edit and destroy their account.
-* Rememberable: manages generating and clearing a token for remembering the user from a saved cookie.
-* Trackable: tracks sign in count, timestamps and IP address.
-* Timeoutable: expires sessions that have no activity in a specified period of time.
-* Validatable: provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
-* Lockable: locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
-* Encryptable: adds support of other authentication mechanisms besides the built-in Bcrypt (the default).
+* Database Authenticatable: responsible for encrypting password and validating authenticity of a user while signing in.
+* Token Authenticatable: validates authenticity of a user while signing in using an authentication token (also known as "single access token").
+* HttpAuthenticatable: sign in users using basic HTTP authentication.
+* Confirmable: responsible for verifying whether an account is already confirmed to sign in, and to send emails with confirmation instructions.
+* Recoverable: takes care of reseting the user password and send reset instructions.
+* Registerable: handles signing up users through a registration process.
+* Rememberable: manages generating and clearing token for remember the user from a saved cookie.
+* Trackable: tracks sign in count, timestamps and ip.
+* Timeoutable: expires sessions without activity in a certain period of time.
+* Validatable: creates all needed validations for email and password. It's totally optional, so you're able to to customize validations by yourself.
+* Lockable: takes care of locking an account based on the number of failed sign in attempts. Handles unlock via expire and email.
+* Activatable: if you need to activate accounts by other means, which are not through confirmation, use this module.

-== Information
+There's an example application using Devise at http://github.com/plataformatec/devise_example .

-=== The Devise wiki
+== Dependencies

-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:
-
-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:
-
-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.
-
-=== Mailing list
-
-If you have any questions, comments, or concerns, please use the Google Group instead of the GitHub issue tracker:
-
-http://groups.google.com/group/plataformatec-devise
-
-=== RDocs
-
-You can view the Devise documentation in RDoc format here:
-
-http://rubydoc.info/github/plataformatec/devise/master/frames
-
-If you need to use Devise with Rails 2.3, you can always run `gem server` from the command line after you install the gem to access the old documentation.
-
-=== Example applications
-
-There are a few example applications available on GitHub that demonstrate various features of Devise with different versions of Rails. You can view them here:
-
-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:
-
-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:
-
-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.
+Devise is based on Warden (http://github.com/hassox/warden), a Rack Authentication Framework so you need to install it as a gem. Please ensure you have it installed in order to use devise (see installation below).

 == Installation

-You can use the latest Rails 3 gem with the latest Devise gem:
+Install warden gem if you don't have it installed:

-  gem install devise
+  gem install warden

-After you install Devise and add it to your Gemfile, you need to run the generator:
+Install devise gem:

-  rails generate devise:install
+  gem install devise --version=1.0.8

-The generator will install an initializer which describes ALL Devise's configuration options and you MUST take a look at it. When you are done, you are ready to add Devise to any of your models using the generator:
+Configure warden and devise gems inside your app:

-  rails generate devise MODEL
+  config.gem 'warden'
+  config.gem 'devise'

-Replace MODEL by the class name you want to add devise, like User, Admin, etc. This will create a model (if one does not exist) and configure it with default Devise modules. The generator will also create a migration file (if your ORM support them) and configure your routes. Continue reading this file to understand exactly what the generator produces and how to use it.
+Run the generator:

-Support for Rails 2.3.x can be found by installing Devise 1.0.x from the v1.0 branch.
+	ruby script/generate devise_install

-== Starting with Rails?
+And you're ready to go. The generator will install an initializer which describes ALL Devise's configuration options, so be sure to take a look at it and the documentation as well:

-If you are building your first Rails application, we recommend you to *not* use Devise. Devise requires a good understanding of the Rails Framework. In such cases, we advise you to start a simple authentication system from scratch, today we have two resources:
+  http://rdoc.info/projects/plataformatec/devise

-* 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
+If you want to use Devise with bundler on Rails 2.3, you need to follow the instructions here:

-Once you have solidified you understanding of Rails and authentication mechanisms, we assure you Devise will be very pleasant to work with. :)
+  http://github.com/carlhuda/bundler/issues/issue/83

-== Getting started
+== Basic Usage

-This is a walkthrough with all steps you need to setup a devise resource, including model, migration, route files, and optional configuration.
+This is a walkthrough with all steps you need to setup a devise resource, including model, migration, route files, and optional configuration. You MUST also check out the *Generators* section below to help you start.

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

-We're assuming here you want a User model with some Devise modules, as outlined below:
+We're assuming here you want a User model with some modules, as outlined below:

  class User < ActiveRecord::Base
    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:
+After you choose which modules to use, you need to setup your migrations. Luckily, devise has some helpers to save you from this boring work:

  create_table :users do |t|
    t.database_authenticatable
@@ -122,79 +78,66 @@ After you choose which modules to use, you need to set up your migrations. Lucki
    t.timestamps
  end

-Devise doesn't use _attr_accessible_ or _attr_protected_ inside its modules, so be sure to define attributes as accessible or protected in your model.
+Remember that Devise don't rely on _attr_accessible_ or _attr_protected_ inside its modules, so be sure to setup what attributes are accessible or protected in your model.

-Configure your routes after setting up your model. Open your config/routes.rb file and add:
+The next setup after setting up your model is to configure your routes. You do this by opening up your config/routes.rb and adding:

-  devise_for :users
+  map.devise_for :users

-This will use your User model to create a set of needed routes (you can see them by running `rake routes`). If you invoked the devise generator, you noticed that this is exactly what the generator produces for us: model, routes and migrations.
+This is going to look inside you User model and create a set of needed routes (you can see them by running `rake routes`).

-Don't forget to run rake db:migrate and you are ready to go! But don't stop reading here, we still have a lot to tell you.
+There are also some options available for configuring your routes, as :class_name (to set the class for that route), :path_prefix, :as and :path_names, where the last two have the same meaning as in common routes. The available :path_names are:

-=== Controller filters and helpers
+  map.devise_for :users, :as => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock' }

-Devise will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_filter:
+Be sure to check devise_for documentation for detailed description.
+
+After this steps, run your migrations, and you are ready to go! But don't finish reading, we still have a lot to tell you:
+
+== Controller filters and helpers
+
+Devise is gonna create some helpers to use inside your controllers and views. To setup a controller that needs user authentication, just add this before_filter:

  before_filter :authenticate_user!

-To verify if a user is signed in, use the following helper:
+To verify if a user is signed in, you have the following helper:

  user_signed_in?

-For the current signed-in user, this helper is available:
+And to get the current signed in user this helper is available:

  current_user

-You can access the session for this scope:
+You have also access to the session for this scope:

  user_session

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

-  root :to => "home#index"
+  map.root :controller => 'home'

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

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

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

-Notice that if your devise model is not called "user" but "member", then the helpers you should use are:
+== Tidying up

-  before_filter :authenticate_member!
-
-  member_signed_in?
-
-  current_member
-
-  member_session
-
-=== Configuring Models
-
-The devise method in your models also accepts some options to configure its modules. For example, you can choose which encryptor to use in database_authenticatable:
-
-  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.
-
-=== Configuring multiple models
-
-Devise allows you to set up as many roles as you want. For example, you may have a User model and also want an Admin model with just authentication, trackable, lockable and timeoutable features and no confirmation or password-recovery features. Just follow these steps:
+Devise let's you setup as many roles as you want, so let's say you already have this User model and also want an Admin model with just authentication, trackable, lockable and timeoutable stuff and none of confirmation or password recovery. Just follow the same steps:

  # Create a migration with the required fields
  create_table :admins do |t|
    t.database_authenticatable
    t.lockable
    t.trackable
-    t.timestamps
  end

  # Inside your Admin model
  devise :database_authenticatable, :trackable, :timeoutable, :lockable

  # Inside your routes
-  devise_for :admins
+  map.devise_for :admin

  # Inside your protected controller
  before_filter :authenticate_admin!
@@ -204,62 +147,41 @@ Devise allows you to set up as many roles as you want. For example, you may have
  current_admin
  admin_session

-=== Configuring views
+== Generators

-We built Devise to help you quickly develop an application that uses authentication. However, we don't want to be in your way when you need to customize it.
+Devise comes with some generators to help you start:

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

-  rails generate devise:views
+This will generate an initializer, with a description of all configuration values. You can also generate models through:

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

-After doing so, you will be able to have views based on the role like "users/sessions/new" and "admins/sessions/new". If no view is found within the scope, Devise will use the default view at "devise/sessions/new". You can also use the generator to generate scoped views:
+A model configured with all devise modules and attr_accessible for default fields will be created. The generator will also create the migration and configure your routes for devise.

-  rails generate devise:views users
+== Model configuration

-=== Configuring controllers
+The devise method in your models also accept some options to configure its modules. For example, you can chose which encryptor to use in database_authenticatable:

-If the customization at the views level is not enough, you can customize each controller by following these steps:
+  devise :database_authenticatable, :confirmable, :recoverable, :encryptor => :bcrypt

-1) Create your custom controller, for example a Admins::SessionsController:
+Besides :encryptor, you can provide :pepper, :stretches, :confirm_within, :remember_for, :timeout_in, :unlock_in and others. All those are describer in the initializer created when you invoke the devise_install generator describer above.

-    class Admins::SessionsController < Devise::SessionsController
-    end
+== Views

-2) Tell the router to use this controller:
+Since devise is an engine, it has all default views inside the gem. They are good to get you started, but you will want to customize them at some point. And Devise has a generator to make copy them all to your application:

-    devise_for :admins, :controllers => { :sessions => "admins/sessions" }
+  ruby script/generate devise_views

-3) And since we changed the controller, it won't use the "devise/sessions" views, so remember to copy "devise/sessions" to "admin/sessions".
+By default Devise will use the same views for all roles you have. But what if you need so different views to each of them? Devise also has an easy way to accomplish it: just setup config.scoped_views to true inside "config/initializers/devise.rb".

-Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call "flash[:notice]" and "flash[:alert]" as appropriate.
+After doing so you will be able to have views based on the scope like 'sessions/users/new' and 'sessions/admin/new'. If no view is found within the scope, Devise will fallback to the default view.

-=== Configuring routes
+Devise uses flash messages to let users know if their login is successful or not. Devise expects your application to call 'flash[:notice]' and 'flash[:alert]' as appropriate.

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

-  devise_for :users, :path => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock', :registration => 'register', :sign_up => 'cmon_let_me_in' }
-
-Be sure to check devise_for documentation for details.
-
-If you have the need for more deep customization, for instance to also allow "/sign_in" besides "/users/sign_in", all you need to do is to create your routes normally and wrap them in a +devise_scope+ block in the router:
-
-  devise_scope :user do
-    get "sign_in", :to => "devise/sessions#new"
-  end
-
-This way you tell devise to use the scope :user when "/sign_in" is accessed. Notice +devise_scope+ is also aliased as +as+ and you can also give a block to +devise_for+, resulting in the same behavior:
-
-  devise_for :users do
-    get "sign_in", :to => "devise/sessions#new"
-  end
-
-Feel free to choose the one you prefer!
-
-=== I18n
-
-Devise uses flash messages with I18n with the flash keys :success and :failure. To customize your app, you can set up your locale file:
+Devise uses flash messages with I18n with the flash keys :success and :failure. To customize your app, you can setup your locale file this way:

  en:
    devise:
@@ -276,22 +198,19 @@ You can also create distinct messages based on the resource you've configured us
        admin:
          signed_in: 'Hello admin!'

-The Devise mailer uses a similar pattern to create subject messages:
+Devise mailer uses the same pattern to create subject messages:

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

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

-http://github.com/plataformatec/devise/wiki/I18n
-
-=== Test helpers
+== Test helpers

 Devise includes some tests helpers for functional specs. To use them, you just need to include Devise::TestHelpers in your test class and use the sign_in and sign_out method. Such methods have the same signature as in controllers:

@@ -301,53 +220,53 @@ Devise includes some tests helpers for functional specs. To use them, you just n
  sign_out :user         # sign_out(scope)
  sign_out @user         # sign_out(resource)

-You can include the Devise Test Helpers in all of your tests by adding the following to the bottom of your test/test_helper.rb file:
+You can include the Devise Test Helpers in all of your tests by adding the following to the bottom of your test/test_helper.rb or spec/spec_helper.rb file:

  class ActionController::TestCase
    include Devise::TestHelpers
  end

-If you're using RSpec and want the helpers automatically included within all +describe+ blocks, add a file called spec/support/devise.rb with the following contents:
+Do not use such helpers for integration tests like Cucumber, Webrat... Just fill in the form or explicitly set the user in session. For more tips, check the wiki (http://wiki.github.com/plataformatec/devise).

-  RSpec.configure do |config|
-    config.include Devise::TestHelpers, :type => :controller
-  end
+== Migrating from other solutions

-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).
+Devise implements encryption strategies for Clearance, Authlogic and Restful-Authentication. To make use of it set the desired encryptor in the encryptor initializer config option. You might also need to rename your encrypted password and salt columns to match Devises's one (encrypted_password and password_salt).

-=== Omniauth
+== Other ORMs

-Devise comes with Omniauth support out of the box to authenticate from other providers. You can read more about Omniauth support in the wiki:
+Devise supports both ActiveRecord (default) and MongoMapper, and has experimental Datamapper supports (in a sense that Devise test suite does not run completely with Datamapper). To choose other ORM, you just need to configure it in the initializer file.

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

-=== Other ORMs
+Please refer to TODO file.

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

-=== Migrating from other solutions
+Needless to say, security is extremely important to Devise. If you find yourself in a possible security issue with Devise, please go through the following steps, trying to reproduce the bug:

-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).
+1) Look at the source code a bit to find out whether your assumptions are correct;
+2) If possible, provide a way to reproduce the bug: a small app on Github or a step-by-step to reproduce;
+3) E-mail us or send a Github private message instead of using the normal issues;

-== Additional information
+Being able to reproduce the bug is the first step to fix it. Thanks for your understanding.

-=== 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:
-
-http://github.com/hassox/warden
-
-=== Contributors
-
-We have a long list of valued contributors. Check them all at:
-
-http://github.com/plataformatec/devise/contributors
-
-=== Maintainers
+== Maintainers

 * José Valim (http://github.com/josevalim)
 * Carlos Antônio da Silva (http://github.com/carlosantoniodasilva)

-== License
+== Contributors

-MIT License. Copyright 2010 Plataforma Tecnologia. http://blog.plataformatec.com.br
+We have a long running list of contributors. Check them all here:
+
+http://github.com/plataformatec/devise/contributors
+
+== Bugs and Feedback
+
+If you discover any bugs or want to drop a line, feel free to create an issue on
+GitHub or send an e-mail to the mailing list.
+
+http://github.com/plataformatec/devise/issues
+http://groups.google.com/group/plataformatec-devise
+
+MIT License. Copyright 2009 Plataforma Tecnologia. http://blog.plataformatec.com.br
--- a/25
+++ b/25
@@ -1,7 +1,9 @@
 # encoding: UTF-8

+require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require File.join(File.dirname(__FILE__), 'lib', 'devise', 'version')

 desc 'Default: run tests for all ORMs.'
 task :default => :pre_commit
@@ -10,9 +12,7 @@ desc 'Run Devise tests for all ORMs.'
 task :pre_commit do
  Dir[File.join(File.dirname(__FILE__), 'test', 'orm', '*.rb')].each do |file|
    orm = File.basename(file).split(".").first
-    # "Some day, my son, rake's inner wisdom will reveal itself.  Until then,
-    # take this `system` -- may its brute force protect you well."
-    exit 1 unless system "rake test DEVISE_ORM=#{orm}"
+    system "rake test DEVISE_ORM=#{orm}"
  end
 end

@@ -32,3 +32,22 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
  rdoc.rdoc_files.include('README.rdoc')
  rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "devise"
+    s.version = Devise::VERSION.dup
+    s.summary = "Flexible authentication solution for Rails with Warden"
+    s.email = "contact@plataformatec.com.br"
+    s.homepage = "http://github.com/plataformatec/devise"
+    s.description = "Flexible authentication solution for Rails with Warden"
+    s.authors = ['José Valim', 'Carlos Antônio']
+    s.files =  FileList["[A-Z]*", "{app,config,generators,lib}/**/*", "rails/init.rb"]
+    s.add_dependency("warden", "~> 0.10.3")
+  end
+
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
+end
--- a/2
+++ b/2
@@ -0,0 +1,2 @@
+* Make test run with DataMapper
+* Extract Activatable tests from Confirmable
--- a/app/controllers/confirmations_controller.rb
+++ b/app/controllers/confirmations_controller.rb
@@ -0,0 +1,33 @@
+class ConfirmationsController < ApplicationController
+  include Devise::Controllers::InternalHelpers
+
+  # GET /resource/confirmation/new
+  def new
+    build_resource
+    render_with_scope :new
+  end
+
+  # POST /resource/confirmation
+  def create
+    self.resource = resource_class.send_confirmation_instructions(params[resource_name])
+
+    if resource.errors.empty?
+      set_flash_message :notice, :send_instructions
+      redirect_to new_session_path(resource_name)
+    else
+      render_with_scope :new
+    end
+  end
+
+  # GET /resource/confirmation?confirmation_token=abcdef
+  def show
+    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
+
+    if resource.errors.empty?
+      set_flash_message :notice, :confirmed
+      sign_in_and_redirect(resource_name, resource)
+    else
+      render_with_scope :new
+    end
+  end
+end
--- a/app/controllers/devise/confirmations_controller.rb
+++ b/app/controllers/devise/confirmations_controller.rb
@@ -1,41 +0,0 @@
-class Devise::ConfirmationsController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
-  # GET /resource/confirmation/new
-  def new
-    build_resource({})
-    render_with_scope :new
-  end
-
-  # POST /resource/confirmation
-  def create
-    self.resource = resource_class.send_confirmation_instructions(params[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
-  end
-
-  # GET /resource/confirmation?confirmation_token=abcdef
-  def show
-    self.resource = resource_class.confirm_by_token(params[:confirmation_token])
-
-    if resource.errors.empty?
-      set_flash_message(:notice, :confirmed) if is_navigational_format?
-      sign_in(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
-  end
-
-  protected
-
-    # The path used after resending confirmation instructions.
-    def after_resending_confirmation_instructions_path_for(resource_name)
-      new_session_path(resource_name)
-    end
-end
--- a/app/controllers/devise/omniauth_callbacks_controller.rb
+++ b/app/controllers/devise/omniauth_callbacks_controller.rb
@@ -1,26 +0,0 @@
-class Devise::OmniauthCallbacksController < ApplicationController
-  include Devise::Controllers::InternalHelpers
-
-  def failure
-    set_flash_message :alert, :failure, :kind => failed_strategy.name.to_s.humanize, :reason => failure_message
-    redirect_to after_omniauth_failure_path_for(resource_name)
-  end
-
-  protected
-
-  def failed_strategy
-    env["omniauth.error.strategy"]
-  end
-
-  def failure_message
-    exception = env["omniauth.error"]
-    error   = exception.error_reason if exception.respond_to?(:error_reason)
-    error ||= exception.error        if exception.respond_to?(:error)
-    error ||= env["omniauth.error.type"].to_s
-    error.to_s.humanize if error
-  end
-
-  def after_omniauth_failure_path_for(scope)
-    new_session_path(scope)
-  end
-end
--- a/app/controllers/devise/registrations_controller.rb
+++ b/app/controllers/devise/registrations_controller.rb
@@ -1,112 +0,0 @@
-class Devise::RegistrationsController < ApplicationController
-  prepend_before_filter :require_no_authentication, :only => [ :new, :create, :cancel ]
-  prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]
-  include Devise::Controllers::InternalHelpers
-
-  # GET /resource/sign_up
-  def new
-    build_resource({})
-    render_with_scope :new
-  end
-
-  # POST /resource
-  def create
-    build_resource
-
-    if resource.save
-      if resource.active_for_authentication?
-        set_flash_message :notice, :signed_up if is_navigational_format?
-        sign_in(resource_name, resource)
-        respond_with resource, :location => redirect_location(resource_name, resource)
-      else
-        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
-    else
-      clean_up_passwords(resource)
-      respond_with_navigational(resource) { render_with_scope :new }
-    end
-  end
-
-  # GET /resource/edit
-  def edit
-    render_with_scope :edit
-  end
-
-  # PUT /resource
-  def update
-    if resource.update_with_password(params[resource_name])
-      set_flash_message :notice, :updated if is_navigational_format?
-      sign_in resource_name, resource, :bypass => true
-      respond_with resource, :location => after_update_path_for(resource)
-    else
-      clean_up_passwords(resource)
-      respond_with_navigational(resource){ render_with_scope :edit }
-    end
-  end
-
-  # DELETE /resource
-  def destroy
-    resource.destroy
-    Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
-    set_flash_message :notice, :destroyed if is_navigational_format?
-    respond_with_navigational(resource){ redirect_to after_sign_out_path_for(resource_name) }
-  end
-
-  # GET /resource/cancel
-  # Forces the session data which is usually expired after sign
-  # in to be expired now. This is useful if the user wants to
-  # cancel oauth signing in/up in the middle of the process,
-  # removing all OAuth session data.
-  def cancel
-    expire_session_data_after_sign_in!
-    redirect_to new_registration_path(resource_name)
-  end
-
-  protected
-
-    # Build a devise resource passing in the session. Useful to move
-    # temporary session data to the newly created user.
-    def build_resource(hash=nil)
-      hash ||= params[resource_name] || {}
-      self.resource = resource_class.new_with_session(hash, session)
-    end
-
-    # The path used after sign up. You need to overwrite this method
-    # in your own RegistrationsController.
-    def after_sign_up_path_for(resource)
-      after_sign_in_path_for(resource)
-    end
-
-    # 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
-    # this method in your own RegistrationsController.
-    def after_inactive_sign_up_path_for(resource)
-      root_path
-    end
-
-    # The default url to be used after updating a resource. You need to overwrite
-    # this method in your own RegistrationsController.
-    def after_update_path_for(resource)
-      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 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}!", true)
-      self.resource = resource_class.to_adapter.get!(send(:"current_#{resource_name}").to_key)
-    end
-end
--- a/app/controllers/devise/sessions_controller.rb
+++ b/app/controllers/devise/sessions_controller.rb
@@ -1,47 +0,0 @@
-class Devise::SessionsController < ApplicationController
-  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
-  include Devise::Controllers::InternalHelpers
-
-  # GET /resource/sign_in
-  def new
-    clean_up_passwords(build_resource)
-    render_with_scope :new
-  end
-
-  # POST /resource/sign_in
-  def create
-    resource = warden.authenticate!(:scope => resource_name, :recall => "#{controller_path}#new")
-
-    # In the running app, the previous line would actually cause this method to
-    # exit by throwing `:warden` if the authentication failed. Unfortunately,
-    # this doesn't happen in the Rails test environment if you have included the
-    # Devise::TestHelpers (see `Devise::TestHelpers::TestWarden#authenticate!`),
-    # which makes it difficult to unit test extensions to this controller. Since
-    # the resource is nil if authentication fails, just short-circuit the method
-    # in that case. This should not affect the running app.
-    
-    return if resource.nil?
-
-    set_flash_message(:notice, :signed_in) if is_navigational_format?
-    sign_in(resource_name, resource)
-    respond_with resource, :location => redirect_location(resource_name, resource)
-  end
-
-  # GET /resource/sign_out
-  def destroy
-    signed_in = signed_in?(resource_name)
-    Devise.sign_out_all_scopes ? sign_out : sign_out(resource_name)
-    set_flash_message :notice, :signed_out if signed_in
-
-    # We actually need to hardcode this, as Rails default responder doesn't
-    # support returning empty response on GET request
-    respond_to do |format|
-      format.any(*navigational_formats) { redirect_to after_sign_out_path_for(resource_name) }
-      format.all do
-        method = "to_#{request_format}"
-        text = {}.respond_to?(method) ? {}.send(method) : ""
-        render :text => text, :status => :ok
-      end
-    end
-  end
-end
--- a/app/controllers/devise/unlocks_controller.rb
+++ b/app/controllers/devise/unlocks_controller.rb
@@ -1,35 +0,0 @@
-class Devise::UnlocksController < ApplicationController
-  prepend_before_filter :require_no_authentication
-  include Devise::Controllers::InternalHelpers
-
-  # GET /resource/unlock/new
-  def new
-    build_resource({})
-    render_with_scope :new
-  end
-
-  # POST /resource/unlock
-  def create
-    self.resource = resource_class.send_unlock_instructions(params[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
-  end
-
-  # GET /resource/unlock?unlock_token=abcdef
-  def show
-    self.resource = resource_class.unlock_access_by_token(params[:unlock_token])
-
-    if resource.errors.empty?
-      set_flash_message :notice, :unlocked if is_navigational_format?
-      sign_in(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
-  end
-end
--- a/app/controllers/devise/passwords_controller.rb
+++ b/app/controllers/devise/passwords_controller.rb
@@ -1,10 +1,10 @@
-class Devise::PasswordsController < ApplicationController
+class PasswordsController < ApplicationController
  prepend_before_filter :require_no_authentication
  include Devise::Controllers::InternalHelpers

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

@@ -13,10 +13,10 @@ class Devise::PasswordsController < ApplicationController
    self.resource = resource_class.send_reset_password_instructions(params[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)
+      set_flash_message :notice, :send_instructions
+      redirect_to new_session_path(resource_name)
    else
-      respond_with_navigational(resource){ render_with_scope :new }
+      render_with_scope :new
    end
  end

@@ -32,11 +32,10 @@ class Devise::PasswordsController < ApplicationController
    self.resource = resource_class.reset_password_by_token(params[resource_name])

    if resource.errors.empty?
-      set_flash_message(:notice, :updated) if is_navigational_format?
-      sign_in(resource_name, resource)
-      respond_with resource, :location => redirect_location(resource_name, resource)
+      set_flash_message :notice, :updated
+      sign_in_and_redirect(resource_name, resource)
    else
-      respond_with_navigational(resource){ render_with_scope :edit }
+      render_with_scope :edit
    end
  end
 end
--- a/app/controllers/registrations_controller.rb
+++ b/app/controllers/registrations_controller.rb
@@ -0,0 +1,53 @@
+class RegistrationsController < ApplicationController
+  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
+  prepend_before_filter :authenticate_scope!, :only => [:edit, :update, :destroy]
+  include Devise::Controllers::InternalHelpers
+
+  # GET /resource/sign_in
+  def new
+    build_resource
+    render_with_scope :new
+  end
+
+  # POST /resource/sign_up
+  def create
+    build_resource
+
+    if resource.save
+      set_flash_message :notice, :signed_up
+      sign_in_and_redirect(resource_name, resource)
+    else
+      render_with_scope :new
+    end
+  end
+
+  # GET /resource/edit
+  def edit
+    render_with_scope :edit
+  end
+
+  # PUT /resource
+  def update
+    if self.resource.update_with_password(params[resource_name])
+      set_flash_message :notice, :updated
+      redirect_to after_sign_in_path_for(self.resource)
+    else
+      render_with_scope :edit
+    end
+  end
+
+  # DELETE /resource
+  def destroy
+    self.resource.destroy
+    set_flash_message :notice, :destroyed
+    sign_out_and_redirect(self.resource)
+  end
+
+  protected
+
+    # Authenticates the current scope and dup the resource
+    def authenticate_scope!
+      send(:"authenticate_#{resource_name}!")
+      self.resource = send(:"current_#{resource_name}").dup
+    end
+end
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -0,0 +1,42 @@
+class SessionsController < ApplicationController
+  prepend_before_filter :require_no_authentication, :only => [ :new, :create ]
+  include Devise::Controllers::InternalHelpers
+
+  # GET /resource/sign_in
+  def new
+    unless flash[:notice].present?
+      Devise::FLASH_MESSAGES.each do |message|
+        set_now_flash_message :alert, message if params.try(:[], message) == "true"
+      end
+    end
+
+    build_resource
+    render_with_scope :new
+  end
+
+  # POST /resource/sign_in
+  def create
+    if resource = authenticate(resource_name)
+      set_flash_message :notice, :signed_in
+      sign_in_and_redirect(resource_name, resource, true)
+    elsif [:custom, :redirect].include?(warden.result)
+      throw :warden, :scope => resource_name
+    else
+      set_now_flash_message :alert, (warden.message || :invalid)
+      clean_up_passwords(build_resource)
+      render_with_scope :new
+    end
+  end
+
+  # GET /resource/sign_out
+  def destroy
+    set_flash_message :notice, :signed_out if signed_in?(resource_name)
+    sign_out_and_redirect(resource_name)
+  end
+
+  protected
+
+    def clean_up_passwords(object)
+      object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
+    end
+end
--- a/app/controllers/unlocks_controller.rb
+++ b/app/controllers/unlocks_controller.rb
@@ -0,0 +1,41 @@
+class UnlocksController < ApplicationController
+  prepend_before_filter :ensure_email_as_unlock_strategy
+  prepend_before_filter :require_no_authentication
+  include Devise::Controllers::InternalHelpers
+
+  # GET /resource/unlock/new
+  def new
+    build_resource
+    render_with_scope :new
+  end
+
+  # POST /resource/unlock
+  def create
+    self.resource = resource_class.send_unlock_instructions(params[resource_name])
+
+    if resource.errors.empty?
+      set_flash_message :notice, :send_instructions
+      redirect_to new_session_path(resource_name)
+    else
+      render_with_scope :new
+    end
+  end
+
+  # GET /resource/unlock?unlock_token=abcdef
+  def show
+    self.resource = resource_class.unlock_access_by_token(params[:unlock_token])
+
+    if resource.errors.empty?
+      set_flash_message :notice, :unlocked
+      sign_in_and_redirect(resource_name, resource)
+    else
+      render_with_scope :new
+    end
+  end
+
+  protected
+
+  def ensure_email_as_unlock_strategy
+    raise ActionController::UnknownAction unless resource_class.unlock_strategy_enabled?(:email)
+  end
+end
--- a/app/helpers/devise_helper.rb
+++ b/app/helpers/devise_helper.rb
@@ -1,25 +0,0 @@
-module DeviseHelper
-  # A simple way to show error messages for the current devise resource. If you need
-  # to customize this method, you can either overwrite it in your application helpers or
-  # copy the views to your application.
-  #
-  # This method is intended to stay simple and it is unlikely that we are going to change
-  # it to add more behavior or options.
-  def devise_error_messages!
-    return "" if resource.errors.empty?
-
-    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_name)
-
-    html = <<-HTML
-    <div id="error_explanation">
-      <h2>#{sentence}</h2>
-      <ul>#{messages}</ul>
-    </div>
-    HTML
-
-    html.html_safe
-  end
-end
--- a/app/mailers/devise/mailer.rb
+++ b/app/mailers/devise/mailer.rb
@@ -1,88 +0,0 @@
-class Devise::Mailer < ::ActionMailer::Base
-  include Devise::Controllers::ScopedViews
-  attr_reader :scope_name, :resource
-
-  def confirmation_instructions(record)
-    setup_mail(record, :confirmation_instructions)
-  end
-
-  def reset_password_instructions(record)
-    setup_mail(record, :reset_password_instructions)
-  end
-
-  def unlock_instructions(record)
-    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
--- a/app/models/devise_mailer.rb
+++ b/app/models/devise_mailer.rb
@@ -0,0 +1,68 @@
+class DeviseMailer < ::ActionMailer::Base
+  extend Devise::Controllers::InternalHelpers::ScopedViews
+
+  # Deliver confirmation instructions when the user is created or its email is
+  # updated, and also when confirmation is manually requested
+  def confirmation_instructions(record)
+    setup_mail(record, :confirmation_instructions)
+  end
+
+  # Deliver reset password instructions when manually requested
+  def reset_password_instructions(record)
+    setup_mail(record, :reset_password_instructions)
+  end
+
+  def unlock_instructions(record)
+    setup_mail(record, :unlock_instructions)
+  end
+
+  private
+
+    # Configure default email options
+    def setup_mail(record, key)
+      scope_name = Devise::Mapping.find_scope!(record)
+      mapping    = Devise.mappings[scope_name]
+
+      subject      translate(mapping, key)
+      from         mailer_sender(mapping)
+      recipients   record.email
+      sent_on      Time.now
+      content_type Devise.mailer_content_type
+      body         render_with_scope(key, mapping, mapping.name => record, :resource => record)
+    end
+
+    def render_with_scope(key, mapping, assigns)
+      if self.class.scoped_views
+        begin
+          render :file => "devise_mailer/#{mapping.as}/#{key}", :body => assigns
+        rescue ActionView::MissingTemplate
+          render :file => "devise_mailer/#{key}", :body => assigns
+        end
+      else
+        render :file => "devise_mailer/#{key}", :body => assigns
+      end
+    end
+
+    def mailer_sender(mapping)
+      if Devise.mailer_sender.is_a?(Proc)
+        block_args = mapping.name if Devise.mailer_sender.arity > 0
+        Devise.mailer_sender.call(block_args)
+      else
+        Devise.mailer_sender
+      end
+    end
+
+    # Setup subject namespaced by model. It means you're able to setup your
+    # messages using specific resource scope, or provide a default one.
+    # Example (i18n locale file):
+    #
+    #   en:
+    #     devise:
+    #       mailer:
+    #         confirmation_instructions: '...'
+    #         user:
+    #           confirmation_instructions: '...'
+    def translate(mapping, key)
+      I18n.t(:"#{mapping.name}.#{key}", :scope => [:devise, :mailer], :default => key)
+    end
+end
--- a/app/views/confirmations/new.html.erb
+++ b/app/views/confirmations/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Resend confirmation instructions</h2>
+
+<% form_for resource_name, resource, :url => confirmation_path(resource_name) do |f| %>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.submit "Resend confirmation instructions" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -1,12 +0,0 @@
-<h2>Resend confirmation instructions</h2>
-
-<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Resend confirmation instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -1,16 +0,0 @@
-<h2>Change your password</h2>
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
-  <%= f.hidden_field :reset_password_token %>
-
-  <p><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -1,12 +0,0 @@
-<h2>Forgot your password?</h2>
-
-<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,25 +0,0 @@
-<h2>Edit <%= resource_name.to_s.humanize %></h2>
-
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></p>
-
-  <p><%= f.submit "Update" %></p>
-<% 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 %>
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -1,18 +0,0 @@
-<h2>Sign up</h2>
-
-<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Sign up" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -1,17 +0,0 @@
-<h2>Sign in</h2>
-
-<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.label :password %><br />
-  <%= f.password_field :password %></p>
-
-  <% if devise_mapping.rememberable? -%>
-    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
-  <% end -%>
-
-  <p><%= f.submit "Sign in" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise/shared/_links.erb
+++ b/app/views/devise/shared/_links.erb
@@ -1,25 +0,0 @@
-<%- if controller_name != 'sessions' %>
-  <%= link_to "Sign in", new_session_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
-<% end -%>
-
-<%- if devise_mapping.omniauthable? %>
-  <%- resource_class.omniauth_providers.each do |provider| %>
-    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
-  <% end -%>
-<% end -%>
--- a/app/views/devise/unlocks/new.html.erb
+++ b/app/views/devise/unlocks/new.html.erb
@@ -1,12 +0,0 @@
-<h2>Resend unlock instructions</h2>
-
-<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.email_field :email %></p>
-
-  <p><%= f.submit "Resend unlock instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>
--- a/app/views/devise_mailer/confirmation_instructions.html.erb
+++ b/app/views/devise_mailer/confirmation_instructions.html.erb
--- a/app/views/devise_mailer/reset_password_instructions.html.erb
+++ b/app/views/devise_mailer/reset_password_instructions.html.erb
--- a/app/views/devise_mailer/unlock_instructions.html.erb
+++ b/app/views/devise_mailer/unlock_instructions.html.erb
--- a/app/views/passwords/edit.html.erb
+++ b/app/views/passwords/edit.html.erb
@@ -0,0 +1,16 @@
+<h2>Change your password</h2>
+
+<% form_for resource_name, resource, :url => password_path(resource_name), :html => { :method => :put } do |f| %>
+  <%= f.error_messages %>
+  <%= f.hidden_field :reset_password_token %>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Change my password" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/passwords/new.html.erb
+++ b/app/views/passwords/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Forgot your password?</h2>
+
+<% form_for resource_name, resource, :url => password_path(resource_name) do |f| %>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.submit "Send me reset password instructions" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/registrations/edit.html.erb
+++ b/app/views/registrations/edit.html.erb
@@ -0,0 +1,25 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<% form_for resource_name, resource, :url => registration_path(resource_name), :html => { :method => :put } do |f| -%>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i></p>
+  <p><%= f.password_field :current_password %></p>
+
+  <p><%= f.submit "Update" %></p>
+<% end -%>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/registrations/new.html.erb
+++ b/app/views/registrations/new.html.erb
@@ -0,0 +1,17 @@
+<h2>Sign up</h2>
+
+<% form_for resource_name, resource, :url => registration_path(resource_name) do |f| -%>
+  <%= f.error_messages %>
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <p><%= f.label :password_confirmation %></p>
+  <p><%= f.password_field :password_confirmation %></p>
+
+  <p><%= f.submit "Sign up" %></p>
+<% end -%>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -0,0 +1,17 @@
+<h2>Sign in</h2>
+
+<% form_for resource_name, resource, :url => session_path(resource_name) do |f| -%>
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.label :password %></p>
+  <p><%= f.password_field :password %></p>
+
+  <% if devise_mapping.rememberable? -%>
+    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
+  <% end -%>
+
+  <p><%= f.submit "Sign in" %></p>
+<% end -%>
+
+<%= render :partial => "shared/devise_links" %>
--- a/app/views/shared/_devise_links.erb
+++ b/app/views/shared/_devise_links.erb
@@ -0,0 +1,19 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to t('devise.sessions.link'), new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to t('devise.registrations.link'), new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+  <%= link_to t('devise.passwords.link'), new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to t('devise.confirmations.link'), new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && controller_name != 'unlocks' %>
+  <%= link_to t('devise.unlocks.link'), new_unlock_path(resource_name) %><br />
+<% end -%>
--- a/app/views/unlocks/new.html.erb
+++ b/app/views/unlocks/new.html.erb
@@ -0,0 +1,12 @@
+<h2>Resend unlock instructions</h2>
+
+<% form_for resource_name, resource, :url => unlock_path(resource_name) do |f| %>
+  <%= f.error_messages %>
+
+  <p><%= f.label :email %></p>
+  <p><%= f.text_field :email %></p>
+
+  <p><%= f.submit "Resend unlock instructions" %></p>
+<% end %>
+
+<%= render :partial => "shared/devise_links" %>
--- a/devise.gemspec
+++ b/devise.gemspec
@@ -1,25 +1,180 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "devise/version"

 Gem::Specification.new do |s|
-  s.name        = "devise"
-  s.version     = Devise::VERSION.dup
-  s.platform    = Gem::Platform::RUBY  
-  s.summary     = "Flexible authentication solution for Rails with Warden"
-  s.email       = "contact@plataformatec.com.br"
-  s.homepage    = "http://github.com/plataformatec/devise"
-  s.description = "Flexible authentication solution for Rails with Warden"
-  s.authors     = ['José Valim', 'Carlos Antônio']
+  s.name = %q{devise}
+  s.version = "1.0.9"

-  s.rubyforge_project = "devise"
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jos\303\251 Valim", "Carlos Ant\303\264nio"]
+  s.date = %q{2010-11-26}
+  s.description = %q{Flexible authentication solution for Rails with Warden}
+  s.email = %q{contact@plataformatec.com.br}
+  s.extra_rdoc_files = [
+    "README.rdoc",
+     "TODO"
+  ]
+  s.files = [
+    "CHANGELOG.rdoc",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "app/controllers/confirmations_controller.rb",
+     "app/controllers/passwords_controller.rb",
+     "app/controllers/registrations_controller.rb",
+     "app/controllers/sessions_controller.rb",
+     "app/controllers/unlocks_controller.rb",
+     "app/models/devise_mailer.rb",
+     "app/views/confirmations/new.html.erb",
+     "app/views/devise_mailer/confirmation_instructions.html.erb",
+     "app/views/devise_mailer/reset_password_instructions.html.erb",
+     "app/views/devise_mailer/unlock_instructions.html.erb",
+     "app/views/passwords/edit.html.erb",
+     "app/views/passwords/new.html.erb",
+     "app/views/registrations/edit.html.erb",
+     "app/views/registrations/new.html.erb",
+     "app/views/sessions/new.html.erb",
+     "app/views/shared/_devise_links.erb",
+     "app/views/unlocks/new.html.erb",
+     "generators/devise/USAGE",
+     "generators/devise/devise_generator.rb",
+     "generators/devise/lib/route_devise.rb",
+     "generators/devise/templates/migration.rb",
+     "generators/devise/templates/model.rb",
+     "generators/devise_install/USAGE",
+     "generators/devise_install/devise_install_generator.rb",
+     "generators/devise_install/templates/README",
+     "generators/devise_install/templates/devise.rb",
+     "generators/devise_views/USAGE",
+     "generators/devise_views/devise_views_generator.rb",
+     "lib/devise.rb",
+     "lib/devise/controllers/helpers.rb",
+     "lib/devise/controllers/internal_helpers.rb",
+     "lib/devise/controllers/url_helpers.rb",
+     "lib/devise/encryptors/authlogic_sha512.rb",
+     "lib/devise/encryptors/base.rb",
+     "lib/devise/encryptors/bcrypt.rb",
+     "lib/devise/encryptors/clearance_sha1.rb",
+     "lib/devise/encryptors/restful_authentication_sha1.rb",
+     "lib/devise/encryptors/sha1.rb",
+     "lib/devise/encryptors/sha512.rb",
+     "lib/devise/failure_app.rb",
+     "lib/devise/hooks/activatable.rb",
+     "lib/devise/hooks/rememberable.rb",
+     "lib/devise/hooks/timeoutable.rb",
+     "lib/devise/hooks/trackable.rb",
+     "lib/devise/locales/en.yml",
+     "lib/devise/mapping.rb",
+     "lib/devise/models.rb",
+     "lib/devise/models/activatable.rb",
+     "lib/devise/models/confirmable.rb",
+     "lib/devise/models/database_authenticatable.rb",
+     "lib/devise/models/http_authenticatable.rb",
+     "lib/devise/models/lockable.rb",
+     "lib/devise/models/recoverable.rb",
+     "lib/devise/models/registerable.rb",
+     "lib/devise/models/rememberable.rb",
+     "lib/devise/models/timeoutable.rb",
+     "lib/devise/models/token_authenticatable.rb",
+     "lib/devise/models/trackable.rb",
+     "lib/devise/models/validatable.rb",
+     "lib/devise/orm/active_record.rb",
+     "lib/devise/orm/data_mapper.rb",
+     "lib/devise/orm/mongo_mapper.rb",
+     "lib/devise/rails.rb",
+     "lib/devise/rails/routes.rb",
+     "lib/devise/rails/warden_compat.rb",
+     "lib/devise/schema.rb",
+     "lib/devise/strategies/base.rb",
+     "lib/devise/strategies/database_authenticatable.rb",
+     "lib/devise/strategies/http_authenticatable.rb",
+     "lib/devise/strategies/rememberable.rb",
+     "lib/devise/strategies/token_authenticatable.rb",
+     "lib/devise/test_helpers.rb",
+     "lib/devise/version.rb",
+     "rails/init.rb"
+  ]
+  s.homepage = %q{http://github.com/plataformatec/devise}
+  s.rdoc_options = ["--charset=UTF-8"]
  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Flexible authentication solution for Rails with Warden}
+  s.test_files = [
+    "test/controllers/helpers_test.rb",
+     "test/controllers/internal_helpers_test.rb",
+     "test/controllers/url_helpers_test.rb",
+     "test/devise_test.rb",
+     "test/encryptors_test.rb",
+     "test/failure_app_test.rb",
+     "test/integration/authenticatable_test.rb",
+     "test/integration/confirmable_test.rb",
+     "test/integration/http_authenticatable_test.rb",
+     "test/integration/lockable_test.rb",
+     "test/integration/rack_middleware_test.rb",
+     "test/integration/recoverable_test.rb",
+     "test/integration/registerable_test.rb",
+     "test/integration/rememberable_test.rb",
+     "test/integration/timeoutable_test.rb",
+     "test/integration/token_authenticatable_test.rb",
+     "test/integration/trackable_test.rb",
+     "test/mailers/confirmation_instructions_test.rb",
+     "test/mailers/reset_password_instructions_test.rb",
+     "test/mailers/unlock_instructions_test.rb",
+     "test/mapping_test.rb",
+     "test/models/authenticatable_test.rb",
+     "test/models/confirmable_test.rb",
+     "test/models/lockable_test.rb",
+     "test/models/recoverable_test.rb",
+     "test/models/rememberable_test.rb",
+     "test/models/timeoutable_test.rb",
+     "test/models/token_authenticatable_test.rb",
+     "test/models/trackable_test.rb",
+     "test/models/validatable_test.rb",
+     "test/models_test.rb",
+     "test/orm/active_record.rb",
+     "test/orm/mongo_mapper.rb",
+     "test/rails_app/app/active_record/admin.rb",
+     "test/rails_app/app/active_record/user.rb",
+     "test/rails_app/app/controllers/admins_controller.rb",
+     "test/rails_app/app/controllers/application_controller.rb",
+     "test/rails_app/app/controllers/home_controller.rb",
+     "test/rails_app/app/controllers/users_controller.rb",
+     "test/rails_app/app/helpers/application_helper.rb",
+     "test/rails_app/app/mongo_mapper/admin.rb",
+     "test/rails_app/app/mongo_mapper/user.rb",
+     "test/rails_app/config/boot.rb",
+     "test/rails_app/config/environment.rb",
+     "test/rails_app/config/environments/development.rb",
+     "test/rails_app/config/environments/production.rb",
+     "test/rails_app/config/environments/test.rb",
+     "test/rails_app/config/initializers/devise.rb",
+     "test/rails_app/config/initializers/inflections.rb",
+     "test/rails_app/config/initializers/new_rails_defaults.rb",
+     "test/rails_app/config/initializers/session_store.rb",
+     "test/rails_app/config/routes.rb",
+     "test/routes_test.rb",
+     "test/support/assertions_helper.rb",
+     "test/support/integration_tests_helper.rb",
+     "test/support/test_silencer.rb",
+     "test/support/tests_helper.rb",
+     "test/test_helper.rb",
+     "test/test_helpers_test.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<warden>, ["~> 0.10.3"])
+    else
+      s.add_dependency(%q<warden>, ["~> 0.10.3"])
+    end
+  else
+    s.add_dependency(%q<warden>, ["~> 0.10.3"])
+  end
+end

-  s.add_dependency("warden", "~> 1.0.3")
-  s.add_dependency("orm_adapter", "~> 0.0.3")
-  s.add_dependency("bcrypt-ruby", "~> 2.1.2")
-end
--- a/generators/devise/USAGE
+++ b/generators/devise/USAGE
@@ -0,0 +1,5 @@
+To create a devise resource user:
+
+    script/generate devise User
+
+This will generate a model named User, a route map for devise called :users, and a migration file for table :users with all devise modules.
--- a/generators/devise/devise_generator.rb
+++ b/generators/devise/devise_generator.rb
@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + "/lib/route_devise.rb")
+
+class DeviseGenerator < Rails::Generator::NamedBase
+
+  def manifest
+    record do |m|
+      m.directory(File.join('app', 'models', class_path))
+      m.template 'model.rb', File.join('app', 'models', "#{file_path}.rb")
+
+      m.migration_template 'migration.rb', 'db/migrate', :migration_file_name => "devise_create_#{table_name}"
+      m.route_devise table_name
+    end
+  end
+
+end
--- a/generators/devise/lib/route_devise.rb
+++ b/generators/devise/lib/route_devise.rb
@@ -0,0 +1,32 @@
+module Rails
+  module Generator
+    module Commands
+      class Create < Base
+
+        # Create devise route. Based on route_resources
+        def route_devise(*resources)
+          resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
+          sentinel = 'ActionController::Routing::Routes.draw do |map|'
+
+          logger.route "map.devise_for #{resource_list}"
+          unless options[:pretend]
+            gsub_file 'config/routes.rb', /(#{Regexp.escape(sentinel)})/mi do |match|
+              "#{match}\n  map.devise_for #{resource_list}\n"
+            end
+          end
+        end
+      end
+
+      class Destroy < RewindBase
+
+        # Destroy devise route. Based on route_resources
+        def route_devise(*resources)
+          resource_list = resources.map { |r| r.to_sym.inspect }.join(', ')
+          look_for = "\n  map.devise_for #{resource_list}\n"
+          logger.route "map.devise_for #{resource_list}"
+          gsub_file 'config/routes.rb', /(#{look_for})/mi, ''
+        end
+      end
+    end
+  end
+end
--- a/lib/generators/active_record/templates/migration.rb
+++ b/lib/generators/active_record/templates/migration.rb
@@ -2,27 +2,19 @@ class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
  def self.up
    create_table(:<%= table_name %>) do |t|
      t.database_authenticatable :null => false
+      t.confirmable
      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
-
-<% for  attribute in attributes -%>
-      t.<%= attribute.type %> :<%= attribute.name %>
-<% end  -%>
+      # t.lockable

      t.timestamps
    end

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

  def self.down
--- a/generators/devise/templates/model.rb
+++ b/generators/devise/templates/model.rb
@@ -0,0 +1,9 @@
+class <%= class_name %> < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :http_authenticatable, :token_authenticatable, :confirmable, :lockable, :timeoutable and :activatable
+  devise :registerable, :database_authenticatable, :recoverable,
+         :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation
+end
--- a/generators/devise_install/USAGE
+++ b/generators/devise_install/USAGE
@@ -0,0 +1,3 @@
+To copy a Devise initializer to your Rails App, with some configuration values, just do:
+
+    script/generate devise_install
--- a/generators/devise_install/devise_install_generator.rb
+++ b/generators/devise_install/devise_install_generator.rb
@@ -0,0 +1,15 @@
+class DeviseInstallGenerator < Rails::Generator::Base
+
+  def manifest
+    record do |m|
+      m.directory "config/initializers"
+      m.template  "devise.rb", "config/initializers/devise.rb"
+
+      m.directory "config/locales"
+      m.file      "../../../lib/devise/locales/en.yml", "config/locales/devise.en.yml"
+
+      m.readme "README"
+    end
+  end
+
+end
--- a/generators/devise_install/templates/README
+++ b/generators/devise_install/templates/README
@@ -1,4 +1,3 @@
-
 ===============================================================================

 Some setup you must do manually if you haven't yet:
@@ -8,18 +7,17 @@ Some setup you must do manually if you haven't yet:

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

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

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

-       root :to => "home#index"
+       map.root :controller => 'home'

-  3. Ensure you have flash messages in app/views/layouts/application.html.erb.
-     For example:
+ 3. Ensure you have a default layout in app/views/layouts and it shows
+     flash messages. For example:

-       <p class="notice"><%= notice %></p>
-       <p class="alert"><%= alert %></p>
+       <p class="notice"><%= flash[:notice] %></p>
+       <p class="alert"><%= flash[:alert] %></p>

 ===============================================================================
--- a/generators/devise_install/templates/devise.rb
+++ b/generators/devise_install/templates/devise.rb
@@ -0,0 +1,105 @@
+# Use this hook to configure devise mailer, warden hooks and so forth. The first
+# four configuration values can also be set straight in your models.
+Devise.setup do |config|
+  # Configure the e-mail address which will be shown in DeviseMailer.
+  config.mailer_sender = "please-change-me@config-initializers-devise.com"
+  
+  # Configure the content type of DeviseMailer mails (defaults to text/html")
+  # config.mailer_content_type = "text/plain"
+
+  # ==> Configuration for :authenticatable
+  # Invoke `rake secret` and use the printed value to setup a pepper to generate
+  # the encrypted password. By default no pepper is used.
+  # config.pepper = "rake secret output"
+
+  # Configure how many times you want the password is reencrypted. Default is 10.
+  # config.stretches = 10
+
+  # Define which will be the encryption algorithm. Supported algorithms are :sha1
+  # (default), :sha512 and :bcrypt. Devise also supports encryptors from others
+  # authentication tools as :clearance_sha1, :authlogic_sha512 (then you should set
+  # stretches above to 20 for default behavior) and :restful_authentication_sha1
+  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
+  # config.encryptor = :sha1
+
+  # Configure which keys are used when authenticating an user. By default is
+  # just :email. You can configure it to use [:username, :subdomain], so for
+  # authenticating an user, both parameters are required. Remember that those
+  # parameters are used only when authenticating and not when retrieving from
+  # session. If you need permissions, you should implement that in a before filter.
+  # config.authentication_keys = [ :email ]
+
+  # The realm used in Http Basic Authentication
+  # config.http_authentication_realm = "Application"
+
+  # ==> Configuration for :confirmable
+  # The time you want give to your user to confirm his account. During this time
+  # he will be able to access your application without confirming. Default is nil.
+  # config.confirm_within = 2.days
+
+  # ==> Configuration for :rememberable
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # ==> Configuration for :timeoutable
+  # The time you want to timeout the user session without activity. After this
+  # time the user will be asked for credentials again.
+  # config.timeout_in = 10.minutes
+
+  # ==> Configuration for :lockable
+  # Number of authentication tries before locking an account.
+  # config.maximum_attempts = 20
+
+  # Defines which strategy will be used to unlock an account.
+  # :email = Sends an unlock link to the user email
+  # :time  = Reanables login after a certain ammount of time (see :unlock_in below)
+  # :both  = enables both strategies
+  # config.unlock_strategy = :both
+
+  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+  # config.unlock_in = 1.hour
+
+  # ==> Configuration for :token_authenticatable
+  # Defines name of the authentication token params key
+  # config.token_authentication_key = :auth_token
+
+  # ==> General configuration
+  # Load and configure the ORM. Supports :active_record (default), :mongo_mapper
+  # (requires mongo_ext installed) and :data_mapper (experimental).
+  # require 'devise/orm/mongo_mapper'
+  # config.orm = :mongo_mapper
+
+  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+  # "sessions/users/new". It's turned off by default because it's slower if you
+  # are using only default views.
+  # config.scoped_views = true
+
+  # By default, devise detects the role accessed based on the url. So whenever
+  # accessing "/users/sign_in", it knows you are accessing an User. This makes
+  # routes as "/sign_in" not possible, unless you tell Devise to use the default
+  # scope, setting true below.
+  # config.use_default_scope = true
+
+  # Configure the default scope used by Devise. By default it's the first devise
+  # role declared in your routes.
+  # config.default_scope = :user
+
+  # If you want to use other strategies, that are not (yet) supported by Devise,
+  # you can configure them inside the config.warden block. The example below
+  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  #
+  # config.warden do |manager|
+  #   manager.oauth(:twitter) do |twitter|
+  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
+  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
+  #     twitter.options :site => 'http://twitter.com'
+  #   end
+  #   manager.default_strategies.unshift :twitter_oauth
+  # end
+
+  # Configure default_url_options if you are using dynamic segments in :path_prefix
+  # for devise_for.
+  # config.default_url_options do
+  #   { :locale => I18n.locale }
+  # end
+end
--- a/generators/devise_views/USAGE
+++ b/generators/devise_views/USAGE
@@ -0,0 +1,3 @@
+To copy all session, password, confirmation and mailer views from devise to your app just run the following command:
+
+    script/generate devise_views
--- a/generators/devise_views/devise_views_generator.rb
+++ b/generators/devise_views/devise_views_generator.rb
@@ -0,0 +1,21 @@
+class DeviseViewsGenerator < Rails::Generator::Base
+
+  def initialize(*args)
+    super
+    @source_root = options[:source] || File.join(spec.path, '..', '..')
+  end
+
+  def manifest
+    record do |m|
+      m.directory "app/views"
+
+      Dir[File.join(@source_root, "app", "views", "**/*.erb")].each do |file|
+        file = file.gsub(@source_root, "")[1..-1]
+
+        m.directory  File.dirname(file)
+        m.file       file, file
+      end
+    end
+  end
+
+end
--- a/lib/devise.rb
+++ b/lib/devise.rb
@@ -1,26 +1,18 @@
-require 'rails'
-require 'active_support/core_ext/numeric/time'
-require 'active_support/dependencies'
-require 'orm_adapter'
-require 'set'
-
 module Devise
  autoload :FailureApp, 'devise/failure_app'
-  autoload :OmniAuth, 'devise/omniauth'
-  autoload :PathChecker, 'devise/path_checker'
+  autoload :Models, 'devise/models'
  autoload :Schema, 'devise/schema'
  autoload :TestHelpers, 'devise/test_helpers'

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

  module Encryptors
    autoload :Base, 'devise/encryptors/base'
+    autoload :Bcrypt, 'devise/encryptors/bcrypt'
    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512'
    autoload :ClearanceSha1, 'devise/encryptors/clearance_sha1'
    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1'
@@ -28,115 +20,100 @@ module Devise
    autoload :Sha1, 'devise/encryptors/sha1'
  end

-  module Strategies
-    autoload :Base, 'devise/strategies/base'
-    autoload :Authenticatable, 'devise/strategies/authenticatable'
+  module Orm
+    autoload :ActiveRecord, 'devise/orm/active_record'
+    autoload :DataMapper, 'devise/orm/data_mapper'
+    autoload :MongoMapper, 'devise/orm/mongo_mapper'
  end

-  # Constants which holds devise configuration for extensions. Those should
-  # not be modified by the "end user" (this is why they are constants).
-  ALL         = []
-  CONTROLLERS = ActiveSupport::OrderedHash.new
-  ROUTES      = ActiveSupport::OrderedHash.new
-  STRATEGIES  = ActiveSupport::OrderedHash.new
-  URL_HELPERS = ActiveSupport::OrderedHash.new
+  ALL = []
+
+  # Authentication ones first
+  ALL.push :database_authenticatable, :http_authenticatable, :token_authenticatable, :rememberable
+
+  # Misc after
+  ALL.push :recoverable, :registerable, :validatable
+
+  # The ones which can sign out after
+  ALL.push :activatable, :confirmable, :lockable, :timeoutable
+
+  # Stats for last, so we make sure the user is really signed in
+  ALL.push :trackable
+
+  # Maps controller names to devise modules.
+  CONTROLLERS = {
+    :sessions => [:database_authenticatable, :token_authenticatable],
+    :passwords => [:recoverable],
+    :confirmations => [:confirmable],
+    :registrations => [:registerable],
+    :unlocks => [:lockable]
+  }
+
+  # Routes for generating url helpers.
+  ROUTES = [:session, :password, :confirmation, :registration, :unlock]
+
+  STRATEGIES  = [:rememberable, :http_authenticatable, :token_authenticatable, :database_authenticatable]

-  # True values used to check params
  TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE']

+  # Maps the messages types that are used in flash message.
+  FLASH_MESSAGES = [:unauthenticated, :unconfirmed, :invalid, :invalid_token, :timeout, :inactive, :locked]
+
  # Declare encryptors length which are used in migrations.
  ENCRYPTORS_LENGTH = {
    :sha1   => 40,
    :sha512 => 128,
    :clearance_sha1 => 40,
    :restful_authentication_sha1 => 40,
-    :authlogic_sha512 => 128
+    :authlogic_sha512 => 128,
+    :bcrypt => 60
  }

-  # Custom domain for cookies. Not set by default
-  mattr_accessor :cookie_options
-  @@cookie_options = {}
-
-  # The number of times to encrypt password.
-  mattr_accessor :stretches
-  @@stretches = 10
-
-  # Keys used when authenticating a user.
-  mattr_accessor :authentication_keys
-  @@authentication_keys = [ :email ]
-
-  # Request keys used when authenticating a user.
-  mattr_accessor :request_keys
-  @@request_keys = []
-
-  # Keys that should be case-insensitive.
-  # False by default for backwards compatibility.
-  mattr_accessor :case_insensitive_keys
-  @@case_insensitive_keys = false
-
-  # If http authentication is enabled by default.
-  mattr_accessor :http_authenticatable
-  @@http_authenticatable = false
-
-  # If http headers should be returned for ajax requests. True by default.
-  mattr_accessor :http_authenticatable_on_xhr
-  @@http_authenticatable_on_xhr = true
-
-  # If params authenticatable is enabled by default.
-  mattr_accessor :params_authenticatable
-  @@params_authenticatable = true
-
-  # The realm used in Http Basic Authentication.
-  mattr_accessor :http_authentication_realm
-  @@http_authentication_realm = "Application"
-
  # Email regex used to validate email formats. Adapted from authlogic.
-  mattr_accessor :email_regexp
-  @@email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
-
-  # Range validation for password length
-  mattr_accessor :password_length
-  @@password_length = 6..128
-
-  # The time the user will be remembered without asking for credentials again.
-  mattr_accessor :remember_for
-  @@remember_for = 2.weeks
-
-  # If true, a valid remember token can be re-used between multiple browsers.
-  mattr_accessor :remember_across_browsers
-  @@remember_across_browsers = true
-
-  # If true, extends the user's remember period when remembered via cookie.
-  mattr_accessor :extend_remember_period
-  @@extend_remember_period = false
-
-  # If true, uses salt as remember token and does not create it in the database.
-  # By default is false for backwards compatibility.
-  mattr_accessor :use_salt_as_remember_token
-  @@use_salt_as_remember_token = false
-
-  # Time interval you can access your account before confirming your account.
-  mattr_accessor :confirm_within
-  @@confirm_within = 0.days
-
-  # Defines which key will be used when confirming an account
-  mattr_accessor :confirmation_keys
-  @@confirmation_keys = [ :email ]
-
-  # Time interval to timeout the user session without activity.
-  mattr_accessor :timeout_in
-  @@timeout_in = 30.minutes
+  EMAIL_REGEX = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i

  # Used to encrypt password. Please generate one with rake secret.
  mattr_accessor :pepper
  @@pepper = nil

+  # The number of times to encrypt password.
+  mattr_accessor :stretches
+  @@stretches = 10
+
+  # Keys used when authenticating an user.
+  mattr_accessor :authentication_keys
+  @@authentication_keys = [ :email ]
+
+  # Time interval where the remember me token is valid.
+  mattr_accessor :remember_for
+  @@remember_for = 2.weeks
+
+  # Time interval you can access your account before confirming your account.
+  mattr_accessor :confirm_within
+  @@confirm_within = 0.days
+
+  # Time interval to timeout the user session without activity.
+  mattr_accessor :timeout_in
+  @@timeout_in = 30.minutes
+
  # Used to define the password encryption algorithm.
  mattr_accessor :encryptor
-  @@encryptor = nil
+  @@encryptor = :sha1
+
+  # Store scopes mappings.
+  mattr_accessor :mappings
+  @@mappings = ActiveSupport::OrderedHash.new
+
+  # Stores the chosen ORM.
+  mattr_accessor :orm
+  @@orm = :active_record
+
+  # TODO Remove
+  mattr_accessor :all
+  @@all = []

  # Tells if devise should apply the schema in ORMs where devise declaration
-  # and schema belongs to the same class (as Datamapper and Mongoid).
+  # and schema belongs to the same class (as Datamapper and MongoMapper).
  mattr_accessor :apply_schema
  @@apply_schema = true

@@ -145,35 +122,22 @@ module Devise
  mattr_accessor :scoped_views
  @@scoped_views = false

-  # Defines which strategy can be used to lock an account.
-  # Values: :failed_attempts, :none
-  mattr_accessor :lock_strategy
-  @@lock_strategy = :failed_attempts
-
-  # Defines which key will be used when locking and unlocking an account
-  mattr_accessor :unlock_keys
-  @@unlock_keys = [ :email ]
+  # Number of authentication tries before locking an account
+  mattr_accessor :maximum_attempts
+  @@maximum_attempts = 20

  # Defines which strategy can be used to unlock an account.
  # Values: :email, :time, :both
  mattr_accessor :unlock_strategy
  @@unlock_strategy = :both

-  # Number of authentication tries before locking an account
-  mattr_accessor :maximum_attempts
-  @@maximum_attempts = 20
-
  # Time interval to unlock the account if :time is defined as unlock_strategy.
  mattr_accessor :unlock_in
  @@unlock_in = 1.hour

-  # Defines which key will be used when recovering the password for an account
-  mattr_accessor :reset_password_keys
-  @@reset_password_keys = [ :email ]
-
-  # Time interval you can reset your password with a reset password key 
-  mattr_accessor :reset_password_within
-  @@reset_password_within = nil
+  # Tell when to use the default scope, if one cannot be found from routes.
+  mattr_accessor :use_default_scope
+  @@use_default_scope = false

  # The default scope which is used by warden.
  mattr_accessor :default_scope
@@ -183,223 +147,120 @@ module Devise
  mattr_accessor :mailer_sender
  @@mailer_sender = nil

+  # Content Type of Devise e-mails.
+  mattr_accessor :mailer_content_type
+  @@mailer_content_type = 'text/html'
+
  # Authentication token params key name of choice. E.g. /users/sign_in?some_key=...
  mattr_accessor :token_authentication_key
  @@token_authentication_key = :auth_token

-  # If true, authentication through token does not store user in session
-  mattr_accessor :stateless_token
-  @@stateless_token = false
+  # The realm used in Http Basic Authentication
+  mattr_accessor :http_authentication_realm
+  @@http_authentication_realm = "Application"

-  # Which formats should be treated as navigational.
-  # We need both :"*/*" and "*/*" to work on different Rails versions.
-  mattr_accessor :navigational_formats
-  @@navigational_formats = [:"*/*", "*/*", :html]
-
-  # When set to true, signing out a user signs out all other scopes.
-  mattr_accessor :sign_out_all_scopes
-  @@sign_out_all_scopes = true
-
-  # The default method used while signing out
-  mattr_accessor :sign_out_via
-  @@sign_out_via = :get
-
-  # PRIVATE CONFIGURATION
-
-  # Store scopes mappings.
-  mattr_reader :mappings
-  @@mappings = ActiveSupport::OrderedHash.new
-
-  # Omniauth configurations.
-  mattr_reader :omniauth_configs
-  @@omniauth_configs = ActiveSupport::OrderedHash.new
-
-  # Define a set of modules that are called when a mapping is added.
-  mattr_reader :helpers
-  @@helpers = Set.new
-  @@helpers << Devise::Controllers::Helpers
-
-  # Private methods to interface with Warden.
-  mattr_accessor :warden_config
-  @@warden_config = nil
-  @@warden_config_block = nil
-
-  # 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
-
-  def self.ref(arg)
-    if defined?(ActiveSupport::Dependencies::ClassCache)
-      ActiveSupport::Dependencies::Reference.store(arg)
-    else
-      ActiveSupport::Dependencies.ref(arg)
-    end
-  end
-
-  def self.omniauth_providers
-    omniauth_configs.keys
-  end
-
-  # Get the mailer class from the mailer reference object.
-  def self.mailer
-    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.
-  def self.mailer=(class_name)
-    @@mailer_ref = ref(class_name)
-  end
-  self.mailer = "Devise::Mailer"
-
-  # Small method that adds a mapping to Devise.
-  def self.add_mapping(resource, options)
-    mapping = Devise::Mapping.new(resource, options)
-    @@mappings[mapping.name] = mapping
-    @@default_scope ||= mapping.name
-    @@helpers.each { |h| h.define_helpers(mapping) }
-    mapping
-  end
-
-  # Make Devise aware of an 3rd party Devise-module (like invitable). For convenience.
-  #
-  # == Options:
-  #
-  #   +model+      - String representing the load path to a custom *model* for this module (to autoload.)
-  #   +controller+ - Symbol representing the name of an exisiting or custom *controller* for this module.
-  #   +route+      - Symbol representing the named *route* helper for this module.
-  #   +strategy+   - Symbol representing if this module got a custom *strategy*.
-  #
-  # All values, except :model, accept also a boolean and will have the same name as the given module
-  # name.
-  #
-  # == Examples:
-  #
-  #   Devise.add_module(:party_module)
-  #   Devise.add_module(:party_module, :strategy => true, :controller => :sessions)
-  #   Devise.add_module(:party_module, :model => 'party_module/model')
-  #
-  def self.add_module(module_name, options = {})
-    ALL << module_name
-    options.assert_valid_keys(:strategy, :model, :controller, :route)
-
-    if strategy = options[:strategy]
-      STRATEGIES[module_name] = (strategy == true ? module_name : strategy)
+  class << self
+    # Default way to setup Devise. Run script/generate devise_install to create
+    # a fresh initializer with all configuration values.
+    def setup
+      yield self
    end

-    if controller = options[:controller]
-      CONTROLLERS[module_name] = (controller == true ? module_name : controller)
+    # Sets warden configuration using a block that will be invoked on warden
+    # initialization.
+    #
+    #  Devise.initialize do |config|
+    #    config.confirm_within = 2.days
+    #
+    #    config.warden do |manager|
+    #      # Configure warden to use other strategies, like oauth.
+    #      manager.oauth(:twitter)
+    #    end
+    #  end
+    def warden(&block)
+      @warden_config = block
    end

-    if route = options[:route]
-      case route
-      when TrueClass
-        key, value = module_name, []
-      when Symbol
-        key, value = route, []
-      when Hash
-        key, value = route.keys.first, route.values.flatten
-      else
-        raise ArgumentError, ":route should be true, a Symbol or a Hash"
+    # Configure default url options to be used within Devise and ActionController.
+    def default_url_options(&block)
+      who = Devise::Mapping.respond_to?(:singleton_class) ?
+        Devise::Mapping.singleton_class : Devise::Mapping.metaclass
+      who.send :define_method, :default_url_options, &block
+    end
+
+    # A method used internally to setup warden manager from the Rails initialize
+    # block.
+    def configure_warden(config) #:nodoc:
+      config.default_strategies *Devise::STRATEGIES
+      config.failure_app = Devise::FailureApp
+      config.silence_missing_strategies!
+      config.default_scope = Devise.default_scope
+
+      # If the user provided a warden hook, call it now.
+      @warden_config.try :call, config
+    end
+
+    # The class of the configured ORM
+    def orm_class
+      Devise::Orm.const_get(@@orm.to_s.camelize.to_sym)
+    end
+
+    # Generate a friendly string randomically to be used as token.
+    def friendly_token
+      ActiveSupport::SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
+    end
+
+    # Make Devise aware of an 3rd party Devise-module. For convenience.
+    #
+    # == Options:
+    #
+    #   +strategy+    - Boolean value representing if this module got a custom *strategy*.
+    #                   Default is +false+. Note: Devise will auto-detect this in such case if this is true.
+    #   +model+       - String representing a load path to a custom *model* for this module (to autoload).
+    #                   Default is +nil+ (i.e. +false+).
+    #   +controller+  - Symbol representing a name of an exisiting or custom *controller* for this module.
+    #                   Default is +nil+ (i.e. +false+).
+    #   +route+       - Symbol representing the name of a *route* related to this module which a set of
+    #                   route view helpers should be created for.
+    #                   Default is +nil+ (i.e. +false+).
+    #
+    # == Examples:
+    #
+    #   Devise.add_module(:party_module)
+    #   Devise.add_module(:party_module, :strategy => true, :controller => :sessions)
+    #   Devise.add_module(:party_module, :model => 'party_module/model')
+    #
+    def add_module(module_name, options = {})
+      Devise::ALL << module_name        unless Devise::ALL.include?(module_name)
+      Devise::STRATEGIES.unshift module_name if options[:strategy] && !Devise::STRATEGIES.include?(module_name)
+
+      if options[:controller]
+        controller = options[:controller].to_sym
+        Devise::CONTROLLERS[controller] ||= []
+        Devise::CONTROLLERS[controller].unshift module_name unless Devise::CONTROLLERS[controller].include?(module_name)
      end

-      URL_HELPERS[key] ||= []
-      URL_HELPERS[key].concat(value)
-      URL_HELPERS[key].uniq!
-
-      ROUTES[module_name] = key
-    end
-
-    if options[:model]
-      path = (options[:model] == true ? "devise/models/#{module_name}" : options[:model])
-      camelized = ActiveSupport::Inflector.camelize(module_name.to_s)
-      Devise::Models.send(:autoload, camelized.to_sym, path)
-    end
-
-    Devise::Mapping.add_module module_name
-  end
-
-  # Sets warden configuration using a block that will be invoked on warden
-  # initialization.
-  #
-  #  Devise.initialize do |config|
-  #    config.confirm_within = 2.days
-  #
-  #    config.warden do |manager|
-  #      # Configure warden to use other strategies, like oauth.
-  #      manager.oauth(:twitter)
-  #    end
-  #  end
-  def self.warden(&block)
-    @@warden_config_block = block
-  end
-
-  # Specify an omniauth provider.
-  #
-  #   config.omniauth :github, APP_ID, APP_SECRET
-  #
-  def self.omniauth(provider, *args)
-    @@helpers << Devise::OmniAuth::UrlHelpers
-    @@omniauth_configs[provider] = Devise::OmniAuth::Config.new(provider, args)
-  end
-
-  # Include helpers in the given scope to AC and AV.
-  def self.include_helpers(scope)
-    ActiveSupport.on_load(:action_controller) do
-      include scope::Helpers if defined?(scope::Helpers)
-      include scope::UrlHelpers
-    end
-
-    ActiveSupport.on_load(:action_view) do
-      include scope::UrlHelpers
-    end
-  end
-
-  # Returns true if Rails version is bigger than 3.0.x
-  def self.rack_session?
-    Rails::VERSION::STRING[0,3] != "3.0"
-  end
-
-  # 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::FailureApp
-      warden_config.default_scope = Devise.default_scope
-      warden_config.intercept_401 = false
-
-      Devise.mappings.each_value do |mapping|
-        warden_config.scope_defaults mapping.name, :strategies => mapping.strategies
+      if options[:route]
+        Devise::ROUTES.unshift options[:route] unless Devise::ROUTES.include?(options[:route])
      end

-      @@warden_config_block.try :call, Devise.warden_config
-      true
+      if options[:model]
+        Devise::Models.module_eval do
+          autoload :"#{module_name.to_s.classify}", options[:model]
+        end
+      end
+
+      Devise::Mapping.register module_name
    end
  end
-
-  # Generate a friendly string randomically to be used as token.
-  def self.friendly_token
-    ActiveSupport::SecureRandom.base64(15).tr('+/=', 'xyz')
-  end
-
-  # constant-time comparison algorithm to prevent timing attacks
-  def self.secure_compare(a, b)
-    return false if a.blank? || b.blank? || a.bytesize != b.bytesize
-    l = a.unpack "C#{a.bytesize}"
-
-    res = 0
-    b.each_byte { |byte| res |= byte ^ l.shift }
-    res == 0
-  end
 end

-require 'warden'
+begin
+  require 'warden'
+rescue
+  gem 'warden'
+  require 'warden'
+end
+
 require 'devise/mapping'
-require 'devise/models'
-require 'devise/modules'
 require 'devise/rails'
--- a/lib/devise/controllers/helpers.rb
+++ b/lib/devise/controllers/helpers.rb
@@ -2,59 +2,17 @@ module Devise
  module Controllers
    # Those helpers are convenience methods added to ApplicationController.
    module Helpers
-      extend ActiveSupport::Concern

-      included do
-        helper_method :warden, :signed_in?, :devise_controller?, :anybody_signed_in?
-      end
+      def self.included(base)
+        base.class_eval do
+          helper_method :warden, :signed_in?, :devise_controller?, :anybody_signed_in?,
+                        *Devise.mappings.keys.map { |m| [:"current_#{m}", :"#{m}_signed_in?", :"#{m}_session"] }.flatten

-      # Define authentication filters and accessor helpers based on mappings.
-      # These filters should be used inside the controllers as before_filters,
-      # so you can control the scope of the user who should be signed in to
-      # access that specific controller/action.
-      # Example:
-      #
-      #   Roles:
-      #     User
-      #     Admin
-      #
-      #   Generated methods:
-      #     authenticate_user!  # Signs user in or redirect
-      #     authenticate_admin! # Signs admin in or redirect
-      #     user_signed_in?     # Checks whether there is a user signed in or not
-      #     admin_signed_in?    # Checks whether there is an admin signed in or not
-      #     current_user        # Current signed in user
-      #     current_admin       # Current signed in admin
-      #     user_session        # Session data available only to the user scope
-      #     admin_session       # Session data available only to the admin scope
-      #
-      #   Use:
-      #     before_filter :authenticate_user!  # Tell devise to use :user map
-      #     before_filter :authenticate_admin! # Tell devise to use :admin map
-      #
-      def self.define_helpers(mapping) #:nodoc:
-        mapping = mapping.name
-
-        class_eval <<-METHODS, __FILE__, __LINE__ + 1
-          def authenticate_#{mapping}!(force = false)
-            warden.authenticate!(:scope => :#{mapping}) if !devise_controller? || force
+          # Use devise default_url_options. We have to declare it here to overwrite
+          # default definitions.
+          def default_url_options(options=nil)
+            Devise::Mapping.default_url_options
          end
-
-          def #{mapping}_signed_in?
-            !!current_#{mapping}
-          end
-
-          def current_#{mapping}
-            @current_#{mapping} ||= warden.authenticate(:scope => :#{mapping})
-          end
-
-          def #{mapping}_session
-            current_#{mapping} && warden.session(:#{mapping})
-          end
-        METHODS
-
-        ActiveSupport.on_load(:action_controller) do
-          helper_method "current_#{mapping}", "#{mapping}_signed_in?", "#{mapping}_session"
        end
      end

@@ -65,53 +23,53 @@ module Devise

      # Return true if it's a devise_controller. false to all controllers unless
      # the controllers defined inside devise. Useful if you want to apply a before
-      # filter to all controllers, except the ones in devise:
+      # filter to all controller, except the ones in devise:
      #
      #   before_filter :my_filter, :unless => { |c| c.devise_controller? }
      def devise_controller?
        false
      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| 
-          warden.authenticate?(:scope => scope)
-        end
+      # Attempts to authenticate the given scope by running authentication hooks,
+      # but does not redirect in case of failures.
+      def authenticate(scope)
+        warden.authenticate(:scope => scope)
      end

-      # Sign in a user that already was authenticated. This helper is useful for logging
+      # Attempts to authenticate the given scope by running authentication hooks,
+      # redirecting in case of failures.
+      def authenticate!(scope)
+        warden.authenticate!(:scope => scope)
+      end
+
+      # Check if the given scope is signed in session, without running
+      # authentication hooks.
+      def signed_in?(scope)
+        warden.authenticate?(:scope => scope)
+      end
+
+      # Check if the any scope is signed in session, without running
+      # authentication hooks.
+      def anybody_signed_in?
+        Devise.mappings.keys.any? { |scope| signed_in?(scope) }
+      end
+
+      # Sign in an user that already was authenticated. This helper is useful for logging
      # users in after sign up.
      #
-      # All options given to sign_in is passed forward to the set_user method in warden.
-      # The only exception is the :bypass option, which bypass warden callbacks and stores
-      # the user straight in session. This option is useful in cases the user is already
-      # signed in, but we want to refresh the credentials in session.
-      #
      # Examples:
      #
-      #   sign_in :user, @user                      # sign_in(scope, resource)
-      #   sign_in @user                             # sign_in(resource)
-      #   sign_in @user, :event => :authentication  # sign_in(resource, options)
-      #   sign_in @user, :bypass => true            # sign_in(resource, options)
-      # 
-      def sign_in(resource_or_scope, *args)
-        options  = args.extract_options!
-        scope    = Devise::Mapping.find_scope!(resource_or_scope)
-        resource = args.last || resource_or_scope
-
-        expire_session_data_after_sign_in!
-
-        if options[:bypass]
-          warden.session_serializer.store(resource, scope)
-        elsif warden.user(scope) == resource && !options.delete(:force)
-          # Do nothing. User already signed in and we are not forcing it.
-        else
-          warden.set_user(resource, options.merge!(:scope => scope))
-        end
+      #   sign_in :user, @user    # sign_in(scope, resource)
+      #   sign_in @user           # sign_in(resource)
+      #
+      def sign_in(resource_or_scope, resource=nil)
+        scope      = Devise::Mapping.find_scope!(resource_or_scope)
+        resource ||= resource_or_scope
+        warden.set_user(resource, :scope => scope)
+        @_session = request.session # Recalculate session
      end

-      # Sign out a given user or scope. This helper is useful for signing out a user
+      # Sign out a given user or scope. This helper is useful for signing out an user
      # after deleting accounts.
      #
      # Examples:
@@ -119,22 +77,13 @@ module Devise
      #   sign_out :user     # sign_out(scope)
      #   sign_out @user     # sign_out(resource)
      #
-      def sign_out(resource_or_scope=nil)
-        return sign_out_all_scopes unless resource_or_scope
+      def sign_out(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
        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)
      end

-      # Sign out all active users or scopes. This helper is useful for signing out all roles
-      # in one click. This signs out ALL scopes in warden.
-      def sign_out_all_scopes
-        Devise.mappings.keys.each { |s| warden.user(s) }
-        warden.raw_session.inspect
-        warden.logout
-      end
-
      # Returns and delete the url stored in the session for the given scope. Useful
      # for giving redirect backs after sign up:
      #
@@ -144,7 +93,8 @@ module Devise
      #
      def stored_location_for(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        session.delete("#{scope}_return_to")
+        key = "#{scope}.return_to"
+        session.delete(key) || session.delete(key.to_sym)
      end

      # The default url to be used after signing in. This is used by all Devise
@@ -179,7 +129,7 @@ module Devise
        respond_to?(home_path, true) ? send(home_path) : root_path
      end

-      # Method used by sessions controller to sign out a user. You can overwrite
+      # Method used by sessions controller to sign out an user. You can overwrite
      # it in your ApplicationController to provide a custom hook for a custom
      # scope. Notice that differently from +after_sign_in_path_for+ this method
      # receives a symbol with the scope, and not the resource.
@@ -189,40 +139,74 @@ module Devise
        root_path
      end

-      # Sign in a user and tries to redirect first to the stored location and
-      # then to the url specified by after_sign_in_path_for. It accepts the same
-      # parameters as the sign_in method.
-      def sign_in_and_redirect(resource_or_scope, *args)
-        options  = args.extract_options!
-        scope    = Devise::Mapping.find_scope!(resource_or_scope)
-        resource = args.last || resource_or_scope
-        sign_in(scope, resource, options)
-        redirect_to redirect_location(scope, resource)
+      # Sign in an user and tries to redirect first to the stored location and
+      # then to the url specified by after_sign_in_path_for.
+      #
+      # If just a symbol is given, consider that the user was already signed in
+      # through other means and just perform the redirection.
+      def sign_in_and_redirect(resource_or_scope, resource=nil, skip=false)
+        scope      = Devise::Mapping.find_scope!(resource_or_scope)
+        resource ||= resource_or_scope
+        if skip
+          @_session = request.session # Recalculate session
+        else
+          sign_in(scope, resource)
+        end
+        redirect_to stored_location_for(scope) || after_sign_in_path_for(resource)
      end

-      def redirect_location(scope, resource) #:nodoc:
-        stored_location_for(scope) || after_sign_in_path_for(resource)
-      end
-
-      # Sign out a user and tries to redirect to the url specified by
+      # Sign out an user and tries to redirect to the url specified by
      # after_sign_out_path_for.
      def sign_out_and_redirect(resource_or_scope)
        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        Devise.sign_out_all_scopes ? sign_out : sign_out(scope)
+        sign_out(scope)
        redirect_to after_sign_out_path_for(scope)
      end

-      # 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) }
+      # Define authentication filters and accessor helpers based on mappings.
+      # These filters should be used inside the controllers as before_filters,
+      # so you can control the scope of the user who should be signed in to
+      # access that specific controller/action.
+      # Example:
+      #
+      #   Maps:
+      #     User => :authenticatable
+      #     Admin => :authenticatable
+      #
+      #   Generated methods:
+      #     authenticate_user!  # Signs user in or redirect
+      #     authenticate_admin! # Signs admin in or redirect
+      #     user_signed_in?     # Checks whether there is an user signed in or not
+      #     admin_signed_in?    # Checks whether there is an admin signed in or not
+      #     current_user        # Current signed in user
+      #     current_admin       # Current signed in admin
+      #     user_session        # Session data available only to the user scope
+      #     admin_session       # Session data available only to the admin scope
+      #
+      #   Use:
+      #     before_filter :authenticate_user!  # Tell devise to use :user map
+      #     before_filter :authenticate_admin! # Tell devise to use :admin map
+      #
+      Devise.mappings.each_key do |mapping|
+        class_eval <<-METHODS, __FILE__, __LINE__ + 1
+          def authenticate_#{mapping}!
+            warden.authenticate!(:scope => :#{mapping})
+          end
+
+          def #{mapping}_signed_in?
+            warden.authenticate?(:scope => :#{mapping})
+          end
+
+          def current_#{mapping}
+            @current_#{mapping} ||= warden.authenticate(:scope => :#{mapping})
+          end
+
+          def #{mapping}_session
+            current_#{mapping} && warden.session(:#{mapping})
+          end
+        METHODS
      end

-      # 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
 end
--- a/lib/devise/controllers/internal_helpers.rb
+++ b/lib/devise/controllers/internal_helpers.rb
@@ -4,32 +4,28 @@ module Devise
    # included in ApplicationController since they all depend on the url being
    # accessed.
    module InternalHelpers #:nodoc:
-      extend ActiveSupport::Concern
-      include Devise::Controllers::ScopedViews

-      MIME_REFERENCES = Mime::HTML.respond_to?(:ref)
+      def self.included(base)
+        base.class_eval do
+          extend ScopedViews
+          unloadable

-      # Helper used by FailureApp and Devise controllers to retrieve proper formats.
-      def self.request_format(request)
-        if request.format.respond_to?(:ref)
-          request.format.ref
-        elsif MIME_REFERENCES
-          request.format
-        elsif request.format # Rails < 3.0.4
-          request.format.to_sym
+          helper_method :resource, :scope_name, :resource_name, :resource_class, :devise_mapping, :devise_controller?
+          hide_action   :resource, :scope_name, :resource_name, :resource_class, :devise_mapping, :devise_controller?
+
+          skip_before_filter *Devise.mappings.keys.map { |m| :"authenticate_#{m}!" }
+          prepend_before_filter :is_devise_resource?
        end
      end

-      included do
-        helper DeviseHelper
+      module ScopedViews
+        def scoped_views
+          defined?(@scoped_views) ? @scoped_views : Devise.scoped_views
+        end

-        helpers = %w(resource scope_name resource_name signed_in_resource
-                     resource_class devise_mapping devise_controller?)
-        hide_action *helpers
-        helper_method *helpers
-
-        prepend_before_filter :is_devise_resource?
-        respond_to *Mime::SET.map(&:to_sym) if mimes_for_respond_to.empty?
+        def scoped_views=(value)
+          @scoped_views = value
+        end
      end

      # Gets the actual resource stored in the instance variable
@@ -48,14 +44,13 @@ module Devise
        devise_mapping.to
      end

-      # Returns a signed in resource from session (if one exists)
-      def signed_in_resource
-        warden.authenticate(:scope => resource_name)
-      end
-
      # Attempt to find the mapped route for devise based on request path
      def devise_mapping
-        @devise_mapping ||= request.env["devise.mapping"]
+        @devise_mapping ||= begin
+          mapping   = Devise::Mapping.find_by_path(request.path)
+          mapping ||= Devise.mappings[Devise.default_scope] if Devise.use_default_scope
+          mapping
+        end
      end

      # Overwrites devise_controller? to return true
@@ -65,35 +60,9 @@ module Devise

    protected

-      def request_format
-        @request_format ||= Devise::Controllers::InternalHelpers.request_format(request)
-      end
-
      # Checks whether it's a devise mapped resource or not.
      def is_devise_resource? #:nodoc:
-        unknown_action! <<-MESSAGE unless devise_mapping
-Could not find devise mapping for path #{request.fullpath.inspect}.
-Maybe you forgot to wrap your route inside the scope block? For example:
-
-    devise_scope :user do
-      match "/some/route" => "some_devise_controller"
-    end
-MESSAGE
-      end
-
-      # Check whether it's navigational format, such as :html or :iphone, or not.
-      def is_navigational_format?
-        Devise.navigational_formats.include?(request_format)
-      end
-
-      # Returns real navigational formats which are supported by Rails
-      def navigational_formats
-        @navigational_formats ||= Devise.navigational_formats.select{ |format| Mime::EXTENSION_LOOKUP[format.to_s] }
-      end
-
-      def unknown_action!(msg)
-        logger.debug "[Devise] #{msg}" if logger
-        raise ActionController::UnknownAction, msg
+        raise ActionController::UnknownAction unless devise_mapping && devise_mapping.allows?(controller_name)
      end

      # Sets the resource creating an instance variable
@@ -102,9 +71,8 @@ MESSAGE
      end

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

      # Helper for use in before_filters where no authentication is required.
@@ -112,11 +80,7 @@ MESSAGE
      # Example:
      #   before_filter :require_no_authentication, :only => :new
      def require_no_authentication
-        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
+        redirect_to after_sign_in_path_for(resource_name) if warden.authenticated?(resource_name)
      end

      # Sets the flash message with :key, using I18n. By default you are able
@@ -133,23 +97,33 @@ MESSAGE
      #
      # Please refer to README or en.yml locale file to check what messages are
      # available.
-      def set_flash_message(key, kind, options={}) #:nodoc:
-        options[:scope] = "devise.#{controller_name}"
-        options[:default] = Array(options[:default]).unshift(kind.to_sym)
-        options[:resource_name] = resource_name
-        message = I18n.t("#{resource_name}.#{kind}", options)
-        flash[key] = message if message.present?
+      def set_flash_message(key, kind, now=false)
+        flash_hash = now ? flash.now : flash
+        flash_hash[key] = I18n.t(:"#{resource_name}.#{kind}",
+                            :scope => [:devise, controller_name.to_sym], :default => kind)
      end

-      def clean_up_passwords(object) #:nodoc:
-        object.clean_up_passwords if object.respond_to?(:clean_up_passwords)
+      # Shortcut to set flash.now message. Same rules applied from set_flash_message
+      def set_now_flash_message(key, kind)
+        set_flash_message(key, kind, true)
      end

-      def respond_with_navigational(*args, &block)
-        respond_with(*args) do |format|
-          format.any(*navigational_formats, &block)
+      # Render a view for the specified scope. Turned off by default.
+      # Accepts just :controller as option.
+      def render_with_scope(action, options={})
+        controller_name = options.delete(:controller) || self.controller_name
+
+        if self.class.scoped_views
+          begin
+            render :template => "#{controller_name}/#{devise_mapping.as}/#{action}"
+          rescue ActionView::MissingTemplate
+            render action, :controller => controller_name
+          end
+        else
+          render action, :controller => controller_name
        end
      end
+
    end
  end
 end
--- a/lib/devise/controllers/rememberable.rb
+++ b/lib/devise/controllers/rememberable.rb
@@ -1,52 +0,0 @@
-module Devise
-  module Controllers
-    # A module that may be optionally included in a controller in order
-    # to provide remember me behavior.
-    module Rememberable
-      # Return default cookie values retrieved from session options.
-      def self.cookie_values
-        Rails.configuration.session_options.slice(:path, :domain, :secure)
-      end
-
-      # A small warden proxy so we can remember and forget uses from hooks.
-      class Proxy #:nodoc:
-        include Devise::Controllers::Rememberable
-
-        delegate :cookies, :env, :to => :@warden
-
-        def initialize(warden)
-          @warden = warden
-        end
-      end
-
-      # Remembers the given resource by setting up a cookie
-      def remember_me(resource)
-        scope = Devise::Mapping.find_scope!(resource)
-        resource.remember_me!(resource.extend_remember_period)
-        cookies.signed["remember_#{scope}_token"] = remember_cookie_values(resource)
-      end
-
-      # Forgets the given resource by deleting a cookie
-      def forget_me(resource)
-        scope = Devise::Mapping.find_scope!(resource)
-        resource.forget_me! unless resource.frozen?
-        cookies.delete("remember_#{scope}_token", forget_cookie_values(resource))
-      end
-
-      protected
-
-      def forget_cookie_values(resource)
-        Devise::Controllers::Rememberable.cookie_values.merge!(resource.cookie_options)
-      end
-
-      def remember_cookie_values(resource)
-        options = { :httponly => true }
-        options.merge!(forget_cookie_values(resource))
-        options.merge!(
-          :value => resource.class.serialize_into_cookie(resource),
-          :expires => resource.remember_expires_at
-        )
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/scoped_views.rb
+++ b/lib/devise/controllers/scoped_views.rb
@@ -1,33 +0,0 @@
-module Devise
-  module Controllers
-    module ScopedViews
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        def scoped_views?
-          defined?(@scoped_views) ? @scoped_views : Devise.scoped_views
-        end
-
-        def scoped_views=(value)
-          @scoped_views = value
-        end
-      end
-
-    protected
-
-      # Render a view for the specified scope. Turned off by default.
-      # Accepts just :controller as option.
-      def render_with_scope(action, path=self.controller_path)
-        if self.class.scoped_views?
-          begin
-            render :template => "#{devise_mapping.scoped_path}/#{path.split("/").last}/#{action}"
-          rescue ActionView::MissingTemplate
-            render :template => "#{path}/#{action}"
-          end
-        else
-          render :template => "#{path}/#{action}"
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/controllers/url_helpers.rb
+++ b/lib/devise/controllers/url_helpers.rb
@@ -19,11 +19,13 @@ module Devise
    # Those helpers are added to your ApplicationController.
    module UrlHelpers

-      Devise::URL_HELPERS.each do |module_name, actions|
+      Devise::ROUTES.each do |module_name|
        [:path, :url].each do |path_or_url|
-          actions.each do |action|
-            action = action ? "#{action}_" : ""
+          actions = [ nil, :new_ ]
+          actions << :edit_    if [:password, :registration].include?(module_name)
+          actions << :destroy_ if [:session].include?(module_name)

+          actions.each do |action|
            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)
--- a/lib/devise/encryptors/authlogic_sha512.rb
+++ b/lib/devise/encryptors/authlogic_sha512.rb
@@ -4,9 +4,10 @@ module Devise
  module Encryptors
    # = AuthlogicSha512
    # Simulates Authlogic's default encryption mechanism.
-    # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to simulate
+    # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to silumate
    #  the default behavior.
    class AuthlogicSha512 < Base
+      
      # Gererates a default password digest based on salt, pepper and the
      # incoming password.
      def self.digest(password, stretches, salt, pepper)
@@ -14,6 +15,7 @@ module Devise
        stretches.times { digest = Digest::SHA512.hexdigest(digest) }
        digest
      end
+
    end
  end
 end
--- a/lib/devise/encryptors/base.rb
+++ b/lib/devise/encryptors/base.rb
@@ -12,8 +12,8 @@ module Devise
        raise NotImplemented
      end

-      def self.salt(stretches)
-        Devise.friendly_token[0,20]
+      def self.salt
+        Devise.friendly_token
      end
    end
  end
--- a/lib/devise/encryptors/bcrypt.rb
+++ b/lib/devise/encryptors/bcrypt.rb
@@ -0,0 +1,21 @@
+require "bcrypt"
+
+module Devise
+  module Encryptors
+    # = BCrypt
+    # Uses the BCrypt hash algorithm to encrypt passwords.
+    class Bcrypt < Base
+
+      # Gererates a default password digest based on stretches, salt, pepper and the
+      # incoming password. We don't strech it ourselves since BCrypt does so internally.
+      def self.digest(password, stretches, salt, pepper)
+        ::BCrypt::Engine.hash_secret([password, pepper].join, salt, stretches)
+      end
+
+      def self.salt
+        ::BCrypt::Engine.generate_salt
+      end
+
+    end
+  end
+end
--- a/lib/devise/encryptors/clearance_sha1.rb
+++ b/lib/devise/encryptors/clearance_sha1.rb
@@ -7,11 +7,13 @@ 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
+      
      # 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}--")
      end
+
    end
  end
 end
--- a/lib/devise/encryptors/restful_authentication_sha1.rb
+++ b/lib/devise/encryptors/restful_authentication_sha1.rb
@@ -5,10 +5,10 @@ module Devise
    # = RestfulAuthenticationSha1
    # Simulates Restful Authentication's default encryption mechanism.
    # Warning: it uses Devise's pepper to port the concept of REST_AUTH_SITE_KEY
-    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES. Should be set to 10 in
-    # the initializer to simulate the default behavior.
+    # Warning: it uses Devise's stretches configuration to port the concept of REST_AUTH_DIGEST_STRETCHES. Should be set to 10 in 
+    # the initializer to silumate the default behavior.
    class RestfulAuthenticationSha1 < Base
-
+      
      # Gererates a default password digest based on salt, pepper and the
      # incoming password.
      def self.digest(password, stretches, salt, pepper)
@@ -19,4 +19,4 @@ module Devise

    end
  end
-end
+end
--- a/lib/devise/encryptors/sha1.rb
+++ b/lib/devise/encryptors/sha1.rb
@@ -5,6 +5,7 @@ module Devise
    # = Sha1
    # Uses the Sha1 hash algorithm to encrypt passwords.
    class Sha1 < Base
+      
      # Gererates a default password digest based on stretches, salt, pepper and the
      # incoming password.
      def self.digest(password, stretches, salt, pepper)
@@ -13,13 +14,14 @@ module Devise
        digest
      end

-    private
+      private

-      # Generate a SHA1 digest joining args. Generated token is something like
-      #   --arg1--arg2--arg3--argN--
-      def self.secure_digest(*tokens)
-        ::Digest::SHA1.hexdigest('--' << tokens.flatten.join('--') << '--')
-      end
+        # Generate a SHA1 digest joining args. Generated token is something like
+        #   --arg1--arg2--arg3--argN--
+        def self.secure_digest(*tokens)
+          ::Digest::SHA1.hexdigest('--' << tokens.flatten.join('--') << '--')
+        end        
+      
    end
  end
 end
--- a/lib/devise/encryptors/sha512.rb
+++ b/lib/devise/encryptors/sha512.rb
@@ -5,6 +5,7 @@ module Devise
    # = Sha512
    # Uses the Sha512 hash algorithm to encrypt passwords.
    class Sha512 < Base
+      
      # Gererates a default password digest based on salt, pepper and the
      # incoming password.
      def self.digest(password, stretches, salt, pepper)
@@ -13,13 +14,14 @@ module Devise
        digest
      end

-    private
+      private

-      # Generate a Sha512 digest joining args. Generated token is something like
-      #   --arg1--arg2--arg3--argN--
-      def self.secure_digest(*tokens)
-        ::Digest::SHA512.hexdigest('--' << tokens.flatten.join('--') << '--')
-      end
+        # Generate a Sha512 digest joining args. Generated token is something like
+        #   --arg1--arg2--arg3--argN--
+        def self.secure_digest(*tokens)
+          ::Digest::SHA512.hexdigest('--' << tokens.flatten.join('--') << '--')
+        end        
+      
    end
  end
 end
--- a/lib/devise/failure_app.rb
+++ b/lib/devise/failure_app.rb
@@ -1,137 +1,70 @@
-require "action_controller/metal"
-
 module Devise
  # Failure application that will be called every time :warden is thrown from
  # any strategy or hook. Responsible for redirect the user to the sign in
  # page based on current scope and mapping. If no scope is given, redirect
  # to the default_url.
-  class FailureApp < ActionController::Metal
-    include ActionController::RackDelegation
-    include ActionController::UrlFor
-    include ActionController::Redirecting
-    include Rails.application.routes.url_helpers
+  class FailureApp
+    attr_reader :env
+    include Warden::Mixins::Common

-    delegate :flash, :to => :request
+    cattr_accessor :default_url, :default_message, :instance_writer => false
+    @@default_message = :unauthenticated

    def self.call(env)
-      action(:respond).call(env)
+      new(env).respond!
    end

-    def self.default_url_options(*args)
-      ApplicationController.default_url_options(*args)
+    def initialize(env)
+      @env = env
    end

-    def respond
-      if http_auth?
-        http_auth
-      elsif warden_options[:recall]
-        recall
-      else
-        redirect
+    def respond!
+      options = @env['warden.options']
+      scope   = options[:scope]
+
+      redirect_path = redirect_path_for(scope)
+      query_string  = query_string_for(options)
+      store_location!(scope)
+
+      headers = {}
+      headers["Location"] = redirect_path
+      headers["Location"] << "?" << query_string unless query_string.empty?
+      headers["Content-Type"] = 'text/plain'
+
+      [302, headers, ["You are being redirected to #{redirect_path}"]]
+    end
+
+    # Build the proper query string based on the given message.
+    def query_string_for(options)
+      message = @env['warden'].try(:message) || options[:message] || default_message
+
+      params = case message
+        when Symbol
+          { message => true }
+        when String
+          { :message => message }
+        else
+          {}
      end
+
+      Rack::Utils.build_query(params)
    end

-    def http_auth
-      self.status = 401
-      self.headers["WWW-Authenticate"] = %(Basic realm=#{Devise.http_authentication_realm.inspect}) if http_auth_header?
-      self.content_type = request.format.to_s
-      self.response_body = http_auth_body
-    end
-
-    def recall
-      env["PATH_INFO"]  = attempted_path
-      flash.now[:alert] = i18n_message(:invalid)
-      self.response = recall_app(warden_options[:recall]).call(env)
-    end
-
-    def redirect
-      store_location!
-      flash[:alert] = i18n_message
-      redirect_to redirect_url
-    end
-
-  protected
-
-    def i18n_message(default = nil)
-      message = warden.message || warden_options[:message] || default || :unauthenticated
-
-      if message.is_a?(Symbol)
-        I18n.t(:"#{scope}.#{message}", :resource_name => scope,
-               :scope => "devise.failure", :default => [message, message.to_s])
+    # Build the path based on current scope.
+    def redirect_path_for(scope)
+      if mapping = Devise.mappings[scope]
+        "#{mapping.parsed_path}/#{mapping.path_names[:sign_in]}"
      else
-        message.to_s
+        "/#{default_url}"
      end
    end

-    def redirect_url
-      if request_format == :html
-        send(:"new_#{scope}_session_path")
-      else
-        send(:"new_#{scope}_session_path", :format => request_format)
-      end
-    end
-
-    # Choose whether we should respond in a http authentication fashion,
-    # including 401 and optional headers.
-    #
-    # This method allows the user to explicitly disable http authentication
-    # on ajax requests in case they want to redirect on failures instead of
-    # handling the errors on their own. This is useful in case your ajax API
-    # is the same as your public API and uses a format like JSON (so you
-    # cannot mark JSON as a navigational format).
-    def http_auth?
-      if request.xhr?
-        Devise.http_authenticatable_on_xhr
-      else
-        !(request_format && Devise.navigational_formats.include?(request_format))
-      end
-    end
-
-    # It does not make sense to send authenticate headers in ajax requests
-    # or if the user disabled them.
-    def http_auth_header?
-      Devise.mappings[scope].to.http_authenticatable && !request.xhr?
-    end
-
-    def http_auth_body
-      return i18n_message unless request_format
-      method = "to_#{request_format}"
-      {}.respond_to?(method) ? { :error => i18n_message }.send(method) : i18n_message
-    end
-
-    def recall_app(app)
-      controller, action = app.split("#")
-      controller_name  = ActiveSupport::Inflector.camelize(controller)
-      controller_klass = ActiveSupport::Inflector.constantize("#{controller_name}Controller")
-      controller_klass.action(action)
-    end
-
-    def warden
-      env['warden']
-    end
-
-    def warden_options
-      env['warden.options']
-    end
-
-    def scope
-      @scope ||= warden_options[:scope] || Devise.default_scope
-    end
-
-    def attempted_path
-      warden_options[:attempted_path]
-    end
-
    # Stores requested uri to redirect the user after signing in. We cannot use
    # scoped session provided by warden here, since the user is not authenticated
    # yet, but we still need to store the uri based on scope, so different scopes
    # would never use the same uri to redirect.
-    def store_location!
-      session["#{scope}_return_to"] = attempted_path if request.get? && !http_auth?
-    end
-
-    def request_format
-      @request_format ||= Devise::Controllers::InternalHelpers.request_format(request)
+    def store_location!(scope)
+      session[:"#{scope}.return_to"] = request.request_uri if request && request.get?
    end
  end
 end
--- a/lib/devise/hooks/activatable.rb
+++ b/lib/devise/hooks/activatable.rb
@@ -1,11 +1,15 @@
-# Deny user access whenever his account is not active yet. All strategies that inherits from
-# Devise::Strategies::Authenticatable and uses the validate already check if the user is active_for_authentication?
-# before actively signing him in. However, we need this as hook to validate the user activity
-# in each request and in case the user is using other strategies beside Devise ones.
+# Deny user access whenever his account is not active yet.
 Warden::Manager.after_set_user do |record, warden, options|
-  if record && record.respond_to?(:active_for_authentication?) && !record.active_for_authentication?
+  if record && record.respond_to?(:active?) && !record.active?
    scope = options[:scope]
    warden.logout(scope)
-    throw :warden, :scope => scope, :message => record.inactive_message
+
+    # If winning strategy was set, this is being called after authenticate and
+    # there is no need to force a redirect.
+    if warden.winning_strategy
+      warden.winning_strategy.fail!(record.inactive_message)
+    else
+      throw :warden, :scope => scope, :message => record.inactive_message
+    end
  end
-end
+end
--- a/lib/devise/hooks/forgetable.rb
+++ b/lib/devise/hooks/forgetable.rb
@@ -1,9 +0,0 @@
-# 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 frozen.
-# This avoids forgetting deleted users.
-Warden::Manager.before_logout do |record, warden, options|
-  if record.respond_to?(:forget_me!)
-    Devise::Controllers::Rememberable::Proxy.new(warden).forget_me(record)
-  end
-end
--- a/lib/devise/hooks/rememberable.rb
+++ b/lib/devise/hooks/rememberable.rb
@@ -1,6 +1,32 @@
-Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
+# After authenticate hook to verify if the user in the given scope asked to be
+# remembered while he does not sign out. Generates a new remember token for
+# that specific user and adds a cookie with this user info to sign in this user
+# automatically without asking for credentials. Refer to rememberable strategy
+# for more info.
+Warden::Manager.prepend_after_authentication do |record, warden, options|
  scope = options[:scope]
-  if record.respond_to?(:remember_me) && record.remember_me && warden.authenticated?(scope)
-    Devise::Controllers::Rememberable::Proxy.new(warden).remember_me(record)
+  remember_me = warden.params[scope].try(:fetch, :remember_me, nil)
+
+  if Devise::TRUE_VALUES.include?(remember_me) &&
+     warden.authenticated?(scope) && record.respond_to?(:remember_me!)
+    record.remember_me!
+
+    warden.response.set_cookie "remember_#{scope}_token", {
+      :value => record.class.serialize_into_cookie(record),
+      :expires => record.remember_expires_at,
+      :path => "/"
+    }
+  end
+end
+
+# Before logout hook to forget the user in the given scope, only if rememberable
+# is activated for this scope. Also clear remember token to ensure the user
+# won't be remembered again.
+# Notice that we forget the user if the record is frozen. This usually means the
+# user was just deleted.
+Warden::Manager.before_logout do |record, warden, scope|
+  if record.respond_to?(:forget_me!)
+    record.forget_me! unless record.frozen?
+    warden.response.delete_cookie "remember_#{scope}_token"
  end
 end
--- a/lib/devise/hooks/timeoutable.rb
+++ b/lib/devise/hooks/timeoutable.rb
@@ -1,20 +1,16 @@
-# Each time a record is set we check whether its session has already timed out
+# Each time a record is set we check whether it's 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 it's scoped session to
 # verify timeout in the following request.
 Warden::Manager.after_set_user do |record, warden, options|
  scope = options[:scope]
-
-  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope) && options[:store] != false
+  if record && record.respond_to?(:timedout?) && warden.authenticated?(scope)
    last_request_at = warden.session(scope)['last_request_at']

    if record.timedout?(last_request_at)
-      path_checker = Devise::PathChecker.new(warden.env, scope)
-      unless path_checker.signing_out?
-        warden.logout(scope)
-        throw :warden, :scope => scope, :message => :timeout
-      end
+      warden.logout(scope)
+      throw :warden, :scope => scope, :message => :timeout
    end

    warden.session(scope)['last_request_at'] = Time.now.utc
--- a/lib/devise/hooks/trackable.rb
+++ b/lib/devise/hooks/trackable.rb
@@ -1,9 +1,18 @@
 # After each sign in, update sign in time, sign in count and sign in IP.
-# This is only triggered when the user is explicitly set (with set_user)
-# and on authentication. Retrieving the user from session (:fetch) does
-# not trigger it.
 Warden::Manager.after_set_user :except => :fetch do |record, warden, options|
-  if record.respond_to?(:update_tracked_fields!) && warden.authenticated?(options[:scope])
-    record.update_tracked_fields!(warden.request)
+  scope = options[:scope]
+  if Devise.mappings[scope].try(:trackable?) && warden.authenticated?(scope)
+    old_current, new_current  = record.current_sign_in_at, Time.now
+    record.last_sign_in_at    = old_current || new_current
+    record.current_sign_in_at = new_current
+
+    old_current, new_current  = record.current_sign_in_ip, warden.request.remote_ip
+    record.last_sign_in_ip    = old_current || new_current
+    record.current_sign_in_ip = new_current
+
+    record.sign_in_count ||= 0
+    record.sign_in_count += 1
+
+    record.save(false)
  end
 end
--- a/lib/devise/locales/en.yml
+++ b/lib/devise/locales/en.yml
@@ -1,18 +1,9 @@
-# Additional translations at http://github.com/plataformatec/devise/wiki/I18n
-
 en:
-  errors:
-    messages:
-      not_found: "not found"
-      already_confirmed: "was already confirmed, please try signing in"
-      not_locked: "was not locked"
-      not_saved:
-        one: "1 error prohibited this %{resource} from being saved:"
-        other: "%{count} errors prohibited this %{resource} from being saved:"
-
  devise:
-    failure:
-      already_authenticated: 'You are already signed in.'
+    sessions:
+      link: 'Sign in'
+      signed_in: 'Signed in successfully.'
+      signed_out: 'Signed out successfully.'
      unauthenticated: 'You need to sign in or sign up before continuing.'
      unconfirmed: 'You have to confirm your account before continuing.'
      locked: 'Your account is locked.'
@@ -20,30 +11,25 @@ en:
      invalid_token: 'Invalid authentication token.'
      timeout: 'Your session expired, please sign in again to continue.'
      inactive: 'Your account was not activated yet.'
-    sessions:
-      signed_in: 'Signed in successfully.'
-      signed_out: 'Signed out successfully.'
    passwords:
+      link: 'Forgot password?'
      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.'
    confirmations:
+      link: "Didn't receive confirmation instructions?"
      send_instructions: '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}.'
+      link: 'Sign up'
+      signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
      updated: 'You updated your account successfully.'
      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
    unlocks:
+      link: "Didn't receive unlock instructions?"
      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.'
-    omniauth_callbacks:
-      success: 'Successfully authorized from %{kind} account.'
-      failure: 'Could not authorize you from %{kind} because "%{reason}".'
    mailer:
-      confirmation_instructions:
-        subject: 'Confirmation instructions'
-      reset_password_instructions:
-        subject: 'Reset password instructions'
-      unlock_instructions:
-        subject: 'Unlock Instructions'
+      confirmation_instructions: 'Confirmation instructions'
+      reset_password_instructions: 'Reset password instructions'
+      unlock_instructions: 'Unlock Instructions'
+
--- a/lib/devise/mapping.rb
+++ b/lib/devise/mapping.rb
@@ -18,12 +18,21 @@ module Devise
  #   mapping.to   #=> User
  #   # is the class to be loaded from routes, given in the route as :class_name.
  #
-  #   mapping.modules  #=> [:authenticatable]
+  #   mapping.for  #=> [:authenticatable]
  #   # is the modules included in the class
  #
  class Mapping #:nodoc:
-    attr_reader :singular, :scoped_path, :path, :controllers, :path_names, :class_name, :sign_out_via
-    alias :name :singular
+    attr_reader :name, :as, :path_names, :path_prefix, :route_options, :sign_out_via
+
+    # Loop through all mappings looking for a map that matches with the requested
+    # path (ie /users/sign_in). If a path prefix is given, it's taken into account.
+    def self.find_by_path(path)
+      Devise.mappings.each_value do |mapping|
+        route = path.split("/")[mapping.as_position]
+        return mapping if route && mapping.as == route.to_sym
+      end
+      nil
+    end

    # Receives an object and find a scope for it. If a scope cannot be found,
    # raises an error. If a symbol is given, it's considered to be the scope.
@@ -37,78 +46,85 @@ module Devise
        Devise.mappings.each_value { |m| return m.name if duck.is_a?(m.to) }
      end

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

-    def self.find_by_path!(path, path_type=:fullpath)
-      Devise.mappings.each_value { |m| return m if path.include?(m.send(path_type)) }
-      raise "Could not find a valid mapping for path #{path.inspect}"
+    # Default url options which can be used as prefix.
+    def self.default_url_options
+      {}
    end

    def initialize(name, options) #:nodoc:
-      @scoped_path = options[:as] ? "#{options[:as]}/#{name}" : name.to_s
-      @singular = (options[:singular] || @scoped_path.tr('/', '_').singularize).to_sym
+      @as    = (options.delete(:as) || name).to_sym
+      @klass = (options.delete(:class_name) || name.to_s.classify).to_s
+      @name  = (options.delete(:scope) || name.to_s.singularize).to_sym

-      @class_name = (options[:class_name] || name.to_s.classify).to_s
-      @ref = Devise.ref(@class_name)
-
-      @path = (options[:path] || name).to_s
-      @path_prefix = options[:path_prefix]
-
-      mod = options[:module] || "devise"
-      @controllers = Hash.new { |h,k| h[k] = "#{mod}/#{k}" }
-      @controllers.merge!(options[:controllers] || {})
+      @path_prefix   = "/#{options.delete(:path_prefix)}/".squeeze("/")
+      @route_options = options || {}

      @path_names = Hash.new { |h,k| h[k] = k.to_s }
-      @path_names.merge!(:registration => "")
-      @path_names.merge!(options[:path_names] || {})
+      @path_names.merge!(options.delete(:path_names) || {})

-      @sign_out_via = options[:sign_out_via] || Devise.sign_out_via
+      @sign_out_via = (options.delete(:sign_out_via) || :get)
    end

    # Return modules for the mapping.
-    def modules
-      @modules ||= to.respond_to?(:devise_modules) ? to.devise_modules : []
+    def for
+      @for ||= to.devise_modules
    end

-    # Gives the class the mapping points to.
+    # Reload mapped class each time when cache_classes is false.
    def to
-      if defined?(ActiveSupport::Dependencies::ClassCache)
-        @ref.get @class_name
-      else
-        @ref.get
+      return @to if @to
+      klass = @klass.constantize
+      @to = klass if Rails.configuration.cache_classes
+      klass
+    end
+
+    # Check if the respective controller has a module in the mapping class.
+    def allows?(controller)
+      (self.for & CONTROLLERS[controller.to_sym]).present?
+    end
+
+    # Return in which position in the path prefix devise should find the as mapping.
+    def as_position
+      self.path_prefix.count("/")
+    end
+
+    # Returns the raw path using path_prefix and as.
+    def raw_path
+      path_prefix + as.to_s
+    end
+
+    # Returns the parsed path taking into account the relative url root and raw path.
+    def parsed_path
+      (ActionController::Base.relative_url_root.to_s + raw_path).tap do |path|
+        self.class.default_url_options.each do |key, value|
+          path.gsub!(key.inspect, value.to_param)
+        end
      end
    end

-    def strategies
-      @strategies ||= STRATEGIES.values_at(*self.modules).compact.uniq.reverse
-    end
-
-    def routes
-      @routes ||= ROUTES.values_at(*self.modules).compact.uniq
-    end
-
    def authenticatable?
-      @authenticatable ||= self.modules.any? { |m| m.to_s =~ /authenticatable/ }
-    end
-
-    def fullpath
-      "/#{@path_prefix}/#{@path}".squeeze("/")
+      @authenticatable ||= self.for.any? { |m| m.to_s =~ /authenticatable/ }
    end

    # Create magic predicates for verifying what module is activated by this map.
    # Example:
    #
    #   def confirmable?
-    #     self.modules.include?(:confirmable)
+    #     self.for.include?(:confirmable)
    #   end
    #
-    def self.add_module(m)
-      class_eval <<-METHOD, __FILE__, __LINE__ + 1
-        def #{m}?
-          self.modules.include?(:#{m})
-        end
-      METHOD
+    def self.register(*modules)
+      modules.each do |m|
+        class_eval <<-METHOD, __FILE__, __LINE__ + 1
+          def #{m}?
+            self.for.include?(:#{m})
+          end
+        METHOD
+      end
    end
+    Devise::Mapping.register *ALL
  end
 end
--- a/lib/devise/models.rb
+++ b/lib/devise/models.rb
@@ -1,8 +1,19 @@
 module Devise
  module Models
+    autoload :Activatable, 'devise/models/activatable'
+    autoload :DatabaseAuthenticatable, 'devise/models/database_authenticatable'
+    autoload :Confirmable, 'devise/models/confirmable'
+    autoload :Lockable, 'devise/models/lockable'
+    autoload :Recoverable, 'devise/models/recoverable'
+    autoload :Rememberable, 'devise/models/rememberable'
+    autoload :Registerable, 'devise/models/registerable'
+    autoload :Timeoutable, 'devise/models/timeoutable'
+    autoload :Trackable, 'devise/models/trackable'
+    autoload :Validatable, 'devise/models/validatable'
+
    # Creates configuration values for Devise and for the given module.
    #
-    #   Devise::Models.config(Devise::Authenticatable, :stretches, 10)
+    #   Devise::Models.config(Devise::Authenticable, :stretches, 10)
    #
    # The line above creates:
    #
@@ -17,9 +28,6 @@ module Devise
    # inside the given class.
    #
    def self.config(mod, *accessors) #:nodoc:
-      (class << mod; self; end).send :attr_accessor, :available_configs
-      mod.available_configs = accessors
-
      accessors.each do |accessor|
        mod.class_eval <<-METHOD, __FILE__, __LINE__ + 1
          def #{accessor}
@@ -41,51 +49,69 @@ module Devise

    # Include the chosen devise modules in your model:
    #
-    #   devise :database_authenticatable, :confirmable, :recoverable
+    #   devise :authenticatable, :confirmable, :recoverable
    #
    # You can also give any of the devise configuration values in form of a hash,
    # with specific values for this model. Please check your Devise initializer
    # for a complete description on those values.
    #
    def devise(*modules)
-      include Devise::Models::Authenticatable
-      options = modules.extract_options!.dup
+      raise "You need to give at least one Devise module" if modules.empty?
+      options = modules.extract_options!

-      selected_modules = modules.map(&:to_sym).uniq.sort_by do |s|
-        Devise::ALL.index(s) || -1  # follow Devise::ALL order
+      if modules.delete(:authenticatable)
+        ActiveSupport::Deprecation.warn ":authenticatable as module is deprecated. Please give :database_authenticatable instead.", caller
+        modules << :database_authenticatable
      end

-      devise_modules_hook! do
-        selected_modules.each do |m|
-          mod = Devise::Models.const_get(m.to_s.classify)
+      @devise_modules = Devise::ALL & modules.map(&:to_sym).uniq

-          if mod.const_defined?("ClassMethods")
-            class_mod = mod.const_get("ClassMethods")
-            extend class_mod
-
-            if class_mod.respond_to?(:available_configs)
-              available_configs = class_mod.available_configs
-              available_configs.each do |config|
-                next unless options.key?(config)                
-                send(:"#{config}=", options.delete(config))
-              end
-            end
-          end
-
-          include mod
+      Devise.orm_class.included_modules_hook(self) do
+        devise_modules.each do |m|
+          include Devise::Models.const_get(m.to_s.classify)
        end

-        self.devise_modules |= selected_modules
        options.each { |key, value| send(:"#{key}=", value) }
      end
    end

-    # The hook which is called inside devise. So your ORM can include devise
-    # compatibility stuff.
-    def devise_modules_hook!
-      yield
+    # Stores all modules included inside the model, so we are able to verify
+    # which routes are needed.
+    def devise_modules
+      @devise_modules ||= []
+    end
+
+    # Find an initialize a record setting an error if it can't be found.
+    def find_or_initialize_with_error_by(attribute, value, error=:invalid)
+      if value.present?
+        conditions = { attribute => value }
+        record = find(:first, :conditions => conditions)
+      end
+
+      unless record
+        record = new
+
+        if value.present?
+          record.send(:"#{attribute}=", value)
+        else
+          error, skip_default = :blank, true
+        end
+
+        add_error_on(record, attribute, error, !skip_default)
+      end
+
+      record
+    end
+
+    # Wraps add error logic in a method that works for different frameworks.
+    def add_error_on(record, attribute, error, add_default=true)
+      options = add_default ? { :default => error.to_s.gsub("_", " ") } : {}
+
+      begin
+        record.errors.add(attribute, error, options)
+      rescue ArgumentError
+        record.errors.add(attribute, error.to_s.gsub("_", " "))
+      end
    end
  end
 end
-
-require 'devise/models/authenticatable'
--- a/lib/devise/models/activatable.rb
+++ b/lib/devise/models/activatable.rb
@@ -0,0 +1,16 @@
+require 'devise/hooks/activatable'
+
+module Devise
+  module Models
+    # This module implements the default API required in activatable hook. 
+    module Activatable
+      def active?
+        true
+      end
+
+      def inactive_message
+        :inactive
+      end
+    end
+  end
+end
--- a/lib/devise/models/authenticatable.rb
+++ b/lib/devise/models/authenticatable.rb
@@ -1,156 +0,0 @@
-require 'devise/hooks/activatable'
-
-module Devise
-  module Models
-    # Authenticatable module. Holds common settings for authentication.
-    #
-    # == Options
-    #
-    # Authenticatable adds the following options to devise_for:
-    #
-    #   * +authentication_keys+: parameters used for authentication. By default [:email].
-    #
-    #   * +request_keys+: parameters from the request object used for authentication.
-    #     By specifying a symbol (which should be a request method), it will automatically be
-    #     passed to find_for_authentication method and considered in your model lookup.
-    #
-    #     For instance, if you set :request_keys to [:subdomain], :subdomain will be considered
-    #     as key on authentication. This can also be a hash where the value is a boolean expliciting
-    #     if the value is required or not.
-    #
-    #   * +http_authenticatable+: if this model allows http authentication. By default true.
-    #     It also accepts an array specifying the strategies that should allow http.
-    #
-    #   * +params_authenticatable+: if this model allows authentication through request params. By default true.
-    #     It also accepts an array specifying the strategies that should allow params authentication.
-    #
-    # == active_for_authentication?
-    #
-    # 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.
-    #
-    # You overwrite this method yourself, but if you do, don't forget to call super:
-    #
-    #   def active_for_authentication?
-    #     super && special_condition_is_valid?
-    #   end
-    #
-    # Whenever active_for_authentication? returns false, Devise asks the reason why your model is inactive using
-    # the inactive_message method. You can overwrite it as well:
-    #
-    #   def inactive_message
-    #     special_condition_is_valid? ? super : :special_condition_is_not_valid
-    #   end
-    #
-    module Authenticatable
-      extend ActiveSupport::Concern
-
-      included do
-        class_attribute :devise_modules, :instance_writer => false
-        self.devise_modules ||= []
-      end
-
-      # Check if the current object is valid for authentication. This method and
-      # find_for_authentication are the methods used in a Warden::Strategy to check
-      # if a model should be signed in or not.
-      #
-      # However, you should not overwrite this method, you should overwrite active_for_authentication?
-      # and inactive_message instead.
-      def valid_for_authentication?
-        if active_for_authentication?
-          block_given? ? yield : true
-        else
-          inactive_message
-        end
-      end
-
-      def active_for_authentication?
-        true
-      end
-
-      def inactive_message
-        :inactive
-      end
-
-      def authenticatable_salt
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :authentication_keys, :request_keys, :case_insensitive_keys, :http_authenticatable, :params_authenticatable)
-
-        def params_authenticatable?(strategy)
-          params_authenticatable.is_a?(Array) ?
-            params_authenticatable.include?(strategy) : params_authenticatable
-        end
-
-        def http_authenticatable?(strategy)
-          http_authenticatable.is_a?(Array) ?
-            http_authenticatable.include?(strategy) : http_authenticatable
-        end
-
-        # Find first record based on conditions given (ie by the sign in form).
-        # Overwrite to add customized conditions, create a join, or maybe use a
-        # namedscope to filter records while authenticating.
-        # Example:
-        #
-        #   def self.find_for_authentication(conditions={})
-        #     conditions[:active] = true
-        #     super
-        #   end
-        #
-        def find_for_authentication(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.
-        def find_or_initialize_with_error_by(attribute, value, error=:invalid) #:nodoc:
-          find_or_initialize_with_errors([attribute], { attribute => value }, error)
-        end
-
-        # 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 = to_adapter.find_first(filter_auth_params(attributes))
-          end
-          
-          unless record
-            record = new
-
-            required_attributes.each do |key|
-              value = attributes[key]
-              record.send("#{key}=", value)
-              record.errors.add(key, value.present? ? error : :blank)
-            end
-          end
-
-          record
-        end
-
-        protected
-
-        # 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.
-        def generate_token(column)
-          loop do
-            token = Devise.friendly_token
-            break token unless to_adapter.find_first({ column => token })
-          end
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/models/confirmable.rb
+++ b/lib/devise/models/confirmable.rb
@@ -1,32 +1,43 @@
+require 'devise/models/activatable'
+
 module Devise
  module Models
+
    # Confirmable is responsible to verify if an account is already confirmed to
    # sign in, and to send emails with confirmation instructions.
    # Confirmation instructions are sent to the user email after creating a
-    # record and when manually requested by a new confirmation instruction request.
+    # record, after updating it's email and also when manually requested by
+    # a new confirmation instruction request.
+    # Whenever the user update it's email, his account is automatically unconfirmed,
+    # it means it won't be able to sign in again without confirming the account
+    # again through the email that was sent.
    #
-    # == Options
+    # Configuration:
    #
-    # Confirmable adds the following options to devise_for:
+    #   confirm_within: the time you want the user will have to confirm it's account
+    #                   without blocking his access. 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 7 days). By default confirm_within is
+    #                   zero, it means users always have to confirm to sign in.
    #
-    #   * +confirm_within+: the time you want to allow the user to access his account
-    #     before confirming it. After this period, the user access is denied. You can
-    #     use this to let your user access some features of your application without
-    #     confirming the account, but blocking it after a certain period (ie 7 days).
-    #     By default confirm_within is zero, it means users always have to confirm to sign in.
-    #
-    # == Examples
+    # Examples:
    #
    #   User.find(1).confirm!      # returns true unless it's already confirmed
    #   User.find(1).confirmed?    # true/false
    #   User.find(1).send_confirmation_instructions # manually send instructions
-    #
+    #   User.find(1).resend_confirmation! # generates a new token and resent it
    module Confirmable
-      extend ActiveSupport::Concern
+      include Devise::Models::Activatable

-      included do
-        before_create :generate_confirmation_token, :if => :confirmation_required?
-        after_create  :send_confirmation_instructions, :if => :confirmation_required?
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+
+          before_create :generate_confirmation_token, :if => :confirmation_required?
+          after_create  :send_confirmation_instructions, :if => :confirmation_required?
+        end
      end

      # Confirm a user by setting it's confirmed_at to actual time. If the user
@@ -35,19 +46,19 @@ module Devise
        unless_confirmed do
          self.confirmation_token = nil
          self.confirmed_at = Time.now
-          save(:validate => false)
+          save(false)
        end
      end

      # Verifies whether a user is confirmed or not
      def confirmed?
-        !!confirmed_at
+        !new_record? && !confirmed_at.nil?
      end

      # Send confirmation instructions by email
      def send_confirmation_instructions
        generate_confirmation_token! if self.confirmation_token.nil?
-        ::Devise.mailer.confirmation_instructions(self).deliver
+        ::DeviseMailer.deliver_confirmation_instructions(self)
      end

      # Resend confirmation token. This method does not need to generate a new token.
@@ -55,11 +66,11 @@ module Devise
        unless_confirmed { send_confirmation_instructions }
      end

-      # Overwrites active_for_authentication? for confirmation
-      # by verifying whether a user is active to sign in or not. If the user
+      # Overwrites active? from Devise::Models::Activatable for confirmation
+      # by verifying whether an user is active to sign in or not. If the user
      # is already confirmed, it should never be blocked. Otherwise we need to
      # calculate if the confirm time has not expired for this user.
-      def active_for_authentication?
+      def active?
        super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
      end

@@ -71,20 +82,21 @@ 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
+        self.confirmed_at  = Time.now
+        @skip_confirmation = true
      end

      protected

        # Callback to overwrite if confirmation is required or not.
        def confirmation_required?
-          !confirmed?
+          !@skip_confirmation
        end

        # Checks if the confirmation for the user is within the limit time.
        # We do this by calculating if the difference between today and the
        # confirmation sent date does not exceed the confirm in time configured.
-        # Confirm_within is a model configuration, must always be an integer value.
+        # Confirm_in is a model configuration, must always be an integer value.
        #
        # Example:
        #
@@ -110,7 +122,7 @@ module Devise
          unless confirmed?
            yield
          else
-            self.errors.add(:email, :already_confirmed)
+            self.class.add_error_on(self, :email, :already_confirmed)
            false
          end
        end
@@ -119,12 +131,12 @@ module Devise
        # this token is being generated
        def generate_confirmation_token
          self.confirmed_at = nil
-          self.confirmation_token = self.class.confirmation_token
+          self.confirmation_token = Devise.friendly_token
          self.confirmation_sent_at = Time.now.utc
        end

        def generate_confirmation_token!
-          generate_confirmation_token && save(:validate => false)
+          generate_confirmation_token && save(false)
        end

      module ClassMethods
@@ -133,8 +145,8 @@ module Devise
        # with an email not found error.
        # Options must contain the user email
        def send_confirmation_instructions(attributes={})
-          confirmable = find_or_initialize_with_errors(confirmation_keys, attributes, :not_found)
-          confirmable.resend_confirmation_token if confirmable.persisted?
+          confirmable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
+          confirmable.resend_confirmation_token unless confirmable.new_record?
          confirmable
        end

@@ -144,16 +156,11 @@ module Devise
        # Options must have the confirmation_token
        def confirm_by_token(confirmation_token)
          confirmable = find_or_initialize_with_error_by(:confirmation_token, confirmation_token)
-          confirmable.confirm! if confirmable.persisted?
+          confirmable.confirm! unless confirmable.new_record?
          confirmable
        end

-        # Generate a token checking if one does not already exist in the database.
-        def confirmation_token
-          generate_token(:confirmation_token)
-        end
-
-        Devise::Models.config(self, :confirm_within, :confirmation_keys)
+        Devise::Models.config(self, :confirm_within)
      end
    end
  end
--- a/lib/devise/models/database_authenticatable.rb
+++ b/lib/devise/models/database_authenticatable.rb
@@ -1,42 +1,66 @@
 require 'devise/strategies/database_authenticatable'
-require 'bcrypt'

 module Devise
  module Models
-    # Authenticatable Module, responsible for encrypting password and validating
+    # Authenticable Module, responsible for encrypting password and validating
    # authenticity of a user while signing in.
    #
-    # == Options
+    # Configuration:
    #
-    # DatabaseAuthenticable adds the following options to devise_for:
+    # You can overwrite configuration values by setting in globally in Devise,
+    # using devise method or overwriting the respective instance method.
    #
-    #   * +stretches+: the cost given to bcrypt.
+    #   pepper: encryption key used for creating encrypted password. Each time
+    #           password changes, it's gonna be encrypted again, and this key
+    #           is added to the password and salt to create a secure hash.
+    #           Always use `rake secret' to generate a new key.
    #
-    # == Examples
+    #   stretches: defines how many times the password will be encrypted.
    #
+    #   encryptor: the encryptor going to be used. By default :sha1.
+    #
+    #   authentication_keys: parameters used for authentication. By default [:email]
+    #
+    # Examples:
+    #
+    #    User.authenticate('email@test.com', 'password123')  # returns authenticated user or nil
    #    User.find(1).valid_password?('password123')         # returns true/false
    #
    module DatabaseAuthenticatable
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods

-      included do
-        attr_reader :password, :current_password
-        attr_accessor :password_confirmation
-        before_validation :downcase_keys
+          attr_reader :password, :current_password
+          attr_accessor :password_confirmation
+        end
      end

-      # Generates password encryption based on the given value.
+      # TODO Remove me in next release
+      def old_password
+        ActiveSupport::Deprecation.warn "old_password is deprecated, please use current_password instead", caller
+        @old_password
+      end
+
+      # Regenerates password salt and encrypted password each time password is set,
+      # and then trigger any "after_changed_password"-callbacks.
      def password=(new_password)
        @password = new_password
-        self.encrypted_password = password_digest(@password) if @password.present?
+
+        if @password.present?
+          self.password_salt = self.class.encryptor_class.salt
+          self.encrypted_password = password_digest(@password)
+        end
      end

-      # Verifies whether an password (ie from sign in) is the user password.
-      def valid_password?(password)
-        return false if encrypted_password.blank?
-        bcrypt   = ::BCrypt::Password.new(self.encrypted_password)
-        password = ::BCrypt::Engine.hash_secret("#{password}#{self.class.pepper}", bcrypt.salt)
-        Devise.secure_compare(password, self.encrypted_password)
+      # Verifies whether an incoming_password (ie from sign in) is the user password.
+      def valid_password?(incoming_password)
+        password_digest(incoming_password) == self.encrypted_password
+      end
+
+      # Checks if a resource is valid upon authentication.
+      def valid_for_authentication?(attributes)
+        valid_password?(attributes[:password])
      end

      # Set password and password confirmation to nil
@@ -58,44 +82,61 @@ module Devise
        result = if valid_password?(current_password)
          update_attributes(params)
        else
-          self.errors.add(:current_password, current_password.blank? ? :blank : :invalid)
+          message = current_password.blank? ? :blank : :invalid
+          self.class.add_error_on(self, :current_password, message, false)
          self.attributes = params
          false
        end

-        clean_up_passwords
+        clean_up_passwords unless result
        result
      end

-      def after_database_authentication
-      end
+      protected

-      # A reliable way to expose the salt regardless of the implementation.
-      def authenticatable_salt
-        self.encrypted_password[0,29] if self.encrypted_password
-      end
+        # Checks whether a password is needed or not. For validations only.
+        # Passwords are always required if it's a new record, or if the password
+        # or confirmation are being set somewhere.
+        def password_required?
+          new_record? || !password.nil? || !password_confirmation.nil?
+        end

-    protected
-
-      # Downcase case-insensitive keys
-      def downcase_keys
-        (self.class.case_insensitive_keys || []).each { |k| self[k].try(:downcase!) }
-      end
-
-      # Digests the password using bcrypt.
-      def password_digest(password)
-        ::BCrypt::Password.create("#{password}#{self.class.pepper}", :cost => self.class.stretches).to_s
-      end
+        # Digests the password using the configured encryptor.
+        def password_digest(password)
+          self.class.encryptor_class.digest(password, self.class.stretches, self.password_salt, self.class.pepper)
+        end

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

-        # We assume this method already gets the sanitized values from the
-        # DatabaseAuthenticatable strategy. If you are using this method on
-        # your own, be sure to sanitize the conditions hash to only include
-        # the proper fields.
-        def find_for_database_authentication(conditions)
-          find_for_authentication(conditions)
+        # Authenticate a user based on configured attribute keys. Returns the
+        # authenticated user if it's valid or nil.
+        def authenticate(attributes={})
+          return unless authentication_keys.all? { |k| attributes[k].present? }
+          conditions = attributes.slice(*authentication_keys)
+          resource = find_for_authentication(conditions)
+          resource if resource.try(:valid_for_authentication?, attributes)
+        end
+
+        # Returns the class for the configured encryptor.
+        def encryptor_class
+          @encryptor_class ||= ::Devise::Encryptors.const_get(encryptor.to_s.classify)
+        end
+
+      protected
+
+        # Find first record based on conditions given (ie by the sign in form).
+        # Overwrite to add customized conditions, create a join, or maybe use a
+        # namedscope to filter records while authenticating.
+        # Example:
+        #
+        #   def self.find_for_authentication(conditions={})
+        #     conditions[:active] = true
+        #     find(:first, :conditions => conditions)
+        #   end
+        #
+        def find_for_authentication(conditions)
+          find(:first, :conditions => conditions)
        end
      end
    end
--- a/lib/devise/models/encryptable.rb
+++ b/lib/devise/models/encryptable.rb
@@ -1,72 +0,0 @@
-require 'devise/strategies/database_authenticatable'
-
-module Devise
-  module Models
-    # Encryptable Module adds support to several encryptors.
-    #
-    # == Options
-    #
-    # Encryptable adds the following options to devise_for:
-    #
-    #   * +pepper+: a random string used to provide a more secure hash.
-    #
-    #   * +encryptor+: the encryptor going to be used. By default is nil.
-    #
-    # == Examples
-    #
-    #    User.find(1).valid_password?('password123') # returns true/false
-    #
-    module Encryptable
-      extend ActiveSupport::Concern
-
-      included do
-        attr_reader :password, :current_password
-        attr_accessor :password_confirmation
-      end
-
-      # Generates password salt.
-      def password=(new_password)
-        self.password_salt = self.class.password_salt if new_password.present?
-        super
-      end
-
-      def authenticatable_salt
-        self.password_salt
-      end
-
-      # Verifies whether an incoming_password (ie from sign in) is the user password.
-      def valid_password?(incoming_password)
-        Devise.secure_compare(password_digest(incoming_password), self.encrypted_password)
-      end
-
-    protected
-
-      # Digests the password using the configured encryptor.
-      def password_digest(password)
-        if self.password_salt.present?
-          self.class.encryptor_class.digest(password, self.class.stretches, self.password_salt, self.class.pepper)
-        end
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :encryptor)
-
-        # Returns the class for the configured encryptor.
-        def encryptor_class
-          @encryptor_class ||= case encryptor
-            when :bcrypt
-              raise "In order to use bcrypt as encryptor, simply remove :encryptable from your devise model"
-            when nil
-              raise "You need to give an :encryptor as option in order to use :encryptable"
-            else
-              ::Devise::Encryptors.const_get(encryptor.to_s.classify)
-          end
-        end
-
-        def password_salt
-          self.encryptor_class.salt(self.stretches)
-        end
-      end
-    end
-  end
-end
--- a/lib/devise/models/http_authenticatable.rb
+++ b/lib/devise/models/http_authenticatable.rb
@@ -0,0 +1,21 @@
+require 'devise/strategies/http_authenticatable'
+
+module Devise
+  module Models
+    # Adds HttpAuthenticatable behavior to your model. It expects that your
+    # model class responds to authenticate and authentication_keys methods
+    # (which for example are defined in authenticatable).
+    module HttpAuthenticatable
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        # Authenticate an user using http.
+        def authenticate_with_http(username, password)
+          authenticate(authentication_keys.first => username, :password => password)
+        end
+      end
+    end
+  end
+end
--- a/lib/devise/models/lockable.rb
+++ b/lib/devise/models/lockable.rb
@@ -1,5 +1,8 @@
+require 'devise/models/activatable'
+
 module Devise
  module Models
+
    # 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
@@ -7,39 +10,43 @@ module Devise
    # 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
+    # Configuration:
    #
-    # 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.
-    #   * +unlock_strategy+: unlock the user account by :time, :email, :both or :none.
-    #   * +unlock_in+: the time you want to lock the user after to lock happens. Only available when unlock_strategy is :time or :both.
-    #   * +unlock_keys+: the keys you want to use when locking and unlocking an account
+    #   maximum_attempts: how many attempts should be accepted before blocking the user.
+    #   unlock_strategy: unlock the user account by :time, :email or :both.
+    #   unlock_in: the time you want to lock the user after to lock happens. Only
+    #              available when unlock_strategy is :time or :both.
    #
    module Lockable
-      extend  ActiveSupport::Concern
+      include Devise::Models::Activatable

-      delegate :lock_strategy_enabled?, :unlock_strategy_enabled?, :to => "self.class"
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+        end
+      end

-      # Lock a user setting it's locked_at to actual time.
+      # Lock an user setting it's locked_at to actual time.
      def lock_access!
+        return true if access_locked?
        self.locked_at = Time.now

-        if unlock_strategy_enabled?(:email)
+        if self.class.unlock_strategy_enabled?(:email)
          generate_unlock_token
          send_unlock_instructions
        end

-        save(:validate => false)
+        save(false)
      end

-      # Unlock a user by cleaning locket_at and failed_attempts.
+      # Unlock an user by cleaning locket_at and failed_attempts.
      def unlock_access!
-        self.locked_at = nil
-        self.failed_attempts = 0 if respond_to?(:failed_attempts=)
-        self.unlock_token = nil  if respond_to?(:unlock_token=)
-        save(:validate => false)
+        if_access_locked do
+          self.locked_at = nil
+          self.failed_attempts = 0
+          self.unlock_token = nil
+          save(false)
+        end
      end

      # Verifies whether a user is locked or not.
@@ -49,7 +56,7 @@ module Devise

      # Send unlock instructions by email
      def send_unlock_instructions
-        ::Devise.mailer.unlock_instructions(self).deliver
+        ::DeviseMailer.deliver_unlock_instructions(self)
      end

      # Resend the unlock instructions if the user is locked.
@@ -57,9 +64,9 @@ module Devise
        if_access_locked { send_unlock_instructions }
      end

-      # Overwrites active_for_authentication? from Devise::Models::Activatable for locking purposes
-      # by verifying whether a user is active to sign in or not based on locked?
-      def active_for_authentication?
+      # Overwrites active? from Devise::Models::Activatable for locking purposes
+      # by verifying whether an user is active to sign in or not based on locked?
+      def active?
        super && !access_locked?
      end

@@ -70,50 +77,29 @@ module Devise
      end

      # Overwrites valid_for_authentication? from Devise::Models::Authenticatable
-      # for verifying whether a user is allowed to sign in or not. If the user
+      # for verifying whether an user is allowed to sign in or not. If the user
      # is locked, it should never be allowed.
-      def valid_for_authentication?
-        return super unless persisted? && lock_strategy_enabled?(:failed_attempts)
-
-        # Unlock the user if the lock is expired, no matter
-        # if the user can login or not (wrong password, etc)
-        unlock_access! if lock_expired?
-
-        case (result = super)
-        when Symbol
-          return result
-        when TrueClass
+      def valid_for_authentication?(attributes)
+        if result = super
          self.failed_attempts = 0
-          save(:validate => false)
-        when FalseClass
-          # PostgreSQL uses nil as the default value for integer columns set to 0
-          self.failed_attempts ||= 0
+        else
          self.failed_attempts += 1
-          if attempts_exceeded?
-            lock_access!
-            return :locked
-          else
-            save(:validate => false)
-          end
+          lock_access! if failed_attempts > self.class.maximum_attempts
        end
-
+        save(false) if changed?
        result
      end

      protected

-        def attempts_exceeded?
-          self.failed_attempts > self.class.maximum_attempts
-        end
-
        # Generates unlock token
        def generate_unlock_token
-          self.unlock_token = self.class.unlock_token
+          self.unlock_token = Devise.friendly_token
        end

        # Tells if the lock is expired if :time unlock strategy is active
        def lock_expired?
-          if unlock_strategy_enabled?(:time)
+          if self.class.unlock_strategy_enabled?(:time)
            locked_at && locked_at < self.class.unlock_in.ago
          else
            false
@@ -126,7 +112,7 @@ module Devise
          if access_locked?
            yield
          else
-            self.errors.add(:email, :not_locked)
+            self.class.add_error_on(self, :email, :not_locked)
            false
          end
        end
@@ -137,8 +123,8 @@ module Devise
        # with an email not found error.
        # Options must contain the user email
        def send_unlock_instructions(attributes={})
-         lockable = find_or_initialize_with_errors(unlock_keys, attributes, :not_found)
-         lockable.resend_unlock_token if lockable.persisted?
+         lockable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
+         lockable.resend_unlock_token unless lockable.new_record?
         lockable
        end

@@ -148,7 +134,7 @@ module Devise
        # Options must have the unlock_token
        def unlock_access_by_token(unlock_token)
          lockable = find_or_initialize_with_error_by(:unlock_token, unlock_token)
-          lockable.unlock_access! if lockable.persisted?
+          lockable.unlock_access! unless lockable.new_record?
          lockable
        end

@@ -157,16 +143,7 @@ module Devise
          [:both, strategy].include?(self.unlock_strategy)
        end

-        # Is the lock enabled for the given lock strategy?
-        def lock_strategy_enabled?(strategy)
-          self.lock_strategy == strategy
-        end
-
-        def unlock_token
-          Devise.friendly_token
-        end
-
-        Devise::Models.config(self, :maximum_attempts, :lock_strategy, :unlock_strategy, :unlock_in, :unlock_keys)
+        Devise::Models.config(self, :maximum_attempts, :unlock_strategy, :unlock_in)
      end
    end
  end
--- a/lib/devise/models/omniauthable.rb
+++ b/lib/devise/models/omniauthable.rb
@@ -1,23 +0,0 @@
-require 'devise/omniauth'
-
-module Devise
-  module Models
-    # Adds OmniAuth support to your model.
-    #
-    # == Options
-    #
-    # Oauthable adds the following options to devise_for:
-    #
-    #   * +omniauth_providers+: Which providers are avaialble to this model. It expects an array:
-    #
-    #       devise_for :database_authenticatable, :omniauthable, :omniauth_providers => [:twitter]
-    #
-    module Omniauthable
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        Devise::Models.config(self, :omniauth_providers)
-      end
-    end
-  end
-end
--- a/lib/devise/models/recoverable.rb
+++ b/lib/devise/models/recoverable.rb
@@ -1,15 +1,8 @@
 module Devise
  module Models

-    # Recoverable takes care of reseting the user password and send reset instructions.
-    #
-    # ==Options
-    #
-    # Recoverable adds the following options to devise_for:
-    #
-    #   * +reset_password_keys+: the keys you want to use when recovering the password for an account
-    #
-    # == Examples
+    # Recoverable takes care of reseting the user password and send reset instructions
+    # Examples:
    #
    #   # resets the user password and save the record, true if valid passwords are given, otherwise false
    #   User.find(1).reset_password!('password123', 'password123')
@@ -20,9 +13,12 @@ module Devise
    #
    #   # creates a new token and send it with instructions about how to reset the password
    #   User.find(1).send_reset_password_instructions
-    #
    module Recoverable
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+        end
+      end

      # Update password saving the record and clearing token. Returns true if
      # the passwords are valid and the record was saved, false otherwise.
@@ -35,56 +31,26 @@ module Devise

      # Resets reset password token and send reset password instructions by email
      def send_reset_password_instructions
-        generate_reset_password_token! if should_generate_token?
-        ::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.
-      # reset_password_within is a model configuration, must always be an integer value.
-      #
-      # Example:
-      #
-      #   # reset_password_within = 1.day and reset_password_sent_at = today
-      #   reset_password_period_valid?   # returns true
-      #
-      #   # reset_password_within = 5.days and reset_password_sent_at = 4.days.ago
-      #   reset_password_period_valid?   # returns true
-      #
-      #   # reset_password_within = 5.days and reset_password_sent_at = 5.days.ago
-      #   reset_password_period_valid?   # returns false
-      #
-      #   # reset_password_within = 0.days
-      #   reset_password_period_valid?   # will always return false
-      #
-      def reset_password_period_valid?
-        respond_to?(:reset_password_sent_at) && reset_password_sent_at &&
-          reset_password_sent_at.utc >= self.class.reset_password_within.ago
+        generate_reset_password_token!
+        ::DeviseMailer.deliver_reset_password_instructions(self)
      end

      protected

-        def should_generate_token?
-          reset_password_token.nil? || !reset_password_period_valid?
-        end
-
        # Generates a new random token for reset password
        def generate_reset_password_token
-          self.reset_password_token = self.class.reset_password_token
-          self.reset_password_sent_at = Time.now.utc if respond_to?(:reset_password_sent_at=)
+          self.reset_password_token = Devise.friendly_token
        end

        # Resets the reset password token with and save the record without
        # validating
        def generate_reset_password_token!
-          generate_reset_password_token && save(:validate => false)
+          generate_reset_password_token && save(false)
        end

        # Removes reset_password token
        def clear_reset_password_token
          self.reset_password_token = nil
-          self.reset_password_sent_at = nil if respond_to?(:reset_password_sent_at=)
        end

      module ClassMethods
@@ -93,34 +59,21 @@ module Devise
        # with an email not found error.
        # Attributes must contain the user email
        def send_reset_password_instructions(attributes={})
-          recoverable = find_or_initialize_with_errors(reset_password_keys, attributes, :not_found)
-          recoverable.send_reset_password_instructions if recoverable.persisted?
+          recoverable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
+          recoverable.send_reset_password_instructions unless recoverable.new_record?
          recoverable
        end

-        # Generate a token checking if one does not already exist in the database.
-        def reset_password_token
-          generate_token(:reset_password_token)
-        end
-
-        # Attempt to find a user by it's reset_password_token to reset its
-        # password. If a user is found and token is still valid, reset its password and automatically
+        # Attempt to find a user by it's reset_password_token to reset it's
+        # password. If a user is found, reset it's password and automatically
        # try saving the record. If not user is found, returns a new user
        # containing an error in reset_password_token attribute.
        # Attributes must contain reset_password_token, password and confirmation
        def reset_password_by_token(attributes={})
          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]) 
-            else
-              recoverable.errors.add(:reset_password_token, :invalid)
-            end
-          end
+          recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) unless recoverable.new_record?
          recoverable
        end
-
-        Devise::Models.config(self, :reset_password_keys, :reset_password_within)
      end
    end
  end
--- a/lib/devise/models/registerable.rb
+++ b/lib/devise/models/registerable.rb
@@ -3,19 +3,6 @@ module Devise
    # Registerable is responsible for everything related to registering a new
    # resource (ie user sign up).
    module Registerable
-      extend ActiveSupport::Concern
-
-      module ClassMethods
-        # A convenience method that receives both parameters and session to
-        # initialize a user. This can be used by OAuth, for example, to send
-        # in the user token and be stored on initialization.
-        #
-        # By default discards all information sent by the session by calling
-        # new with params.
-        def new_with_session(params, session)
-          new(params)
-        end
-      end
    end
  end
 end
--- a/lib/devise/models/rememberable.rb
+++ b/lib/devise/models/rememberable.rb
@@ -1,6 +1,5 @@
 require 'devise/strategies/rememberable'
 require 'devise/hooks/rememberable'
-require 'devise/hooks/forgetable'

 module Devise
  module Models
@@ -11,27 +10,16 @@ module Devise
    # You probably wouldn't use rememberable methods directly, they are used
    # mostly internally for handling the remember token.
    #
-    # == Options
+    # Configuration:
    #
-    # Rememberable adds the following options in devise_for:
+    #   remember_for: the time you want the user will be remembered without
+    #                 asking for credentials. After this time the user will be
+    #                 blocked and will have to enter his credentials again.
+    #                 This configuration is also used to calculate the expires
+    #                 time for the cookie created to remember the user.
+    #                 By default remember_for is 2.weeks.
    #
-    #   * +remember_for+: the time you want the user will be remembered without
-    #     asking for credentials. After this time the user will be blocked and
-    #     will have to enter his credentials again. This configuration is also
-    #     used to calculate the expires time for the cookie created to remember
-    #     the user. By default remember_for is 2.weeks.
-    #
-    #   * +remember_across_browsers+: if a valid remember token can be re-used
-    #     between multiple browsers. By default remember_across_browsers is true
-    #     and cannot be turned off if you are using password salt instead of remember
-    #     token.
-    #
-    #   * +extend_remember_period+: if true, extends the user's remember period
-    #     when remembered via cookie. False by default.
-    #
-    #   * +cookie_options+: configuration options passed to the created cookie.
-    #
-    # == Examples
+    # Examples:
    #
    #   User.find(1).remember_me!  # regenerating the token
    #   User.find(1).forget_me!    # clearing the token
@@ -42,29 +30,41 @@ module Devise
    #   # lookup the user based on the incoming cookie information
    #   User.serialize_from_cookie(cookie_string)
    module Rememberable
-      extend ActiveSupport::Concern

-      attr_accessor :remember_me, :extend_remember_period
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods

-      # Generate a new remember token and save the record without validations
-      # unless remember_across_browsers is true and the user already has a valid token.
-      def remember_me!(extend_period=false)
-        self.remember_token = self.class.remember_token if respond_to?(:remember_token) && generate_remember_token?
-        self.remember_created_at = Time.now.utc if generate_remember_timestamp?(extend_period)
-        save(:validate => false)
+          # Remember me option available in after_authentication hook.
+          attr_accessor :remember_me
+        end
+      end
+
+      # Generate a new remember token and save the record without validations.
+      def remember_me!
+        self.remember_token = Devise.friendly_token
+        self.remember_created_at = Time.now.utc
+        save(false)
      end

      # Removes the remember token only if it exists, and save the record
      # without validations.
      def forget_me!
-        self.remember_token = nil if respond_to?(:remember_token=)
-        self.remember_created_at = nil
-        save(:validate => false)
+        if remember_token
+          self.remember_token = nil
+          self.remember_created_at = nil
+          save(false)
+        end
+      end
+
+      # Checks whether the incoming token matches or not with the record token.
+      def valid_remember_token?(token)
+        remember_token && !remember_expired? && remember_token == token
      end

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

      # Remember token expires at created time + remember_for configuration
@@ -72,55 +72,20 @@ module Devise
        remember_created_at + self.class.remember_for
      end

-      def rememberable_value
-        if respond_to?(:remember_token)
-          remember_token
-        elsif respond_to?(:authenticatable_salt) && (salt = authenticatable_salt)
-          salt
-        else
-          raise "The #{self.class.name} class does not respond to remember_token and " <<
-            "authenticatable_salt returns nil. In order to use rememberable, you must " <<
-            "add a remember_token field to your model or ensure a password is always set."
-        end
-      end
-
-      def cookie_options
-        self.class.cookie_options
-      end
-
-    protected
-
-      # Generate a token unless remember_across_browsers is true and there is
-      # an existing remember_token or the existing remember_token has expried.
-      def generate_remember_token? #:nodoc:
-        !(self.class.remember_across_browsers && remember_token) || remember_expired?
-      end
-
-      # Generate a timestamp if extend_remember_period is true, if no remember_token
-      # exists, or if an existing remember token has expired.
-      def generate_remember_timestamp?(extend_period) #:nodoc:
-        extend_period || remember_created_at.nil? || remember_expired?
-      end
-
      module ClassMethods
        # Create the cookie key using the record id and remember_token
        def serialize_into_cookie(record)
-          [record.to_key, record.rememberable_value]
+          "#{record.id}::#{record.remember_token}"
        end

        # Recreate the user based on the stored cookie
-        def serialize_from_cookie(id, remember_token)
-          record = to_adapter.get(id)
-          record if record && record.rememberable_value == remember_token && !record.remember_expired?
+        def serialize_from_cookie(cookie)
+          record_id, record_token = cookie.split('::')
+          record = find(:first, :conditions => { :id => record_id }) if record_id
+          record if record.try(:valid_remember_token?, record_token)
        end

-        # Generate a token checking if one does not already exist in the database.
-        def remember_token
-          generate_token(:remember_token)
-        end
-
-        Devise::Models.config(self, :remember_for, :remember_across_browsers,
-          :extend_remember_period, :cookie_options)
+        Devise::Models.config(self, :remember_for)
      end
    end
  end
--- a/lib/devise/models/timeoutable.rb
+++ b/lib/devise/models/timeoutable.rb
@@ -7,34 +7,19 @@ module Devise
    # will be asked for credentials again, it means, he/she will be redirected
    # to the sign in page.
    #
-    # == Options
-    #
-    # Timeoutable adds the following options to devise_for:
-    #
-    #   * +timeout_in+: the interval to timeout the user session without activity.
-    #
-    # == Examples
-    #
-    #   user.timedout?(30.minutes.ago)
+    # Configuration:
    #
+    #   timeout_in: the time you want to timeout the user session without activity.
    module Timeoutable
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.extend ClassMethods
+      end

      # Checks whether the user session has expired based on configured time.
      def timedout?(last_access)
-        return false if remember_exists_and_not_expired?
-        
        last_access && last_access <= self.class.timeout_in.ago
      end
-      
-      private
-      
-      def remember_exists_and_not_expired?
-        return false unless respond_to?(:remember_expired?)
-        
-        remember_created_at && !remember_expired?
-      end
-      
+
      module ClassMethods
        Devise::Models.config(self, :timeout_in)
      end
--- a/lib/devise/models/token_authenticatable.rb
+++ b/lib/devise/models/token_authenticatable.rb
@@ -2,33 +2,28 @@ require 'devise/strategies/token_authenticatable'

 module Devise
  module Models
-    # The TokenAuthenticatable module is responsible for generating an authentication token and
-    # validating the authenticity of the same while signing in.
+    # Token Authenticatable Module, responsible for generate authentication token and validating
+    # authenticity of a user while signing in using an authentication token (say follows an URL).
    #
-    # This module only provides a few helpers to help you manage the token, but it is up to you
-    # to choose how to use it. For example, if you want to have a new token every time the user
-    # saves his account, you can do the following:
+    # == Configuration:
    #
-    #   before_save :reset_authentication_token
+    # You can overwrite configuration values by setting in globally in Devise (+Devise.setup+),
+    # using devise method, or overwriting the respective instance method.
    #
-    # On the other hand, if you want to generate token unless one exists, you should use instead:
+    # +token_authentication_key+ - Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
    #
-    #   before_save :ensure_authentication_token
+    # == Examples:
    #
-    # If you want to delete the token after it is used, you can do so in the
-    # after_token_authentication callback.
-    #
-    # == Options
-    #
-    # TokenAuthenticatable adds the following options to devise_for:
-    #
-    #   * +token_authentication_key+: Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
-    #
-    #   * +stateless_token+: By default, when you sign up with a token, Devise will store the user in session
-    #     as any other authentication strategy. You can set stateless_token to true to avoid this.
+    #    User.authenticate_with_token(:auth_token => '123456789')           # returns authenticated user or nil
+    #    User.find(1).valid_authentication_token?('rI1t6PKQ8yP7VetgwdybB')  # returns true/false
    #
    module TokenAuthenticatable
-      extend ActiveSupport::Concern
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+          before_save :ensure_authentication_token
+        end
+      end

      # Generate new authentication token (a.k.a. "single access token").
      def reset_authentication_token
@@ -38,34 +33,56 @@ module Devise
      # Generate new authentication token and save the record.
      def reset_authentication_token!
        reset_authentication_token
-        save(:validate => false)
+        self.save
      end

      # Generate authentication token unless already exists.
      def ensure_authentication_token
-        reset_authentication_token if authentication_token.blank?
+        self.reset_authentication_token if self.authentication_token.blank?
      end

      # Generate authentication token unless already exists and save the record.
      def ensure_authentication_token!
-        reset_authentication_token! if authentication_token.blank?
+        self.reset_authentication_token! if self.authentication_token.blank?
      end

-      # Hook called after token authentication.
-      def after_token_authentication
+      # Verifies whether an +incoming_authentication_token+ (i.e. from single access URL)
+      # is the user authentication token.
+      def valid_authentication_token?(incoming_auth_token)
+        incoming_auth_token.present? && incoming_auth_token == self.authentication_token
      end

      module ClassMethods
-        def find_for_token_authentication(conditions)
-          find_for_authentication(:authentication_token => conditions[token_authentication_key])
+        ::Devise::Models.config(self, :token_authentication_key)
+
+        # Authenticate a user based on authentication token.
+        def authenticate_with_token(attributes)
+          token = attributes[self.token_authentication_key]
+          resource = self.find_for_token_authentication(token)
+          resource if resource.try(:valid_authentication_token?, token)
        end

-        # Generate a token checking if one does not already exist in the database.
        def authentication_token
-          generate_token(:authentication_token)
+          ::Devise.friendly_token
        end

-        ::Devise::Models.config(self, :token_authentication_key, :stateless_token)
+        protected
+
+          # Find first record based on conditions given (ie by the sign in form).
+          # Overwrite to add customized conditions, create a join, or maybe use a
+          # namedscope to filter records while authenticating.
+          #
+          # == Example:
+          #
+          #   def self.find_for_token_authentication(token, conditions = {})
+          #     conditions = {:active => true}
+          #     self.find_by_authentication_token(token, :conditions => conditions)
+          #   end
+          #
+          def find_for_token_authentication(token)
+            self.find(:first, :conditions => { :authentication_token => token})
+          end
+
      end
    end
  end
--- a/lib/devise/models/trackable.rb
+++ b/lib/devise/models/trackable.rb
@@ -11,20 +11,6 @@ module Devise
    # * 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
-        self.last_sign_in_at     = old_current || new_current
-        self.current_sign_in_at  = new_current
-
-        old_current, new_current = self.current_sign_in_ip, request.remote_ip
-        self.last_sign_in_ip     = old_current || new_current
-        self.current_sign_in_ip  = new_current
-
-        self.sign_in_count ||= 0
-        self.sign_in_count += 1
-
-        save(:validate => false)
-      end
    end
  end
 end
--- a/lib/devise/models/validatable.rb
+++ b/lib/devise/models/validatable.rb
@@ -1,35 +1,27 @@
 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 it's format is
-    # valid. Also tests presence of password, confirmation and length.
-    #
-    # == Options
-    #
-    # Validatable adds the following options to devise_for:
-    #
-    #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 6..128.
-    #
+    # valid. Also tests presence of password, confirmation and length
    module Validatable
      # All validations used by this module.
      VALIDATIONS = [ :validates_presence_of, :validates_uniqueness_of, :validates_format_of,
                      :validates_confirmation_of, :validates_length_of ].freeze

      def self.included(base)
-        base.extend ClassMethods
        assert_validations_api!(base)

        base.class_eval do
-          validates_presence_of   :email, :if => :email_required?
-          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   :email
+          validates_uniqueness_of :email, :scope => authentication_keys[1..-1], :case_sensitive => false, :allow_blank => true
+          validates_format_of     :email, :with  => EMAIL_REGEX, :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
+            v.validates_length_of       :password, :within => 6..20, :allow_blank => true
          end
        end
      end
@@ -42,23 +34,6 @@ module Devise
                "to the following methods: #{unavailable_validations.to_sentence}."
        end
      end
-
-    protected
-
-      # Checks whether a password is needed or not. For validations only.
-      # Passwords are always required if it's a new record, or if the password
-      # or confirmation are being set somewhere.
-      def password_required?
-        !persisted? || !password.nil? || !password_confirmation.nil?
-      end
-
-      def email_required?
-        true
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :email_regexp, :password_length)
-      end
    end
  end
 end
--- a/lib/devise/modules.rb
+++ b/lib/devise/modules.rb
@@ -1,30 +0,0 @@
-require 'active_support/core_ext/object/with_options'
-
-Devise.with_options :model => true do |d|
-  # Strategies first
-  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,    :controller => :sessions, :route => { :session => routes }
-    s.add_module :rememberable
-  end
-
-  # Other authentications
-  d.add_module :encryptable
-  d.add_module :omniauthable, :controller => :omniauth_callbacks,  :route => :omniauth_callback
-
-  # Misc after
-  routes = [nil, :new, :edit]
-  d.add_module :recoverable,  :controller => :passwords,     :route => { :password => routes }
-  d.add_module :registerable, :controller => :registrations, :route => { :registration => (routes << :cancel) }
-  d.add_module :validatable
-
-  # The ones which can sign out after
-  routes = [nil, :new]
-  d.add_module :confirmable,  :controller => :confirmations, :route => { :confirmation => routes }
-  d.add_module :lockable,     :controller => :unlocks,       :route => { :unlock => routes }
-  d.add_module :timeoutable
-
-  # Stats for last, so we make sure the user is really signed in
-  d.add_module :trackable
-end
--- a/lib/devise/omniauth.rb
+++ b/lib/devise/omniauth.rb
@@ -1,32 +0,0 @@
-begin
-  require "omniauth/core"
-rescue LoadError => e
-  warn "Could not load 'omniauth/core'. Please ensure you have the oa-core gem installed and listed in your Gemfile."
-  raise
-end
-
-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.
-OmniAuth.config.path_prefix = nil
-
-OmniAuth.config.on_failure = Proc.new do |env|
-  env['devise.mapping'] = Devise::Mapping.find_by_path!(env['PATH_INFO'], :path)
-  controller_name  = ActiveSupport::Inflector.camelize(env['devise.mapping'].controllers[:omniauth_callbacks])
-  controller_klass = ActiveSupport::Inflector.constantize("#{controller_name}Controller")
-  controller_klass.action(:failure).call(env)
-end
-
-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
--- a/lib/devise/omniauth/config.rb
+++ b/lib/devise/omniauth/config.rb
@@ -1,18 +0,0 @@
-module Devise
-  module OmniAuth
-    class Config
-      attr_accessor :strategy
-      attr_reader :args
-
-      def initialize(provider, args)
-        @provider = provider
-        @args     = args
-        @strategy = nil
-      end
-
-      def strategy_class
-        ::OmniAuth::Strategies.const_get("#{::OmniAuth::Utils.camelize(@provider.to_s)}")
-      end
-    end
-  end
-end     
--- a/lib/devise/omniauth/url_helpers.rb
+++ b/lib/devise/omniauth/url_helpers.rb
@@ -1,33 +0,0 @@
-module Devise
-  module OmniAuth
-    module UrlHelpers
-      def self.define_helpers(mapping)
-        return unless mapping.omniauthable?
-
-        class_eval <<-URL_HELPERS, __FILE__, __LINE__ + 1
-          def #{mapping.name}_omniauth_authorize_path(provider, params = {})
-            if Devise.omniauth_configs[provider.to_sym]
-              script_name = request.env["SCRIPT_NAME"]
-
-              path = "\#{script_name}/#{mapping.path}/auth/\#{provider}\".squeeze("/")
-              path << '?' + params.to_param if params.present?
-              path
-            else
-              raise ArgumentError, "Could not find omniauth provider \#{provider.inspect}"
-            end
-          end
-        URL_HELPERS
-      end
-
-      def omniauth_authorize_path(resource_or_scope, *args)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        send("#{scope}_omniauth_authorize_path", *args)
-      end
-
-      def omniauth_callback_path(resource_or_scope, *args)
-        scope = Devise::Mapping.find_scope!(resource_or_scope)
-        send("#{scope}_omniauth_callback_path", *args)
-      end
-    end
-  end
-end
--- a/lib/devise/orm/active_record.rb
+++ b/lib/devise/orm/active_record.rb
@@ -1,11 +1,9 @@
-require 'orm_adapter/adapters/active_record'
-
 module Devise
  module Orm
    # This module contains some helpers and handle schema (migrations):
    #
    #   create_table :accounts do |t|
-    #     t.database_authenticatable
+    #     t.authenticatable
    #     t.confirmable
    #     t.recoverable
    #     t.rememberable
@@ -21,18 +19,23 @@ module Devise
    #   add_index "accounts", ["reset_password_token"], :name => "reset_password_token", :unique => true
    #
    module ActiveRecord
-      module Schema
-        include Devise::Schema
+      # Required ORM hook. Just yield the given block in ActiveRecord.
+      def self.included_modules_hook(klass)
+        yield
+      end

-        # Tell how to apply schema methods.
-        def apply_devise_schema(name, type, options={})
-          column name, type.to_s.downcase.to_sym, options
-        end
+      include Devise::Schema
+
+      # Tell how to apply schema methods.
+      def apply_schema(name, type, options={})
+        column name, type.to_s.downcase.to_sym, options
      end
    end
  end
 end

-ActiveRecord::Base.extend Devise::Models
-ActiveRecord::ConnectionAdapters::Table.send :include, Devise::Orm::ActiveRecord::Schema
-ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Orm::ActiveRecord::Schema
+if defined?(ActiveRecord)
+  ActiveRecord::Base.extend Devise::Models
+  ActiveRecord::ConnectionAdapters::Table.send :include, Devise::Orm::ActiveRecord
+  ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Orm::ActiveRecord
+end
--- a/lib/devise/orm/data_mapper.rb
+++ b/lib/devise/orm/data_mapper.rb
@@ -0,0 +1,83 @@
+module Devise
+  module Orm
+    module DataMapper
+      module InstanceMethods
+        def save(flag=nil)
+          if flag == false
+            save!
+          else
+            super()
+          end
+        end
+      end
+
+      def self.included_modules_hook(klass)
+        klass.send :extend,  self
+        klass.send :include, InstanceMethods
+
+        yield
+
+        klass.devise_modules.each do |mod|
+          klass.send(mod) if klass.respond_to?(mod)
+        end
+      end
+
+      include Devise::Schema
+
+      SCHEMA_OPTIONS = {
+        :null  => :nullable,
+        :limit => :length
+      }
+
+      # Hooks for confirmable
+      def before_create(*args)
+        wrap_hook(:before, *args)
+      end
+
+      def after_create(*args)
+        wrap_hook(:after, *args)
+      end
+
+      def wrap_hook(action, *args)
+        options = args.extract_options!
+
+        args.each do |callback|
+          send action, :create, callback
+          class_eval <<-METHOD, __FILE__, __LINE__ + 1
+            def #{callback}
+              super if #{options[:if] || true}
+            end
+          METHOD
+        end
+      end
+
+      # Add ActiveRecord like finder
+      def find(*args)
+        options = args.extract_options!
+        case args.first
+          when :first
+            first(options)
+          when :all
+            all(options)
+          else
+            get(*args)
+        end
+      end
+
+      # Tell how to apply schema methods. This automatically maps :limit to
+      # :length and :null to :nullable.
+      def apply_schema(name, type, options={})
+        return unless Devise.apply_schema
+
+        SCHEMA_OPTIONS.each do |old_key, new_key|
+          next unless options.key?(old_key)
+          options[new_key] = options.delete(old_key)
+        end
+
+        property name, type, options
+      end
+    end
+  end
+end
+
+DataMapper::Model.send(:include, Devise::Models)
--- a/lib/devise/orm/mongo_mapper.rb
+++ b/lib/devise/orm/mongo_mapper.rb
@@ -0,0 +1,52 @@
+module Devise
+  module Orm
+    module MongoMapper
+      module InstanceMethods
+        def save(options={})
+          if options == false
+            super(:validate => false)
+          else
+            super
+          end
+        end
+      end
+
+      def self.included_modules_hook(klass)
+        klass.send :extend,  self
+        klass.send :include, InstanceMethods
+        yield
+
+        klass.devise_modules.each do |mod|
+          klass.send(mod) if klass.respond_to?(mod)
+        end
+      end
+      
+      def find(*args)
+        case args.first
+        when :first, :all
+          send(args.shift, *args)
+        else
+          super
+        end
+      end
+      
+      include Devise::Schema
+
+      # Tell how to apply schema methods. This automatically converts DateTime
+      # to Time, since MongoMapper does not recognize the former.
+      def apply_schema(name, type, options={})
+        return unless Devise.apply_schema
+        type = Time if type == DateTime
+        key name, type, options
+      end
+    end
+  end
+end
+
+if MongoMapper::Version >= "0.8.0"
+  MongoMapper::Plugins::Document::ClassMethods.send(:include, Devise::Models)
+  MongoMapper::Plugins::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
+else
+  MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
+  MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)
+end
--- a/lib/devise/orm/mongoid.rb
+++ b/lib/devise/orm/mongoid.rb
@@ -1,31 +0,0 @@
-require 'orm_adapter/adapters/mongoid'
-
-module Devise
-  module Orm
-    module Mongoid
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end
-      end
-
-      module Schema
-        include Devise::Schema
-
-        # Tell how to apply schema methods
-        def apply_devise_schema(name, type, options={})
-          type = Time if type == DateTime
-          field name, { :type => type }.merge!(options)
-        end
-      end
-    end
-  end
-end
-
-Mongoid::Document::ClassMethods.class_eval do
-  include Devise::Models
-  include Devise::Orm::Mongoid::Hook
-end
--- a/lib/devise/path_checker.rb
+++ b/lib/devise/path_checker.rb
@@ -1,18 +0,0 @@
-module Devise
-  class PathChecker
-    include Rails.application.routes.url_helpers
-
-    def self.default_url_options(*args)
-      ApplicationController.default_url_options(*args)
-    end
-
-    def initialize(env, scope)
-      @current_path = "/#{env["SCRIPT_NAME"]}/#{env["PATH_INFO"]}".squeeze("/")
-      @scope = scope
-    end
-
-    def signing_out?
-      @current_path == send("destroy_#{@scope}_session_path")
-    end
-  end
-end
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -1,43 +1,14 @@
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'

-module Devise
-  class Engine < ::Rails::Engine
-    config.devise = Devise
+Rails.configuration.after_initialize do
+  require "devise/orm/#{Devise.orm}"

-    # Initialize Warden and copy its configurations.
-    config.app_middleware.use Warden::Manager do |config|
-      Devise.warden_config = config
-    end
-
-    # Force routes to be loaded if we are doing any eager load.
-    config.before_eager_load { |app| app.reload_routes! }
-
-    initializer "devise.url_helpers" do
-      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|
-          config.strategy = strategy
-        end
-      end
-
-      if Devise.omniauth_configs.any?
-        Devise.include_helpers(Devise::OmniAuth)
-      end
-    end
+  # Adds Warden Manager to Rails middleware stack, configuring default devise
+  # strategy and also the failure app.
+  Rails.configuration.middleware.use Warden::Manager do |config|
+    Devise.configure_warden(config)
  end
+
+  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
 end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
José Valim	7abe80e079	Update gemspec with 1.0.9 release.	2010-11-26 13:25:19 +01:00
Carlos Antonio da Silva	cf3e5c5d85	Fix deprecation warning in Rails 2.3.10	2010-11-26 08:42:01 -02:00
José Valim	ef5cb5c34b	Work around a bug in Rails 2.3.10 where reset session cause Rack::Lint tests to fail.	2010-11-26 11:31:38 +01:00
José Valim	09e815fa1c	Prepare for 1.0.9.	2010-11-21 00:24:31 +01:00
José Valim	f72d7d85c7	Avoid session fixation attacks	2010-11-21 00:23:44 +01:00
José Valim	994e62a533	Fix metaclass deprecation	2010-11-21 00:02:29 +01:00
Carlos Antonio da Silva	18284d9ba3	Remove "returning" deprecation warning	2010-09-21 21:12:05 -03:00
Vinicius Baggio	9321db99a0	Fixing typo in documentation	2010-09-09 08:50:53 -03:00
Eike Bernhardt	d9d9cf99e5	It's just 'save(false)' in Rails 2.3.x	2010-09-09 19:47:14 +08:00
Eike Bernhardt	a3a142eb04	Save confirmation token to the database, if one does not exist but was requested, closes #377	2010-09-09 19:47:14 +08:00
Hugo Baraúna	e4e6fb77bb	Updates installation steps in the README	2010-08-22 17:33:35 -07:00
Martin Rehfeld	0638a68704	use :sign_out_via to control the method(s) for the destroy_*_session_path route	2010-08-14 11:06:31 +08:00
Martin Rehfeld	a49f03e2f9	provide :sign_out_via option for Devise::Mapping	2010-08-14 11:06:31 +08:00
José Valim	9b9924c9e5	Dup version!	2010-08-02 04:41:47 -07:00
José Valim	7bfdd8e45e	Email should be case insensitive, closes #372	2010-07-15 21:13:37 +02:00
Carlos Antonio da Silva	0a3181f42b	Fix docs about after_sign_in_path_for and routes	2010-07-13 22:21:57 -03:00
Carlos Antonio da Silva	cb990f2d28	Get rid of some deprecation warnings and update Changelog	2010-07-07 00:10:28 -03:00
Carlos Antonio da Silva	fdb0cf11bb	Refactor redirect path to its own method in Devise failure, allow overriding in custom failure apps	2010-07-06 23:59:44 -03:00
Carlos Antonio da Silva	49db713b8f	Adding a small note about security and issues	2010-07-05 14:27:54 -03:00
José Valim	1741a79114	Release Devise 1.0.8 with a few fixes and latest mongomapper support.	2010-06-23 12:20:50 +02:00
Iván Valdés (@ivanvc)	a41025e421	Fixed MongoMapper adapter in order to get it working with versions >= 0.8.0 Signed-off-by: José Valim <jose.valim@gmail.com>	2010-06-23 11:18:14 +02:00
Luke Cunningham	73e5d848c1	updated Document and EmbeddedDocument hooks to fix issue with MongoMapper v0.8	2010-06-17 18:48:24 +08:00
Maxim Filatov	ca512267c5	anybody_signed_in? added to helper methods	2010-06-12 19:22:59 +08:00
SSDany	55a47128bf	anybody_signed_in? helper	2010-06-12 19:22:58 +08:00
Mike Breen	0609a5e192	:authenticatable as module is deprecated so the model generator should use :database_authenticatable	2010-05-26 03:42:44 +08:00
Paul Rosania	201cfa9824	Automatically create the confirmation_token when email is sent for optionally confirmable models Signed-off-by: José Valim <jose.valim@gmail.com>	2010-05-16 14:55:50 +02:00
Paul Rosania	d853c376d4	Mark confirmable roles as active when confirmation_required? is false Signed-off-by: José Valim <jose.valim@gmail.com>	2010-05-16 14:55:49 +02:00
José Valim	18f6e06963	Update README.	2010-05-03 13:59:21 +02:00
José Valim	c38b2f69d0	Release devise 1.0.7 with small fixes.	2010-05-03 13:56:25 +02:00
José Valim	c29b6ca4ea	Confirmable is not default anymore. This provides a better bootstrap experience.	2010-05-03 00:10:21 +02:00
Ryan Booker	e666fae249	Fix grammar in notice, closes #229 Signed-off-by: José Valim <jose.valim@gmail.com>	2010-04-25 09:57:05 +02:00
José Valim	ad730da580	Include model_session helpers in view, closes #227	2010-04-25 09:56:09 +02:00
José Valim	1a9092c61b	Ensure password confirmation is always required, closes #228	2010-04-25 09:55:11 +02:00
José Valim	234af4b14a	Help avoid common pitfalls.	2010-04-13 00:15:30 -07:00
José Valim	f69bc53f04	Authenticatable => DatabaseAuthenticatable.	2010-04-12 04:50:49 -07:00
José Valim	681f816074	Backport small updates done in master.	2010-04-11 08:05:21 +02:00
José Valim	6915e6226a	Update instructions on README.	2010-04-04 04:41:56 -07:00
José Valim	1865298074	Release Devise 1.0.6.	2010-04-03 13:25:06 +02:00
José Valim	1e4394e361	Update generated migration.	2010-04-02 20:37:54 +02:00
postmodern	b033c8e938	Expend the length of the encrypted_password field to 128 to allow storing BCrypt or SHA512 passwords. Signed-off-by: José Valim <jose.valim@gmail.com>	2010-04-02 20:36:32 +02:00
José Valim	f7d134ba9d	Tidy up previous commit.	2010-04-02 20:29:42 +02:00
Nat Budin	0bc15286b4	Pass back the custom response, if the winning strategy uses the custom\! method Signed-off-by: José Valim <jose.valim@gmail.com>	2010-04-02 20:28:26 +02:00
José Valim	b425c701e0	Update warden dependency.	2010-04-01 19:27:04 +02:00
José Valim	c18d8e50d3	Backport database_authenticatable change,.	2010-04-01 12:16:43 +02:00
José Valim	52f729e74f	Bug fixes on unlockable.	2010-03-28 23:14:36 +02:00
José Valim	bb026205cb	Do not force halt on authenticatable. This allows other strategies (like devise_imapable or even devise_facebook_connectable) to hook into sessions controller as well. Those strategies should follow the same convention, allowing them to be cascated.	2010-03-28 14:57:32 +02:00
Josh Kalderimis	e80b46b68f	removed duplicated method Signed-off-by: José Valim <jose.valim@gmail.com>	2010-03-28 07:26:22 +02:00
José Valim	ce3926fea4	Bump tiny.	2010-03-26 13:04:05 +01:00
José Valim	e2793fc69e	sign_in_count shoud default to zero.	2010-03-26 12:57:36 +01:00
Carlos Antonio da Silva	867e896bc8	Merge branch 'v1.0' of github.com:plataformatec/devise into v1.0	2010-03-26 08:45:49 -03:00
José Valim	053c6f1a3a	Move password_required? to authenticatable. This allow you to reuse it when building your own validations.	2010-03-26 12:19:15 +01:00
Carlos Antonio da Silva	a73fead23e	Merge branch 'v1.0' of github.com:plataformatec/devise into v1.0	2010-03-26 08:19:10 -03:00
Carlos Antonio da Silva	42eb89b909	Use prepend_before_filter in require_no_authentication. We need to be sure require_no_authentication runs before other user filters that may call some Devise helper (ie current_xxx).	2010-03-26 08:14:58 -03:00
José Valim	913444059c	Allow devise to work with association proxies.	2010-03-26 10:26:38 +01:00
Josh Kalderimis	b305b7f357	changed add_module to add modules to the bottom of ALL, also added test to confirm order in ALL is being adhered to Signed-off-by: José Valim <jose.valim@gmail.com>	2010-03-26 09:32:25 +01:00
José Valim	06d43525d6	Require no authentication on unlockable.	2010-03-25 16:28:36 -03:00
Josh Kalderimis	6d08646ddc	added routes option to add_module so route view helpers are created Signed-off-by: José Valim <jose.valim@gmail.com>	2010-03-25 09:05:13 +01:00
José Valim	1bee9fbef9	Clean up lockable and class methods API.	2010-03-10 16:18:28 +01:00
José Valim	5a4b797265	Remove deprecated behavior.	2010-03-04 08:20:51 +01:00
José Valim	d36e1012f8	Release 1.0.4 with a couple bug fixes.	2010-03-03 12:24:29 +01:00
Lucas de Castro	5d187ff278	Fixing session controllers when within namespaces Signed-off-by: José Valim <jose.valim@gmail.com>	2010-03-03 12:16:24 +01:00
Cyril Mougel	a0220243c3	fix spec failed with mongo_mapper DEVISE_ORM Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-25 08:44:08 +01:00
José Valim	4c10f86e74	Do not forget frozen records. Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-25 08:35:07 +01:00
Lucas Uyezu	cf66e935a9	SQLite requries a default value when the column is NOT NULL Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-25 08:34:47 +01:00
José Valim	fbe485f3df	Update warden which fixes a security issue.	2010-02-23 19:52:53 +01:00
José Valim	545462e964	Bump to 1.0.3.	2010-02-23 15:45:07 +01:00
José Valim	42df192df8	Do not remove options from MongoMapper find.	2010-02-23 15:41:52 +01:00
Andre Arko	7f451ed9cc	Add rails/init.rb to the gemspec Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-19 18:06:38 +01:00
Daniel Jagszent	27fe3023ae	renamed init.rb -> rails/init.rb. So that rails can find and initalize the GemPlugin even without a config.gem "devise" line in environment.rb (for using with bundler) Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-19 17:10:03 +01:00
Paul Campbell	41d416a18e	add paragraphs to html emails Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-19 10:18:00 +01:00
José Valim	c36cd84c31	Returns the proper response body based on the rquest for 401.	2010-02-18 19:52:37 +01:00
José Valim	fd96335d05	Autoload Devise::Models.	2010-02-18 07:22:26 +01:00
José Valim	23568bda82	Bump to 1.0.2.	2010-02-17 21:30:54 +01:00
José Valim	ee7f5270fc	Uses the same content type as request on http authenticatable 401 responses	2010-02-17 21:25:31 +01:00
José Valim	f294700723	Update test files.	2010-02-17 21:15:11 +01:00
Glenn Roberts	c86ce298dc	add content type test, update config doc Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-17 21:13:27 +01:00
Glenn Roberts	b0ff0d46dd	add content_type config parameter Signed-off-by: José Valim <jose.valim@gmail.com>	2010-02-17 21:13:16 +01:00
José Valim	187ef5c452	Update README.	2010-02-17 13:56:00 +01:00