app/models/user.rb in spree_auth-0.60.6 vs app/models/user.rb in spree_auth-0.70.RC1

@@ -36,13 +36,13 @@
 
   def anonymous?
     email =~ /@example.net$/
   end
 
-  def deliver_password_reset_instructions!
+  def send_reset_password_instructions
     reset_perishable_token!
-    UserMailer.password_reset_instructions(self).deliver
+    UserMailer.reset_password_instructions(self).deliver
   end
 
   protected
   def password_required?
     !persisted? || password.present? || password_confirmation.present?
@@ -61,10 +61,10 @@
     self.login ||= self.email if self.email
   end
 
   # Generate a friendly string randomically to be used as token.
   def self.friendly_token
-    ActiveSupport::SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
+    SecureRandom.base64(15).tr('+/=', '-_ ').strip.delete("\n")
   end
 
   # Generate a token by looping and ensuring does not already exist.
   def self.generate_token(column)
     loop do