Added Devise.all to freeze your app strategies and moved friendly_token to Devise module.

lib/devise.rb

@@ -12,12 +12,9 @@ module Devise
   SERIALIZERS = [:authenticatable, :rememberable].freeze
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
-  # Maps the messages types that comes from warden to a flash type.
-  # This hash is not frozen, so you can add your messages as well.
-  FLASH_MESSAGES = {
-    :unauthenticated => :success,
-    :unconfirmed => :failure
-  }
+  # Maps the messages types that are used in flash message. This array is not
+  # frozen, so you can add messages from your own strategies.
+  FLASH_MESSAGES = [ :unauthenticated, :unconfirmed, :invalid ]
 
   # Declare encryptors length which are used in migrations.
   ENCRYPTORS_LENGTH = {
@@ -67,6 +64,10 @@ module Devise
   mattr_accessor :orm
   @@orm = :active_record
 
+  # Configure default options used in :all
+  mattr_accessor :all
+  @@all = Devise::ALL.dup
+
   class << self
     # Default way to setup Devise. Run script/generate devise_install to create
     # a fresh initializer with all configuration values.
@@ -74,11 +75,6 @@ module Devise
       yield self
     end
 
-    def mail_sender=(value) #:nodoc:
-      ActiveSupport::Deprecation.warn "Devise.mail_sender= is deprecated, use Devise.mailer_sender instead"
-      DeviseMailer.sender = value
-    end
-
     # Sets the sender in DeviseMailer.
     def mailer_sender=(value)
       DeviseMailer.sender = value
@@ -122,6 +118,11 @@ module Devise
     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
   end
 end
 

lib/devise/models.rb

@@ -83,7 +83,7 @@ module Devise
     def devise(*modules)
       options  = modules.extract_options!
 
-      modules  = Devise::ALL if modules.include?(:all)
+      modules  = Devise.all if modules.include?(:all)
       modules -= Array(options.delete(:except))
       modules  = [:authenticatable] | modules
 

lib/devise/models/authenticatable.rb

@@ -42,7 +42,7 @@ module Devise
       # setted.
       def password=(new_password)
         @password = new_password
-        self.password_salt = friendly_token
+        self.password_salt = Devise.friendly_token
         self.encrypted_password = password_digest(@password)
       end
 
@@ -53,16 +53,11 @@ module Devise
       end
 
       protected
-      
+
         # Digests the password using the configured encryptor
         def password_digest(password)
           encryptor.digest(password, stretches, password_salt, pepper)
         end
-      
-        # Generate a friendly string randomically to be used as token.
-        def friendly_token
-          ActiveSupport::SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
-        end
 
       module ClassMethods
         # Authenticate a user based on email and password. Returns the

lib/devise/models/confirmable.rb

@@ -119,7 +119,7 @@ module Devise
         # this token is being generated
         def generate_confirmation_token
           self.confirmed_at = nil
-          self.confirmation_token = friendly_token
+          self.confirmation_token = Devise.friendly_token
           self.confirmation_sent_at = Time.now.utc
         end
 

lib/devise/models/recoverable.rb

@@ -42,7 +42,7 @@ module Devise
 
         # Generates a new random token for reset password
         def generate_reset_password_token
-          self.reset_password_token = friendly_token
+          self.reset_password_token = Devise.friendly_token
         end
 
         # Resets the reset password token with and save the record without

lib/devise/models/rememberable.rb

@@ -43,7 +43,7 @@ module Devise
 
       # Generate a new remember token and save the record without validations.
       def remember_me!
-        self.remember_token = friendly_token
+        self.remember_token = Devise.friendly_token
         self.remember_created_at = Time.now.utc
         save(false)
       end