devise 2.1.4 → 2.2.0.rc

data/test/models/database_authenticatable_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'test_models'
 require 'digest/sha1'
 
 class DatabaseAuthenticatableTest < ActiveSupport::TestCase
@@ -12,6 +13,17 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal email.downcase, user.email
   end
 
+  test 'should downcase case insensitive keys that refer to virtual attributes when saving' do
+    email        = 'Foo@Bar1.com'
+    confirmation = 'Foo@Bar1.com'
+    attributes   = valid_attributes(:email => email, :email_confirmation => confirmation)
+    user = UserWithVirtualAttributes.new(attributes)
+
+    assert_equal confirmation, user.email_confirmation
+    user.save!
+    assert_equal confirmation.downcase, user.email_confirmation
+  end
+
   test 'should remove whitespace from strip whitespace keys when saving' do
     # strip_whitespace_keys is set to :email by default.
     email = ' foo@bar.com '
@@ -23,9 +35,15 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
   end
 
   test "param filter should not convert booleans and integer to strings" do
-    conditions = { "login" => "foo@bar.com", "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
+    conditions = { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => (1..10) }
     conditions = Devise::ParamFilter.new([], []).filter(conditions)
-    assert_equal( { "login" => "foo@bar.com", "bool1" => "true", "bool2" => "false", "fixnum" => "123", "will_be_converted" => "1..10" }, conditions)
+    assert_equal( { 'login' => 'foo@bar.com', "bool1" => true, "bool2" => false, "fixnum" => 123, "will_be_converted" => "1..10" }, conditions)
+  end
+
+  test "param filter should not convert regular expressions to strings" do
+    conditions = { "regexp" => /expression/ }
+    conditions = Devise::ParamFilter.new([], []).filter(conditions)
+    assert_equal( { "regexp" => /expression/ }, conditions)
   end
 
   test 'should respond to password and password confirmation' do
@@ -60,14 +78,14 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should test for a valid password' do
     user = create_user
-    assert user.valid_password?('123456')
+    assert user.valid_password?('12345678')
     assert_not user.valid_password?('654321')
   end
 
   test 'should not raise error with an empty password' do
     user = create_user
     user.encrypted_password = ''
-    assert_nothing_raised { user.valid_password?('123456') }
+    assert_nothing_raised { user.valid_password?('12345678') }
   end
 
   test 'should be an invalid password if the user has an empty password' do
@@ -82,31 +100,38 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should update password with valid current password' do
     user = create_user
-    assert user.update_with_password(:current_password => '123456',
-      :password => 'pass321', :password_confirmation => 'pass321')
-    assert user.reload.valid_password?('pass321')
+    assert user.update_with_password(:current_password => '12345678',
+      :password => 'pass4321', :password_confirmation => 'pass4321')
+    assert user.reload.valid_password?('pass4321')
   end
 
   test 'should update password with valid current password and :as option' do
     user = create_user
-    assert user.update_with_password(:current_password => '123456',
-      :password => 'pass321', :password_confirmation => 'pass321', :as => :admin)
-    assert user.reload.valid_password?('pass321')
+    assert user.update_with_password(:current_password => '12345678',
+      :password => 'pass4321', :password_confirmation => 'pass4321', :as => :admin)
+    assert user.reload.valid_password?('pass4321')
   end
 
   test 'should add an error to current password when it is invalid' do
     user = create_user
     assert_not user.update_with_password(:current_password => 'other',
-      :password => 'pass321', :password_confirmation => 'pass321')
-    assert user.reload.valid_password?('123456')
+      :password => 'pass4321', :password_confirmation => 'pass4321')
+    assert user.reload.valid_password?('12345678')
     assert_match "is invalid", user.errors[:current_password].join
   end
 
+  test 'should not change encrypted password when it is invalid' do
+    user = create_user
+    assert_not user.update_with_password(:current_password => 'other',
+      :password => 'pass4321', :password_confirmation => 'pass4321')
+    assert_not user.encrypted_password_changed?
+  end
+
   test 'should add an error to current password when it is blank' do
     user = create_user
-    assert_not user.update_with_password(:password => 'pass321',
-      :password_confirmation => 'pass321')
-    assert user.reload.valid_password?('123456')
+    assert_not user.update_with_password(:password => 'pass4321',
+      :password_confirmation => 'pass4321')
+    assert user.reload.valid_password?('12345678')
     assert_match "can't be blank", user.errors[:current_password].join
   end
 
@@ -121,21 +146,21 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should ignore password and its confirmation if they are blank' do
     user = create_user
-    assert user.update_with_password(:current_password => '123456', :email => "new@example.com")
+    assert user.update_with_password(:current_password => '12345678', :email => "new@example.com")
     assert_equal "new@example.com", user.email
   end
 
   test 'should not update password with invalid confirmation' do
     user = create_user
-    assert_not user.update_with_password(:current_password => '123456',
-      :password => 'pass321', :password_confirmation => 'other')
-    assert user.reload.valid_password?('123456')
+    assert_not user.update_with_password(:current_password => '12345678',
+      :password => 'pass4321', :password_confirmation => 'other')
+    assert user.reload.valid_password?('12345678')
   end
 
   test 'should clean up password fields on failure' do
     user = create_user
-    assert_not user.update_with_password(:current_password => '123456',
-      :password => 'pass321', :password_confirmation => 'other')
+    assert_not user.update_with_password(:current_password => '12345678',
+      :password => 'pass4321', :password_confirmation => 'other')
     assert user.password.blank?
     assert user.password_confirmation.blank?
   end
@@ -154,9 +179,9 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
 
   test 'should not update password without password' do
     user = create_user
-    user.update_without_password(:password => 'pass321', :password_confirmation => 'pass321')
-    assert !user.reload.valid_password?('pass321')
-    assert user.valid_password?('123456')
+    user.update_without_password(:password => 'pass4321', :password_confirmation => 'pass4321')
+    assert !user.reload.valid_password?('pass4321')
+    assert user.valid_password?('12345678')
   end
 
   test 'downcase_keys with validation' do

data/test/models/lockable_test.rb

@@ -232,19 +232,19 @@ class LockableTest < ActiveSupport::TestCase
       swap Devise, :lock_strategy => :failed_attempts do
         assert_same_content Devise::Models::Lockable.required_fields(User), [
          :failed_attempts,
-         :unlock_at,
+         :locked_at,
          :unlock_token
         ]
       end
     end
   end
 
-  test 'required_fields should contain only failed_attempts and unlock_at when the strategies are time and failed_attempts are enabled' do
+  test 'required_fields should contain only failed_attempts and locked_at when the strategies are time and failed_attempts are enabled' do
     swap Devise, :unlock_strategy => :time do
       swap Devise, :lock_strategy => :failed_attempts do
         assert_same_content Devise::Models::Lockable.required_fields(User), [
          :failed_attempts,
-         :unlock_at
+         :locked_at
         ]
       end
     end
@@ -260,4 +260,14 @@ class LockableTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test 'should not return a locked unauthenticated message if in paranoid mode' do
+    swap Devise, :paranoid => :true do
+      user = create_user
+      user.failed_attempts = Devise.maximum_attempts + 1
+      user.lock_access!
+
+      assert_equal :invalid, user.unauthenticated_message
+    end
+  end
 end

data/test/models/serializable_test.rb

@@ -21,7 +21,8 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on JSON' do
-    assert_equal %w(created_at email facebook_token id updated_at username), from_json().keys.sort
+    keys = from_json().keys.select{ |key| !key.include?("id") }
+    assert_equal %w(created_at email facebook_token updated_at username), keys.sort
   end
 
   test 'should not include unsafe keys on JSON even if a new except is provided' do

data/test/models_test.rb

@@ -1,26 +1,5 @@
 require 'test_helper'
-
-class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
-end
-
-class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
-end
-
-class UserWithValidation < User
-  validates_presence_of :username
-end
-
-class Several < Admin
-  devise :validatable
-  devise :lockable
-end
-
-class Inheritable < Admin
-end
+require 'test_models'
 
 class ActiveRecordTest < ActiveSupport::TestCase
   def include_module?(klass, mod)

data/test/orm/mongoid.rb

@@ -1,14 +1,13 @@
 require 'mongoid/version'
 
 Mongoid.configure do |config|
-  config.master  = Mongo::Connection.new('127.0.0.1', 27017).db("devise-test-suite")
+  config.connect_to("devise-test-suite")
   config.use_utc = true
   config.include_root_in_json = true
 end
 
 class ActiveSupport::TestCase
   setup do
-    User.delete_all
-    Admin.delete_all
+    Mongoid.purge!
   end
 end

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

@@ -5,4 +5,5 @@ class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :current_user, :unless => :devise_controller?
   before_filter :authenticate_user!, :if => :devise_controller?
+  respond_to *Mime::SET.map(&:to_sym)
 end

data/test/rails_app/app/mailers/users/mailer.rb

@@ -1,3 +1,8 @@
 class Users::Mailer < Devise::Mailer
-  default :from => 'custom@example.com'
+  default :from     => 'custom@example.com'
 end
+
+class Users::ReplyToMailer < Devise::Mailer
+  default :from     => 'custom@example.com'
+  default :reply_to => 'custom_reply_to@example.com'
+end

data/test/rails_app/app/mongoid/admin.rb

@@ -6,8 +6,8 @@ class Admin
   include SharedAdmin
 
   ## Database authenticatable
-  field :email,              :type => String, :null => true
-  field :encrypted_password, :type => String, :null => true
+  field :email,              :type => String
+  field :encrypted_password, :type => String
 
   ## Recoverable
   field :reset_password_token,   :type => String
@@ -24,4 +24,6 @@ class Admin
 
   ## Lockable
   field :locked_at, :type => Time
+
+  field :active, :type => Boolean, :default => false
 end

data/test/rails_app/app/mongoid/shim.rb

@@ -7,13 +7,13 @@ module Shim
   end
 
   module ClassMethods
-    def last(options={})
+    def last(options = {})
       options.delete(:order) if options[:order] == "id"
-      super(options)
+      where(options).last
     end
 
     def find_by_email(email)
-      first(:conditions => { :email => email })
+      find_by(:email => email)
     end
   end
 

data/test/rails_app/app/mongoid/user.rb

@@ -9,8 +9,8 @@ class User
   field :facebook_token, :type => String
 
   ## Database authenticatable
-  field :email,              :type => String, :null => false, :default => ""
-  field :encrypted_password, :type => String, :null => false, :default => ""
+  field :email,              :type => String, :default => ""
+  field :encrypted_password, :type => String, :default => ""
 
   ## Recoverable
   field :reset_password_token,   :type => String

data/test/rails_app/config/initializers/devise.rb

@@ -85,8 +85,8 @@ Devise.setup do |config|
   # config.extend_remember_period = false
 
   # ==> Configuration for :validatable
-  # Range for password length. Default is 6..128.
-  # config.password_length = 6..128
+  # Range for password length. Default is 8..128.
+  # config.password_length = 8..128
 
   # Regex to use to validate the email address
   # config.email_regexp = /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i

data/test/rails_app/lib/shared_user.rb

@@ -7,7 +7,7 @@ module SharedUser
            :trackable, :validatable, :omniauthable
 
     attr_accessor :other_key
-    attr_accessible :username, :email, :password, :password_confirmation, :remember_me
+    attr_accessible :username, :email, :password, :password_confirmation, :remember_me, :confirmation_sent_at
 
     # They need to be included after Devise is called.
     extend ExtendMethods

data/test/support/helpers.rb

@@ -25,8 +25,8 @@ class ActiveSupport::TestCase
   def valid_attributes(attributes={})
     { :username => "usertest",
       :email => generate_unique_email,
-      :password => '123456',
-      :password_confirmation => '123456' }.update(attributes)
+      :password => '12345678',
+      :password_confirmation => '12345678' }.update(attributes)
   end
 
   def new_user(attributes={})

data/test/support/integration.rb

@@ -10,10 +10,11 @@ class ActionDispatch::IntegrationTest
       user = User.create!(
         :username => 'usertest',
         :email => options[:email] || 'user@test.com',
-        :password => options[:password] || '123456',
-        :password_confirmation => options[:password] || '123456',
+        :password => options[:password] || '12345678',
+        :password_confirmation => options[:password] || '12345678',
         :created_at => Time.now.utc
       )
+      user.update_attribute(:confirmation_sent_at, options[:confirmation_sent_at]) if options[:confirmation_sent_at]
       user.confirm! unless options[:confirm] == false
       user.lock_access! if options[:locked] == true
       user
@@ -36,7 +37,7 @@ class ActionDispatch::IntegrationTest
     user = create_user(options)
     visit_with_option options[:visit], new_user_session_path
     fill_in 'email', :with => options[:email] || 'user@test.com'
-    fill_in 'password', :with => options[:password] || '123456'
+    fill_in 'password', :with => options[:password] || '12345678'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?
     click_button 'Sign In'

data/test/test_helpers_test.rb

@@ -9,7 +9,7 @@ class TestHelpersTest < ActionController::TestCase
       self.status = 306
     end
   end
-  
+
   test "redirects if attempting to access a page unauthenticated" do
     get :index
     assert_redirected_to new_user_session_path
@@ -47,6 +47,18 @@ class TestHelpersTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "does not redirect with valid user after failed first attempt" do
+    get :index
+    assert_response :redirect
+
+    user = create_user
+    user.confirm!
+
+    sign_in user
+    get :index
+    assert_response :success
+  end
+
   test "redirects if valid user signed out" do
     user = create_user
     user.confirm!
@@ -58,7 +70,7 @@ class TestHelpersTest < ActionController::TestCase
     get :index
     assert_redirected_to new_user_session_path
   end
-  
+
   test "respects custom failure app" do
     begin
       Devise.warden_config.failure_app = CustomFailureApp
@@ -69,6 +81,11 @@ class TestHelpersTest < ActionController::TestCase
     end
   end
 
+  test "returns the body of a failure app" do
+    get :index
+    assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
+  end
+
   test "defined Warden after_authentication callback should not be called when sign_in is called" do
     begin
       Warden::Manager.after_authentication do |user, auth, opts|

data/test/test_models.rb

@@ -0,0 +1,27 @@
+class Configurable < User
+  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
+         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
+         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
+end
+
+class WithValidation < Admin
+  devise :database_authenticatable, :validatable, :password_length => 2..6
+end
+
+class UserWithValidation < User
+  validates_presence_of :username
+end
+
+class UserWithVirtualAttributes < User
+  devise :case_insensitive_keys => [ :email, :email_confirmation ]
+  validates :email, :presence => true, :confirmation => {:on => :create}
+  attr_accessible :email, :email_confirmation
+end
+
+class Several < Admin
+  devise :validatable
+  devise :lockable
+end
+
+class Inheritable < Admin
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  version: 2.1.4
-  prerelease: 
+  prerelease: 6
+  version: 2.2.0.rc
 platform: ruby
 authors:
 - José Valim
@@ -10,72 +10,72 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2012-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: warden
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+    none: false
+  name: warden
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: orm_adapter
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+    none: false
+  name: orm_adapter
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: bcrypt-ruby
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
+  name: bcrypt-ruby
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+    none: false
+  name: railties
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
+    none: false
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -85,6 +85,7 @@ files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.rdoc
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -159,6 +160,7 @@ files:
 - lib/devise/strategies/rememberable.rb
 - lib/devise/strategies/token_authenticatable.rb
 - lib/devise/test_helpers.rb
+- lib/devise/time_inflector.rb
 - lib/devise/version.rb
 - lib/generators/active_record/devise_generator.rb
 - lib/generators/active_record/templates/migration.rb
@@ -194,7 +196,6 @@ files:
 - test/generators/mongoid_generator_test.rb
 - test/generators/views_generator_test.rb
 - test/helpers/devise_helper_test.rb
-- test/indifferent_hash.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
 - test/integration/database_authenticatable_test.rb
@@ -287,6 +288,7 @@ files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
+- test/test_models.rb
 homepage: http://github.com/plataformatec/devise
 licenses: []
 post_install_message: 
@@ -294,17 +296,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
+  none: false
 requirements: []
 rubyforge_project: devise
 rubygems_version: 1.8.23
@@ -326,7 +328,6 @@ test_files:
 - test/generators/mongoid_generator_test.rb
 - test/generators/views_generator_test.rb
 - test/helpers/devise_helper_test.rb
-- test/indifferent_hash.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
 - test/integration/database_authenticatable_test.rb
@@ -419,3 +420,4 @@ test_files:
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
+- test/test_models.rb