Removed User#initialize_confirmation_token from before_save; added #g…

…enerate_confirmation_token to before_create
thoughtbot · Feb 16, 2010 · 1448735 · 1448735
1 parent 58e05e2
commit 1448735
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/lib/clearance/user.rb b/lib/clearance/user.rb
@@ -66,9 +66,8 @@ module Callbacks
       def self.included(model)
         model.class_eval do
           before_save :initialize_salt,
-                      :encrypt_password,
+                      :encrypt_password
-                      :initialize_confirmation_token
+          before_create :generate_confirmation_token
-
           after_create :send_confirmation_email, :unless => :email_confirmed?
         end
       end
@@ -165,10 +164,6 @@ def generate_remember_token
         self.remember_token = encrypt("--#{Time.now.utc}--#{encrypted_password}--#{id}--")
       end
 
-      def initialize_confirmation_token
-        generate_confirmation_token if new_record?
-      end
-
       def password_required?
         encrypted_password.blank? || !password.blank?
       end