devise 0.3.0 → 0.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,16 @@
+* deprecations
+  * Notifier is deprecated, use DeviseMailer instead. Remember to rename
+    app/views/notifier to app/views/devise_mailer and I18n key from
+    devise.notifier to devise.mailer
+  * :authenticable calls are deprecated, use :authenticatable instead
+
+* enhancements
+  * [#16] Allow devise to be more agnostic. Do not require ActiveRecord to be loaded.
+  * Allow Warden::Manager to be configured through Devise
+  * Created a generator which creates an initializer
+
+== 0.3.0
+
 * bug fix
   * [#15] Allow yml messages to be configured by not using engine locales
 

data/README.rdoc

@@ -91,29 +91,11 @@ You could also include the other devise modules as below:
 
 Note that validations aren't added by default, so you're able to customize it. In order to have automatic validations working just include :validatable.
 
-== Configuration values
+== Model configuration
 
-In addition to :except, you can provide some options to devise call:
+In addition to :except, you can provide :pepper, :stretches, :confirm_within and :remember_for as options to devise method.
 
-* pepper: setup a pepper to generate de encrypted password. By default no pepper is used:
-
-  devise :all, :pepper => 'my_pepper'
-
-* stretches: configure how many times you want the password is reencrypted.
-
-  devise :all, :stretches => 20
-
-* confirm_within: the time the user can access the site before being blocked because his account was not confirmed
-
-  devise :all, :confirm_within => 1.week
-
-* remember_for: the time to store the remember me cookie in the user
-
-  devise :all, :remember_for => 2.weeks
-
-All those values can also be set in a global way by setting them in Devise:
-
-  Devise.confirm_within = 1.week
+All those options are described in "config/initializers/devise.rb", which is generated when you invoke `ruby script/generate devise_install` in your application root.
 
 == Routes
 
@@ -140,23 +122,12 @@ This is going to look inside you User model and create the needed routes:
                         POST /users/confirmation(.:format)     {:controller=>"confirmations", :action=>"create"}
 
 You can run the routes rake task to verify what routes are being created by devise.
-There are also some options available for configuring your routes:
-
-* :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'
+There are also some options available for configuring your routes, as :class_name (to set the class for that route), :as and :path_names, where the last two have the same meaning as in routes. The available :path_names are:
 
-* :singular => setup the name used to create named routes. By default, for a :users key, it is going to be the singularized version, :user. To configure a named route like account_session_path instead of user_session_path just do:
+  map.devise_for :users, :as => "usuarios", :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
 
-  map.devise_for :users, :singular => :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' }
+Be sure to check devise_for documentation for detailed description.
 
 == Controller filters
 
@@ -182,7 +153,7 @@ After signing in a user, confirming it's account or updating it's password, devi
 
 You also need to setup default url options for the mailer, if you are using confirmable or recoverable. Here's is the configuration for development:
 
-  Notifier.sender = "no-reply@yourapp.com"
+  DeviseMailer.sender = "no-reply@yourapp.com"
   ActionMailer::Base.default_url_options = { :host => 'localhost:3000' }
 
 == Tidying up
@@ -212,15 +183,19 @@ Devise let's you setup as many roles as you want, so let's say you already have
 
 Devise comes with some generators to help you start:
 
-  script/generate devise Model
+  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
 
-Will generate a model, configured with all devise modules, and add attr_accessible for default fields, so you can setup more accessible attributes later. The generator will also create the migration and configure your route for devise.
+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.
 
 You can also copy devise views to your application, being able to modify them based on your needs. To do it so, run the following command:
 
-  script/generate devise_views
+  ruby script/generate devise_views
 
-This is gonna copy all session, password, confirmation and notifier views to your app/views folder.
+This is gonna copy all session, password, confirmation and mailer views to your app/views folder.
 
 == I18n
 
@@ -241,11 +216,11 @@ You can also create distinct messages based on the resource you've configured us
         admin:
           signed_in: 'Hello admin!'
 
-Devise notifier uses the same pattern to create subject messages:
+Devise mailer uses the same pattern to create subject messages:
 
   en:
     devise:
-      notifier:
+      mailer:
         confirmation_instructions: 'Hello everybody!'
         user:
           confirmation_instructions: 'Hello User! Please confirm your email'

data/app/models/{notifier.rb → devise_mailer.rb}

@@ -1,5 +1,15 @@
-class Notifier < ::ActionMailer::Base
-  cattr_accessor :sender
+class DeviseMailer < ::ActionMailer::Base
+
+  # Sets who is sending the e-mail
+  def self.sender=(value)
+    @@sender = value
+  end
+
+  # Reads who is sending the e-mail
+  def self.sender
+    @@sender
+  end
+  self.sender = nil
 
   # Deliver confirmation instructions when the user is created or its email is
   # updated, and also when confirmation is manually requested
@@ -33,12 +43,11 @@ class Notifier < ::ActionMailer::Base
     #
     #   en:
     #     devise:
-    #       notifier:
+    #       mailer:
     #         confirmation_instructions: '...'
     #         user:
-    #           notifier:
-    #             confirmation_instructions: '...'
+    #           confirmation_instructions: '...'
     def translate(mapping, key)
-      I18n.t(:"#{mapping.name}.#{key}", :scope => [:devise, :notifier], :default => key)
+      I18n.t(:"#{mapping.name}.#{key}", :scope => [:devise, :mailer], :default => key)
     end
 end

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

data/generators/devise_install/devise_install_generator.rb

@@ -0,0 +1,9 @@
+class DeviseInstallGenerator < Rails::Generator::Base
+
+  def manifest
+    record do |m|
+      m.file "devise.rb", "config/initializers/devise.rb"
+    end
+  end
+
+end

data/generators/devise_install/templates/devise.rb

@@ -0,0 +1,33 @@
+# 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|
+  # Invoke `rake secret` and use the printed value to setup a pepper to generate
+  # the encrypted password. By default no pepper is used.
+  # config.pepper = "rake secret output"
+
+  # Configure how many times you want the password is reencrypted. Default is 10.
+  # config.stretches = 10
+
+  # The time you want give to your user to confirm his account. During this time
+  # he will be able to access your application without confirming. Default is nil.
+  # config.confirm_within = 2.days
+
+  # The time the user will be remembered without asking for credentials again.
+  # config.remember_for = 2.weeks
+
+  # Configure the e-mail address which will be shown in DeviseMailer.
+  # config.mail_sender = "foo.bar@yourapp.com"
+
+  # If you want to use other strategies, that are not (yet) supported by Devise,
+  # you can configure them inside the config.warden block. The example below
+  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+  #
+  # config.manager do |manager|
+  #   manager.oauth(:twitter) do |twitter|
+  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
+  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
+  #     twitter.options :site => 'http://twitter.com'
+  #   end
+  #   manager.default_strategies.unshift :twitter_oauth
+  # end
+end

data/generators/devise_views/USAGE

@@ -1,3 +1,3 @@
-To copy all session, password and confirmation views from devise to your app just run the following command:
+To copy all session, password, confirmation and mailer views from devise to your app just run the following command:
 
     script/generate devise_views

data/lib/devise.rb

@@ -8,67 +8,50 @@ module Devise
     :confirmations => :confirmable
   }.freeze
 
+  STRATEGIES  = [:rememberable, :authenticatable].freeze
   TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE'].freeze
 
-  # Creates configuration values for Devise and for the given module.
-  #
-  #   Devise.model_config(Devise::Authenticable, :stretches, 10)
-  #
-  # The line above creates:
-  #
-  #   1) An accessor called Devise.stretches, which value is used by default;
-  #
-  #   2) Some class methods for your model Model.stretches and Model.stretches=
-  #      which have higher priority than Devise.stretches;
-  #
-  #   3) And an instance method stretches.
-  #
-  # To add the class methods you need to have a module ClassMethods defined
-  # inside the given class.
-  #
-  def self.model_config(mod, accessor, default=nil) #:nodoc:
-    mattr_accessor accessor
-    send(:"#{accessor}=", default)
-
-    mod.class_eval <<-METHOD, __FILE__, __LINE__
-      def #{accessor}
-        self.class.#{accessor}
-      end
-    METHOD
-
-    mod.const_get(:ClassMethods).class_eval <<-METHOD, __FILE__, __LINE__
-      def #{accessor}
-        if defined?(@#{accessor})
-          @#{accessor}
-        elsif superclass.respond_to?(:#{accessor})
-          superclass.#{accessor}
-        else
-          Devise.#{accessor}
-        end
-      end
-
-      def #{accessor}=(value)
-        @#{accessor} = value
-      end
-    METHOD
+  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
+
+    # Sets the sender in DeviseMailer.
+    def mail_sender=(value)
+      DeviseMailer.sender = value
+    end
+    alias :sender= :mail_sender= 
+
+    # 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
+
+    # A method used internally to setup warden manager from the Rails initialize
+    # block.
+    def configure_warden_manager(manager) #:nodoc:
+      manager.default_strategies *Devise::STRATEGIES
+      manager.failure_app = Devise::Failure
+      manager.silence_missing_strategies!
+
+      # If the user provided a warden hook, call it now.
+      @warden_config.try :call, manager
+    end
   end
 end
 
-# Devise initialization process goes like this:
-#
-#   1) Include Devise::ActiveRecord and Devise::Migrations
-#   2) Load and config warden
-#   3) Load devise mapping structure
-#   4) Add routes extensions
-#   5) Load routes definitions
-#   6) Include filters and helpers in controllers and views
-#
-Rails.configuration.after_initialize do
-  ActiveRecord::Base.extend Devise::ActiveRecord
-  ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Migrations
-  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'devise', 'locales', 'en.yml'))
-end
-
 require 'devise/warden'
 require 'devise/mapping'
-require 'devise/routes'
+require 'devise/rails'

data/lib/devise/failure.rb

@@ -9,10 +9,13 @@ module Devise
     def self.call(env)
       options = env['warden.options']
       scope   = options[:scope]
-      params  = if env['warden'].try(:message)
-        { env['warden'].message => true }
-      else
-        options[:params]
+      params  = case env['warden'].try(:message)
+        when Symbol
+          { env['warden'].message => true }
+        when String
+          { :message => env['warden'].message }
+        else
+          options[:params]
       end
 
       redirect_path = if mapping = Devise.mappings[scope]

data/lib/devise/locales/en.yml

@@ -12,7 +12,7 @@ en:
     confirmations:
       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.'
-    notifier:
+    mailer:
       confirmation_instructions: 'Confirmation instructions'
       reset_password_instructions: 'Reset password instructions'
 

data/lib/devise/migrations.rb

@@ -26,13 +26,6 @@ module Devise
       string :password_salt,      :limit =>  20, :null => null
     end
 
-    # TODO Remove me in a next release.
-    #
-    def authenticable(*args)
-      ActiveSupport::Deprecation.warn "authenticable in migrations is deprecated, use authenticatable instead"
-      authenticatable(*args)
-    end
-
     # Creates confirmation_token, confirmed_at and confirmation_sent_at.
     #
     def confirmable

data/lib/devise/{active_record.rb → models.rb}

@@ -1,34 +1,59 @@
 module Devise
-  module ActiveRecord
-    # Shortcut method for including all devise modules inside your model.
-    # You can give some extra options while declaring devise in your model:
+  module Models
+    # Creates configuration values for Devise and for the given module.
     #
-    # * except: convenient option that allows you to add all devise modules,
-    #   removing only the modules you setup here:
+    #   Devise::Models.config(Devise::Authenticable, :stretches, 10)
     #
-    #    devise :all, :except => :rememberable
+    # The line above creates:
     #
-    # * pepper: setup a pepper to generate de encrypted password. By default no
-    #   pepper is used:
+    #   1) An accessor called Devise.stretches, which value is used by default;
     #
-    #    devise :all, :pepper => 'my_pepper'
+    #   2) Some class methods for your model Model.stretches and Model.stretches=
+    #      which have higher priority than Devise.stretches;
     #
-    # * stretches: configure how many times you want the password is reencrypted.
+    #   3) And an instance method stretches.
     #
-    #    devise :all, :stretches => 20
+    # To add the class methods you need to have a module ClassMethods defined
+    # inside the given class.
     #
-    # * confirm_within: the time you want your user to confirm it's account. During
-    #   this time he will be able to access your application without confirming.
-    #
-    #    devise :all, :confirm_within => 7.days
+    def self.config(mod, accessor, default=nil) #:nodoc:
+      Devise.send :mattr_accessor, accessor
+      Devise.send :"#{accessor}=", default
+
+      mod.class_eval <<-METHOD, __FILE__, __LINE__
+        def #{accessor}
+          self.class.#{accessor}
+        end
+      METHOD
+
+      mod.const_get(:ClassMethods).class_eval <<-METHOD, __FILE__, __LINE__
+        def #{accessor}
+          if defined?(@#{accessor})
+            @#{accessor}
+          elsif superclass.respond_to?(:#{accessor})
+            superclass.#{accessor}
+          else
+            Devise.#{accessor}
+          end
+        end
+
+        def #{accessor}=(value)
+          @#{accessor} = value
+        end
+      METHOD
+    end
+
+    # Shortcut method for including all devise modules inside your model.
+    # You can give some extra options while declaring devise in your model:
     #
-    # * remember_for: the time the user will be remembered without asking for
-    #   credentials again.
+    # * except: convenient option that allows you to add all devise modules,
+    #   removing only the modules you setup here:
     #
-    #    devise :all, :remember_for => 2.weeks
+    #    devise :all, :except => :rememberable
     #
-    # You can refer to Authenticable, Confirmable and Rememberable for more
-    # information about writing your own method to setup each model apart.
+    # You can also give the following configuration values in a hash: :pepper,
+    # :stretches, :confirm_within and :remember_for. Please check your Devise
+    # initialiazer for a complete description on those values.
     #
     # Examples:
     #
@@ -59,13 +84,6 @@ module Devise
     def devise(*modules)
       options  = modules.extract_options!
 
-      # TODO Remove me in a next release
-      if modules.include?(:authenticable)
-        modules.delete(:authenticable)
-        modules.unshift(:authenticatable)
-        ActiveSupport::Deprecation.warn "devise :authenticate is deprecated, use authenticatable instead"
-      end
-
       modules  = Devise::ALL if modules.include?(:all)
       modules -= Array(options.delete(:except))
       modules  = [:authenticatable] | modules

data/lib/devise/models/authenticatable.rb

@@ -90,8 +90,8 @@ module Devise
         end
       end
 
-      Devise.model_config(self, :pepper)
-      Devise.model_config(self, :stretches, 10)
+      Devise::Models.config(self, :pepper)
+      Devise::Models.config(self, :stretches, 10)
     end
   end
 end

data/lib/devise/models/confirmable.rb

@@ -56,7 +56,7 @@ module Devise
 
       # Send confirmation instructions by email
       def send_confirmation_instructions
-        ::Notifier.deliver_confirmation_instructions(self)
+        ::DeviseMailer.deliver_confirmation_instructions(self)
       end
 
       # Remove confirmation date and send confirmation instructions, to ensure
@@ -101,7 +101,7 @@ module Devise
         #
         def confirmation_period_valid?
           confirmation_sent_at? &&
-            (Date.today - confirmation_sent_at.to_date).days < confirm_within
+            (Time.now.utc - confirmation_sent_at.utc) < confirm_within
         end
 
         # Checks whether the record is confirmed or not, yielding to the block
@@ -150,7 +150,7 @@ module Devise
         end
       end
 
-      Devise.model_config(self, :confirm_within, 0.days)
+      Devise::Models.config(self, :confirm_within, 0.days)
     end
   end
 end

data/lib/devise/models/recoverable.rb

@@ -35,7 +35,7 @@ module Devise
       # Resets reset password token and send reset password instructions by email
       def send_reset_password_instructions
         generate_reset_password_token!
-        ::Notifier.deliver_reset_password_instructions(self)
+        ::DeviseMailer.deliver_reset_password_instructions(self)
       end
 
       protected

data/lib/devise/models/rememberable.rb

@@ -45,7 +45,7 @@ module Devise
       # Generate a new remember token and save the record without validations.
       def remember_me!
         self.remember_token = friendly_token
-        self.remember_created_at = Time.now
+        self.remember_created_at = Time.now.utc
         save(false)
       end
 
@@ -66,7 +66,7 @@ module Devise
 
       # Remember token should be expired if expiration time not overpass now.
       def remember_expired?
-        remember_expires_at <= Time.now
+        remember_expires_at <= Time.now.utc
       end
 
       # Remember token expires at created time + remember_for configuration
@@ -89,7 +89,7 @@ module Devise
         end
       end
 
-      Devise.model_config(self, :remember_for, 2.weeks)
+      Devise::Models.config(self, :remember_for, 2.weeks)
     end
   end
 end

data/lib/devise/rails.rb

@@ -0,0 +1,17 @@
+require 'devise/rails/routes'
+require 'devise/rails/warden_compat'
+
+Rails.configuration.after_initialize do
+  if defined?(ActiveRecord)
+    ActiveRecord::Base.extend Devise::Models
+    ActiveRecord::ConnectionAdapters::TableDefinition.send :include, Devise::Migrations
+  end
+
+  # Adds Warden Manager to Rails middleware stack, configuring default devise
+  # strategy and also the failure app.
+  Rails.configuration.middleware.use Warden::Manager do |manager|
+    Devise.configure_warden_manager(manager)
+  end
+
+  I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
+end

data/lib/devise/rails/warden_compat.rb

@@ -0,0 +1,26 @@
+# Taken from RailsWarden, thanks to Hassox. http://github.com/hassox/rails_warden
+module Warden::Mixins::Common
+  # Gets the rails request object by default if it's available
+  def request
+    return @request if @request
+    if env['action_controller.rescue.request']
+      @request = env['action_controller.rescue.request']
+    else
+      Rack::Request.new(env)
+    end
+  end
+
+  def raw_session
+    request.session
+  end
+
+  def reset_session!
+    raw_session.inspect # why do I have to inspect it to get it to clear?
+    raw_session.clear
+  end
+
+  # Proxy to request cookies
+  def cookies
+    request.cookies
+  end
+end

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.3.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/lib/devise/warden.rb

@@ -5,33 +5,6 @@ rescue
   require 'warden'
 end
 
-# Taken from RailsWarden, thanks to Hassox. http://github.com/hassox/rails_warden
-module Warden::Mixins::Common
-  # Gets the rails request object by default if it's available
-  def request
-    return @request if @request
-    if env['action_controller.rescue.request']
-      @request = env['action_controller.rescue.request']
-    else
-      Rack::Request.new(env)
-    end
-  end
-
-  def raw_session
-    request.session
-  end
-
-  def reset_session!
-    raw_session.inspect # why do I have to inspect it to get it to clear?
-    raw_session.clear
-  end
-
-  # Proxy to request cookies
-  def cookies
-    request.cookies
-  end
-end
-
 # Session Serialization in. This block determines how the user will be stored
 # in the session. If you're using a complex object like an ActiveRecord model,
 # it is not a good idea to store the complete object. An ID is sufficient.
@@ -43,19 +16,5 @@ Warden::Manager.serialize_from_session do |klass, id|
   klass.find(id)
 end
 
-# Be a good citizen and always set the controller action, even if Devise is
-# never calling the failure app through warden.
-Warden::Manager.before_failure do |env, opts|
-  env['warden'].request.params['action'] = 'new'
-end
-
 # Setup devise strategies for Warden
 require 'devise/strategies/base'
-
-# Adds Warden Manager to Rails middleware stack, configuring default devise
-# strategy and also the controller who will manage not authenticated users.
-Rails.configuration.middleware.use Warden::Manager do |manager|
-  manager.default_strategies :rememberable, :authenticatable
-  manager.failure_app = Devise::Failure
-  manager.silence_missing_strategies!
-end

data/test/devise_test.rb

@@ -0,0 +1,72 @@
+require 'test/test_helper'
+
+module Devise
+  def self.clean_warden_config!
+    @warden_config = nil 
+  end
+end
+
+class DeviseTest < ActiveSupport::TestCase
+  class MockManager
+    attr_accessor :failure_app
+    attr_reader :default_strategies, :silence_missing_strategies
+
+    def silence_missing_strategies!
+      @silence_missing_strategies = true
+    end
+
+    def default_strategies(*args)
+      if args.empty?
+        @default_strategies
+      else
+        @default_strategies = args
+      end
+    end
+  end
+
+  test 'DeviseMailer.sender can be configured through Devise' do
+    swap DeviseMailer, :sender => "foo@bar" do
+      assert_equal "foo@bar", DeviseMailer.sender
+      Devise.mail_sender = "bar@foo"
+      assert_equal "bar@foo", DeviseMailer.sender
+    end
+  end
+
+  test 'model options can be configured through Devise' do
+    swap Devise, :confirm_within => 113, :pepper => "foo" do
+      assert_equal 113, Devise.confirm_within
+      assert_equal "foo", Devise.pepper
+    end
+  end
+
+  test 'setup block yields self' do
+    Devise.setup do |config|
+      assert_equal Devise, config
+    end
+  end
+
+  test 'warden manager configuration' do
+    manager = MockManager.new
+    Devise.configure_warden_manager(manager)
+
+    assert_equal Devise::Failure, manager.failure_app
+    assert_equal [:rememberable, :authenticatable], manager.default_strategies
+    assert manager.silence_missing_strategies
+  end
+
+  test 'warden manager user configuration through a block' do
+    begin
+      @executed = false
+      Devise.warden do |manager|
+        @executed = true
+        assert_kind_of MockManager, manager
+      end
+
+      manager = MockManager.new
+      Devise.configure_warden_manager(manager)
+      assert @executed
+    ensure
+      Devise.clean_warden_config!
+    end
+  end
+end

data/test/mailers/confirmation_instructions_test.rb

@@ -4,7 +4,7 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
-    Notifier.sender = 'test@example.com'
+    DeviseMailer.sender = 'test@example.com'
   end
 
   def user
@@ -36,13 +36,13 @@ class ConfirmationInstructionsTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :notifier => { :confirmation_instructions => 'Account Confirmation' } } do
+    store_translations :en, :devise => { :mailer => { :confirmation_instructions => 'Account Confirmation' } } do
       assert_equal 'Account Confirmation', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :notifier => { :user => { :confirmation_instructions => 'User Account Confirmation' } } } do
+    store_translations :en, :devise => { :mailer => { :user => { :confirmation_instructions => 'User Account Confirmation' } } } do
       assert_equal 'User Account Confirmation', mail.subject
     end
   end

data/test/mailers/reset_password_instructions_test.rb

@@ -4,7 +4,7 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
 
   def setup
     setup_mailer
-    Notifier.sender = 'test@example.com'
+    DeviseMailer.sender = 'test@example.com'
   end
 
   def user
@@ -39,13 +39,13 @@ class ResetPasswordInstructionsTest < ActionMailer::TestCase
   end
 
   test 'setup subject from I18n' do
-    store_translations :en, :devise => { :notifier => { :reset_password_instructions => 'Reset instructions' } } do
+    store_translations :en, :devise => { :mailer => { :reset_password_instructions => 'Reset instructions' } } do
       assert_equal 'Reset instructions', mail.subject
     end
   end
 
   test 'subject namespaced by model' do
-    store_translations :en, :devise => { :notifier => { :user => { :reset_password_instructions => 'User Reset Instructions' } } } do
+    store_translations :en, :devise => { :mailer => { :user => { :reset_password_instructions => 'User Reset Instructions' } } } do
       assert_equal 'User Reset Instructions', mail.subject
     end
   end

data/test/mapping_test.rb

@@ -1,6 +1,6 @@
 require 'test/test_helper'
 
-class MapTest < ActiveSupport::TestCase
+class MappingTest < ActiveSupport::TestCase
 
   test 'store options' do
     mapping = Devise.mappings[:user]

data/test/models/rememberable_test.rb

@@ -20,14 +20,6 @@ class RememberableTest < ActiveSupport::TestCase
     assert_not user.changed?
   end
 
-  test 'remember_me should calculate expires_at based on remember_for setup' do
-    user = create_user
-    assert_not user.remember_created_at?
-    user.remember_me!
-    assert user.remember_created_at?
-    assert_equal Date.today, user.remember_created_at.to_date
-  end
-
   test 'forget_me should clear remember token and save the record without validating' do
     user = create_user
     user.remember_me!
@@ -38,7 +30,7 @@ class RememberableTest < ActiveSupport::TestCase
     assert_not user.changed?
   end
 
-  test 'forget_me should clear remember_expires_at' do
+  test 'forget_me should clear remember_created_at' do
     user = create_user
     user.remember_me!
     assert user.remember_created_at?

data/test/support/model_tests_helper.rb

@@ -33,4 +33,19 @@ class ActiveSupport::TestCase
   def create_user(attributes={})
     User.create!(valid_attributes(attributes))
   end
+
+  # Execute the block setting the given values and restoring old values after
+  # the block is executed.
+  def swap(object, new_values)
+    old_values = {}
+    new_values.each do |key, value|
+      old_values[key] = object.send key
+      object.send :"#{key}=", value
+    end
+    yield
+  ensure
+    old_values.each do |key, value|
+      object.send :"#{key}=", value
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -02:00
+date: 2009-11-03 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,10 +40,10 @@ files:
 - app/controllers/confirmations_controller.rb
 - app/controllers/passwords_controller.rb
 - app/controllers/sessions_controller.rb
-- app/models/notifier.rb
+- app/models/devise_mailer.rb
 - app/views/confirmations/new.html.erb
-- app/views/notifier/confirmation_instructions.html.erb
-- app/views/notifier/reset_password_instructions.html.erb
+- app/views/devise_mailer/confirmation_instructions.html.erb
+- app/views/devise_mailer/reset_password_instructions.html.erb
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
 - app/views/sessions/new.html.erb
@@ -53,11 +53,13 @@ files:
 - generators/devise/templates/README
 - 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/devise.rb
 - generators/devise_views/USAGE
 - generators/devise_views/devise_views_generator.rb
 - init.rb
 - lib/devise.rb
-- lib/devise/active_record.rb
 - lib/devise/controllers/filters.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/url_helpers.rb
@@ -67,12 +69,15 @@ files:
 - lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/migrations.rb
+- lib/devise/models.rb
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/recoverable.rb
 - lib/devise/models/rememberable.rb
 - lib/devise/models/validatable.rb
-- lib/devise/routes.rb
+- lib/devise/rails.rb
+- lib/devise/rails/routes.rb
+- lib/devise/rails/warden_compat.rb
 - lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/strategies/rememberable.rb
@@ -127,6 +132,7 @@ test_files:
 - test/controllers/url_helpers_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/filters_test.rb
+- test/models_test.rb
 - test/integration/authenticatable_test.rb
 - test/integration/rememberable_test.rb
 - test/integration/recoverable_test.rb
@@ -142,7 +148,7 @@ test_files:
 - test/support/model_tests_helper.rb
 - test/support/assertions_helper.rb
 - test/support/integration_tests_helper.rb
+- test/devise_test.rb
 - test/routes_test.rb
 - test/test_helper.rb
 - test/mapping_test.rb
-- test/active_record_test.rb