authentasaurus 0.6.17 → 0.6.18

data/lib/active_record/acts_as_authenticatable.rb

@@ -18,9 +18,9 @@ module ActiveRecord::ActsAsAuthenticatable
     end
     
     
-    ## Authenticates the username and password
-    def authenticate(username, password, remember = false)
-      user=self.find_by_username username
+    ## Authenticates the username (or email) and password
+    def authenticate(username_or_email, password, remember = false)
+      user=self.find_by_username(username_or_email) || self.find_by_email(username_or_email)
       if user
         expected_password=encrypt_password(password, user.password_seed)
         unless expected_password == user.hashed_password && user.active

data/lib/active_record/acts_as_authenticatable_validatable.rb

@@ -7,9 +7,9 @@ module ActiveRecord::ActsAsAuthenticatableValidatable
   end
   
   module ClassMethods
-    ## Authenticates the username and password
-    def authenticate(username, password, remember = false)
-      user=self.find_by_username username
+    ## Authenticates the username (or email) and password
+    def authenticate(username_or_email, password, remember = false)
+      user=self.find_by_username(username_or_email) || self.find_by_email(username_or_email)
       if user
         expected_password=encrypt_password(password, user.password_seed)
         unless expected_password == user.hashed_password && user.active && user.validation.nil?    

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: authentasaurus
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 6
-  - 17
-  version: 0.6.17
+  - 18
+  version: 0.6.18
 platform: ruby
 authors: 
 - Omar Mekky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 +03:00
+date: 2010-09-28 00:00:00 +03:00
 default_executable: 
 dependencies: []