devise 0.2.3 → 0.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+* bug fix
+  * [#15] Allow yml messages to be configured by not using engine locales
+
+* deprecations
+  * Renamed confirm_in to confirm_within
+  * [#14] Do not send confirmation messages when user changes his e-mail
+  * [#13] Renamed authenticable to authenticatable and added deprecation warnings
+
 == 0.2.3
 
 * enhancements

data/README.rdoc

@@ -9,7 +9,7 @@ Devise is a flexible authentication solution for Rails based on Warden. It:
 
 Right now it's composed of five mainly modules:
 
-* Authenticable: responsible for encrypting password and validating authenticity of a user while signing in.
+* Authenticatable: responsible for encrypting password and validating authenticity of a user while signing in.
 * 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.
 * Rememberable: manages generating and clearing token for remember the user from a saved cookie.
@@ -51,7 +51,7 @@ Devise must be setted up within the model (or models) you want to use, and devis
 We're assuming here you want a User model. First of all you have to setup a migration with the following fields:
 
   create_table :users do
-    t.authenticable
+    t.authenticatable
     t.confirmable
     t.recoverable
     t.rememberable
@@ -70,26 +70,20 @@ Now let's setup a User model adding the devise line to have your authentication
     devise
   end
 
-This line adds devise authenticable automatically for you inside your User class. 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.
+This line adds devise authenticatable automatically for you inside your User class. 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.
 
 You could also include the other devise modules as below:
 
-  # Same as using only devise, authenticable is activated by default
-  devise :authenticable
+  # Same as using only devise, authenticatable is activated by default
+  devise :authenticatable
 
-  # Include authenticable + confirmable
+  # Include authenticatable + confirmable
   devise :confirmable
 
-  # Include authenticable + recoverable
-  devise :recoverable
+  # Include authenticatable + recoverable + rememberable
+  devise :recoverable, :rememberable
 
-  # Include authenticable + rememberable modules
-  devise :rememberable
-
-  # Include authenticable + confirmable + recoverable + rememberable + validatable
-  devise :confirmable, :recoverable, :rememberable, :validatable
-
-  # Same as above, include all of them
+  # Include all of them
   devise :all
 
   # Include all except recoverable
@@ -97,6 +91,8 @@ 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
+
 In addition to :except, you can provide some options to devise call:
 
 * pepper: setup a pepper to generate de encrypted password. By default no pepper is used:
@@ -107,21 +103,27 @@ In addition to :except, you can provide some options to devise call:
 
   devise :all, :stretches => 20
 
-* confirm_in: the time the user can access the site before being blocked because his account was not confirmed
+* confirm_within: the time the user can access the site before being blocked because his account was not confirmed
 
-  devise :all, :confirm_in => 1.week
+  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
+
+== Routes
+
 The next step after setting up your model is to configure your routes for devise. You do this by opening up your config/routes.rb and adding:
 
   map.devise_for :users
 
 This is going to look inside you User model and create the needed routes:
 
-  # Session routes for Authenticable (default)
+  # 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"}
@@ -156,7 +158,9 @@ There are also some options available for configuring your routes:
 
   map.devise_for :users, :path_names => { :sign_in => 'login', :sign_out => 'logout', :password => 'secret', :confirmation => 'verification' }
 
-And that is it! 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:
+== Controller filters
+
+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!
 
@@ -181,11 +185,13 @@ You also need to setup default url options for the mailer, if you are using conf
   Notifier.sender = "no-reply@yourapp.com"
   ActionMailer::Base.default_url_options = { :host => 'localhost:3000' }
 
+== Tidying up
+
 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 the same authentication stuff, but not confirmation or password recovery. Just follow the same steps:
 
   # Create a migration with the required fields
   create_table :admins do |t|
-    t.authenticable
+    t.authenticatable
   end
 
   # Inside your Admin model

data/generators/devise_views/devise_views_generator.rb

@@ -2,20 +2,22 @@ class DeviseViewsGenerator < Rails::Generator::Base
 
   def initialize(*args)
     super
-    @source_root = options[:source] || File.join(spec.path, '..', '..', 'app', 'views')
+    @source_root = options[:source] || File.join(spec.path, '..', '..')
   end
 
   def manifest
     record do |m|
-      views_directory = File.join('app', 'views')
-      m.directory views_directory
+      m.directory "app/views"
 
-      Dir[File.join(@source_root, "**/*.erb")].each do |file|
+      Dir[File.join(@source_root, "app", "views", "**/*.erb")].each do |file|
         file = file.gsub(@source_root, "")[1..-1]
 
-        m.directory  File.join(views_directory, File.dirname(file))
-        m.file       file, File.join(views_directory, file)
+        m.directory  File.dirname(file)
+        m.file       file, file
       end
+
+      m.directory "config/locales"
+      m.file "lib/devise/locales/en.yml", "config/locales/devise.en.yml"
     end
   end
 

data/lib/devise.rb

@@ -1,9 +1,9 @@
 module Devise
-  ALL = [:authenticable, :confirmable, :recoverable, :rememberable, :validatable].freeze
+  ALL = [:authenticatable, :confirmable, :recoverable, :rememberable, :validatable].freeze
 
   # Maps controller names to devise modules
   CONTROLLERS = {
-    :sessions => :authenticable,
+    :sessions => :authenticatable,
     :passwords => :recoverable,
     :confirmations => :confirmable
   }.freeze
@@ -66,6 +66,7 @@ end
 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'

data/lib/devise/active_record.rb

@@ -17,10 +17,10 @@ module Devise
     #
     #    devise :all, :stretches => 20
     #
-    # * confirm_in: the time you want your user to confirm it's account. During
+    # * 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_in => 7.days
+    #    devise :all, :confirm_within => 7.days
     #
     # * remember_for: the time the user will be remembered without asking for
     #   credentials again.
@@ -32,22 +32,22 @@ module Devise
     #
     # Examples:
     #
-    #   # include only authenticable module (default)
+    #   # include only authenticatable module (default)
     #   devise
     #
-    #   # include authenticable + confirmable modules
+    #   # include authenticatable + confirmable modules
     #   devise :confirmable
     #
-    #   # include authenticable + recoverable modules
+    #   # include authenticatable + recoverable modules
     #   devise :recoverable
     #
-    #   # include authenticable + rememberable modules
+    #   # include authenticatable + rememberable modules
     #   devise :rememberable
     #
-    #   # include authenticable + validatable modules
+    #   # include authenticatable + validatable modules
     #   devise :validatable
     #
-    #   # include authenticable + confirmable + recoverable + rememberable + validatable
+    #   # include authenticatable + confirmable + recoverable + rememberable + validatable
     #   devise :confirmable, :recoverable, :rememberable, :validatable
     #
     #   # shortcut to include all modules (same as above)
@@ -59,9 +59,16 @@ 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 |= [:authenticable]
+      modules  = [:authenticatable] | modules
 
       modules.each do |m|
         devise_modules << m.to_sym

data/lib/devise/controllers/filters.rb

@@ -54,8 +54,8 @@ module Devise
       # Example:
       #
       #   Maps:
-      #     User => :authenticable
-      #     Admin => :authenticable
+      #     User => :authenticatable
+      #     Admin => :authenticatable
       #
       #   Generated methods:
       #     authenticate_user!  # Signs user in or redirect

data/{config → lib/devise}/locales/en.yml

@@ -4,7 +4,7 @@ en:
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
       unauthenticated: 'You need to sign in or sign up before continuing.'
-      unconfirmed: 'Your account was not confirmed and your confirmation period has expired.'
+      unconfirmed: 'You have to confirm your account before continuing.'
       invalid: 'Invalid email or password.'
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'

data/lib/devise/mapping.rb

@@ -18,7 +18,7 @@ module Devise
   #   mapping.to   #=> User
   #   # is the class to be loaded from routes, given in the route as :class_name.
   #
-  #   mapping.for  #=> [:authenticable]
+  #   mapping.for  #=> [:authenticatable]
   #   # is the modules included in the class
   #
   class Mapping #:nodoc:

data/lib/devise/migrations.rb

@@ -2,7 +2,7 @@ module Devise
   # Helpers to migration:
   #
   #   create_table :accounts do |t|
-  #     t.authenticable
+  #     t.authenticatable
   #     t.confirmable
   #     t.recoverable
   #     t.rememberable
@@ -19,13 +19,20 @@ module Devise
 
     # Creates email, encrypted_password and password_salt.
     #
-    def authenticable(options={})
+    def authenticatable(options={})
       null = options[:null] || false
       string :email,              :limit => 100, :null => null
       string :encrypted_password, :limit =>  40, :null => null
       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/models/{authenticable.rb → authenticatable.rb}

@@ -1,5 +1,5 @@
 require 'digest/sha1'
-require 'devise/strategies/authenticable'
+require 'devise/strategies/authenticatable'
 
 module Devise
   module Models
@@ -24,7 +24,7 @@ module Devise
     #    User.authenticate('email@test.com', 'password123')  # returns authenticated user or nil
     #    User.find(1).valid_password?('password123')         # returns true/false
     #
-    module Authenticable
+    module Authenticatable
       def self.included(base)
         base.class_eval do
           extend ClassMethods
@@ -75,8 +75,8 @@ module Devise
         # authenticated user if it's valid or nil.
         # Attributes are :email and :password
         def authenticate(attributes={})
-          authenticable = find_by_email(attributes[:email])
-          authenticable if authenticable.try(:valid_password?, attributes[:password])
+          authenticatable = find_by_email(attributes[:email])
+          authenticatable if authenticatable.try(:valid_password?, attributes[:password])
         end
 
         # Attempt to find a user by it's email. If not user is found, returns a

data/lib/devise/models/confirmable.rb

@@ -14,13 +14,13 @@ module Devise
     #
     # Configuration:
     #
-    #   confirm_in: the time you want the user will have to confirm it's account
-    #               without blocking his access. When confirm_in is zero, the
-    #               user won't be able to sign in without confirming. You can
-    #               use this to let your user access some features of your
-    #               application without confirming the account, but blocking it
-    #               after a certain period (ie 7 days). By default confirm_in is
-    #               zero, it means users always have to confirm to sign in.
+    #   confirm_within: the time you want the user will have to confirm it's account
+    #                   without blocking his access. When confirm_within is zero, the
+    #                   user won't be able to sign in without confirming. You can
+    #                   use this to let your user access some features of your
+    #                   application without confirming the account, but blocking it
+    #                   after a certain period (ie 7 days). By default confirm_within is
+    #                   zero, it means users always have to confirm to sign in.
     #
     # Examples:
     #
@@ -34,8 +34,8 @@ module Devise
         base.class_eval do
           extend ClassMethods
 
-          before_save :reset_confirmation, :if => :email_changed?
-          after_save  :send_confirmation_instructions, :if => :email_changed?
+          before_create :generate_confirmation_token
+          after_create  :send_confirmation_instructions
         end
       end
 
@@ -64,7 +64,7 @@ module Devise
       # confirming it's account
       def reset_confirmation!
         unless_confirmed do
-          reset_confirmation
+          generate_confirmation_token
           save(false)
           send_confirmation_instructions
         end
@@ -87,21 +87,21 @@ module Devise
         #
         # Example:
         #
-        #   # confirm_in = 1.day and confirmation_sent_at = today
+        #   # confirm_within = 1.day and confirmation_sent_at = today
         #   confirmation_period_valid?   # returns true
         #
-        #   # confirm_in = 5.days and confirmation_sent_at = 4.days.ago
+        #   # confirm_within = 5.days and confirmation_sent_at = 4.days.ago
         #   confirmation_period_valid?   # returns true
         #
-        #   # confirm_in = 5.days and confirmation_sent_at = 5.days.ago
+        #   # confirm_within = 5.days and confirmation_sent_at = 5.days.ago
         #   confirmation_period_valid?   # returns false
         #
-        #   # confirm_in = 0.days
+        #   # confirm_within = 0.days
         #   confirmation_period_valid?   # will always return false
         #
         def confirmation_period_valid?
           confirmation_sent_at? &&
-            (Date.today - confirmation_sent_at.to_date).days < confirm_in
+            (Date.today - confirmation_sent_at.to_date).days < confirm_within
         end
 
         # Checks whether the record is confirmed or not, yielding to the block
@@ -115,26 +115,14 @@ module Devise
           end
         end
 
-        # Remove confirmation date from the user, ensuring after a user update
-        # it's email, it won't be able to sign in without confirming it.
-        def reset_confirmation
-          generate_confirmation_token
-          self.confirmed_at = nil
-        end
-
         # Generates a new random token for confirmation, and stores the time
         # this token is being generated
         def generate_confirmation_token
+          self.confirmed_at = nil
           self.confirmation_token = friendly_token
           self.confirmation_sent_at = Time.now.utc
         end
 
-        # Resets the confirmation token with and save the record without
-        # validating.
-        def generate_confirmation_token!
-          generate_confirmation_token && save(false)
-        end
-
       module ClassMethods
 
         # Attempt to find a user by it's email. If a record is found, send new
@@ -162,7 +150,7 @@ module Devise
         end
       end
 
-      Devise.model_config(self, :confirm_in, 0.days)
+      Devise.model_config(self, :confirm_within, 0.days)
     end
   end
 end

data/lib/devise/routes.rb

@@ -19,7 +19,7 @@ module ActionController::Routing
       # 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
-      # authenticable, confirmable and recoverable modules. After creating this
+      # authenticatable, confirmable and recoverable modules. After creating this
       # inside your routes:
       #
       #   map.devise_for :users
@@ -27,7 +27,7 @@ module ActionController::Routing
       # this method is going to look inside your User model and create the
       # needed routes:
       #
-      #  # Session routes for Authenticable (default)
+      #  # 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"}
@@ -69,7 +69,7 @@ module ActionController::Routing
           mapping = Devise::Mapping.new(resource, options)
           Devise.mappings[mapping.name] = mapping
 
-          if mapping.authenticable?
+          if mapping.authenticatable?
             with_options(:controller => 'sessions', :path_prefix => mapping.as) 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 })

data/lib/devise/strategies/{authenticable.rb → authenticatable.rb}

@@ -2,7 +2,7 @@ module Devise
   module Strategies
     # Default strategy for signing in a user, based on his email and password.
     # Redirects to sign_in page if it's not authenticated
-    class Authenticable < Devise::Strategies::Base
+    class Authenticatable < Devise::Strategies::Base
 
       # Authenticate a user based on email and password params, returning to warden
       # success and the authenticated user if everything is okay. Otherwise redirect
@@ -43,4 +43,4 @@ module Devise
   end
 end
 
-Warden::Strategies.add(:authenticable, Devise::Strategies::Authenticable)
+Warden::Strategies.add(:authenticatable, Devise::Strategies::Authenticatable)

data/lib/devise/strategies/rememberable.rb

@@ -3,7 +3,7 @@ module Devise
     # 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*
-    # authenticable.
+    # authenticatable.
     class Rememberable < Devise::Strategies::Base
 
       # A valid strategy for rememberable needs a remember token in the cookies.

data/lib/devise/version.rb

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

data/lib/devise/warden.rb

@@ -55,7 +55,7 @@ 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, :authenticable
+  manager.default_strategies :rememberable, :authenticatable
   manager.failure_app = Devise::Failure
   manager.silence_missing_strategies!
 end

data/test/active_record_test.rb

@@ -31,7 +31,7 @@ end
 class Configurable < User
   devise :all, :stretches => 15,
                :pepper => 'abcdef',
-               :confirm_in => 5.days,
+               :confirm_within => 5.days,
                :remember_for => 7.days
 end
 
@@ -54,38 +54,38 @@ class ActiveRecordTest < ActiveSupport::TestCase
     end
   end
 
-  test 'include by default authenticable only' do
-    assert_include_modules Authenticable, :authenticable
+  test 'include by default authenticatable only' do
+    assert_include_modules Authenticable, :authenticatable
     assert_not_include_modules Authenticable, :confirmable, :recoverable, :rememberable, :validatable
   end
 
   test 'add confirmable module only' do
-    assert_include_modules Confirmable, :authenticable, :confirmable
+    assert_include_modules Confirmable, :authenticatable, :confirmable
     assert_not_include_modules Confirmable, :recoverable, :rememberable, :validatable
   end
 
   test 'add recoverable module only' do
-    assert_include_modules Recoverable, :authenticable, :recoverable
+    assert_include_modules Recoverable, :authenticatable, :recoverable
     assert_not_include_modules Recoverable, :confirmable, :rememberable, :validatable
   end
 
   test 'add rememberable module only' do
-    assert_include_modules Rememberable, :authenticable, :rememberable
+    assert_include_modules Rememberable, :authenticatable, :rememberable
     assert_not_include_modules Rememberable, :confirmable, :recoverable, :validatable
   end
 
   test 'add validatable module only' do
-    assert_include_modules Validatable, :authenticable, :validatable
+    assert_include_modules Validatable, :authenticatable, :validatable
     assert_not_include_modules Validatable, :confirmable, :recoverable, :rememberable
   end
 
   test 'add all modules' do
     assert_include_modules Devisable,
-      :authenticable, :confirmable, :recoverable, :rememberable, :validatable
+      :authenticatable, :confirmable, :recoverable, :rememberable, :validatable
   end
 
   test 'configure modules with except option' do
-    assert_include_modules Exceptable, :authenticable, :confirmable
+    assert_include_modules Exceptable, :authenticatable, :confirmable
     assert_not_include_modules Exceptable, :recoverable, :rememberable, :validatable
   end
 
@@ -97,8 +97,8 @@ class ActiveRecordTest < ActiveSupport::TestCase
     assert_equal 'abcdef', Configurable.new.pepper
   end
 
-  test 'set a default value for confirm_in' do
-    assert_equal 5.days, Configurable.new.confirm_in
+  test 'set a default value for confirm_within' do
+    assert_equal 5.days, Configurable.new.confirm_within
   end
 
   test 'set a default value for remember_for' do

data/test/integration/confirmable_test.rb

@@ -59,7 +59,7 @@ class ConfirmationTest < ActionController::IntegrationTest
   end
 
   test 'not confirmed user and setup to block without confirmation should not be able to sign in' do
-    Devise.confirm_in = 0
+    Devise.confirm_within = 0
     user = sign_in_as_user(:confirm => false)
 
     assert_redirected_to new_user_session_path(:unconfirmed => true)
@@ -67,7 +67,7 @@ class ConfirmationTest < ActionController::IntegrationTest
   end
 
   test 'not confirmed user but configured with some days to confirm should be able to sign in' do
-    Devise.confirm_in = 1
+    Devise.confirm_within = 1
     user = sign_in_as_user(:confirm => false)
 
     assert_response :success

data/test/mapping_test.rb

@@ -57,13 +57,13 @@ class MapTest < ActiveSupport::TestCase
 
   test 'magic predicates' do
     mapping = Devise.mappings[:user]
-    assert mapping.authenticable?
+    assert mapping.authenticatable?
     assert mapping.confirmable?
     assert mapping.recoverable?
     assert mapping.rememberable?
 
     mapping = Devise.mappings[:admin]
-    assert mapping.authenticable?
+    assert mapping.authenticatable?
     assert_not mapping.confirmable?
     assert_not mapping.recoverable?
     assert_not mapping.rememberable?

data/test/models/{authenticable_test.rb → authenticatable_test.rb}

@@ -1,7 +1,7 @@
 require 'test/test_helper'
 require 'digest/sha1'
 
-class AuthenticableTest < ActiveSupport::TestCase
+class AuthenticatableTest < ActiveSupport::TestCase
 
   def encrypt_password(user, pepper=nil, stretches=1)
     user.class_eval { define_method(:stretches) { stretches } } if stretches

data/test/models/confirmable_test.rb

@@ -149,38 +149,23 @@ class ConfirmableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should resend email instructions for the user reconfirming the email if it has changed' do
+  test 'should not resend email instructions if the user change his email' do
     user = create_user
     user.email = 'new_test@example.com'
-    assert_email_sent do
-      user.save!
-    end
-  end
-
-  test 'should not resend email instructions if the user is updated but the email is not' do
-    user = create_user
-    user.confirmed_at = Time.now
     assert_email_not_sent do
       user.save!
     end
   end
 
-  test 'should reset confirmation status when updating email' do
+  test 'should not reset confirmation status or token when updating email' do
     user = create_user
-    assert_not user.confirmed?
     user.confirm!
-    assert user.confirmed?
     user.email = 'new_test@example.com'
     user.save!
-    assert_not user.reload.confirmed?
-  end
 
-  test 'should reset confirmation token when updating email' do
-    user = create_user
-    token = user.confirmation_token
-    user.email = 'new_test@example.com'
-    user.save!
-    assert_not_equal token, user.reload.confirmation_token
+    user.reload
+    assert user.confirmed?
+    assert_nil user.confirmation_token
   end
 
   test 'should not be able to send instructions if the user is already confirmed' do
@@ -194,20 +179,20 @@ class ConfirmableTest < ActiveSupport::TestCase
 
   test 'confirm time should fallback to devise confirm in default configuration' do
     begin
-      confirm_in = Devise.confirm_in
-      Devise.confirm_in = 1.day
+      confirm_within = Devise.confirm_within
+      Devise.confirm_within = 1.day
       user = new_user
       user.confirmation_sent_at = 2.days.ago
       assert_not user.active?
-      Devise.confirm_in = 3.days
+      Devise.confirm_within = 3.days
       assert user.active?
     ensure
-      Devise.confirm_in = confirm_in
+      Devise.confirm_within = confirm_within
     end
   end
 
   test 'should be active when confirmation sent at is not overpast' do
-    Devise.confirm_in = 5.days
+    Devise.confirm_within = 5.days
     user = create_user
     user.confirmation_sent_at = 4.days.ago
     assert user.active?
@@ -223,21 +208,21 @@ class ConfirmableTest < ActiveSupport::TestCase
   end
 
   test 'should not be active when confirmation was sent within the limit' do
-    Devise.confirm_in = 5.days
+    Devise.confirm_within = 5.days
     user = create_user
     user.confirmation_sent_at = 5.days.ago
     assert_not user.active?
   end
 
   test 'should be active when confirm in is zero' do
-    Devise.confirm_in = 0.days
+    Devise.confirm_within = 0.days
     user = create_user
     user.confirmation_sent_at = Date.today
     assert_not user.active?
   end
 
   test 'should not be active when confirmation was sent before confirm in time' do
-    Devise.confirm_in = 4.days
+    Devise.confirm_within = 4.days
     user = create_user
     user.confirmation_sent_at = 5.days.ago
     assert_not user.active?

data/test/test_helper.rb

@@ -17,7 +17,7 @@ ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":me
 ActiveRecord::Schema.define(:version => 1) do
   [:users, :admins].each do |table|
     create_table table do |t|
-      t.authenticable :null => table == :admins
+      t.authenticatable :null => table == :admins
 
       if table == :users
         t.confirmable

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -02:00
+date: 2009-10-30 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,6 @@ files:
 - app/views/passwords/edit.html.erb
 - app/views/passwords/new.html.erb
 - app/views/sessions/new.html.erb
-- config/locales/en.yml
 - generators/devise/USAGE
 - generators/devise/devise_generator.rb
 - generators/devise/lib/route_devise.rb
@@ -65,15 +64,16 @@ files:
 - lib/devise/failure.rb
 - lib/devise/hooks/confirmable.rb
 - lib/devise/hooks/rememberable.rb
+- lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/migrations.rb
-- lib/devise/models/authenticable.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/strategies/authenticable.rb
+- lib/devise/strategies/authenticatable.rb
 - lib/devise/strategies/base.rb
 - lib/devise/strategies/rememberable.rb
 - lib/devise/version.rb
@@ -127,13 +127,13 @@ test_files:
 - test/controllers/url_helpers_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/filters_test.rb
-- test/integration/authenticable_test.rb
+- test/integration/authenticatable_test.rb
 - test/integration/rememberable_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/confirmable_test.rb
 - test/mailers/confirmation_instructions_test.rb
 - test/mailers/reset_password_instructions_test.rb
-- test/models/authenticable_test.rb
+- test/models/authenticatable_test.rb
 - test/models/rememberable_test.rb
 - test/models/recoverable_test.rb
 - test/models/validatable_test.rb