Permalink
Browse files

Use a better method name to check the requirement of password confirm…

…ation

Also improve changelog entries related to secure password to proper
highlight.
  • Loading branch information...
1 parent 017b0fb commit 3a33e8ea85f025d5ba575318583d1038889a2ba1 @carlosantoniodasilva carlosantoniodasilva committed Jan 7, 2014
Showing with 8 additions and 8 deletions.
  1. +3 −3 activemodel/CHANGELOG.md
  2. +5 −5 activemodel/lib/active_model/secure_password.rb
@@ -19,8 +19,8 @@
*Bogdan Gusiev*
-* Fix has_secure_password. `password_confirmation` validations are triggered
- even if no `password_confirmation` is set.
+* Fix `has_secure_password` not to trigger `password_confirmation` validations
+ if no `password_confirmation` is set.
*Vladimir Kiselev*
@@ -33,7 +33,7 @@
*Charles Bergeron*
-* Fix regression in has_secure_password. When a password is set, but a
+* Fix regression in `has_secure_password`. When a password is set, but a
confirmation is an empty string, it would incorrectly save.
*Steve Klabnik* and *Phillip Calvin*
@@ -57,9 +57,9 @@ def has_secure_password(options = {})
include InstanceMethodsOnActivation
if options.fetch(:validations, true)
- validates_confirmation_of :password, if: :should_confirm_password?
+ validates_confirmation_of :password, if: :password_confirmation_required?
validates_presence_of :password, on: :create
- validates_presence_of :password_confirmation, if: :should_confirm_password?
+ validates_presence_of :password_confirmation, if: :password_confirmation_required?
before_create { raise "Password digest missing on new record" if password_digest.blank? }
end
@@ -113,9 +113,9 @@ def password_confirmation=(unencrypted_password)
private
- def should_confirm_password?
- password_confirmation && password.present?
- end
+ def password_confirmation_required?
+ password_confirmation && password.present?
+ end
end
end
end

0 comments on commit 3a33e8e

Please sign in to comment.