simplest_auth 0.2.2 → 0.2.3

data/Rakefile

@@ -7,14 +7,15 @@ require 'lib/simplest_auth/version'
 task :default => :test
 
 spec = Gem::Specification.new do |s|
-  s.name            = 'simplest_auth'
-  s.version         = SimplestAuth::Version.to_s
-  s.summary         = "Simple implementation of authentication for Rails"
-  s.author          = 'Tony Pitale'
-  s.email           = 'tony.pitale@viget.com'
-  s.homepage        = 'http://viget.com/extend'
-  s.files           = %w(README.textile Rakefile) + Dir.glob("lib/**/*")
-  s.test_files      = Dir.glob("test/**/*_test.rb")
+  s.name              = 'simplest_auth'
+  s.rubyforge_project = 'viget'
+  s.version           = SimplestAuth::Version.to_s
+  s.summary           = "Simple implementation of authentication for Rails"
+  s.author            = 'Tony Pitale'
+  s.email             = 'tony.pitale@viget.com'
+  s.homepage          = 'http://viget.com/extend'
+  s.files             = %w(README.textile Rakefile) + Dir.glob("lib/**/*")
+  s.test_files        = Dir.glob("test/**/*_test.rb")
   
   s.add_dependency('bcrypt-ruby', '~> 2.1.1')
 end

data/lib/simplest_auth/model.rb

@@ -29,28 +29,29 @@ module SimplestAuth
       end
 
       def authenticate(email, password)
+        user = nil
         if active_record?
-          klass = find_by_email(email)
+          user = find_by_email(email)
         elsif data_mapper?
-          klass = first(:email => email)
+          user = first(:email => email)
         end
 
-        (klass && klass.authentic?(password)) ? klass : nil
+        (user && user.authentic?(password)) ? user : nil
       end
 
       def authenticate_by(ident)
         if active_record?
           instance_eval <<-EOM
             def authenticate(#{ident}, password)
-              klass = find_by_#{ident}(#{ident})
-              (klass && klass.authentic?(password)) ? klass : nil
+              user = find_by_#{ident}(#{ident})
+              (user && user.authentic?(password)) ? user : nil
             end
           EOM
         elsif data_mapper?
           instance_eval <<-EOM
             def authenticate(#{ident}, password)
-              klass = first(:#{ident} => #{ident})
-              (klass && klass.authentic?(password)) ? klass : nil
+              user = first(:#{ident} => #{ident})
+              (user && user.authentic?(password)) ? user : nil
             end
           EOM
         end
@@ -71,7 +72,11 @@ module SimplestAuth
       RecordNotFound = Class.new(StandardError) unless defined?(RecordNotFound)
 
       def authentic?(password)
-        Password.new(self.crypted_password) == password
+        begin
+          return Password.new(self.crypted_password) == password
+        rescue BCrypt::Errors::InvalidHash
+          return false
+        end
       end
 
       private

data/lib/simplest_auth/version.rb

@@ -3,7 +3,7 @@ module SimplestAuth
     
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
     
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: simplest_auth
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Tony Pitale
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -04:00
+date: 2009-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: viget
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3