authlogic 2.0.8 → 2.0.9

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 2.0.9 release 2009-4-9
+
+* Fixed bug where hooks provided by the password module were called when the password module was not being used due to the fact that the password field did not exist.
+* Fixed bug where the find_with_login method was not being aliased if you were using an alternate field besides login.
+
 == 2.0.8 release 2009-4-9
 
 * Dont reset the @password_changed instance variable to false because its halts the callback chain, instead reset it to nil.

data/lib/authlogic/acts_as_authentic/base.rb

@@ -61,13 +61,13 @@ module Authlogic
           acts_as_authentic_modules.delete(mod)
           acts_as_authentic_modules
         end
-      
+        
         private
           def acts_as_authentic_modules
             key = :acts_as_authentic_modules
             inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : []
           end
-        
+          
           def config(key, value, default_value = nil, read_value = nil)
             if value == read_value
               inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : default_value
@@ -75,12 +75,11 @@ module Authlogic
               write_inheritable_attribute(key, value)
             end
           end
-
+          
           def first_column_to_exist(*columns_to_check)
             columns_to_check.each { |column_name| return column_name.to_sym if column_names.include?(column_name.to_s) }
             columns_to_check.first && columns_to_check.first.to_sym
           end
-
       end
     end
   end

data/lib/authlogic/acts_as_authentic/email.rb

@@ -73,8 +73,6 @@ module Authlogic
       module Methods
         def self.included(klass)
           klass.class_eval do
-            extend ClassMethods
-            
             if validate_email_field && email_field
               validates_length_of email_field, validates_length_of_email_field_options
               validates_format_of email_field, validates_format_of_email_field_options
@@ -82,24 +80,6 @@ module Authlogic
             end
           end
         end
-        
-        # Class methods relating to the email field
-        module ClassMethods
-          # Calls alias_method if your email_field name is "out of the norm".
-          def self.included(klass)
-            klass.send(:alias_method, "find_with_email", "find_with_#{email_field}") if klass.email_field != :email
-          end
-          
-          # Please see the find_with_login method in Authlogic::ActsAsAuthentic::Login module. It's the same exact thing
-          # but for the login field instead of the email field.
-          def find_with_email(email)
-            if validates_uniqueness_of_email_field_options[:case_sensitive] == false
-              first(:conditions => ["LOWER(#{quoted_table_name}.#{email_field}) = ?", email.downcase])
-            else
-              send("find_by_#{email_field}", email)
-            end
-          end
-        end
       end
     end
   end

data/lib/authlogic/acts_as_authentic/login.rb

@@ -55,6 +55,39 @@ module Authlogic
           config(:validates_uniqueness_of_login_field_options, value, {:case_sensitive => false, :scope => validations_scope, :if => "#{login_field}_changed?".to_sym})
         end
         alias_method :validates_uniqueness_of_login_field_options=, :validates_uniqueness_of_login_field_options
+        
+        # This method allows you to find a record with the given login. If you notice, with ActiveRecord you have the
+        # validates_uniqueness_of validation function. They give you a :case_sensitive option. I handle this in the same
+        # manner that they handle that. If you are using the login field and set false for the :case_sensitive option in
+        # validates_uniqueness_of_login_field_options this method will modify the query to look something like:
+        #
+        #   first(:conditions => ["LOWER(#{quoted_table_name}.#{login_field}) = ?", login.downcase])
+        #
+        # If you don't specify this it calls the good old find_by_* method:
+        #
+        #   find_by_login(login)
+        #
+        # The above also applies for using email as your login, except that you need to set the :case_sensitive in
+        # validates_uniqueness_of_email_field_options to false.
+        #
+        # The only reason I need to do the above is for Postgres and SQLite since they perform case sensitive searches with the
+        # find_by_* methods.
+        def find_by_smart_case_login_field(login)
+          if login_field
+            find_with_case(login_field, login, validates_uniqueness_of_login_field_options[:case_sensitive] != false)
+          else
+            find_with_case(email_field, login, validates_uniqueness_of_email_field_options[:case_sensitive] != false)
+          end
+        end
+        
+        private
+          def find_with_case(field, value, sensitivity = true)
+            if sensitivity
+              send("find_by_#{field}", value)
+            else
+              first(:conditions => ["LOWER(#{quoted_table_name}.#{field}) = ?", value.downcase])
+            end
+          end
       end
       
       # All methods relating to the login field
@@ -62,8 +95,6 @@ module Authlogic
         # Adds in various validations, modules, etc.
         def self.included(klass)
           klass.class_eval do
-            extend ClassMethods
-            
             if validate_login_field && login_field
               validates_length_of login_field, validates_length_of_login_field_options
               validates_format_of login_field, validates_format_of_login_field_options
@@ -71,35 +102,6 @@ module Authlogic
             end
           end
         end
-        
-        # Class methods relating to the login field.
-        module ClassMethods
-          # Calls alias_method if your login_field name is "out of the norm".
-          def self.included(klass)
-            klass.send(:alias_method, "find_with_login", "find_with_#{login_field}") if klass.login_field != :login
-          end
-          
-          # This method allows you to find a record with the given login. If you notice, with ActiveRecord you have the
-          # validates_uniqueness_of validation function. They give you a :case_sensitive option. I handle this in the same
-          # manner that they handle that. If you set false for the :case_sensitive option in validates_uniqueness_of_login_field_options
-          # this method will modify the query to look something like:
-          #
-          #   first(:conditions => ["LOWER(#{quoted_table_name}.#{login_field}) = ?", login.downcase])
-          #
-          # If you don't specify this it calls the good old find_by_* method:
-          #
-          #   find_by_login(login)
-          #
-          # The only reason I need to do the above is for Postgres and SQLite since they perform case sensitive searches with the
-          # find_by_* methods.
-          def find_with_login(login)
-            if validates_uniqueness_of_login_field_options[:case_sensitive] == false
-              first(:conditions => ["LOWER(#{quoted_table_name}.#{login_field}) = ?", login.downcase])
-            else
-              send("find_by_#{login_field}", login)
-            end
-          end
-        end
       end
     end
   end

data/lib/authlogic/acts_as_authentic/password.rb

@@ -118,7 +118,7 @@ module Authlogic
         ]
         
         def self.included(klass)
-          return if !klass.column_names.include?(klass.crypted_password_field.to_s)
+          return if klass.crypted_password_field.nil?
           klass.define_callbacks *METHODS
         end
         
@@ -135,7 +135,7 @@ module Authlogic
       # The methods related to the password field.
       module Methods
         def self.included(klass)
-          return if !klass.column_names.include?(klass.crypted_password_field.to_s)
+          return if klass.crypted_password_field.nil?
           
           klass.class_eval do
             include InstanceMethods

data/lib/authlogic/acts_as_authentic/persistence_token.rb

@@ -16,8 +16,10 @@ module Authlogic
             extend ClassMethods
             include InstanceMethods
             
-            after_password_set :reset_persistence_token
-            after_password_verification :reset_persistence_token!, :if => :reset_persistence_token?
+            if respond_to?(:after_password_set) && respond_to?(:after_password_verification)
+              after_password_set :reset_persistence_token
+              after_password_verification :reset_persistence_token!, :if => :reset_persistence_token?
+            end
             
             validates_presence_of :persistence_token
             validates_uniqueness_of :persistence_token, :if => :persistence_token_changed?

data/lib/authlogic/session/password.rb

@@ -32,10 +32,10 @@ module Authlogic
         # Now just specifcy the name of this method for this configuration option and you are all set. You can do anything you want here. Maybe you allow users to have multiple logins
         # and you want to search a has_many relationship, etc. The sky is the limit.
         #
-        # * <tt>Default:</tt> "find_by_case_insensitive_#{login_field}"
+        # * <tt>Default:</tt> "find_by_smart_case_login_field"
         # * <tt>Accepts:</tt> Symbol or String
         def find_by_login_method(value = nil)
-          config(:find_by_login_method, value, "find_with_#{login_field}")
+          config(:find_by_login_method, value, "find_by_smart_case_login_field")
         end
         alias_method :find_by_login_method=, :find_by_login_method
         

data/lib/authlogic/version.rb

@@ -41,7 +41,7 @@ module Authlogic # :nodoc:
 
     MAJOR = 2
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/acts_as_authentic_test/email_test.rb

@@ -89,12 +89,5 @@ module ActsAsAuthenticTest
       assert !u.valid?
       assert !u.errors.on(:email)
     end
-    
-    def test_find_with_email
-      ben = users(:ben)
-      assert_equal ben, User.find_with_email("bjohnson@binarylogic.com")
-      assert_equal ben, User.find_with_email("bJohnson@binarylogic.com")
-      assert_equal ben, User.find_with_email("BJOHNSON@BINARYLOGIC.COM")
-    end
   end
 end

data/test/acts_as_authentic_test/login_test.rb

@@ -90,11 +90,16 @@ module ActsAsAuthenticTest
       assert !u.errors.on(:login)
     end
     
-    def test_find_with_login
+    def test_find_by_smart_case_login_field
       ben = users(:ben)
-      assert_equal ben, User.find_with_login("bjohnson")
-      assert_equal ben, User.find_with_login("BJOHNSON")
-      assert_equal ben, User.find_with_login("Bjohnson")
+      assert_equal ben, User.find_by_smart_case_login_field("bjohnson")
+      assert_equal ben, User.find_by_smart_case_login_field("BJOHNSON")
+      assert_equal ben, User.find_by_smart_case_login_field("Bjohnson")
+      
+      drew = employees(:drew)
+      assert_equal drew, Employee.find_by_smart_case_login_field("dgainor@binarylogic.com")
+      assert_equal drew, Employee.find_by_smart_case_login_field("Dgainor@binarylogic.com")
+      assert_equal drew, Employee.find_by_smart_case_login_field("DGAINOR@BINARYLOGIC.COM")
     end
   end
 end

data/test/test_helper.rb

@@ -69,11 +69,22 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :current_login_ip
     t.string    :last_login_ip
   end
+  
+  create_table :affiliates do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.integer   :company_id
+    t.string    :username
+    t.string    :pw_hash
+    t.string    :pw_salt
+    t.string    :persistence_token
+  end
 end
 
 require File.dirname(__FILE__) + '/../lib/authlogic' unless defined?(Authlogic)
 require File.dirname(__FILE__) + '/../lib/authlogic/test_case'
 require File.dirname(__FILE__) + '/libs/project'
+require File.dirname(__FILE__) + '/libs/affiliate'
 require File.dirname(__FILE__) + '/libs/employee'
 require File.dirname(__FILE__) + '/libs/employee_session'
 require File.dirname(__FILE__) + '/libs/user'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-09 00:00:00 -04:00
+date: 2009-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency