From ffa974d55c99c2e4a10064bf53ae13d04991a67d Mon Sep 17 00:00:00 2001
From: Oscar Del Ben <info@oscardelben.com>
Date: Tue, 24 Apr 2012 19:03:59 +0200
Subject: Refactor SecurePassword#authenticate

---
 activemodel/lib/active_model/secure_password.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index e7a57cf691..8ab0bccc11 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -55,11 +55,7 @@ module ActiveModel
     module InstanceMethodsOnActivation
       # Returns self if the password is correct, otherwise false.
       def authenticate(unencrypted_password)
-        if BCrypt::Password.new(password_digest) == unencrypted_password
-          self
-        else
-          false
-        end
+        BCrypt::Password.new(password_digest) == unencrypted_password && self
       end
 
       # Encrypts the password into the password_digest attribute.
-- 
cgit v1.2.3