Allow devise :all, :except => :foo to be given.

lib/devise.rb

@@ -5,6 +5,17 @@ rescue
   require 'warden'
 end
 
+module Devise
+  ALL = [:authenticable, :confirmable, :recoverable, :validatable].freeze
+
+  # Maps controller names to devise modules
+  CONTROLLERS = {
+    :sessions => :authenticable,
+    :passwords => :recoverable,
+    :confirmations => :confirmable
+  }.freeze
+end
+
 require 'devise/warden'
 require 'devise/mapping'
 require 'devise/routes'

lib/devise/active_record.rb

@@ -21,11 +21,18 @@ module Devise
     #
     #   # shortcut to include all modules (same as above)
     #   devise :all
-    def devise(*options)
+    #
-      options  = [:confirmable, :recoverable, :validatable] if options.include?(:all)
+    #   # include all except :recoverable
-      options |= [:authenticable]
+    #   devise :all, :except => :recoverable
+    #
+    def devise(*modules)
+      options  = modules.extract_options!
 
-      options.each do |m|
+      modules  = Devise::ALL             if modules.include?(:all)
+      modules -= Array(options[:except]) if options.key?(:except)
+      modules |= [:authenticable]
+
+      modules.each do |m|
         devise_modules << m.to_sym
         include Devise::Models.const_get(m.to_s.classify)
       end

lib/devise/mapping.rb

@@ -1,11 +1,4 @@
 module Devise
-  # Maps controller names to devise modules
-  CONTROLLERS = {
-    :sessions => :authenticable,
-    :passwords => :recoverable,
-    :confirmations => :confirmable
-  }.freeze
-
   # Responsible for handling devise mappings and routes configuration. Each
   # resource configured by devise_for in routes is actually creating a mapping
   # object. You can refer to devise_for in routes for usage options.

test/rails_app/app/models/admin.rb

@@ -1,3 +1,3 @@
 class Admin < ActiveRecord::Base
-  devise :validatable
+  devise :all, :except => [:recoverable, :confirmable]
 end