authem 1.0.0.rc3 → 1.0.0.rc4

data/lib/authem/base_user.rb

@@ -9,37 +9,47 @@ module Authem::BaseUser
     validates_uniqueness_of :email
     validates_format_of :email, with: /^\S+@\S+$/
     validates_presence_of :password, on: :create
-    validates_confirmation_of :password, message: 'should match confirmation'
+    validates_confirmation_of :password
+  end
 
-    def self.find_by_email(email)
+  module ClassMethods
+    def find_by_email(email)
       where("LOWER(email) = ?", email.downcase).first
     end
+  end
 
-    def remember_token
-      self[:remember_token] || generate_token(:remember)
-    end
+  def remember_token
+    self[:remember_token] || generate_token(:remember)
+  end
 
-    def session_token
-      self[:session_token] || generate_token(:session)
-    end
+  def session_token
+    self[:session_token] || generate_token(:session)
+  end
 
-    def reset_password(password, confirmation)
-      return false unless password.present?
+  def reset_password(password, confirmation)
+    return false unless password.present?
 
-      self.password = password
-      self.password_confirmation = confirmation
-      self.reset_password_token = nil
-      save
-    end
+    reset_password_token = self.reset_password_token
+
+    self.password = password
+    self.password_confirmation = confirmation
+    self.reset_password_token = nil
 
-    def reset_password_token!
-      generate_token(:reset_password)
+    if save
+      true
+    else
+      self.reset_password_token = reset_password_token
+      false
     end
+  end
 
-    private
+  def reset_password_token!
+    generate_token(:reset_password)
+  end
 
-    def generate_token(type)
-      Authem::Token.generate.tap { |token| update_column("#{type}_token", token) }
-    end
+  private
+
+  def generate_token(type)
+    Authem::Token.generate.tap { |token| update_column("#{type}_token", token) }
   end
 end

data/lib/authem/sorcery_user.rb

@@ -6,16 +6,16 @@ module Authem::SorceryUser
     attr_accessor :password, :password_confirmation
 
     before_save :encrypt_password
+  end
 
-    def authenticate(password)
-      self if crypted_password.present? && ::BCrypt::Password.new(crypted_password) == [password, salt].join
-    end
+  def authenticate(password)
+    self if crypted_password.present? && ::BCrypt::Password.new(crypted_password) == [password, salt].join
+  end
 
-    def encrypt_password
-      if password.present?
-        self.salt = ::BCrypt::Engine.generate_salt
-        self.crypted_password = ::BCrypt::Password.create([password, salt].join)
-      end
+  def encrypt_password
+    if password.present?
+      self.salt = ::BCrypt::Engine.generate_salt
+      self.crypted_password = ::BCrypt::Password.create([password, salt].join)
     end
   end
 end

data/lib/authem/version.rb

@@ -1,3 +1,3 @@
 module Authem
-  VERSION = '1.0.0.rc3'
+  VERSION = '1.0.0.rc4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authem
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport