devise 2.2.3 → 2.2.4

data/test/models/database_authenticatable_test.rb

@@ -52,6 +52,18 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert_equal( { "login" => "foo@bar.com", "bool1" => "true", "bool2" => "false", "fixnum" => "123", "will_be_converted" => "1..10" }, conditions)
   end
 
+  test 'param filter should filter case_insensitive_keys as insensitive' do
+    conditions = {'insensitive' => 'insensitive_VAL', 'sensitive' => 'sensitive_VAL'}
+    conditions = Devise::ParamFilter.new(['insensitive'], []).filter(conditions)
+    assert_equal( {'insensitive' => 'insensitive_val', 'sensitive' => 'sensitive_VAL'}, conditions )
+  end
+
+  test 'param filter should filter strip_whitespace_keys stripping whitespaces' do
+    conditions = {'strip_whitespace' => ' strip_whitespace_val ', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}
+    conditions = Devise::ParamFilter.new([], ['strip_whitespace']).filter(conditions)
+    assert_equal( {'strip_whitespace' => 'strip_whitespace_val', 'do_not_strip_whitespace' => ' do_not_strip_whitespace_val '}, conditions )
+  end
+
   test 'should respond to password and password confirmation' do
     user = new_user
     assert user.respond_to?(:password)
@@ -183,6 +195,26 @@ class DatabaseAuthenticatableTest < ActiveSupport::TestCase
     assert user.valid_password?('12345678')
   end
 
+  test 'should destroy user if current password is valid' do
+    user = create_user
+    assert user.destroy_with_password('12345678')
+    assert !user.persisted?
+  end
+
+  test 'should not destroy user with invalid password' do
+    user = create_user
+    assert_not user.destroy_with_password('other')
+    assert user.persisted?
+    assert_match "is invalid", user.errors[:current_password].join
+  end
+
+  test 'should not destroy user with blank password' do
+    user = create_user
+    assert_not user.destroy_with_password(nil)
+    assert user.persisted?
+    assert_match "can't be blank", user.errors[:current_password].join
+  end
+
   test 'downcase_keys with validation' do
     user = User.create(:email => "HEllO@example.com", :password => "123456")
     user = User.create(:email => "HEllO@example.com", :password => "123456")

data/test/models/lockable_test.rb

@@ -59,7 +59,7 @@ class LockableTest < ActiveSupport::TestCase
     assert_not user.active_for_authentication?
   end
 
-  test "should unlock a user by cleaning locked_at, falied_attempts and unlock_token" do
+  test "should unlock a user by cleaning locked_at, failed_attempts and unlock_token" do
     user = create_user
     user.lock_access!
     assert_not_nil user.reload.locked_at

data/test/models/rememberable_test.rb

@@ -57,9 +57,10 @@ class RememberableTest < ActiveSupport::TestCase
 
   test 'forget_me should not try to update resource if it has been destroyed' do
     resource = create_resource
-    resource.destroy
     resource.expects(:remember_created_at).never
     resource.expects(:save).never
+
+    resource.destroy
     resource.forget_me!
   end
 
@@ -114,7 +115,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'remember should not be expired if it was created whitin the limit time' do
+  test 'remember should not be expired if it was created within the limit time' do
     swap Devise, :remember_for => 30.days do
       resource = create_resource
       resource.remember_me!
@@ -166,7 +167,7 @@ class RememberableTest < ActiveSupport::TestCase
     end
   end
 
-  test 'should have the required_fiels array' do
+  test 'should have the required_fields array' do
     assert_same_content Devise::Models::Rememberable.required_fields(User), [
       :remember_created_at
     ]

data/test/models/serializable_test.rb

@@ -6,18 +6,18 @@ class SerializableTest < ActiveSupport::TestCase
   end
 
   test 'should not include unsafe keys on XML' do
-    assert_match /email/, @user.to_xml
-    assert_no_match /confirmation-token/, @user.to_xml
+    assert_match(/email/, @user.to_xml)
+    assert_no_match(/confirmation-token/, @user.to_xml)
   end
 
   test 'should not include unsafe keys on XML even if a new except is provided' do
-    assert_no_match /email/, @user.to_xml(:except => :email)
-    assert_no_match /confirmation-token/, @user.to_xml(:except => :email)
+    assert_no_match(/email/, @user.to_xml(:except => :email))
+    assert_no_match(/confirmation-token/, @user.to_xml(:except => :email))
   end
 
   test 'should include unsafe keys on XML if a force_except is provided' do
-    assert_no_match /<email/, @user.to_xml(:force_except => :email)
-    assert_match /confirmation-token/, @user.to_xml(:force_except => :email)
+    assert_no_match(/<email/, @user.to_xml(:force_except => :email))
+    assert_match(/confirmation-token/, @user.to_xml(:force_except => :email))
   end
 
   test 'should not include unsafe keys on JSON' do

data/test/models/validatable_test.rb

@@ -59,7 +59,7 @@ class ValidatableTest < ActiveSupport::TestCase
     assert_equal 'doesn\'t match confirmation', user.errors[:password].join
   end
 
-  test 'should require password when updating/reseting password' do
+  test 'should require password when updating/resetting password' do
     user = create_user
 
     user.password = ''
@@ -69,7 +69,7 @@ class ValidatableTest < ActiveSupport::TestCase
     assert_equal 'can\'t be blank', user.errors[:password].join
   end
 
-  test 'should require confirmation when updating/reseting password' do
+  test 'should require confirmation when updating/resetting password' do
     user = create_user
     user.password_confirmation = 'another_password'
     assert user.invalid?
@@ -98,7 +98,7 @@ class ValidatableTest < ActiveSupport::TestCase
     assert_not (user.errors[:password].join =~ /is too long/)
   end
 
-  test 'should complain about length even if possword is not required' do
+  test 'should complain about length even if password is not required' do
     user = new_user(:password => 'x'*129, :password_confirmation => 'x'*129)
     user.stubs(:password_required?).returns(false)
     assert user.invalid?

data/test/models_test.rb

@@ -83,7 +83,12 @@ class ActiveRecordTest < ActiveSupport::TestCase
   end
 
   test 'set null fields on migrations' do
-    Admin.create!
+    # Ignore email sending since no email exists.
+    klass = Class.new(Admin) do
+      def send_devise_notification(*); end
+    end
+
+    klass.create!
   end
 end
 

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

@@ -5,4 +5,8 @@ end
 class Users::ReplyToMailer < Devise::Mailer
   default :from     => 'custom@example.com'
   default :reply_to => 'custom_reply_to@example.com'
-end
+end
+
+class Users::FromProcMailer < Devise::Mailer
+  default :from     => proc { 'custom@example.com' }
+end

data/test/rails_app/config/routes.rb

@@ -17,39 +17,39 @@ Rails.application.routes.draw do
   devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
 
   as :user do
-    match "/as/sign_in", :to => "devise/sessions#new"
+    get "/as/sign_in", :to => "devise/sessions#new"
   end
 
-  match "/sign_in", :to => "devise/sessions#new"
+  get "/sign_in", :to => "devise/sessions#new"
 
   # Admin scope
   devise_for :admin, :path => "admin_area", :controllers => { :sessions => :"admins/sessions" }, :skip => :passwords
 
-  match "/admin_area/home", :to => "admins#index", :as => :admin_root
-  match "/anywhere", :to => "foo#bar", :as => :new_admin_password
+  get "/admin_area/home", :to => "admins#index", :as => :admin_root
+  get "/anywhere", :to => "foo#bar", :as => :new_admin_password
 
   authenticate(:admin) do
-    match "/private", :to => "home#private", :as => :private
+    get "/private", :to => "home#private", :as => :private
   end
 
   authenticate(:admin, lambda { |admin| admin.active? }) do
-    match "/private/active", :to => "home#private", :as => :private_active
+    get "/private/active", :to => "home#private", :as => :private_active
   end
 
   authenticated :admin do
-    match "/dashboard", :to => "home#admin_dashboard"
+    get "/dashboard", :to => "home#admin_dashboard"
   end
 
   authenticated :admin, lambda { |admin| admin.active? } do
-    match "/dashboard/active", :to => "home#admin_dashboard"
+    get "/dashboard/active", :to => "home#admin_dashboard"
   end
 
   authenticated do
-    match "/dashboard", :to => "home#user_dashboard"
+    get "/dashboard", :to => "home#user_dashboard"
   end
 
   unauthenticated do
-    match "/join", :to => "home#join"
+    get "/join", :to => "home#join"
   end
 
   # Routes for constraints testing
@@ -92,9 +92,9 @@ Rails.application.routes.draw do
     devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "Admin"
   end
 
-  match "/set", :to => "home#set"
-  match "/unauthenticated", :to => "home#unauthenticated"
-  match "/custom_strategy/new"
+  get "/set", :to => "home#set"
+  get "/unauthenticated", :to => "home#unauthenticated"
+  get "/custom_strategy/new"
 
   root :to => "home#index"
 end

data/test/test_helper.rb

@@ -10,7 +10,7 @@ require "orm/#{DEVISE_ORM}"
 
 I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
 
-require 'mocha'
+require 'mocha/setup'
 require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - José Valim
@@ -10,72 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: warden
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
-  name: warden
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: orm_adapter
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    none: false
-  name: orm_adapter
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: bcrypt-ruby
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
-  name: bcrypt-ruby
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-    none: false
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
-    none: false
-  name: railties
   type: :runtime
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !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: []
@@ -84,6 +75,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- .yardopts
 - CHANGELOG.rdoc
 - CONTRIBUTING.md
 - Gemfile
@@ -114,6 +106,7 @@ files:
 - app/views/devise/unlocks/new.html.erb
 - config/locales/en.yml
 - devise.gemspec
+- devise.png
 - gemfiles/Gemfile.rails-3.1.x
 - gemfiles/Gemfile.rails-3.1.x.lock
 - lib/devise.rb
@@ -185,6 +178,7 @@ files:
 - test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
+- test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
 - test/delegator_test.rb
@@ -290,7 +284,9 @@ files:
 - test/test_helpers_test.rb
 - test/test_models.rb
 homepage: http://github.com/plataformatec/devise
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -300,23 +296,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: devise
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Flexible authentication solution for Rails with Warden
 test_files:
 - test/controllers/custom_strategy_test.rb
 - test/controllers/helpers_test.rb
 - test/controllers/internal_helpers_test.rb
+- test/controllers/passwords_controller_test.rb
 - test/controllers/sessions_controller_test.rb
 - test/controllers/url_helpers_test.rb
 - test/delegator_test.rb