user.rb in janova-clearance-0.9.1

- old
+ new

@@ -14,11 +14,10 @@
     #   include AttrAccessor
     #   include Callbacks
     #
     # @see ClassMethods
     # @see InstanceMethods
-    # @see AttrAccessible
     # @see AttrAccessor
     # @see Validations
     # @see Callbacks
     def self.included(model)
       model.extend(ClassMethods)
@@ -52,11 +51,11 @@
           validates_presence_of     :email, :unless => :email_optional?
           validates_uniqueness_of   :email, :case_sensitive => false, :allow_blank => true
           validates_format_of       :email, :with => %r{^[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#\$%&'*+\/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$}i, :allow_blank => true
 
           validates_presence_of     :password, :unless => :password_optional?
-          validates_confirmation_of :password, :unless => :password_optional?
+          validates_confirmation_of :password
         end
       end
     end
 
     module Callbacks
@@ -97,30 +96,30 @@
       #
       # @example
       #   user.reset_remember_token!
       def reset_remember_token!
         generate_remember_token
-        save(false)
+        save(:validate => false)
       end
 
       # Confirm my email.
       #
       # @example
       #   user.confirm_email!
       def confirm_email!
         self.email_confirmed    = true
         self.confirmation_token = nil
-        save(false)
+        save(:validate => false)
       end
 
       # Mark my account as forgotten password.
       #
       # @example
       #   user.forgot_password!
       def forgot_password!
         generate_confirmation_token
-        save(false)
+        save(:validate => false)
       end
 
       # Update my password.
       #
       # @param [String, String] password and password confirmation
@@ -184,10 +183,10 @@
         # warn "[DEPRECATION] password_required?: use !password_optional? instead"
         !password_optional?
       end
 
       def send_confirmation_email
-        ClearanceMailer.deliver_confirmation self
+        ClearanceMailer.confirmation(self).deliver
       end
     end
 
     module ClassMethods
       # Authenticate with email and password.