Instance methods shouldnt be added until you actually call has_secure_password

1 files changed, 15 insertions, 11 deletions

diff --git a/activemodel/lib/active_model/secure_password.rb b/activemodel/lib/active_model/secure_password.rb
index 52941942b8..7e8370a04c 100644
--- a/activemodel/lib/active_model/secure_password.rb
+++ b/activemodel/lib/active_model/secure_password.rb
@@ -37,22 +37,26 @@ module ActiveModel
 
         validates_confirmation_of :password
         validates_presence_of     :password_digest
+        
+        include InstanceMethodsOnActivation
       end
     end
 
-    # Returns self if the password is correct, otherwise false.
-    def authenticate(unencrypted_password)
-      if BCrypt::Password.new(password_digest) == unencrypted_password
-        self
-      else
-        false
+    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
       end
-    end
 
-    # Encrypts the password into the password_digest attribute.
-    def password=(unencrypted_password)
-      @password = unencrypted_password
-      self.password_digest = BCrypt::Password.create(unencrypted_password)
+      # Encrypts the password into the password_digest attribute.
+      def password=(unencrypted_password)
+        @password = unencrypted_password
+        self.password_digest = BCrypt::Password.create(unencrypted_password)
+      end
     end
   end
 end