3 files changed, 17 insertions, 13 deletions
diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index 33454123ce..67f88b4088 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -325,7 +325,7 @@ module ActiveModel
             options.symbolize_keys!
             @prefix, @suffix = options[:prefix] || '', options[:suffix] || ''
             @regex = /^(#{Regexp.escape(@prefix)})(.+?)(#{Regexp.escape(@suffix)})$/
-            @method_missing_target = :"#{@prefix}attribute#{@suffix}"
+            @method_missing_target = "#{@prefix}attribute#{@suffix}"
             @method_name = "#{prefix}%s#{suffix}"
           end
 
diff --git a/activemodel/lib/active_model/callbacks.rb b/activemodel/lib/active_model/callbacks.rb
index aaa41f5ec6..7302a869c8 100644
--- a/activemodel/lib/active_model/callbacks.rb
+++ b/activemodel/lib/active_model/callbacks.rb
@@ -102,7 +102,7 @@ module ActiveModel
         define_callbacks(callback, options)
 
         types.each do |type|
-          send(:"_define_#{type}_model_callback", self, callback)
+          send("_define_#{type}_model_callback", self, callback)
         end
       end
     end
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