devise 0.7.1 → 0.7.2

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+== 0.7.2
+
+* deprecation
+  * Renamed reset_confirmation! to resend_confirmation!
+  * Copying locale is part of the installation process
+
+* bug fix
+  * Fixed render_with_scope to work with all controllers
+  * Allow sign in with two different users in Devise::TestHelpers
+
 == 0.7.1
 
 * enhancements

data/README.rdoc

@@ -42,6 +42,10 @@ Configure warden and devise gems inside your app:
   config.gem 'warden'
   config.gem 'devise'
 
+Run the generator:
+
+	ruby script/generate devise_install
+
 And you're ready to go.
 
 == Basic Usage

data/generators/devise/devise_generator.rb

@@ -4,9 +4,6 @@ class DeviseGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      # Check for class naming collisions.
-      m.class_collisions(class_name)
-
       # Model
       m.directory(File.join('app', 'models', class_path))
       m.template 'model.rb', File.join('app', 'models', "#{file_path}.rb")

data/generators/devise/templates/migration.rb

@@ -1,7 +1,7 @@
 class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration
   def self.up
     create_table(:<%= table_name %>) do |t|
-      t.authenticatable :encryptor => :sha1
+      t.authenticatable :encryptor => :sha1, :null => false
       t.confirmable
       t.recoverable
       t.rememberable

data/generators/devise_install/devise_install_generator.rb

@@ -2,7 +2,11 @@ class DeviseInstallGenerator < Rails::Generator::Base
 
   def manifest
     record do |m|
-      m.template "devise.rb", "config/initializers/devise.rb"
+      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"
     end
   end
 

data/generators/devise_views/devise_views_generator.rb

@@ -15,9 +15,6 @@ class DeviseViewsGenerator < Rails::Generator::Base
         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,7 +1,28 @@
 module Devise
-  autoload :Schema, 'devise/schema'
-  autoload :Mapping, 'devise/mapping'
   autoload :FailureApp, 'devise/failure_app'
+  autoload :Mapping, 'devise/mapping'
+  autoload :Schema, 'devise/schema'
+  autoload :TestHelpers, 'devise/test_helpers'
+
+  module Controllers
+    autoload :Filters, 'devise/controllers/filters'
+    autoload :Helpers, 'devise/controllers/helpers'
+    autoload :UrlHelpers, 'devise/controllers/url_helpers'
+  end
+
+  module Encryptors
+    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512'
+    autoload :AuthlogicSha1, 'devise/encryptors/authlogic_sha1'
+    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1'
+    autoload :Sha512, 'devise/encryptors/sha512'
+    autoload :Sha1, 'devise/encryptors/sha1'
+  end
+
+  module Orm
+    autoload :ActiveRecord, 'devise/orm/active_record'
+    autoload :DataMapper, 'devise/orm/data_mapper'
+    autoload :MongoMapper, 'devise/orm/mongo_mapper'
+  end
 
   ALL = [:authenticatable, :confirmable, :recoverable, :rememberable,
          :timeoutable, :trackable, :validatable]
@@ -147,8 +168,4 @@ end
 
 # Set the default_scope to nil, so it's overwritten when the first route is declared.
 Warden::Manager.default_scope = nil
-
-require 'devise/controllers'
-require 'devise/encryptors'
-require 'devise/orm'
 require 'devise/rails'

data/lib/devise/controllers/helpers.rb

@@ -100,7 +100,7 @@ module Devise
       def render_with_scope(action)
         if Devise.scoped_views
           begin
-            render :template => "sessions/#{devise_mapping.as}/#{action}"
+            render :template => "#{controller_name}/#{devise_mapping.as}/#{action}"
           rescue ActionView::MissingTemplate
             render action
           end

data/lib/devise/models/confirmable.rb

@@ -27,15 +27,15 @@ module Devise
     #   User.find(1).confirm!      # returns true unless it's already confirmed
     #   User.find(1).confirmed?    # true/false
     #   User.find(1).send_confirmation_instructions # manually send instructions
-    #   User.find(1).reset_confirmation! # reset confirmation status and send instructions
+    #   User.find(1).resend_confirmation! # generates a new token and resent it
     module Confirmable
 
       def self.included(base)
         base.class_eval do
           extend ClassMethods
 
-          before_create :generate_confirmation_token
-          after_create  :send_confirmation_instructions
+          before_create :generate_confirmation_token, :if => :confirmation_required?
+          after_create  :send_confirmation_instructions, :if => :confirmation_required?
         end
       end
 
@@ -62,7 +62,7 @@ module Devise
       # Remove confirmation date and send confirmation instructions, to ensure
       # after sending these instructions the user won't be able to sign in without
       # confirming it's account
-      def reset_confirmation!
+      def resend_confirmation!
         unless_confirmed do
           generate_confirmation_token
           save(false)
@@ -78,8 +78,20 @@ module Devise
         confirmed? || confirmation_period_valid?
       end
 
+      # If you don't want confirmation to be sent on create, neither a code
+      # to be generated, call skip_confirmation!
+      def skip_confirmation!
+        self.confirmed_at  = Time.now
+        @skip_confirmation = true
+      end
+
       protected
 
+        # Callback to overwrite if confirmation is required or not.
+        def confirmation_required?
+          !@skip_confirmation
+        end
+
         # Checks if the confirmation for the user is within the limit time.
         # We do this by calculating if the difference between today and the
         # confirmation sent date does not exceed the confirm in time configured.
@@ -129,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.reset_confirmation! unless confirmable.new_record?
+          confirmable.resend_confirmation! unless confirmable.new_record?
           confirmable
         end
 

data/lib/devise/models/recoverable.rb

@@ -20,16 +20,11 @@ module Devise
         end
       end
 
-      # Update password
-      def reset_password(new_password, new_password_confirmation)
-        self.password = new_password
-        self.password_confirmation = new_password_confirmation
-      end
-
       # Update password saving the record and clearing token. Returns true if
       # the passwords are valid and the record was saved, false otherwise.
       def reset_password!(new_password, new_password_confirmation)
-        reset_password(new_password, new_password_confirmation)
+        self.password = new_password
+        self.password_confirmation = new_password_confirmation
         clear_reset_password_token if valid?
         save
       end

data/lib/devise/schema.rb

@@ -8,17 +8,11 @@ module Devise
     # == Options
     # * :null - When true, allow columns to be null.
     # * :encryptor - The encryptor going to be used, necessary for setting the proper encrypter password length.
-    # * :skip_email - If you want to use another authentication key, you can skip e-mail creation.
-    #                 If you are using an ORM where the devise declaration is in the same class as the schema,
-    #                 as in Datamapper or Mongomapper, the email is skipped automatically if not included in
-    #                 authentication_keys.
     def authenticatable(options={})
-      null = options[:null] || false
+      null       = options[:null] || false
       encryptor  = options[:encryptor] || (respond_to?(:encryptor) ? self.encryptor : :sha1)
-      have_email = respond_to?(:authentication_keys) ? self.authentication_keys.include?(:email) : true
-      skip_email = options[:skip_email] || !have_email
 
-      apply_schema :email,              String, :null => null, :limit => 100 unless skip_email
+      apply_schema :email,              String, :null => null, :limit => 100
       apply_schema :encrypted_password, String, :null => null, :limit => Devise::ENCRYPTORS_LENGTH[encryptor]
       apply_schema :password_salt,      String, :null => null, :limit => 20
     end

data/lib/devise/test_helpers.rb

@@ -78,6 +78,7 @@ module Devise
     #
     def sign_out(resource_or_scope)
       scope = Devise::Mapping.find_scope!(resource_or_scope)
+      @controller.instance_variable_set(:"@current_#{scope}", nil)
       warden.logout(scope)
     end
 

data/lib/devise/version.rb

@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "0.7.1".freeze
+  VERSION = "0.7.2".freeze
 end

data/test/models/confirmable_test.rb

@@ -15,7 +15,7 @@ class ConfirmableTest < ActiveSupport::TestCase
     user = create_user
     3.times do
       token = user.confirmation_token
-      user.reset_confirmation!
+      user.resend_confirmation!
       assert_not_equal token, user.confirmation_token
     end
   end
@@ -108,6 +108,17 @@ class ConfirmableTest < ActiveSupport::TestCase
     end
   end
 
+  test 'should not generate a new token neither send e-mail if skip_confirmation! is invoked' do
+    user = new_user
+    user.skip_confirmation!
+
+    assert_email_not_sent do
+      user.save!
+      assert_nil user.confirmation_token
+      assert_not_nil user.confirmed_at
+    end
+  end
+
   test 'should find a user to send confirmation instructions' do
     user = create_user
     confirmation_user = User.send_confirmation_instructions(:email => user.email)
@@ -125,20 +136,13 @@ class ConfirmableTest < ActiveSupport::TestCase
     assert_equal 'not found', confirmation_user.errors[:email]
   end
 
-  test 'should reset confirmation token before send the confirmation instructions email' do
+  test 'should generate a confirmation token before send the confirmation instructions email' do
     user = create_user
     token = user.confirmation_token
     confirmation_user = User.send_confirmation_instructions(:email => user.email)
     assert_not_equal token, user.reload.confirmation_token
   end
 
-  test 'should reset confirmation status when sending the confirmation instructions' do
-    user = create_user
-    assert_not user.confirmed?
-    confirmation_user = User.send_confirmation_instructions(:email => user.email)
-    assert_not user.reload.confirmed?
-  end
-
   test 'should send email instructions for the user confirm it\'s email' do
     user = create_user
     assert_email_sent do
@@ -168,7 +172,7 @@ class ConfirmableTest < ActiveSupport::TestCase
   test 'should not be able to send instructions if the user is already confirmed' do
     user = create_user
     user.confirm!
-    assert_not user.reset_confirmation!
+    assert_not user.resend_confirmation!
     assert user.confirmed?
     assert_equal 'already confirmed', user.errors[:email]
   end

data/test/models/recoverable_test.rb

@@ -32,7 +32,7 @@ class RecoverableTest < ActiveSupport::TestCase
 
   test 'should reset password and password confirmation from params' do
     user = create_user
-    user.reset_password('123456789', '987654321')
+    user.reset_password!('123456789', '987654321')
     assert_equal '123456789', user.password
     assert_equal '987654321', user.password_confirmation
   end

data/test/rails_app/app/controllers/users_controller.rb

@@ -9,4 +9,8 @@ class UsersController < ApplicationController
     user_session['last_request_at'] = 31.minutes.ago.utc
     render :text => 'User will be expired on next request'
   end
+
+  def show
+    render :text => current_user.id.to_s
+  end
 end

data/test/test_helpers_test.rb

@@ -5,14 +5,14 @@ class TestHelpersTest < ActionController::TestCase
   include Devise::TestHelpers
 
   test "redirects if attempting to access a page unauthenticated" do
-    get :index
+    get :show
     assert_redirected_to "/users/sign_in?unauthenticated=true"
   end
 
   test "redirects if attempting to access a page with a unconfirmed account" do
     swap Devise, :confirm_within => 0 do
       sign_in create_user
-      get :index
+      get :show
       assert_redirected_to "/users/sign_in?unconfirmed=true"
     end
   end
@@ -22,7 +22,7 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :index
+    get :show
     assert_response :success
   end
 
@@ -31,14 +31,31 @@ class TestHelpersTest < ActionController::TestCase
     user.confirm!
 
     sign_in user
-    get :index
+    get :show
 
     sign_out user
-    get :index
+    get :show
     assert_redirected_to "/users/sign_in?unauthenticated=true"
   end
 
-  def create_user
-    User.create!(:email => "jose.valim@plataformatec.com", :password => "123456")
+  test "allows to sign in with different users" do
+    first_user = create_user(1)
+    first_user.confirm!
+
+    sign_in first_user
+    get :show
+    assert_equal first_user.id.to_s, @response.body
+    sign_out first_user
+
+    second_user = create_user(2)
+    second_user.confirm!
+
+    sign_in second_user
+    get :show
+    assert_equal second_user.id.to_s, @response.body
+  end
+
+  def create_user(i=nil)
+    User.create!(:email => "jose.valim#{i}@plataformatec.com", :password => "123456")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-09 00:00:00 -02:00
+date: 2009-12-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,11 +60,9 @@ files:
 - generators/devise_views/devise_views_generator.rb
 - init.rb
 - lib/devise.rb
-- lib/devise/controllers.rb
 - lib/devise/controllers/filters.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/url_helpers.rb
-- lib/devise/encryptors.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/clearance_sha1.rb
 - lib/devise/encryptors/restful_authentication_sha1.rb
@@ -84,7 +82,6 @@ files:
 - lib/devise/models/timeoutable.rb
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
-- lib/devise/orm.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/data_mapper.rb
 - lib/devise/orm/mongo_mapper.rb

data/lib/devise/controllers.rb

@@ -1,7 +0,0 @@
-module Devise
-  module Controllers
-    autoload :Filters, 'devise/controllers/filters' 
-    autoload :Helpers, 'devise/controllers/helpers' 
-    autoload :UrlHelpers, 'devise/controllers/url_helpers'     
-  end
-end

data/lib/devise/encryptors.rb

@@ -1,9 +0,0 @@
-module Devise
-  module Encryptors
-    autoload :AuthlogicSha512, 'devise/encryptors/authlogic_sha512' 
-    autoload :AuthlogicSha1, 'devise/encryptors/authlogic_sha1' 
-    autoload :RestfulAuthenticationSha1, 'devise/encryptors/restful_authentication_sha1' 
-    autoload :Sha512, 'devise/encryptors/sha512' 
-    autoload :Sha1, 'devise/encryptors/sha1' 
-  end
-end

data/lib/devise/orm.rb

@@ -1,7 +0,0 @@
-module Devise
-  module Orm
-    autoload :ActiveRecord, 'devise/orm/active_record'
-    autoload :DataMapper,   'devise/orm/data_mapper'
-    autoload :MongoMapper,  'devise/orm/mongo_mapper'
-  end
-end