Release devise 1.0.7 with small fixes.

Signed-off-by: José Valim <jose.valim@gmail.com>

.gitignore

@@ -3,7 +3,5 @@
 *~
 coverage/*
 *.sqlite3
-.bundle
 rdoc/*
 pkg
-log

CHANGELOG.rdoc

@@ -1,62 +1,3 @@
-== 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.rc
-
-* 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 Datamapper and 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
-  * Support for latest MongoMapper
-  * Added anybody_signed_in? helper (by github.com/SSDany)
-
-* bug fix
-  * confirmation_required? is properly honored on active? calls. (by github.com/paulrosania)
-
 == 1.0.7
 
 * bug fix
@@ -120,6 +61,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
 

Gemfile

@@ -1,29 +0,0 @@
-source "http://rubygems.org"
-
-# Need to install Rails from source
-gem "rails", "3.0.0.beta4"
-gem "warden", "0.10.7"
-gem "sqlite3-ruby"
-gem "webrat", "0.7.0"
-gem "mocha", :require => false
-gem "bcrypt-ruby", :require => "bcrypt"
-
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
-end
-
-group :mongoid do
-  gem "mongo"
-  gem "mongoid", :git => "git://github.com/durran/mongoid.git"
-  gem "bson_ext"
-end
-
-group :data_mapper do
-  gem 'dm-core',           '~> 1.0.0', :git => 'git://github.com/datamapper/dm-core'
-  gem 'dm-migrations',     '~> 1.0.0', :git => 'git://github.com/datamapper/dm-migrations'
-  gem 'dm-sqlite-adapter', '~> 1.0.0', :git => 'git://github.com/datamapper/dm-sqlite-adapter'
-  gem 'dm-validations',    '~> 1.0.0', :git => 'git://github.com/datamapper/dm-validations'
-  gem 'dm-serializer',     '~> 1.0.0', :git => 'git://github.com/datamapper/dm-serializer'
-  gem 'dm-timestamps',     '~> 1.0.0', :git => 'git://github.com/datamapper/dm-timestamps'
-  gem 'dm-rails',          '~> 1.0.0', :git => 'git://github.com/datamapper/dm-rails'
-end

README.rdoc

@@ -7,90 +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.
 
-Right now it's composed of 11 modules:
+Right now it's composed of 12 modules:
 
-* Database Authenticatable: encrypts and stores a password in the database to validate the authenticity of an user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
-* Token Authenticatable: signs in an 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.
-* 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.
+* 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.
+
+There's an example application using Devise at http://github.com/plataformatec/devise_example .
+
+== Dependencies
+
+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
 
-=== Rails 3 beta 4
+Install warden gem if you don't have it installed:
 
-To use Devise with Rails 3 beta 4, please use it straight from the git repository, by adding it to your Gemfile:
+  sudo gem install warden
 
-  gem "devise", :git => "git://github.com/plataformatec/devise.git"
+Install devise gem:
 
-Then follow the same steps as below.
+  sudo gem install devise --version=1.0.6
 
-=== Rails 3 beta 3
+Configure warden and devise gems inside your app:
 
-Devise master branch now supports Rails 3 and is NOT backward compatible. You can use the latest Rails 3 beta gem with Devise latest gem:
+  config.gem 'warden'
+  config.gem 'devise'
 
-  gem install devise --version=1.1.rc1
+Run the generator:
 
-After you install Devise and add it to your Gemfile, you need to run the generator:
+	ruby script/generate devise_install
 
-  rails generate devise:install
+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:
 
-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:
+  http://rdoc.info/projects/plataformatec/devise
 
-  rails generate devise MODEL
+If you want to use Devise with bundler on Rails 2.3, you need to follow the instructions here:
 
-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.
-
-=== Rails 2.3
-
-If you want to use the Rails 2.3.x version, you should do:
-
-  gem install devise --version=1.0.7
-
-And please check the README at the v1.0 branch since this one is based on Rails 3:
-
-  http://github.com/plataformatec/devise/tree/v1.0
-
-== Ecosystem
-
-Devise ecosystem is growing solid day after day. If you just need a walkthrough about setting up Devise, this README will work great. But if you need more documentation and resources, please check both the wiki and rdoc:
-
-* http://rdoc.info/projects/plataformatec/devise
-* http://wiki.github.com/plataformatec/devise
-
-Both links above are for Devise with Rails 3. 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.
-
-Another great way to learn Devise are Ryan Bates' screencasts:
-
-* http://railscasts.com/episodes/209-introducing-devise
-* http://railscasts.com/episodes/210-customizing-devise
-
-And a few example applications:
-
-* Rails 2.3 app using Devise at http://github.com/plataformatec/devise_example
-* Rails 2.3 app using Devise with subdomains at http://github.com/fortuity/subdomain-authentication
-* Rails 3.0 app with Mongoid at http://github.com/fortuity/rails3-mongoid-devise
-
-Finally, Devise also has several extensions built by the community. Don't forget to check them at the end of this README. If you want to write an extension on your own, you should also check Warden (http://github.com/hassox/warden), a Rack Authentication Framework which Devise depends on.
+  http://github.com/carlhuda/bundler/issues/issue/83
 
 == 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
@@ -101,67 +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`).
+This is going to look inside you User model and create a set of needed routes (you can see them by running `rake routes`).
 
-Options for configuring your routes include :class_name (to set the class for that route), :path_prefix, :path and :path_names, where the last two have the same meaning as in common routes. The available :path_names are:
+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:
 
-  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' }
+  map.devise_for :users, :as => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification', :unlock => 'unblock' }
 
-Be sure to check devise_for documentation for details.
+Be sure to check devise_for documentation for detailed description.
 
-This exactly what the devise generator produces for you: model, routes and migrations. Don't forget to run rake db:migrate and you are ready to go! But don't stop reading here, we still have a lot to tell you.
+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 will create some helpers to use inside your controllers and views. To set up a controller with user authentication, just add this before_filter:
+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"
+  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' }
 
 == Tidying up
 
-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!
@@ -171,46 +147,41 @@ Devise allows you to set up as many roles as you want. For example, you may have
   current_admin
   admin_session
 
+== Generators
+
+Devise comes with some generators to help you start:
+
+  ruby script/generate devise_install
+
+This will generate an initializer, with a description of all configuration values. You can also generate models through:
+
+  ruby script/generate devise Model
+
+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.
+
 == Model configuration
 
-The devise method in your models also accepts some options to configure its modules. For example, you can choose which encryptor to use in database_authenticatable:
+The devise method in your models also accept some options to configure its modules. For example, you can chose which encryptor to use in database_authenticatable:
 
   devise :database_authenticatable, :confirmable, :recoverable, :encryptor => :bcrypt
 
-Besides :encryptor, you can define :pepper, :stretches, :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.
+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.
 
-== Configuring views
+== Views
 
-We built Devise to help you quickly develop an application that uses authentication. However, we don't want to be in your way when you need to customize it.
+Since devise is an engine, 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:
 
-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_views
 
-  rails generate devise:views
+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".
 
-However, if you have more than one role in your application (such as "User" and "Admin"), you will notice that Devise uses the same views for all roles. Fortunately, Devise offers an easy way to customize views. All you need to do is set "config.scoped_views = true" inside "config/initializers/devise.rb".
+After doing so you will be able to have views based on the scope like 'sessions/users/new' and 'sessions/admin/new'. If no view is found within the scope, Devise will fallback to the default view.
 
-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".
-
-== Configuring controllers
-
-If the customization at the views level is not enough, you can customize each controller by following these steps:
-
-1) Create your custom controller, for example a Admins::SessionsController:
-
-    class Admins::SessionsController < Devise::SessionsController
-    end
-
-2) Tell the router to use this controller:
-
-    devise_for :admins, :controllers => { :sessions => "admin/sessions" }
-
-3) And since we changed the controller, it won't use the "devise/sessions" views, so remember to copy "devise/sessions" to "admin/sessions".
-
-Remember that Devise uses flash messages to let users know if sign in was successful or failed. Devise expects your application to call "flash[:notice]" and "flash[:alert]" as appropriate.
+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.
 
 == 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:
@@ -227,7 +198,7 @@ You can also create distinct messages based on the resource you've configured us
         admin:
           signed_in: 'Hello admin!'
 
-The Devise mailer uses the same pattern to create subject messages:
+Devise mailer uses the same pattern to create subject messages:
 
   en:
     devise:
@@ -255,29 +226,15 @@ You can include the Devise Test Helpers in all of your tests by adding the follo
     include Devise::TestHelpers
   end
 
-Do not use such helpers for integration tests such as Cucumber or Webrat. Instead, fill in the form or explicitly set the user in session. For more tips, check the wiki (http://wiki.github.com/plataformatec/devise).
+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).
 
 == Migrating from other solutions
 
-Devise implements encryption strategies for Clearance, Authlogic and Restful-Authentication. To make use of these strategies, set the desired encryptor in the encryptor initializer config option. You might also need to rename your encrypted password and salt columns to match Devise's fields (encrypted_password and password_salt).
+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).
 
 == Other ORMs
 
-Devise supports ActiveRecord (by default) and Mongoid. We offer experimental Datamapper support (with the limitation that the Devise test suite does not run completely with Datamapper). To choose other ORM, you just need to configure it in the initializer file.
-
-== Extensions
-
-Devise also has extensions created by the community:
-
-* http://github.com/scambra/devise_invitable adds support to Devise for sending invitations by email.
-
-* http://github.com/grimen/devise_facebook_connectable adds support for Facebook Connect authentication, and optionally fetching user info from Facebook in the same step.
-
-* http://github.com/joshk/devise_imapable adds support for imap based authentication, excellent for internal apps when an LDAP server isn't available.
-
-* http://github.com/cschiewek/devise_ldap_authenticatable adds support for LDAP authentication via simple bind.
-
-Please consult their respective documentation for more information and requirements.
+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.
 
 == TODO
 
@@ -290,20 +247,14 @@ Please refer to TODO file.
 
 == Contributors
 
-We have a long list of valued contributors. Check them all at:
-
-http://github.com/plataformatec/devise/contributors
+We have a long running list of contributors. Check them in the CHANGELOG or do `git shortlog -s -n` in the cloned repository.
 
 == Bugs and Feedback
 
-If you discover any bugs, please create an issue on GitHub.
+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
-
-For support, send an e-mail to the mailing list.
-
 http://groups.google.com/group/plataformatec-devise
 
-== License
-
-MIT License. Copyright 2010 Plataforma Tecnologia. http://blog.plataformatec.com.br
+MIT License. Copyright 2009 Plataforma Tecnologia. http://blog.plataformatec.com.br

Rakefile

@@ -37,16 +37,14 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "devise"
-    s.version = Devise::VERSION.dup
+    s.version = Devise::VERSION
     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,lib}/**/*"]
-    s.extra_rdoc_files = FileList["[A-Z]*"] - %w(Gemfile Rakefile)
-    s.add_dependency("warden", "~> 0.10.7")
-    s.add_dependency("bcrypt-ruby", "~> 2.1.2")
+    s.files =  FileList["[A-Z]*", "{app,config,generators,lib}/**/*", "rails/init.rb"]
+    s.add_dependency("warden", "~> 0.10.3")
   end
 
   Jeweler::GemcutterTasks.new

TODO

@@ -1,3 +1,2 @@
-* Move integration tests to Capybara
-* Better ORM integration
-* Extract activatable models tests from confirmable
+* Make test run with DataMapper
+* Extract Activatable tests from Confirmable

app/controllers/confirmations_controller.rb

@@ -1,4 +1,4 @@
-class Devise::ConfirmationsController < ApplicationController
+class ConfirmationsController < ApplicationController
   include Devise::Controllers::InternalHelpers
 
   # GET /resource/confirmation/new

app/controllers/devise/sessions_controller.rb

@@ -1,23 +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 => "new")
-    set_flash_message :notice, :signed_in
-    sign_in_and_redirect(resource_name, resource)
-  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
-end

app/controllers/passwords_controller.rb

@@ -1,4 +1,4 @@
-class Devise::PasswordsController < ApplicationController
+class PasswordsController < ApplicationController
   prepend_before_filter :require_no_authentication
   include Devise::Controllers::InternalHelpers
 

app/controllers/registrations_controller.rb

@@ -1,11 +1,11 @@
-class Devise::RegistrationsController < ApplicationController
+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_up
+  # GET /resource/sign_in
   def new
-    build_resource({})
+    build_resource
     render_with_scope :new
   end
 
@@ -17,7 +17,6 @@ class Devise::RegistrationsController < ApplicationController
       set_flash_message :notice, :signed_up
       sign_in_and_redirect(resource_name, resource)
     else
-      clean_up_passwords(resource)
       render_with_scope :new
     end
   end
@@ -29,29 +28,26 @@ class Devise::RegistrationsController < ApplicationController
 
   # PUT /resource
   def update
-    if resource.update_with_password(params[resource_name])
+    if self.resource.update_with_password(params[resource_name])
       set_flash_message :notice, :updated
-      redirect_to after_update_path_for(resource)
+      redirect_to after_sign_in_path_for(self.resource)
     else
-      clean_up_passwords(resource)
       render_with_scope :edit
     end
   end
 
   # DELETE /resource
   def destroy
-    resource.destroy
+    self.resource.destroy
     set_flash_message :notice, :destroyed
     sign_out_and_redirect(self.resource)
   end
 
   protected
 
-    # 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.
+    # Authenticates the current scope and dup the resource
     def authenticate_scope!
       send(:"authenticate_#{resource_name}!")
-      self.resource = resource_class.find(send(:"current_#{resource_name}").id)
+      self.resource = send(:"current_#{resource_name}").dup
     end
-end
+end

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

app/controllers/unlocks_controller.rb

@@ -1,4 +1,4 @@
-class Devise::UnlocksController < ApplicationController
+class UnlocksController < ApplicationController
   prepend_before_filter :ensure_email_as_unlock_strategy
   prepend_before_filter :require_no_authentication
   include Devise::Controllers::InternalHelpers

app/helpers/devise_helper.rb

@@ -1,17 +0,0 @@
-module DeviseHelper
-  def devise_error_messages!
-    return "" if resource.errors.empty?
-
-    messages = resource.errors.full_messages.map { |msg| content_tag(:li, msg) }.join
-    sentence = "#{pluralize(resource.errors.count, "error")} prohibited this #{resource_name} from being saved:"
-
-    html = <<-HTML
-    <div id="error_explanation">
-      <h2>#{sentence}</h2>
-      <ul>#{messages}</ul>
-    </div>
-    HTML
-
-    html.html_safe
-  end
-end

app/mailers/devise/mailer.rb

@@ -1,68 +0,0 @@
-class Devise::Mailer < ::ActionMailer::Base
-  include Devise::Controllers::ScopedViews
-  attr_reader :devise_mapping, :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)
-    @scope_name     = Devise::Mapping.find_scope!(record)
-    @devise_mapping = Devise.mappings[@scope_name]
-    @resource       = instance_variable_set("@#{@devise_mapping.name}", record)
-
-    template_path = ["devise/mailer"]
-    template_path.unshift "#{@devise_mapping.plural}/mailer" if self.class.scoped_views?
-
-    headers = {
-      :subject => translate(@devise_mapping, action),
-      :from => mailer_sender(@devise_mapping),
-      :to => record.email,
-      :template_path => template_path
-    }
-
-    headers.merge!(record.headers_for(action)) if record.respond_to?(:headers_for)
-    mail(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
-
-  # Setup a subject doing an I18n lookup. At first, it attemps to set a subject
-  # based on the current mapping:
-  #
-  #   en:
-  #     devise:
-  #       mailer:
-  #         confirmation_instructions:
-  #           user_subject: '...'
-  #
-  # If one does not exist, it fallbacks to ActionMailer default:
-  #
-  #   en:
-  #     devise:
-  #       mailer:
-  #         confirmation_instructions:
-  #           subject: '...'
-  #
-  def translate(mapping, key)
-    I18n.t(:"#{mapping.name}_subject", :scope => [:devise, :mailer, key],
-      :default => [:subject, key.to_s.humanize])
-  end
-end

app/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

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" %>

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)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend confirmation instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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 %><br />
-  <%= f.password_field :password %></p>
-
-  <p><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></p>
-
-  <p><%= f.submit "Change my password" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.submit "Send me reset password instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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.text_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 %>

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.text_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" %>

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.text_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" %>

app/views/devise/shared/_links.erb

@@ -1,19 +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 -%>

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)) do |f| %>
-  <%= devise_error_messages! %>
-
-  <p><%= f.label :email %><br />
-  <%= f.text_field :email %></p>
-
-  <p><%= f.submit "Resend unlock instructions" %></p>
-<% end %>
-
-<%= render :partial => "devise/shared/links" %>

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" %>

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" %>

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" %>

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" %>

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" %>

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 -%>

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" %>

devise.gemspec

@@ -5,49 +5,54 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise}
-  s.version = "1.1.rc2"
+  s.version = "1.0.7"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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-06-23}
+  s.date = %q{2010-05-03}
   s.description = %q{Flexible authentication solution for Rails with Warden}
   s.email = %q{contact@plataformatec.com.br}
   s.extra_rdoc_files = [
-    "CHANGELOG.rdoc",
-     "MIT-LICENSE",
-     "README.rdoc",
+    "README.rdoc",
      "TODO"
   ]
   s.files = [
     "CHANGELOG.rdoc",
-     "Gemfile",
      "MIT-LICENSE",
      "README.rdoc",
      "Rakefile",
      "TODO",
-     "app/controllers/devise/confirmations_controller.rb",
-     "app/controllers/devise/passwords_controller.rb",
-     "app/controllers/devise/registrations_controller.rb",
-     "app/controllers/devise/sessions_controller.rb",
-     "app/controllers/devise/unlocks_controller.rb",
-     "app/helpers/devise_helper.rb",
-     "app/mailers/devise/mailer.rb",
-     "app/views/devise/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/devise/passwords/edit.html.erb",
-     "app/views/devise/passwords/new.html.erb",
-     "app/views/devise/registrations/edit.html.erb",
-     "app/views/devise/registrations/new.html.erb",
-     "app/views/devise/sessions/new.html.erb",
-     "app/views/devise/shared/_links.erb",
-     "app/views/devise/unlocks/new.html.erb",
-     "config/locales/en.yml",
+     "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/scoped_views.rb",
      "lib/devise/controllers/url_helpers.rb",
      "lib/devise/encryptors/authlogic_sha512.rb",
      "lib/devise/encryptors/base.rb",
@@ -58,15 +63,16 @@ Gem::Specification.new do |s|
      "lib/devise/encryptors/sha512.rb",
      "lib/devise/failure_app.rb",
      "lib/devise/hooks/activatable.rb",
-     "lib/devise/hooks/forgetable.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/authenticatable.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",
@@ -75,36 +81,26 @@ Gem::Specification.new do |s|
      "lib/devise/models/token_authenticatable.rb",
      "lib/devise/models/trackable.rb",
      "lib/devise/models/validatable.rb",
-     "lib/devise/modules.rb",
      "lib/devise/orm/active_record.rb",
      "lib/devise/orm/data_mapper.rb",
-     "lib/devise/orm/mongoid.rb",
-     "lib/devise/path_checker.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/authenticatable.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",
-     "lib/generators/devise/devise/devise_generator.rb",
-     "lib/generators/devise/devise/templates/migration.rb",
-     "lib/generators/devise/install/install_generator.rb",
-     "lib/generators/devise/install/templates/README",
-     "lib/generators/devise/install/templates/devise.rb",
-     "lib/generators/devise/views/views_generator.rb",
-     "lib/generators/devise_generator.rb",
-     "lib/generators/devise_install_generator.rb",
-     "lib/generators/devise_views_generator.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.rubygems_version = %q{1.3.6}
   s.summary = %q{Flexible authentication solution for Rails with Warden}
   s.test_files = [
     "test/controllers/helpers_test.rb",
@@ -115,9 +111,9 @@ Gem::Specification.new do |s|
      "test/failure_app_test.rb",
      "test/integration/authenticatable_test.rb",
      "test/integration/confirmable_test.rb",
-     "test/integration/database_authenticatable_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",
@@ -128,8 +124,8 @@ Gem::Specification.new do |s|
      "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/database_authenticatable_test.rb",
      "test/models/lockable_test.rb",
      "test/models/recoverable_test.rb",
      "test/models/rememberable_test.rb",
@@ -139,42 +135,31 @@ Gem::Specification.new do |s|
      "test/models/validatable_test.rb",
      "test/models_test.rb",
      "test/orm/active_record.rb",
-     "test/orm/data_mapper.rb",
-     "test/orm/mongoid.rb",
+     "test/orm/mongo_mapper.rb",
      "test/rails_app/app/active_record/admin.rb",
-     "test/rails_app/app/active_record/shim.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/sessions_controller.rb",
      "test/rails_app/app/controllers/users_controller.rb",
-     "test/rails_app/app/data_mapper/admin.rb",
-     "test/rails_app/app/data_mapper/shim.rb",
-     "test/rails_app/app/data_mapper/user.rb",
      "test/rails_app/app/helpers/application_helper.rb",
-     "test/rails_app/app/mongoid/admin.rb",
-     "test/rails_app/app/mongoid/shim.rb",
-     "test/rails_app/app/mongoid/user.rb",
-     "test/rails_app/config/application.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/backtrace_silencers.rb",
      "test/rails_app/config/initializers/devise.rb",
      "test/rails_app/config/initializers/inflections.rb",
-     "test/rails_app/config/initializers/secret_token.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/rails_app/db/migrate/20100401102949_create_tables.rb",
-     "test/rails_app/db/schema.rb",
      "test/routes_test.rb",
-     "test/support/assertions.rb",
-     "test/support/helpers.rb",
-     "test/support/integration.rb",
+     "test/support/assertions_helper.rb",
+     "test/support/integration_tests_helper.rb",
      "test/support/test_silencer.rb",
-     "test/support/webrat/integrations/rails.rb",
+     "test/support/tests_helper.rb",
      "test/test_helper.rb",
      "test/test_helpers_test.rb"
   ]
@@ -183,16 +168,13 @@ Gem::Specification.new do |s|
     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.7"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<warden>, ["~> 0.10.3"])
     else
-      s.add_dependency(%q<warden>, ["~> 0.10.7"])
-      s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+      s.add_dependency(%q<warden>, ["~> 0.10.3"])
     end
   else
-    s.add_dependency(%q<warden>, ["~> 0.10.7"])
-    s.add_dependency(%q<bcrypt-ruby>, ["~> 2.1.2"])
+    s.add_dependency(%q<warden>, ["~> 0.10.3"])
   end
 end
 

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.

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

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

generators/devise/templates/migration.rb

@@ -2,20 +2,18 @@ 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.confirmable
-      # t.lockable :lock_strategy => :<%= Devise.lock_strategy %>, :unlock_strategy => :<%= Devise.unlock_strategy %>
-      # t.token_authenticatable
+      # 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
   end
 

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, :authenticatable, :recoverable,
+         :rememberable, :trackable, :validatable
+
+  # Setup accessible (or protected) attributes for your model
+  attr_accessible :email, :password, :password_confirmation
+end

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

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

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>
 
 ===============================================================================

generators/devise_install/templates/devise.rb

@@ -1,19 +1,27 @@
 # 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|
-  # ==> Mailer Configuration
   # 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"
 
-  # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+  # ==> 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"
 
-  # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default), :mongoid
-  # (bson_ext recommended) and :data_mapper (experimental).
-  require 'devise/orm/<%= options[:orm] %>'
+  # 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
 
-  # ==> Configuration for any authentication mechanism
   # 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
@@ -21,71 +29,33 @@ Devise.setup do |config|
   # session. If you need permissions, you should implement that in a before filter.
   # config.authentication_keys = [ :email ]
 
-  # Tell if authentication through request.params is enabled. True by default.
-  # config.params_authenticatable = true
-
-  # Tell if authentication through HTTP Basic Auth is enabled. True by default.
-  # config.http_authenticatable = true
-
   # The realm used in Http Basic Authentication
   # config.http_authentication_realm = "Application"
 
-  # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = 10
-
-  # Define which will be the encryption algorithm. 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 = :bcrypt
-
-  # Setup a pepper to generate the encrypted password.
-  config.pepper = <%= ActiveSupport::SecureRandom.hex(64).inspect %>
-
   # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
+  # 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.
-  # When confirm_within is zero, the user won't be able to sign in without confirming. 
-  # You can use this to let your user access some features of your application 
-  # without confirming the account, but blocking it after a certain period 
-  # (ie 2 days). 
   # config.confirm_within = 2.days
 
   # ==> Configuration for :rememberable
   # The time the user will be remembered without asking for credentials again.
   # config.remember_for = 2.weeks
 
-  # ==> Configuration for :validatable
-  # Range for password length
-  # config.password_length = 6..20
-
-  # Regex to use to validate the email address
-  # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
-
   # ==> 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
-  # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
+  # 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  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
+  # :time  = Reanables login after a certain ammount of time (see :unlock_in below)
+  # :both  = enables both strategies
   # config.unlock_strategy = :both
 
-  # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
-  # config.maximum_attempts = 20
-
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
   # config.unlock_in = 1.hour
 
@@ -93,7 +63,12 @@ Devise.setup do |config|
   # Defines name of the authentication token params key
   # config.token_authentication_key = :auth_token
 
-  # ==> Scopes configuration
+  # ==> 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.
@@ -103,23 +78,12 @@ Devise.setup do |config|
   # 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.
-  # Note that devise does not generate default routes. You also have to
-  # specify them in config/routes.rb
   # 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
 
-  # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
-  # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
-
-  # ==> Warden configuration
   # 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
@@ -130,6 +94,12 @@ Devise.setup do |config|
   #     twitter.consumer_key  = <YOUR CONSUMER KEY>
   #     twitter.options :site => 'http://twitter.com'
   #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+  #   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

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

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

lib/devise.rb

@@ -1,16 +1,12 @@
-require 'active_support/core_ext/numeric/time'
-require 'active_support/dependencies'
-
 module Devise
   autoload :FailureApp, 'devise/failure_app'
-  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 :ScopedViews, 'devise/controllers/scoped_views'
     autoload :UrlHelpers, 'devise/controllers/url_helpers'
   end
 
@@ -24,21 +20,45 @@ 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".
-  ALL         = []
-  CONTROLLERS = ActiveSupport::OrderedHash.new
-  ROUTES      = ActiveSupport::OrderedHash.new
-  STRATEGIES  = 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,
@@ -49,9 +69,8 @@ module Devise
     :bcrypt => 60
   }
 
-  # Custom domain for cookies. Not set by default
-  mattr_accessor :cookie_domain
-  @@cookie_domain = false
+  # Email regex used to validate email formats. Adapted from authlogic.
+  EMAIL_REGEX = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
 
   # Used to encrypt password. Please generate one with rake secret.
   mattr_accessor :pepper
@@ -65,26 +84,6 @@ module Devise
   mattr_accessor :authentication_keys
   @@authentication_keys = [ :email ]
 
-  # If http authentication is enabled by default.
-  mattr_accessor :http_authenticatable
-  @@http_authenticatable = 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 = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i
-
-  # Range validation for password length
-  mattr_accessor :password_length
-  @@password_length = 6..20
-
   # Time interval where the remember me token is valid.
   mattr_accessor :remember_for
   @@remember_for = 2.weeks
@@ -99,14 +98,22 @@ module Devise
 
   # 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
 
@@ -115,20 +122,15 @@ 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
+  # 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
@@ -145,132 +147,118 @@ 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
 
-  mattr_accessor :navigational_formats
-  @@navigational_formats = [:html]
+  # The realm used in Http Basic Authentication
+  mattr_accessor :http_authentication_realm
+  @@http_authentication_realm = "Application"
 
-  # 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
-
-  # Get the mailer class from the mailer reference object.
-  def self.mailer
-    @@mailer_ref.get
-  end
-
-  # Set the mailer reference object to access the mailer.
-  def self.mailer=(class_name)
-    @@mailer_ref = ActiveSupport::Dependencies.ref(class_name)
-  end
-  self.mailer = "Devise::Mailer"
-
-  # Register a model in Devise. You can call this manually if you don't want
-  # to use devise routes. Check devise_for in routes to know which options
-  # are available.
-  def self.add_model(resource, options)
-    mapping = Devise::Mapping.new(resource, options)
-    self.mappings[mapping.name] = mapping
-    self.default_scope ||= mapping.name
-    mapping
-  end
-
-  # Make Devise aware of an 3rd party Devise-module. 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.
-  #   +flash+      - Symbol representing the *flash messages* used by this helper.
-  #   +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)
-
-    config = {
-      :strategy => STRATEGIES,
-      :route => ROUTES,
-      :controller => CONTROLLERS
-    }
-
-    config.each do |key, value|
-      next unless options[key]
-      name = (options[key] == true ? module_name : options[key])
-
-      if value.is_a?(Hash)
-        value[module_name] = name
-      else
-        value << name unless value.include?(name)
-      end
+  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 options[:model]
-      model_path = (options[:model] == true ? "devise/models/#{module_name}" : options[:model])
-      Devise::Models.send(:autoload, module_name.to_s.camelize.to_sym, model_path)
+    # 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
 
-    Devise::Mapping.add_module module_name
-  end
+    # Configure default url options to be used within Devise and ActionController.
+    def default_url_options(&block)
+      Devise::Mapping.metaclass.send :define_method, :default_url_options, &block
+    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
+    # 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
 
-  # 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
+      # If the user provided a warden hook, call it now.
+      @warden_config.try :call, config
+    end
 
-      Devise.mappings.each_value do |mapping|
-        warden_config.scope_defaults mapping.name, :strategies => mapping.strategies
+    # 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
 
-      @@warden_config_block.try :call, Devise.warden_config
-      true
-    end
-  end
+      if options[:route]
+        Devise::ROUTES.unshift options[:route] unless Devise::ROUTES.include?(options[:route])
+      end
 
-  # Generate a friendly string randomically to be used as token.
-  def self.friendly_token
-    ActiveSupport::SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
+      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
 end
 
-require 'warden'
+begin
+  require 'warden'
+rescue
+  gem 'warden'
+  require 'warden'
+end
+
 require 'devise/mapping'
-require 'devise/models'
-require 'devise/modules'
 require 'devise/rails'

lib/devise/controllers/helpers.rb

@@ -2,11 +2,18 @@ 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?,
-                      *Devise.mappings.keys.map { |m| [:"current_#{m}", :"#{m}_signed_in?", :"#{m}_session"] }.flatten
+      def self.included(base)
+        base.class_eval do
+          helper_method :warden, :signed_in?, :devise_controller?,
+                        *Devise.mappings.keys.map { |m| [:"current_#{m}", :"#{m}_signed_in?", :"#{m}_session"] }.flatten
+
+          # 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
+        end
       end
 
       # The main accessor for the warden proxy instance
@@ -23,18 +30,24 @@ module Devise
         false
       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
+
+      # 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.
       #
@@ -73,7 +86,7 @@ module Devise
       #
       def stored_location_for(resource_or_scope)
         scope = Devise::Mapping.find_scope!(resource_or_scope)
-        session.delete(:"#{scope}_return_to")
+        session.delete(:"#{scope}.return_to")
       end
 
       # The default url to be used after signing in. This is used by all Devise
@@ -108,36 +121,6 @@ module Devise
         respond_to?(home_path, true) ? send(home_path) : root_path
       end
 
-      # The default url to be used after updating a resource. This is used by all Devise
-      # controllers and you can overwrite it in your ApplicationController to
-      # provide a custom hook for a custom resource.
-      #
-      # By default, it first tries to find a resource_root_path, otherwise it
-      # uses the root path. For a user scope, you can define the default url in
-      # the following way:
-      #
-      #   map.user_root '/users', :controller => 'users' # creates user_root_path
-      #
-      #   map.resources :users do |users|
-      #     users.root # creates user_root_path
-      #   end
-      #
-      #
-      # If none of these are defined, root_path is used. However, if this default
-      # is not enough, you can customize it, for example:
-      #
-      #   def after_update_path_for(resource)
-      #     if resource.is_a?(User) && resource.can_publish?
-      #       publisher_url
-      #     else
-      #       super
-      #     end
-      #   end
-      #
-      def after_update_path_for(resource_or_scope)
-        after_sign_in_path_for(resource_or_scope)
-      end
-
       # 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
@@ -153,10 +136,10 @@ module Devise
       #
       # 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)
+      def sign_in_and_redirect(resource_or_scope, resource=nil, skip=false)
         scope      = Devise::Mapping.find_scope!(resource_or_scope)
         resource ||= resource_or_scope
-        sign_in(scope, resource) unless warden.user(scope) == resource
+        sign_in(scope, resource) unless skip
         redirect_to stored_location_for(scope) || after_sign_in_path_for(resource)
       end
 
@@ -174,9 +157,9 @@ module Devise
       # access that specific controller/action.
       # Example:
       #
-      #   Roles:
-      #     User
-      #     Admin
+      #   Maps:
+      #     User => :authenticatable
+      #     Admin => :authenticatable
       #
       #   Generated methods:
       #     authenticate_user!  # Signs user in or redirect

lib/devise/controllers/internal_helpers.rb

@@ -4,20 +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
 
-      included do
-        unloadable
-        helper DeviseHelper
+      def self.included(base)
+        base.class_eval do
+          extend ScopedViews
+          unloadable
 
-        helpers = %w(resource scope_name resource_name
-                     resource_class devise_mapping devise_controller?)
-        hide_action *helpers
-        helper_method *helpers
+          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?
 
-        prepend_before_filter :is_devise_resource?
-        skip_before_filter *Devise.mappings.keys.map { |m| :"authenticate_#{m}!" }
+          skip_before_filter *Devise.mappings.keys.map { |m| :"authenticate_#{m}!" }
+          prepend_before_filter :is_devise_resource?
+        end
+      end
+
+      module ScopedViews
+        def scoped_views
+          defined?(@scoped_views) ? @scoped_views : Devise.scoped_views
+        end
+
+        def scoped_views=(value)
+          @scoped_views = value
+        end
       end
 
       # Gets the actual resource stored in the instance variable
@@ -54,8 +62,7 @@ module Devise
 
       # Checks whether it's a devise mapped resource or not.
       def is_devise_resource? #:nodoc:
-        raise ActionController::UnknownAction unless devise_mapping &&
-          devise_mapping.allowed_controllers.include?(controller_path)
+        raise ActionController::UnknownAction unless devise_mapping && devise_mapping.allows?(controller_name)
       end
 
       # Sets the resource creating an instance variable
@@ -64,9 +71,8 @@ module Devise
       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.
@@ -91,14 +97,33 @@ module Devise
       #
       # Please refer to README or en.yml locale file to check what messages are
       # available.
-      def set_flash_message(key, kind)
-        flash[key] = I18n.t(:"#{resource_name}.#{kind}", :resource_name => resource_name,
+      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)
-        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
+
+      # 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

lib/devise/controllers/scoped_views.rb

@@ -1,35 +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, options={})
-        controller_name = options.delete(:controller) || self.controller_name
-
-        if self.class.scoped_views?
-          begin
-            render :template => "#{devise_mapping.plural}/#{controller_name}/#{action}"
-          rescue ActionView::MissingTemplate
-            render :template => "#{controller_path}/#{action}"
-          end
-        else
-          render :template => "#{controller_path}/#{action}"
-        end
-      end
-    end
-  end
-end

lib/devise/controllers/url_helpers.rb

@@ -19,7 +19,7 @@ module Devise
     # Those helpers are added to your ApplicationController.
     module UrlHelpers
 
-      Devise::ROUTES.values.uniq.each do |module_name|
+      Devise::ROUTES.each do |module_name|
         [:path, :url].each do |path_or_url|
           actions = [ nil, :new_ ]
           actions << :edit_    if [:password, :registration].include?(module_name)

lib/devise/encryptors/authlogic_sha512.rb

@@ -7,6 +7,7 @@ module Devise
     # Warning: it uses Devise's stretches configuration to port Authlogic's one. Should be set to 20 in the initializer to 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

lib/devise/encryptors/bcrypt.rb

@@ -5,6 +5,7 @@ module Devise
     # = 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)
@@ -14,6 +15,7 @@ module Devise
       def self.salt
         ::BCrypt::Engine.generate_salt
       end
+
     end
   end
 end

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

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

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

lib/devise/failure_app.rb

@@ -1,103 +1,65 @@
-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
+    def respond!
+      options = @env['warden.options']
+      scope   = options[:scope]
+
+      redirect_path = if mapping = Devise.mappings[scope]
+        "#{mapping.parsed_path}/#{mapping.path_names[:sign_in]}"
       else
-        redirect
+        "/#{default_url}"
       end
+      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
 
-    def http_auth
-      self.status = 401
-      self.headers["WWW-Authenticate"] = %(Basic realm=#{Devise.http_authentication_realm.inspect})
-      self.content_type = request.format.to_s
-      self.response_body = http_auth_body
-    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
 
-    def recall
-      env["PATH_INFO"]  = attempted_path
-      flash.now[:alert] = i18n_message(:invalid)
-      self.response = recall_controller.action(warden_options[:recall]).call(env)
-    end
-
-    def redirect
-      store_location!
-      flash[:alert] = i18n_message unless flash[:notice]
-      redirect_to send(:"new_#{scope}_session_path")
-    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])
-      else
-        message.to_s
+      params = case message
+        when Symbol
+          { message => true }
+        when String
+          { :message => message }
+        else
+          {}
       end
-    end
 
-    def http_auth?
-      !Devise.navigational_formats.include?(request.format.to_sym) || request.xhr?
-    end
-
-    def http_auth_body
-      method = :"to_#{request.format.to_sym}"
-      {}.respond_to?(method) ? { :error => i18n_message }.send(method) : i18n_message
-    end
-
-    def recall_controller
-      "#{params[:controller].camelize}Controller".constantize
-    end
-
-    def warden
-      env['warden']
-    end
-
-    def warden_options
-      env['warden.options']
-    end
-
-    def scope
-      @scope ||= warden_options[:scope]
-    end
-
-    def attempted_path
-      warden_options[:attempted_path]
+      Rack::Utils.build_query(params)
     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?
+    def store_location!(scope)
+      session[:"#{scope}.return_to"] = request.request_uri if request && request.get?
     end
   end
 end

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?
-# 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?) && !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

lib/devise/hooks/forgetable.rb

@@ -1,11 +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!)
-    record.forget_me! unless record.frozen?
-    options = record.cookie_domain? ? { :domain => record.cookie_domain } : {}
-    warden.cookies.delete("remember_#{options[:scope]}_token", options)
-  end
-end

lib/devise/hooks/rememberable.rb

@@ -1,35 +1,32 @@
-module Devise
-  module Hooks
-    # Overwrite success! in authentication strategies allowing users to be remembered.
-    # We choose to implement this as an strategy hook instead of a warden hook to allow a specific
-    # strategy (like token authenticatable or facebook authenticatable) to turn off remember_me?
-    # cookies.
-    module Rememberable #:nodoc:
-      def success!(resource)
-        super
+# 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]
+  remember_me = warden.params[scope].try(:fetch, :remember_me, nil)
 
-        if succeeded? && resource.respond_to?(:remember_me!) && remember_me?
-          resource.remember_me!
+  if Devise::TRUE_VALUES.include?(remember_me) &&
+     warden.authenticated?(scope) && record.respond_to?(:remember_me!)
+    record.remember_me!
 
-          configuration = {
-            :value => resource.class.serialize_into_cookie(resource),
-            :expires => resource.remember_expires_at,
-            :path => "/"
-          }
-
-          configuration[:domain] = resource.cookie_domain if resource.cookie_domain?
-          cookies.signed["remember_#{scope}_token"] = configuration
-        end
-      end
-
-    protected
-
-      def remember_me?
-        valid_params? && Devise::TRUE_VALUES.include?(params_auth_hash[:remember_me])
-      end
-    end
+    warden.response.set_cookie "remember_#{scope}_token", {
+      :value => record.class.serialize_into_cookie(record),
+      :expires => record.remember_expires_at,
+      :path => "/"
+    }
   end
 end
 
-Devise::Strategies::Authenticatable.send :include, Devise::Hooks::Rememberable
-
+# 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

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)
     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

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

lib/devise/locales/en.yml

@@ -1,12 +1,9 @@
 en:
-  errors:
-    messages:
-      not_found: "not found"
-      already_confirmed: "was already confirmed"
-      not_locked: "was not locked"
-
   devise:
-    failure:
+    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.'
@@ -14,26 +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:
+      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.'
     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'
+

lib/devise/mapping.rb

@@ -18,19 +18,18 @@ 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, :plural, :path, :controllers, :path_names, :path_prefix, :class_name
-    alias :name :singular
+    attr_reader :name, :as, :path_names, :path_prefix, :route_options
 
     # 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.segment_position]
-        return mapping if route && mapping.path == route.to_sym
+        route = path.split("/")[mapping.as_position]
+        return mapping if route && mapping.as == route.to_sym
       end
       nil
     end
@@ -50,89 +49,80 @@ module Devise
       raise "Could not find a valid mapping for #{duck}"
     end
 
+    # Default url options which can be used as prefix.
+    def self.default_url_options
+      {}
+    end
+
     def initialize(name, options) #:nodoc:
-      if as = options.delete(:as)
-        ActiveSupport::Deprecation.warn ":as is deprecated, please use :path instead."
-        options[:path] ||= as
-      end
+      @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
 
-      if scope = options.delete(:scope)
-        ActiveSupport::Deprecation.warn ":scope is deprecated, please use :singular instead."
-        options[:singular] ||= scope
-      end
+      @path_prefix   = "/#{options.delete(:path_prefix)}/".squeeze("/")
+      @route_options = options || {}
 
-      @plural   = name.to_sym
-      @path     = (options.delete(:path) || name).to_sym
-      @singular = (options.delete(:singular) || name.to_s.singularize).to_sym
-
-      @class_name = (options.delete(:class_name) || name.to_s.classify).to_s
-      @ref = ActiveSupport::Dependencies.ref(@class_name)
-
-      @path_prefix = "/#{options.delete(:path_prefix)}/".squeeze("/")
-
-      @controllers = Hash.new { |h,k| h[k] = "devise/#{k}" }
-      @controllers.merge!(options.delete(:controllers) || {})
-
-      @path_names  = Hash.new { |h,k| h[k] = k.to_s }
-      @path_names.merge!(:registration => "")
+      @path_names = Hash.new { |h,k| h[k] = k.to_s }
       @path_names.merge!(options.delete(:path_names) || {})
     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
-      @ref.get
+      return @to if @to
+      klass = @klass.constantize
+      @to = klass if Rails.configuration.cache_classes
+      klass
     end
 
-    def strategies
-      @strategies ||= STRATEGIES.values_at(*self.modules).compact.uniq.reverse
-    end
-
-    def routes
-      @routes ||= ROUTES.values_at(*self.modules).compact.uniq
-    end
-
-    # Keep a list of allowed controllers for this mapping. It's useful to ensure
-    # that an Admin cannot access the registrations controller unless it has
-    # :registerable in the model.
-    def allowed_controllers
-      @allowed_controllers ||= begin
-        canonical = CONTROLLERS.values_at(*self.modules).compact
-        @controllers.values_at(*canonical)
-      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 segment_position
+    def as_position
       self.path_prefix.count("/")
     end
 
     # Returns the raw path using path_prefix and as.
-    def full_path
-      path_prefix + path.to_s
+    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
+      returning (ActionController::Base.relative_url_root.to_s + raw_path) do |path|
+        self.class.default_url_options.each do |key, value|
+          path.gsub!(key.inspect, value.to_param)
+        end
+      end
     end
 
     def authenticatable?
-      @authenticatable ||= self.modules.any? { |m| m.to_s =~ /authenticatable/ }
+      @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

lib/devise/models.rb

@@ -1,5 +1,16 @@
 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::Authenticable, :stretches, 10)
@@ -38,14 +49,14 @@ 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
+      raise "You need to give at least one Devise module" if modules.empty?
       options = modules.extract_options!
 
       if modules.delete(:authenticatable)
@@ -53,28 +64,54 @@ module Devise
         modules << :database_authenticatable
       end
 
-      if modules.delete(:activatable)
-        ActiveSupport::Deprecation.warn ":activatable as module is deprecated. It's included in your model by default.", caller
-      end
+      @devise_modules = Devise::ALL & modules.map(&:to_sym).uniq
 
-      if modules.delete(:http_authenticatable)
-        ActiveSupport::Deprecation.warn ":http_authenticatable as module is deprecated and is on by default. Revert by setting :http_authenticatable => false.", caller
-      end
+      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 += Devise::ALL & modules.map(&:to_sym).uniq
-
-      devise_modules_hook! do
-        devise_modules.each { |m| include Devise::Models.const_get(m.to_s.classify) }
         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'

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

lib/devise/models/authenticatable.rb

@@ -1,118 +0,0 @@
-require 'devise/hooks/activatable'
-
-module Devise
-  module Models
-    # Authenticable module. Holds common settings for authentication.
-    #
-    # == Configuration:
-    #
-    # You can overwrite configuration values by setting in globally in Devise,
-    # using devise method or overwriting the respective instance method.
-    #
-    #   authentication_keys: parameters used for authentication. By default [:email].
-    #
-    #   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?
-    #
-    # Before authenticating an user and in each request, Devise checks if your model is active by
-    # calling model.active?. This method is overwriten by other devise modules. For instance,
-    # :confirmable overwrites .active? 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?
-    #     super && special_condition_is_valid?
-    #   end
-    #
-    # Whenever active? 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? and
-      # inactive_message instead.
-      def valid_for_authentication?
-        if active?
-          block_given? ? yield : true
-        else
-          inactive_message
-        end
-      end
-
-      def active?
-        true
-      end
-
-      def inactive_message
-        :inactive
-      end
-
-      module ClassMethods
-        Devise::Models.config(self, :authentication_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)
-          find(:first, :conditions => 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:
-          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 = :blank
-            end
-            record.errors.add(attribute, error)
-          end
-
-          record
-        end
-      end
-    end
-  end
-end

lib/devise/models/confirmable.rb

@@ -1,5 +1,8 @@
+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
@@ -26,11 +29,15 @@ module Devise
     #   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
@@ -39,19 +46,18 @@ 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?
-        persisted? && !confirmed_at.nil?
+        !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.
@@ -64,7 +70,7 @@ module Devise
       # 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?
-        super && (!confirmation_required? || confirmed? || confirmation_period_valid?)
+        super && (confirmed? || confirmation_period_valid?)
       end
 
       # The message to be shown if the account is inactive.
@@ -115,7 +121,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
@@ -124,7 +130,7 @@ 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
 
@@ -135,7 +141,7 @@ module Devise
         # Options must contain the user email
         def send_confirmation_instructions(attributes={})
           confirmable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
-          confirmable.resend_confirmation_token if confirmable.persisted?
+          confirmable.resend_confirmation_token unless confirmable.new_record?
           confirmable
         end
 
@@ -145,14 +151,10 @@ 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
 
-        def confirmation_token
-          Devise.friendly_token
-        end
-
         Devise::Models.config(self, :confirm_within)
       end
     end

lib/devise/models/database_authenticatable.rb

@@ -19,16 +19,27 @@ module Devise
     #
     #   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
+          attr_reader :password, :current_password
+          attr_accessor :password_confirmation
+        end
+      end
+
+      # 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,
@@ -47,6 +58,11 @@ module Devise
         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
       def clean_up_passwords
         self.password = self.password_confirmation = nil
@@ -66,35 +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
 
-    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?
+          new_record? || !password.nil? || !password_confirmation.nil?
+        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
+        # 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, :encryptor)
+        Devise::Models.config(self, :pepper, :stretches, :encryptor, :authentication_keys)
+
+        # 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
 
-        def find_for_database_authentication(conditions)
-          find_for_authentication(conditions)
+      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

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

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
@@ -10,35 +13,39 @@ module Devise
     # Configuration:
     #
     #   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_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 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 an user by cleaning locket_at and failed_attempts.
       def unlock_access!
         if_access_locked do
           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)
+          self.failed_attempts = 0
+          self.unlock_token = nil
+          save(false)
         end
       end
 
@@ -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.
@@ -72,40 +79,27 @@ module Devise
       # Overwrites valid_for_authentication? from Devise::Models::Authenticatable
       # 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)
-
-        case (result = super)
-        when Symbol
-          return result
-        when TrueClass
+      def valid_for_authentication?(attributes)
+        if result = super
           self.failed_attempts = 0
-        when FalseClass
+        else
           self.failed_attempts += 1
-          if attempts_exceeded?
-            lock_access!
-            return :locked
-          end
+          lock_access! if failed_attempts > self.class.maximum_attempts
         end
-
-        save(:validate => false) if changed?
+        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
@@ -118,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
@@ -130,7 +124,7 @@ module Devise
         # Options must contain the user email
         def send_unlock_instructions(attributes={})
          lockable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
-         lockable.resend_unlock_token if lockable.persisted?
+         lockable.resend_unlock_token unless lockable.new_record?
          lockable
         end
 
@@ -140,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
 
@@ -149,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)
+        Devise::Models.config(self, :maximum_attempts, :unlock_strategy, :unlock_in)
       end
     end
   end

lib/devise/models/recoverable.rb

@@ -14,7 +14,11 @@ 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.
@@ -28,7 +32,7 @@ module Devise
       # Resets reset password token and send reset password instructions by email
       def send_reset_password_instructions
         generate_reset_password_token!
-        ::Devise.mailer.reset_password_instructions(self).deliver
+        ::DeviseMailer.deliver_reset_password_instructions(self)
       end
 
       protected
@@ -41,7 +45,7 @@ module Devise
         # 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
@@ -56,7 +60,7 @@ module Devise
         # Attributes must contain the user email
         def send_reset_password_instructions(attributes={})
           recoverable = find_or_initialize_with_error_by(:email, attributes[:email], :not_found)
-          recoverable.send_reset_password_instructions if recoverable.persisted?
+          recoverable.send_reset_password_instructions unless recoverable.new_record?
           recoverable
         end
 
@@ -67,7 +71,7 @@ module Devise
         # 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])
-          recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) if recoverable.persisted?
+          recoverable.reset_password!(attributes[:password], attributes[:password_confirmation]) unless recoverable.new_record?
           recoverable
         end
       end

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
@@ -31,18 +30,21 @@ module Devise
     #   # lookup the user based on the incoming cookie information
     #   User.serialize_from_cookie(cookie_string)
     module Rememberable
-      extend ActiveSupport::Concern
 
-      included do
-        # Remember me option available in after_authentication hook.
-        attr_accessor :remember_me
+      def self.included(base)
+        base.class_eval do
+          extend ClassMethods
+
+          # 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(:validate => false)
+        save(false)
       end
 
       # Removes the remember token only if it exists, and save the record
@@ -51,10 +53,15 @@ module Devise
         if remember_token
           self.remember_token = nil
           self.remember_created_at = nil
-          save(:validate => false)
+          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_expires_at <= Time.now.utc
@@ -65,28 +72,20 @@ module Devise
         remember_created_at + self.class.remember_for
       end
 
-      def cookie_domain
-        self.class.cookie_domain
-      end
-
-      def cookie_domain?
-        self.class.cookie_domain != false
-      end
-
       module ClassMethods
         # Create the cookie key using the record id and remember_token
         def serialize_into_cookie(record)
-          [record.id, record.remember_token]
+          "#{record.id}::#{record.remember_token}"
         end
 
         # Recreate the user based on the stored cookie
-        def serialize_from_cookie(id, remember_token)
-          conditions = { :id => id, :remember_token => remember_token }
-          record = find(:first, :conditions => conditions)
-          record if record && !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
 
-        Devise::Models.config(self, :remember_for, :cookie_domain)
+        Devise::Models.config(self, :remember_for)
       end
     end
   end

lib/devise/models/timeoutable.rb

@@ -11,7 +11,9 @@ module Devise
     #
     #   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)

lib/devise/models/token_authenticatable.rb

@@ -2,11 +2,8 @@ require 'devise/strategies/token_authenticatable'
 
 module Devise
   module Models
-    # The TokenAuthenticatable module is responsible for generating an authentication token and
-    # validating the authenticity of the same while signing in.
-    #
-    # This module only provides a few helpers to help you manage the token. Creating and resetting
-    # the token is your responsibility.
+    # 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).
     #
     # == Configuration:
     #
@@ -15,8 +12,18 @@ module Devise
     #
     # +token_authentication_key+ - Defines name of the authentication token params key. E.g. /users/sign_in?some_key=...
     #
+    # == Examples:
+    #
+    #    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
@@ -26,7 +33,7 @@ module Devise
       # Generate new authentication token and save the record.
       def reset_authentication_token!
         reset_authentication_token
-        self.save(:validate => false)
+        self.save
       end
 
       # Generate authentication token unless already exists.
@@ -39,21 +46,43 @@ module Devise
         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
         ::Devise::Models.config(self, :token_authentication_key)
 
-        def find_for_token_authentication(conditions)
-          conditions[:authentication_token] ||= conditions.delete(token_authentication_key)
-          find_for_authentication(conditions)
+        # 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
 
         def authentication_token
           ::Devise.friendly_token
         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_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

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

lib/devise/models/validatable.rb

@@ -11,18 +11,17 @@ module Devise
                       :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
           validates_uniqueness_of :email, :scope => authentication_keys[1..-1], :allow_blank => true
-          validates_format_of     :email, :with  => email_regexp, :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
@@ -35,19 +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
-
-      module ClassMethods
-        Devise::Models.config(self, :email_regexp, :password_length)
-      end
     end
   end
 end

lib/devise/modules.rb

@@ -1,23 +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|      
-    s.add_module :database_authenticatable, :controller => :sessions, :route => :session
-    s.add_module :token_authenticatable,    :controller => :sessions, :route => :session
-    s.add_module :rememberable
-  end
-
-  # Misc after   
-  d.add_module :recoverable,  :controller => :passwords,     :route => :password
-  d.add_module :registerable, :controller => :registrations, :route => :registration
-  d.add_module :validatable
-
-  # The ones which can sign out after
-  d.add_module :confirmable,  :controller => :confirmations, :route => :confirmation
-  d.add_module :lockable,     :controller => :unlocks,       :route => :unlock
-  d.add_module :timeoutable
-
-  # Stats for last, so we make sure the user is really signed in
-  d.add_module :trackable
-end

lib/devise/orm/active_record.rb

@@ -3,7 +3,7 @@ module Devise
     # 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
@@ -19,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

lib/devise/orm/data_mapper.rb

@@ -1,97 +1,83 @@
 module Devise
   module Orm
     module DataMapper
-      module Hook
-        def devise_modules_hook!
-          extend Schema
-          include Compatibility
-          yield
-          return unless Devise.apply_schema
-          devise_modules.each { |m| send(m) if respond_to?(m, true) }
-        end
-      end
-
-      module Schema
-        include Devise::Schema
-
-        SCHEMA_OPTIONS = {
-          :null  => :required,
-          :limit => :length
-        }
-
-        # Tell how to apply schema methods. This automatically maps :limit to
-        # :length and :null to :required.
-        def apply_devise_schema(name, type, options={})
-          SCHEMA_OPTIONS.each do |old_key, new_key|
-            next unless options.key?(old_key)
-            options[new_key] = options.delete(old_key)
-          end
-
-          options.delete(:default) if options[:default].nil?
-          property name, type, options
-        end
-      end
-
-      module Compatibility
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # Hooks for confirmable
-          def before_create(*args)
-            wrap_hook(:before, :create, *args)
-          end
-
-          def after_create(*args)
-            wrap_hook(:after, :create, *args)
-          end
-          
-          def before_save(*args)
-            wrap_hook(:before, :save, *args)
-          end
-
-          def wrap_hook(action, method, *args)
-            options = args.extract_options!
-
-            args.each do |callback|
-              send action, method, 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)
-            case args.first
-            when :first, :all
-              send(args.shift, *args)
-            else
-              get(*args)
-            end
-          end
-        end
-
-        def changed?
-          dirty?
-        end
-
-        def save(options=nil)
-          if options.is_a?(Hash) && options[:validate] == false
+      module InstanceMethods
+        def save(flag=nil)
+          if flag == false
             save!
           else
             super()
           end
         end
+      end
 
-        def update_attributes(*args)
-          update(*args)
+      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.append_extensions(Devise::Models)
-DataMapper::Model.append_extensions(Devise::Orm::DataMapper::Hook)
+DataMapper::Model.send(:include, Devise::Models)

lib/devise/orm/mongo_mapper.rb

@@ -0,0 +1,47 @@
+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
+
+MongoMapper::Document::ClassMethods.send(:include, Devise::Models)
+MongoMapper::EmbeddedDocument::ClassMethods.send(:include, Devise::Models)

lib/devise/orm/mongoid.rb

@@ -1,29 +0,0 @@
-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

lib/devise/path_checker.rb

@@ -1,13 +0,0 @@
-module Devise
-  class PathChecker
-    include Rails.application.routes.url_helpers
-
-    def initialize(env, scope)
-      @env, @scope = env, scope
-    end
-
-    def signing_out?
-      @env["PATH_INFO"] == send("destroy_#{@scope}_session_path")
-    end
-  end
-end

lib/devise/rails.rb

@@ -1,64 +1,14 @@
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'
 
-# Include UrlHelpers in ActionController and ActionView as soon as they are loaded.
-ActiveSupport.on_load(:action_controller) { include Devise::Controllers::UrlHelpers }
-ActiveSupport.on_load(:action_view) { include Devise::Controllers::UrlHelpers }
+Rails.configuration.after_initialize do
+  require "devise/orm/#{Devise.orm}"
 
-module Devise
-  class Engine < ::Rails::Engine
-    config.devise = Devise
-
-    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! }
-
-    config.after_initialize do
-      Devise.encryptor ||= begin
-        warn "[WARNING] config.encryptor is not set in your config/initializers/devise.rb. " \
-          "Devise will then set it to :bcrypt. If you were using the previous default " \
-          "encryptor, please add config.encryptor = :sha1 to your configuration file."
-        :bcrypt
-      end
-    end
-
-    unless Rails.env.production?
-      config.after_initialize do
-        actions = [:confirmation_instructions, :reset_password_instructions, :unlock_instructions]
-
-        translations = begin
-          I18n.t("devise.mailer", :raise => true).map { |k, v| k if v.is_a?(String) }.compact
-        rescue Exception => e # Do not care if something fails
-          []
-        end
-
-        keys = actions & translations
-
-        keys.each do |key|
-          ActiveSupport::Deprecation.warn "The I18n message 'devise.mailer.#{key}' is deprecated. " \
-            "Please use 'devise.mailer.#{key}.subject' instead."
-        end
-      end
-
-      config.after_initialize do
-        flash = [:unauthenticated, :unconfirmed, :invalid, :invalid_token, :timeout, :inactive, :locked]
-
-        translations = begin
-          I18n.t("devise.sessions", :raise => true).keys
-        rescue Exception => e # Do not care if something fails
-          []
-        end
-
-        keys = flash & translations
-
-        if keys.any?
-          ActiveSupport::Deprecation.warn "The following I18n messages in 'devise.sessions' " \
-            "are deprecated: #{keys.to_sentence}. Please move them to 'devise.failure' instead."
-        end
-      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
-end
+
+  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
+end

lib/devise/rails/routes.rb

@@ -1,161 +1,125 @@
-module ActionDispatch::Routing
+module ActionController::Routing
   class RouteSet #:nodoc:
+
     # Ensure Devise modules are included only after loading routes, because we
-    # need devise_for mappings already declared to create filters and helpers.
-    def finalize_with_devise!
-      finalize_without_devise!
-      Devise.configure_warden!
+    # need devise_for mappings already declared to create magic filters and
+    # helpers.
+    def load_routes_with_devise!
+      load_routes_without_devise!
+      return if Devise.mappings.empty?
+
       ActionController::Base.send :include, Devise::Controllers::Helpers
+      ActionController::Base.send :include, Devise::Controllers::UrlHelpers
+
+      ActionView::Base.send :include, Devise::Controllers::UrlHelpers
     end
-    alias_method_chain :finalize!, :devise
-  end
+    alias_method_chain :load_routes!, :devise
 
-  class Mapper
-    # Includes devise_for method for routes. This method is responsible to
-    # generate all needed routes for devise, based on what modules you have
-    # defined in your model.
-    #
-    # Examples: Let's say you have an User model configured to use
-    # authenticatable, confirmable and recoverable modules. After creating this
-    # inside your routes:
-    #
-    #   devise_for :users
-    #
-    # This method is going to look inside your User model and create the
-    # needed routes:
-    #
-    #  # Session routes for Authenticatable (default)
-    #       new_user_session GET  /users/sign_in                    {:controller=>"sessions", :action=>"new"}
-    #           user_session POST /users/sign_in                    {:controller=>"sessions", :action=>"create"}
-    #   destroy_user_session GET  /users/sign_out                   {:controller=>"sessions", :action=>"destroy"}
-    #
-    #  # Password routes for Recoverable, if User model has :recoverable configured
-    #      new_user_password GET  /users/password/new(.:format)     {:controller=>"passwords", :action=>"new"}
-    #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"passwords", :action=>"edit"}
-    #          user_password PUT  /users/password(.:format)         {:controller=>"passwords", :action=>"update"}
-    #                        POST /users/password(.:format)         {:controller=>"passwords", :action=>"create"}
-    #
-    #  # Confirmation routes for Confirmable, if User model has :confirmable configured
-    #  new_user_confirmation GET  /users/confirmation/new(.:format) {:controller=>"confirmations", :action=>"new"}
-    #      user_confirmation GET  /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"show"}
-    #                        POST /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"create"}
-    #
-    # You can configure your routes with some options:
-    #
-    #  * :class_name => setup a different class to be looked up by devise,
-    #                   if it cannot be correctly find by the route name.
-    #
-    #      devise_for :users, :class_name => 'Account'
-    #
-    #  * :path => allows you to setup path name that will be used, as rails routes does.
-    #             The following route configuration would setup your route as /accounts instead of /users:
-    #
-    #      devise_for :users, :path => 'accounts'
-    #
-    #  * :singular => setup the singular name for the given resource. This is used as the instance variable name in
-    #                 controller, as the name in routes and the scope given to warden.
-    #
-    #      devise_for :users, :singular => :user
-    #
-    #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :sign_up,
-    #                   :password, :confirmation, :unlock.
-    #
-    #      devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
-    #
-    #  * :path_prefix => the path prefix to be used in all routes.
-    #
-    #      devise_for :users, :path_prefix => "/:locale"
-    #
-    #  If you are using a dynamic prefix, like :locale above, you need to configure default_url_options in your ApplicationController
-    #  class level, so Devise can pick it:
-    #
-    #      class ApplicationController < ActionController::Base
-    #        def self.default_url_options
-    #          { :locale => I18n.locale }
-    #        end
-    #      end
-    #
-    #  * :controllers => the controller which should be used. All routes by default points to Devise controllers.
-    #    However, if you want them to point to custom controller, you should do:
-    #
-    #      devise_for :users, :controllers => { :sessions => "users/sessions" }
-    #
-    #  * :skip => tell which controller you want to skip routes from being created:
-    #
-    #      devise_for :users, :skip => :sessions
-    #
-    def devise_for(*resources)
-      options = resources.extract_options!
-      resources.map!(&:to_sym)
+    class Mapper #:doc:
+      # Includes devise_for method for routes. This method is responsible to
+      # generate all needed routes for devise, based on what modules you have
+      # defined in your model.
+      # Examples: Let's say you have an User model configured to use
+      # authenticatable, confirmable and recoverable modules. After creating this
+      # inside your routes:
+      #
+      #   map.devise_for :users
+      #
+      # this method is going to look inside your User model and create the
+      # needed routes:
+      #
+      #  # Session routes for Authenticatable (default)
+      #       new_user_session GET  /users/sign_in                    {:controller=>"sessions", :action=>"new"}
+      #           user_session POST /users/sign_in                    {:controller=>"sessions", :action=>"create"}
+      #   destroy_user_session GET  /users/sign_out                   {:controller=>"sessions", :action=>"destroy"}
+      #
+      #  # Password routes for Recoverable, if User model has :recoverable configured
+      #      new_user_password GET  /users/password/new(.:format)     {:controller=>"passwords", :action=>"new"}
+      #     edit_user_password GET  /users/password/edit(.:format)    {:controller=>"passwords", :action=>"edit"}
+      #          user_password PUT  /users/password(.:format)         {:controller=>"passwords", :action=>"update"}
+      #                        POST /users/password(.:format)         {:controller=>"passwords", :action=>"create"}
+      #
+      #  # Confirmation routes for Confirmable, if User model has :confirmable configured
+      #  new_user_confirmation GET  /users/confirmation/new(.:format) {:controller=>"confirmations", :action=>"new"}
+      #      user_confirmation GET  /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"show"}
+      #                        POST /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"create"}
+      #
+      # You can configure your routes with some options:
+      #
+      #  * :class_name => setup a different class to be looked up by devise, if it cannot be correctly find by the route name.
+      #
+      #    map.devise_for :users, :class_name => 'Account'
+      #
+      #  * :as => allows you to setup path name that will be used, as rails routes does. The following route configuration would setup your route as /accounts instead of /users:
+      #
+      #    map.devise_for :users, :as => 'accounts'
+      #
+      #  * :scope => setup the scope name. This is used as the instance variable name in controller, as the name in routes and the scope given to warden. Defaults to the singular of the given name:
+      #
+      #    map.devise_for :users, :scope => :account
+      #
+      #  * :path_names => configure different path names to overwrite defaults :sign_in, :sign_out, :password and :confirmation.
+      #
+      #    map.devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
+      #
+      #  * :path_prefix => the path prefix to be used in all routes.
+      #
+      #    map.devise_for :users, :path_prefix => "/:locale"
+      #
+      #  Any other options will be passed to route definition. If you need conditions for your routes, just map:
+      #
+      #    map.devise_for :users, :conditions => { :subdomain => /.+/ }
+      #
+      #  If you are using a dynamic prefix, like :locale above, you need to configure default_url_options through Devise. You can do that in config/initializers/devise.rb or setting a Devise.default_url_options:
+      #
+      #    Devise.default_url_options do
+      #      { :locale => I18n.locale }
+      #    end
+      #
+      def devise_for(*resources)
+        options = resources.extract_options!
 
-      resources.each do |resource|
-        mapping = Devise.add_model(resource, options)
+        resources.map!(&:to_sym)
+        resources.each do |resource|
+          mapping = Devise::Mapping.new(resource, options.dup)
+          Devise.default_scope ||= mapping.name
+          Devise.mappings[mapping.name] = mapping
 
-        begin
-          raise_no_devise_method_error!(mapping.class_name) unless mapping.to.respond_to?(:devise)
-        rescue NoMethodError => e
-          raise unless e.message.include?("undefined method `devise'")
-          raise_no_devise_method_error!(mapping.class_name)
-        end
+          route_options = mapping.route_options.merge(:path_prefix => mapping.raw_path, :name_prefix => "#{mapping.name}_")
 
-        routes  = mapping.routes
-        routes -= Array(options.delete(:skip)).map { |s| s.to_s.singularize.to_sym }
-
-        routes.each do |mod|
-          send(:"devise_#{mod}", mapping, mapping.controllers)
+          with_options(route_options) do |routes|
+            mapping.for.each do |mod|
+              send(mod, routes, mapping) if self.respond_to?(mod, true)
+            end
+          end
         end
       end
+
+      protected
+
+        def database_authenticatable(routes, mapping)
+          routes.with_options(:controller => 'sessions', :name_prefix => nil) do |session|
+            session.send(:"new_#{mapping.name}_session",     mapping.path_names[:sign_in],  :action => 'new',     :conditions => { :method => :get })
+            session.send(:"#{mapping.name}_session",         mapping.path_names[:sign_in],  :action => 'create',  :conditions => { :method => :post })
+            session.send(:"destroy_#{mapping.name}_session", mapping.path_names[:sign_out], :action => 'destroy', :conditions => { :method => :get })
+          end
+        end
+
+        def confirmable(routes, mapping)
+          routes.resource :confirmation, :only => [:new, :create, :show], :as => mapping.path_names[:confirmation]
+        end
+
+        def lockable(routes, mapping)
+          routes.resource :unlock, :only => [:new, :create, :show], :as => mapping.path_names[:unlock]
+        end
+
+        def recoverable(routes, mapping)
+          routes.resource :password, :only => [:new, :create, :edit, :update], :as => mapping.path_names[:password]
+        end
+
+        def registerable(routes, mapping)
+          routes.resource :registration, :only => [:new, :create, :edit, :update, :destroy], :as => mapping.raw_path[1..-1], :path_prefix => nil, :path_names => { :new => mapping.path_names[:sign_up] }
+        end
     end
-
-    def authenticate(scope)
-      constraint = lambda do |request|
-        request.env["warden"].authenticate!(:scope => scope)
-      end
-
-      constraints(constraint) do
-        yield
-      end
-    end
-
-    protected
-
-      def devise_session(mapping, controllers)
-        scope mapping.full_path do
-          get  mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#new",     :as => :"new_#{mapping.name}_session"
-          post mapping.path_names[:sign_in],  :to => "#{controllers[:sessions]}#create",  :as => :"#{mapping.name}_session"
-          get  mapping.path_names[:sign_out], :to => "#{controllers[:sessions]}#destroy", :as => :"destroy_#{mapping.name}_session"
-        end
-      end
- 
-      def devise_password(mapping, controllers)
-        scope mapping.full_path, :name_prefix => mapping.name do
-          resource :password, :only => [:new, :create, :edit, :update], :path => mapping.path_names[:password], :controller => controllers[:passwords]
-        end
-      end
- 
-      def devise_confirmation(mapping, controllers)
-        scope mapping.full_path, :name_prefix => mapping.name do
-          resource :confirmation, :only => [:new, :create, :show], :path => mapping.path_names[:confirmation], :controller => controllers[:confirmations]
-        end
-      end
- 
-      def devise_unlock(mapping, controllers)
-        scope mapping.full_path, :name_prefix => mapping.name do
-          resource :unlock, :only => [:new, :create, :show], :path => mapping.path_names[:unlock], :controller => controllers[:unlocks]
-        end
-      end
-
-      def devise_registration(mapping, controllers)
-        scope mapping.full_path[1..-1], :name_prefix => mapping.name do
-          resource :registration, :only => [:new, :create, :edit, :update, :destroy], :path => mapping.path_names[:registration],
-                   :path_names => { :new => mapping.path_names[:sign_up] }, :controller => controllers[:registrations]
-        end
-      end
-
-      def raise_no_devise_method_error!(klass)
-        raise "#{klass} does not respond to 'devise' method. This usually means you haven't " <<
-          "loaded your ORM file or it's being loaded too late. To fix it, be sure to require 'devise/orm/YOUR_ORM' " <<
-          "inside 'config/initializers/devise.rb' or before your application definition in 'config/application.rb'"
-      end
   end
 end

lib/devise/rails/warden_compat.rb

@@ -1,6 +1,6 @@
 module Warden::Mixins::Common
   def request
-    @request ||= ActionDispatch::Request.new(env)
+    @request ||= env['action_controller.rescue.request']
   end
 
   def reset_session!
@@ -8,8 +8,8 @@ module Warden::Mixins::Common
     raw_session.clear
   end
 
-  def cookies
-    request.cookie_jar
+  def response
+    @response ||= env['action_controller.rescue.response']
   end
 end
 

lib/devise/schema.rb

@@ -12,11 +12,6 @@ module Devise
     #
     # == Options
     # * :null - When true, allow columns to be null.
-    # * :default - Should be set to "" when :null is false.
-    #
-    # == Notes
-    # For Datamapper compatibility, we explicitly hardcode the limit for the
-    # encrypter password field in 128 characters.
     def database_authenticatable(options={})
       null    = options[:null] || false
       default = options[:default] || ""
@@ -25,72 +20,53 @@ module Devise
         ActiveSupport::Deprecation.warn ":encryptor as option is deprecated, simply remove it."
       end
 
-      apply_devise_schema :email,              String, :null => null, :default => default
-      apply_devise_schema :encrypted_password, String, :null => null, :default => default, :limit => 128
-      apply_devise_schema :password_salt,      String, :null => null, :default => default
-    end      
+      apply_schema :email,              String, :null => null, :default => default
+      apply_schema :encrypted_password, String, :null => null, :default => default, :limit => 128
+      apply_schema :password_salt,      String, :null => null, :default => default
+    end
 
     # Creates authentication_token.
-    def token_authenticatable(options={})
-      apply_devise_schema :authentication_token, String
+    def token_authenticatable
+      apply_schema :authentication_token, String
     end
 
     # Creates confirmation_token, confirmed_at and confirmation_sent_at.
     def confirmable
-      apply_devise_schema :confirmation_token,   String
-      apply_devise_schema :confirmed_at,         DateTime
-      apply_devise_schema :confirmation_sent_at, DateTime
+      apply_schema :confirmation_token,   String
+      apply_schema :confirmed_at,         DateTime
+      apply_schema :confirmation_sent_at, DateTime
     end
 
     # Creates reset_password_token.
     def recoverable
-      apply_devise_schema :reset_password_token, String
+      apply_schema :reset_password_token, String
     end
 
     # Creates remember_token and remember_created_at.
     def rememberable
-      apply_devise_schema :remember_token,      String
-      apply_devise_schema :remember_created_at, DateTime
+      apply_schema :remember_token,      String
+      apply_schema :remember_created_at, DateTime
     end
 
     # Creates sign_in_count, current_sign_in_at, last_sign_in_at,
     # current_sign_in_ip, last_sign_in_ip.
     def trackable
-      apply_devise_schema :sign_in_count,      Integer, :default => 0
-      apply_devise_schema :current_sign_in_at, DateTime
-      apply_devise_schema :last_sign_in_at,    DateTime
-      apply_devise_schema :current_sign_in_ip, String
-      apply_devise_schema :last_sign_in_ip,    String
+      apply_schema :sign_in_count,      Integer, :default => 0
+      apply_schema :current_sign_in_at, DateTime
+      apply_schema :last_sign_in_at,    DateTime
+      apply_schema :current_sign_in_ip, String
+      apply_schema :last_sign_in_ip,    String
     end
 
-    # Creates failed_attempts, unlock_token and locked_at depending on the options given.
-    #
-    # == Options
-    # * :unlock_strategy - The strategy used for unlock. Can be :time, :email, :both (default), :none.
-    #   If :email or :both, creates a unlock_token field.
-    # * :lock_strategy - The strategy used for locking. Can be :failed_attempts (default) or :none.
-    def lockable(options={})
-      unlock_strategy   = options[:unlock_strategy]
-      unlock_strategy ||= self.unlock_strategy if respond_to?(:unlock_strategy)
-      unlock_strategy ||= :both
-
-      lock_strategy   = options[:lock_strategy]
-      lock_strategy ||= self.lock_strategy if respond_to?(:lock_strategy)
-      lock_strategy ||= :failed_attempts
-
-      if lock_strategy == :failed_attempts
-        apply_devise_schema :failed_attempts, Integer, :default => 0
-      end
-
-      if [:both, :email].include?(unlock_strategy)
-        apply_devise_schema :unlock_token, String
-      end
-
-      apply_devise_schema :locked_at, DateTime
+    # Creates failed_attempts, unlock_token and locked_at
+    def lockable
+      apply_schema :failed_attempts, Integer, :default => 0
+      apply_schema :unlock_token,    String
+      apply_schema :locked_at,       DateTime
     end
 
     # Overwrite with specific modification to create your own schema.
-    def apply_devise_schema(name, type, options={})
+    def apply_schema(name, type, options={})
       raise NotImplementedError
     end
   end

lib/devise/strategies/authenticatable.rb

@@ -1,111 +0,0 @@
-require 'devise/strategies/base'
-
-module Devise
-  module Strategies
-    # This strategy should be used as basis for authentication strategies. It retrieves
-    # parameters both from params or from http authorization headers. See database_authenticatable
-    # for an example.
-    class Authenticatable < Base
-      attr_accessor :authentication_hash, :password
-
-      def valid?
-        valid_for_http_auth? || valid_for_params_auth?
-      end
-
-    private
-
-      # Check if this is strategy is valid for http authentication by:
-      #
-      #   * Validating if the model allows params authentication;
-      #   * If any of the authorization headers were sent;
-      #   * If all authentication keys are present;
-      #
-      def valid_for_http_auth?
-        http_authenticatable? && request.authorization && with_authentication_hash(http_auth_hash)
-      end
-
-      # Check if this is strategy is valid for params authentication by:
-      #
-      #   * Validating if the model allows params authentication;
-      #   * If the request hits the sessions controller through POST;
-      #   * If the params[scope] returns a hash with credentials;
-      #   * If all authentication keys are present;
-      #
-      def valid_for_params_auth?
-        params_authenticatable? && valid_request? &&
-          valid_params? && with_authentication_hash(params_auth_hash)
-      end
-
-      # Check if the model accepts this strategy as http authenticatable.
-      def http_authenticatable?
-        mapping.to.http_authenticatable?(authenticatable_name)
-      end
-
-      # Check if the model accepts this strategy as params authenticatable.
-      def params_authenticatable?
-        mapping.to.params_authenticatable?(authenticatable_name)
-      end
-
-      # Extract the appropriate subhash for authentication from params.
-      def params_auth_hash
-         params[scope]
-       end
-
-      # Extract a hash with attributes:values from the http params.
-      def http_auth_hash
-        keys = [authentication_keys.first, :password]
-        Hash[*keys.zip(decode_credentials).flatten]
-      end
-
-      # By default, a request is valid  if the controller is allowed and the VERB is POST.
-      def valid_request?
-        valid_controller? && valid_verb?
-      end
-
-      # Check if the controller is the one registered for authentication.
-      def valid_controller?
-        mapping.controllers[:sessions] == params[:controller]
-      end
-
-      # Check if it was a POST request.
-      def valid_verb?
-        request.post?
-      end
-
-      # If the request is valid, finally check if params_auth_hash returns a hash.
-      def valid_params?
-        params_auth_hash.is_a?(Hash)
-      end
-
-      # Check if password is present and is not equal to "X" (default value for token).
-      def valid_password?
-        password.present? && password != "X"
-      end
-
-      # Helper to decode credentials from HTTP.
-      def decode_credentials
-        username_and_password = request.authorization.split(' ', 2).last || ''
-        ActiveSupport::Base64.decode64(username_and_password).split(/:/, 2)
-      end
-
-      # Sets the authentication hash and the password from params_auth_hash or http_auth_hash.
-      def with_authentication_hash(hash)
-        self.authentication_hash = hash.slice(*authentication_keys)
-        self.password = hash[:password]
-        authentication_keys.all?{ |k| authentication_hash[k].present? }
-      end
-
-      # Holds the authentication keys.
-      def authentication_keys
-        @authentication_keys ||= mapping.to.authentication_keys
-      end
-
-      # Holds the authenticatable name for this class. Devise::Strategies::DatabaseAuthenticatable
-      # becomes simply :database.
-      def authenticatable_name
-        @authenticatable_name ||=
-          self.class.name.split("::").last.underscore.sub("_authenticatable", "").to_sym
-      end
-    end
-  end
-end

lib/devise/strategies/base.rb

@@ -2,7 +2,8 @@ module Devise
   module Strategies
     # Base strategy for Devise. Responsible for verifying correct scope and mapping.
     class Base < ::Warden::Strategies::Base
-      # Checks if a valid scope was given for devise and find mapping based on this scope.
+      # Checks if a valid scope was given for devise and find mapping based on
+      # this scope.
       def mapping
         @mapping ||= begin
           mapping = Devise.mappings[scope]
@@ -10,24 +11,6 @@ module Devise
           mapping
         end
       end
-
-    protected
-
-      def succeeded?
-        @result == :success
-      end
-
-      # Simply invokes valid_for_authentication? with the given block and deal with the result.
-      def validate(resource, &block)
-        result = resource && resource.valid_for_authentication?(&block)
-
-        case result
-        when Symbol, String
-          fail!(result)
-        else
-          result
-        end 
-      end
     end
   end
-end
+end

lib/devise/strategies/database_authenticatable.rb

@@ -1,19 +1,34 @@
-require 'devise/strategies/authenticatable'
+require 'devise/strategies/base'
 
 module Devise
   module Strategies
-    # Default strategy for signing in a user, based on his email and password in the database.
-    class DatabaseAuthenticatable < Authenticatable
-      def authenticate!
-        resource = valid_password? && mapping.to.find_for_database_authentication(authentication_hash)
+    # Default strategy for signing in a user, based on his email and password.
+    # Redirects to sign_in page if it's not authenticated
+    class DatabaseAuthenticatable < Base
+      def valid?
+        valid_controller? && valid_params? && mapping.to.respond_to?(:authenticate)
+      end
 
-        if validate(resource){ resource.valid_password?(password) }
-          resource.after_database_authentication
+      # Authenticate a user based on email and password params, returning to warden
+      # success and the authenticated user if everything is okay. Otherwise redirect
+      # to sign in page.
+      def authenticate!
+        if resource = mapping.to.authenticate(params[scope])
           success!(resource)
         else
           fail(:invalid)
         end
       end
+
+      protected
+
+        def valid_controller?
+          params[:controller] =~ /sessions$/
+        end
+
+        def valid_params?
+          params[scope] && params[scope][:password].present?
+        end
     end
   end
 end

lib/devise/strategies/http_authenticatable.rb

@@ -0,0 +1,59 @@
+require 'devise/strategies/base'
+
+module Devise
+  module Strategies
+    # Sign in an user using HTTP authentication.
+    class HttpAuthenticatable < Base
+      def valid?
+        http_authentication? && mapping.to.respond_to?(:authenticate_with_http)
+      end
+
+      def authenticate!
+        username, password = username_and_password
+
+        if resource = mapping.to.authenticate_with_http(username, password)
+          success!(resource)
+        else
+          custom!([401, custom_headers, [response_body]])
+        end
+      end
+
+    private
+
+      def username_and_password
+        decode_credentials(request).split(/:/, 2)
+      end
+
+      def response_body
+        body   = "HTTP Basic: Access denied."
+        method = :"to_#{request_format.to_sym}"
+        {}.respond_to?(method) ? { :error => body }.send(method) : body
+      end
+
+      def http_authentication
+        request.env['HTTP_AUTHORIZATION']   ||
+        request.env['X-HTTP_AUTHORIZATION'] ||
+        request.env['X_HTTP_AUTHORIZATION'] ||
+        request.env['REDIRECT_X_HTTP_AUTHORIZATION']
+      end
+      alias :http_authentication? :http_authentication
+
+      def decode_credentials(request)
+        ActiveSupport::Base64.decode64(http_authentication.split(' ', 2).last || '')
+      end
+
+      def custom_headers
+        {
+          "Content-Type" => request_format.to_s,
+          "WWW-Authenticate" => %(Basic realm="#{Devise.http_authentication_realm.gsub(/"/, "")}")
+        }
+      end
+
+      def request_format
+        @request_format ||= Mime::Type.lookup_by_extension(request.template_format.to_s)
+      end
+    end
+  end
+end
+
+Warden::Strategies.add(:http_authenticatable, Devise::Strategies::HttpAuthenticatable)

lib/devise/strategies/rememberable.rb

@@ -4,37 +4,31 @@ module Devise
   module Strategies
     # Remember the user through the remember token. This strategy is responsible
     # to verify whether there is a cookie with the remember token, and to
-    # recreate the user from this cookie if it exists. Must be called *before*
+    # recreate the user from this cookie if it exists.  Must be called *before*
     # authenticatable.
     class Rememberable < Devise::Strategies::Base
+
       # A valid strategy for rememberable needs a remember token in the cookies.
       def valid?
-        remember_cookie.present?
+        remember_me_cookie.present? && mapping.to.respond_to?(:serialize_from_cookie)
       end
 
       # To authenticate a user we deserialize the cookie and attempt finding
       # the record in the database. If the attempt fails, we pass to another
       # strategy handle the authentication.
       def authenticate!
-        resource = mapping.to.serialize_from_cookie(*remember_cookie)
-
-        if validate(resource)
+        if resource = mapping.to.serialize_from_cookie(remember_me_cookie)
           success!(resource)
         else
-          cookies.delete(remember_key)
           pass
         end
       end
 
     private
 
-      def remember_key
-        "remember_#{scope}_token"
-      end
-
       # Accessor for remember cookie
-      def remember_cookie
-        @remember_cookie ||= cookies.signed[remember_key]
+      def remember_me_cookie
+        @remember_me_cookie ||= request.cookies["remember_#{mapping.name}_token"]
       end
     end
   end

lib/devise/strategies/token_authenticatable.rb

@@ -2,45 +2,33 @@ require 'devise/strategies/base'
 
 module Devise
   module Strategies
-    # Strategy for signing in a user, based on a authenticatable token. This works for both params
-    # and http. For the former, all you need to do is to pass the params in the URL:
-    #
-    #   http://myapp.example.com/?user_token=SECRET
-    #
-    # For HTTP, you can pass the token as username and blank password. Since some clients may require
-    # a password, you can pass "X" as password and it will simply be ignored.
-    class TokenAuthenticatable < Authenticatable
-      def authenticate!
-        resource = mapping.to.find_for_token_authentication(authentication_hash)
+    # Strategy for signing in a user, based on a authenticatable token.
+    # Redirects to sign_in page if it's not authenticated.
+    class TokenAuthenticatable < Base
+      def valid?
+        mapping.to.respond_to?(:authenticate_with_token) && authentication_token(scope).present?
+      end
 
-        if validate(resource)
-          resource.after_token_authentication
+      # Authenticate a user based on authenticatable token params, returning to warden
+      # success and the authenticated user if everything is okay. Otherwise redirect
+      # to sign in page.
+      def authenticate!
+        if resource = mapping.to.authenticate_with_token(params[scope] || params)
           success!(resource)
         else
-          fail(:invalid_token)
+          fail!(:invalid_token)
         end
       end
 
     private
 
-      # TokenAuthenticatable request is valid for any controller and any verb.
-      def valid_request?
-        true
-      end
-
-      # Do not use remember_me behavir with token.
-      def remember_me?
-        false
-      end
-
-      # Try both scoped and non scoped keys.
-      def params_auth_hash
-        params[scope] || params
-      end
-
-      # Overwrite authentication keys to use token_authentication_key.
-      def authentication_keys
-        @authentication_keys ||= [mapping.to.token_authentication_key]
+      # Detect authentication token in params: scoped or not.
+      def authentication_token(scope)
+        if params[scope]
+          params[scope][mapping.to.token_authentication_key]
+        else
+          params[mapping.to.token_authentication_key]
+        end
       end
     end
   end

lib/devise/test_helpers.rb

@@ -15,7 +15,7 @@ module Devise
       def initialize(controller)
         @controller = controller
         manager = Warden::Manager.new(nil) do |config|
-          config.merge! Devise.warden_config
+          Devise.configure_warden(config)
         end
         super(controller.request.env, manager)
       end
@@ -40,8 +40,7 @@ module Devise
           Warden::Manager._before_failure.each{ |hook| hook.call(env, result) }
 
           status, headers, body = Devise::FailureApp.call(env).to_a
-          @controller.send :render, :status => status, :text => body,
-            :content_type => headers["Content-Type"], :location => headers["Location"]
+          @controller.send :redirect_to, headers["Location"]
         else
           result
         end
@@ -50,7 +49,10 @@ module Devise
 
     # We need to setup the environment variables and the response in the controller.
     def setup_controller_for_warden #:nodoc:
-      @request.env['action_controller.instance'] = @controller
+      @request.env['action_controller.rescue.request']  = @request
+      @request.env['action_controller.rescue.response'] = @response
+      @request.env['rack.session'] = session
+      @controller.response = @response
     end
 
     # Quick access to Warden::Proxy.

lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "1.1.rc2".freeze
+  VERSION = "1.0.7".freeze
 end

lib/generators/devise/devise/devise_generator.rb

@@ -1,86 +0,0 @@
-require 'rails/generators/migration'
-
-module Devise
-  module Generators
-    class DeviseGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::Migration
-
-      source_root File.expand_path("../templates", __FILE__)
-      namespace "devise"
-
-      desc "Generates a model with the given NAME (if one does not exist) with devise " <<
-           "configuration plus a migration file and devise routes."
-
-      def self.orm_has_migration?
-        Rails::Generators.options[:rails][:orm] == :active_record
-      end
-
-      def self.next_migration_number(path)
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
-      end
-
-      class_option :orm
-      class_option :migration, :type => :boolean, :default => orm_has_migration?
-
-      def invoke_orm_model
-        return unless behavior == :invoke
-
-        if model_exists?
-          say "* Model already exists. Adding Devise behavior."
-        elsif options[:orm].present?
-          invoke "model", [name], :migration => false, :orm => options[:orm]
-
-          unless model_exists?
-            abort "Tried to invoke the model generator for '#{options[:orm]}' but could not find it.\n" <<
-              "Please create your model by hand before calling `rails g devise #{name}`."
-          end
-        else
-          abort "Cannot create a devise model because config.generators.orm is blank.\n" <<
-            "Please create your model by hand or configure your generators orm before calling `rails g devise #{name}`."
-        end
-      end
-
-      def inject_devise_config_into_model
-        devise_class_setup = <<-CONTENT
-
-  # Include default devise modules. Others available are:
-  # :token_authenticatable, :confirmable, :lockable and :timeoutable
-  devise :database_authenticatable, :registerable,
-         :recoverable, :rememberable, :trackable, :validatable
-
-CONTENT
-
-        case options[:orm].to_s
-        when "mongoid"
-          inject_into_file model_path, devise_class_setup, :after => "include Mongoid::Document\n"
-        when "data_mapper"
-          inject_into_file model_path, devise_class_setup, :after => "include DataMapper::Resource\n"
-        when "active_record"
-          inject_into_class model_path, class_name, devise_class_setup + <<-CONTENT
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation
-CONTENT
-        end
-      end
-
-      def copy_migration_template
-        return unless options.migration?
-        migration_template "migration.rb", "db/migrate/devise_create_#{table_name}"
-      end
-
-      def add_devise_routes
-        route "devise_for :#{table_name}"
-      end
-
-    protected
-
-      def model_exists?
-        File.exists?(File.join(destination_root, model_path))
-      end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{file_path}.rb")
-      end
-    end
-  end
-end

lib/generators/devise/install/install_generator.rb

@@ -1,24 +0,0 @@
-require 'active_support/secure_random'
-
-module Devise
-  module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-
-      desc "Creates a Devise initializer and copy locale files to your application."
-      class_option :orm
-
-      def copy_initializer
-        template "devise.rb", "config/initializers/devise.rb"
-      end
-
-      def copy_locale
-        copy_file "../../../../../config/locales/en.yml", "config/locales/devise.en.yml"
-      end
-
-      def show_readme
-        readme "README"
-      end
-    end
-  end
-end

lib/generators/devise/views/views_generator.rb

@@ -1,63 +0,0 @@
-module Devise
-  module Generators
-    class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../../../../app/views", __FILE__)
-      desc "Copies all Devise views to your application."
-
-      argument :scope, :required => false, :default => nil,
-                       :desc => "The scope to copy views to"
-
-      class_option :template_engine, :type => :string, :aliases => "-t", :default => "erb",
-                                     :desc => "Template engine for the views. Available options are 'erb' and 'haml'."
-
-      def copy_views
-        case options[:template_engine]
-        when "haml"
-          verify_haml_existence
-          verify_haml_version
-          create_and_copy_haml_views
-        else
-          directory "devise", "app/views/#{scope || :devise}"
-        end
-      end
-
-    protected
-
-      def verify_haml_existence
-        begin
-          require 'haml'
-        rescue LoadError
-          say "HAML is not installed, or it is not specified in your Gemfile."
-          exit
-        end
-      end
-
-      def verify_haml_version
-        unless Haml.version[:major] == 2 and Haml.version[:minor] >= 3 or Haml.version[:major] >= 3
-          say "To generate HAML templates, you need to install HAML 2.3 or above."
-          exit
-        end
-      end
-
-      def create_and_copy_haml_views
-        require 'tmpdir'
-        html_root = "#{self.class.source_root}/devise"
-
-        Dir.mktmpdir("devise-haml.") do |haml_root|
-          Dir["#{html_root}/**/*"].each do |path|
-            relative_path = path.sub(html_root, "")
-            source_path   = (haml_root + relative_path).sub(/erb$/, "haml")
-
-            if File.directory?(path)
-              FileUtils.mkdir_p(source_path)
-            else
-              `html2haml -r #{path} #{source_path}`
-            end
-          end
-
-          directory haml_root, "app/views/#{scope || :devise}"
-        end
-      end
-    end
-  end
-end

lib/generators/devise_generator.rb

@@ -1,2 +0,0 @@
-# Remove this file on next rails release
-require "generators/devise/devise/devise_generator"

lib/generators/devise_install_generator.rb

@@ -1,4 +0,0 @@
-# Remove this file after deprecation
-if caller.none? { |l| l =~ %r{lib/rails/generators\.rb:(\d+):in `lookup!'$} }
-  warn "[WARNING] `rails g devise_install` is deprecated, please use `rails g devise:install` instead."
-end