Empact-authlogic 2.1.5 → 3.0.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Ben Johnson of Binary Logic
+Copyright (c) 2011 Ben Johnson of Binary Logic
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,5 +1,7 @@
 = Authlogic
 
+** Please note the latest version is compatible with rails 3 only. Rails 2 should use version 2.X.X **
+
 Authlogic is a clean, simple, and unobtrusive ruby authentication solution.
 
 A code example can replace a thousand words...
@@ -67,8 +69,12 @@ If you find a bug or a problem please post it in the issues section. If you need
 * <b>Authlogic OpenID addon:</b> http://github.com/binarylogic/authlogic_openid
 * <b>Authlogic LDAP addon:</b> http://github.com/binarylogic/authlogic_ldap
 * <b>Authlogic Facebook Connect:</b> http://github.com/kalasjocke/authlogic_facebook_connect
+* <b>Authlogic Facebook Connect (New JS API):</b> http://github.com/studybyte/authlogic_facebook_connect
+* <b>Authlogic Facebook Shim</b> http://github.com/james2m/authlogic_facebook_shim
 * <b>Authlogic OAuth (Twitter):</b> http://github.com/jrallison/authlogic_oauth
+* <b>Authlogic Oauth and OpenID:</b> http://github.com/viatropos/authlogic-connect
 * <b>Authlogic PAM:</b> http://github.com/nbudin/authlogic_pam
+* <b>Authlogic x509:</b> http://github.com/auth-scc/authlogic_x509
 
 If you create one of your own, please let me know about it so I can add it to this list. Or just fork the project, add your link, and send me a pull request.
 
@@ -150,7 +156,7 @@ What if your user sessions controller could look just like your other controller
     def new
       @user_session = UserSession.new
     end
-    
+
     def create
       @user_session = UserSession.new(params[:user_session])
       if @user_session.save
@@ -159,7 +165,7 @@ What if your user sessions controller could look just like your other controller
         render :action => :new
       end
     end
-    
+
     def destroy
       current_user_session.destroy
       redirect_to new_user_session_url
@@ -183,13 +189,13 @@ Or how about persisting the session...
 
   class ApplicationController
     helper_method :current_user_session, :current_user
-    
+
     private
       def current_user_session
         return @current_user_session if defined?(@current_user_session)
         @current_user_session = UserSession.find
       end
-      
+
       def current_user
         return @current_user if defined?(@current_user)
         @current_user = current_user_session && current_user_session.user
@@ -200,17 +206,15 @@ Or how about persisting the session...
 
 Install the gem / plugin (recommended)
 
-From rubyforge:
+Rails 3:
 
   $ sudo gem install authlogic
 
-Or from github:
-
-  $ sudo gem install binarylogic-authlogic
+Rails 2:
 
-Now just add the gem dependency in your projects configuration.
+  $ sudo gem install authlogic --version=2.1.6
 
-Or you can install this as a plugin:
+Or install as a plugin:
 
   script/plugin install git://github.com/binarylogic/authlogic.git
 

data/Rakefile

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'rake'
+require 'bundler'
+
+Bundler.setup
 
 begin
   require 'jeweler'
@@ -9,10 +12,9 @@ begin
     gem.email = "bjohnson@binarylogic.com"
     gem.homepage = "http://github.com/binarylogic/authlogic"
     gem.authors = ["Ben Johnson of Binary Logic", "Ben Woosley"]
-    gem.rubyforge_project = "authlogic"
-    gem.add_dependency "activesupport"
+    gem.add_bundler_dependencies
   end
-  Jeweler::RubyforgeTasks.new
+  Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
@@ -37,6 +39,4 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:major: 2
+:major: 3
+:minor: 0
+:patch: 3
 :build: 
-:minor: 1
-:patch: 5

data/lib/authlogic/acts_as_authentic/base.rb

@@ -4,6 +4,9 @@ module Authlogic
     module Base
       def self.included(klass)
         klass.class_eval do
+          class_attribute :acts_as_authentic_modules, :acts_as_authentic_config
+          self.acts_as_authentic_modules ||= []
+          self.acts_as_authentic_config  ||= {}
           extend Config
         end
       end
@@ -41,7 +44,7 @@ module Authlogic
         #
         # That being said, this is your tool for extending Authlogic and "hooking" into the acts_as_authentic call.
         def add_acts_as_authentic_module(mod, action = :append)
-          modules = acts_as_authentic_modules
+          modules = acts_as_authentic_modules.clone
           case action
           when :append
             modules << mod
@@ -49,21 +52,17 @@ module Authlogic
             modules = [mod] + modules
           end
           modules.uniq!
-          write_inheritable_attribute(:acts_as_authentic_modules, modules)
+          self.acts_as_authentic_modules = modules
         end
         
         # This is the same as add_acts_as_authentic_module, except that it removes the module from the list.
         def remove_acts_as_authentic_module(mod)
-          acts_as_authentic_modules.delete(mod)
-          acts_as_authentic_modules
+          modules = acts_as_authentic_modules.clone
+          modules.delete(mod)
+          self.acts_as_authentic_modules = modules
         end
-        
+
         private
-          def acts_as_authentic_modules
-            key = :acts_as_authentic_modules
-            inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : []
-          end
-          
           def db_setup?
             begin
               column_names
@@ -75,9 +74,12 @@ module Authlogic
           
           def rw_config(key, value, default_value = nil, read_value = nil)
             if value == read_value
-              inheritable_attributes.include?(key) ? read_inheritable_attribute(key) : default_value
+              acts_as_authentic_config.include?(key) ? acts_as_authentic_config[key] : default_value
             else
-              write_inheritable_attribute(key, value)
+              config = acts_as_authentic_config.clone
+              config[key] = value
+              self.acts_as_authentic_config = config
+              value
             end
           end
           

data/lib/authlogic/acts_as_authentic/email.rb

@@ -11,7 +11,7 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # Configuration to modify how Authlogic handles the email field.
       module Config
         # The name of the field that stores email addresses.
@@ -22,7 +22,7 @@ module Authlogic
           rw_config(:email_field, value, first_column_to_exist(nil, :email, :email_address))
         end
         alias_method :email_field=, :email_field
-        
+
         # Toggles validating the email field or not.
         #
         # * <tt>Default:</tt> true
@@ -31,20 +31,20 @@ module Authlogic
           rw_config(:validate_email_field, value, true)
         end
         alias_method :validate_email_field=, :validate_email_field
-        
+
         # A hash of options for the validates_length_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
         # merge options into it. Checkout the convenience function merge_validates_length_of_email_field_options to merge
         # options.</b>
         #
-        # * <tt>Default:</tt> {:within => 6..100}
+        # * <tt>Default:</tt> {:maximum => 100}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
         def validates_length_of_email_field_options(value = nil)
-          rw_config(:validates_length_of_email_field_options, value, {:within => 6..100})
+          rw_config(:validates_length_of_email_field_options, value, {:maximum => 100})
         end
         alias_method :validates_length_of_email_field_options=, :validates_length_of_email_field_options
-        
+
         # A convenience function to merge options into the validates_length_of_email_field_options. So intead of:
         #
         #   self.validates_length_of_email_field_options = validates_length_of_email_field_options.merge(:my_option => my_value)
@@ -55,25 +55,25 @@ module Authlogic
         def merge_validates_length_of_email_field_options(options = {})
           self.validates_length_of_email_field_options = validates_length_of_email_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_format_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
         # merge options into it. Checkout the convenience function merge_validates_format_of_email_field_options to merge
         # options.</b>
         #
-        # * <tt>Default:</tt> {:with => Authlogic::Regex.email, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}
+        # * <tt>Default:</tt> {:with => Authlogic::Regex.email, :message => lambda {I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_format_of
         def validates_format_of_email_field_options(value = nil)
           rw_config(:validates_format_of_email_field_options, value, {:with => Authlogic::Regex.email, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")})
         end
         alias_method :validates_format_of_email_field_options=, :validates_format_of_email_field_options
-        
+
         # See merge_validates_length_of_email_field_options. The same thing except for validates_format_of_email_field_options.
         def merge_validates_format_of_email_field_options(options = {})
           self.validates_format_of_email_field_options = validates_format_of_email_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_uniqueness_of call for the email field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
@@ -86,13 +86,13 @@ module Authlogic
           rw_config(:validates_uniqueness_of_email_field_options, value, {:case_sensitive => false, :scope => validations_scope, :if => "#{email_field}_changed?".to_sym})
         end
         alias_method :validates_uniqueness_of_email_field_options=, :validates_uniqueness_of_email_field_options
-        
+
         # See merge_validates_length_of_email_field_options. The same thing except for validates_uniqueness_of_email_field_options.
         def merge_validates_uniqueness_of_email_field_options(options = {})
           self.validates_uniqueness_of_email_field_options = validates_uniqueness_of_email_field_options.merge(options)
         end
       end
-      
+
       # All methods relating to the email field
       module Methods
         def self.included(klass)

data/lib/authlogic/acts_as_authentic/logged_in_status.rb

@@ -11,7 +11,7 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
+
       # All configuration for the logged in status feature set.
       module Config
         # The timeout to determine when a user is logged in or not.
@@ -23,32 +23,31 @@ module Authlogic
         end
         alias_method :logged_in_timeout=, :logged_in_timeout
       end
-      
+
       # All methods for the logged in status feature seat.
       module Methods
         def self.included(klass)
           return if !klass.column_names.include?("last_request_at")
-          
+
           klass.class_eval do
             include InstanceMethods
-            
-            named_scope :logged_in, lambda { {:conditions => ["last_request_at > ?", logged_in_timeout.seconds.ago]} }
-            named_scope :logged_out, lambda { {:conditions => ["last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago]} }
+            scope :logged_in, where("last_request_at > ?", logged_in_timeout.seconds.ago)
+            scope :logged_out, where("last_request_at is NULL or last_request_at <= ?", logged_in_timeout.seconds.ago)
           end
         end
-        
+
         module InstanceMethods
           # Returns true if the last_request_at > logged_in_timeout.
           def logged_in?
             raise "Can not determine the records login state because there is no last_request_at column" if !respond_to?(:last_request_at)
             !last_request_at.nil? && last_request_at > logged_in_timeout.seconds.ago
           end
-        
+
           # Opposite of logged_in?
           def logged_out?
             !logged_in?
           end
-        
+
           private
             def logged_in_timeout
               self.class.logged_in_timeout

data/lib/authlogic/acts_as_authentic/login.rb

@@ -8,8 +8,8 @@ module Authlogic
           add_acts_as_authentic_module(Methods)
         end
       end
-      
-      # Confguration for the login field.
+
+      # Configuration for the login field.
       module Config
         # The name of the login field in the database.
         #
@@ -19,8 +19,8 @@ module Authlogic
           rw_config(:login_field, value, first_column_to_exist(nil, :login, :username))
         end
         alias_method :login_field=, :login_field
-        
-        # Whether or not the validate the login field
+
+        # Whether or not to validate the login field
         #
         # * <tt>Default:</tt> true
         # * <tt>Accepts:</tt> Boolean
@@ -28,7 +28,7 @@ module Authlogic
           rw_config(:validate_login_field, value, true)
         end
         alias_method :validate_login_field=, :validate_login_field
-        
+
         # A hash of options for the validates_length_of call for the login field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
@@ -41,8 +41,8 @@ module Authlogic
           rw_config(:validates_length_of_login_field_options, value, {:within => 3..100})
         end
         alias_method :validates_length_of_login_field_options=, :validates_length_of_login_field_options
-        
-        # A convenience function to merge options into the validates_length_of_login_field_options. So intead of:
+
+        # A convenience function to merge options into the validates_length_of_login_field_options. So instead of:
         #
         #   self.validates_length_of_login_field_options = validates_length_of_login_field_options.merge(:my_option => my_value)
         #
@@ -52,25 +52,25 @@ module Authlogic
         def merge_validates_length_of_login_field_options(options = {})
           self.validates_length_of_login_field_options = validates_length_of_login_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_format_of call for the login field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
         # merge options into it. Checkout the convenience function merge_validates_format_of_login_field_options to merge
         # options.</b>
         #
-        # * <tt>Default:</tt> {:with => Authlogic::Regex.login, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
+        # * <tt>Default:</tt> {:with => Authlogic::Regex.login, :message => lambda {I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}}
         # * <tt>Accepts:</tt> Hash of options accepted by validates_format_of
         def validates_format_of_login_field_options(value = nil)
           rw_config(:validates_format_of_login_field_options, value, {:with => Authlogic::Regex.login, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")})
         end
         alias_method :validates_format_of_login_field_options=, :validates_format_of_login_field_options
-        
+
         # See merge_validates_length_of_login_field_options. The same thing, except for validates_format_of_login_field_options
         def merge_validates_format_of_login_field_options(options = {})
           self.validates_format_of_login_field_options = validates_format_of_login_field_options.merge(options)
         end
-        
+
         # A hash of options for the validates_uniqueness_of call for the login field. Allows you to change this however you want.
         #
         # <b>Keep in mind this is ruby. I wanted to keep this as flexible as possible, so you can completely replace the hash or
@@ -83,18 +83,18 @@ module Authlogic
           rw_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
-        
+
         # See merge_validates_length_of_login_field_options. The same thing, except for validates_uniqueness_of_login_field_options
         def merge_validates_uniqueness_of_login_field_options(options = {})
           self.validates_uniqueness_of_login_field_options = validates_uniqueness_of_login_field_options.merge(options)
         end
-        
-        # This method allows you to find a record with the given login. If you notice, with ActiveRecord you have the
+
+        # This method allows you to find a record with the given login. If you notice, with Active Record 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])
+        #   where("LOWER(#{quoted_table_name}.#{login_field}) = ?", login.downcase).first
         #
         # If you don't specify this it calls the good old find_by_* method:
         #
@@ -112,17 +112,18 @@ module Authlogic
             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.mb_chars.downcase])
+              like_word = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+              where("#{quoted_table_name}.#{field} #{like_word} ?", value.mb_chars).first
             end
           end
       end
-      
+
       # All methods relating to the login field
       module Methods
         # Adds in various validations, modules, etc.

data/lib/authlogic/acts_as_authentic/password.rb

@@ -182,7 +182,7 @@ module Authlogic
           klass.define_callbacks *METHODS
           
           # If Rails 3, support the new callback syntax
-          if klass.singleton_class.method_defined?(:set_callback)
+          if klass.send(klass.respond_to?(:singleton_class) ? :singleton_class : :metaclass).method_defined?(:set_callback)
             METHODS.each do |method|
               klass.class_eval <<-"end_eval", __FILE__, __LINE__
                 def self.#{method}(*methods, &block)
@@ -277,7 +277,7 @@ module Authlogic
           # Resets the password to a random friendly token and then saves the record.
           def reset_password!
             reset_password
-            save_without_session_maintenance(false)
+            save_without_session_maintenance(:validate => false)
           end
           alias_method :randomize_password!, :reset_password!
         
@@ -314,7 +314,7 @@ module Authlogic
             
             def transition_password(attempted_password)
               self.password = attempted_password
-              save(false)
+              save(:validate => false)
             end
           
             def require_password?