@@ -13,7 +13,7 @@ require File.dirname(__FILE__) + "/authlogic/crypto_providers/bcrypt" require File.dirname(__FILE__) + "/authlogic/crypto_providers/aes256" if defined?(ActiveRecord) - require File.dirname(__FILE__) + "/authlogic/orm_adapters/active_record_adapter/acts_as_authentic" + require File.dirname(__FILE__) + "/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/base" require File.dirname(__FILE__) + "/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials" require File.dirname(__FILE__) + "/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in" require File.dirname(__FILE__) + "/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/perishability" lib/authlogic.rb @@ -150,15 +150,6 @@ module Authlogic # * <tt>email_field_validates_uniqueness_of_options</tt> - default: same as :login_field if :login_field_type == :email, # These options are applied to the validates_uniqueness_of call for the :email_field module Config - def first_column_to_exist(*columns_to_check) # :nodoc: - 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 : nil - end - - def meta_def(name, &block) - (class << self; self; end).instance_eval { define_method name, &block } - end - def acts_as_authentic_with_config(options = {}) # Stop all configuration if the DB is not set up begin @@ -224,12 +215,15 @@ module Authlogic options[:transition_from_crypto_provider] = [options[:transition_from_crypto_provider]].compact unless options[:transition_from_crypto_provider].is_a?(Array) - meta_def :acts_as_authentic_config do - options - end - + cattr_accessor :acts_as_authentic_config + self.acts_as_authentic_config = options acts_as_authentic_without_config(options) end + + def first_column_to_exist(*columns_to_check) # :nodoc: + 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 : nil + end end end end lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb @@ -39,7 +39,7 @@ module Authlogic @_logged_out = true #{options[:session_ids].inspect}.each do |session_id| - session = #{options[:session_class]}.find(*[session_id].compact) + session = #{options[:session_class]}.find(session_id) if session if !session.record.blank? @_logged_out = false lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/session_maintenance.rb @@ -62,8 +62,7 @@ module Authlogic # # See the id method for more information on ids. def find(id = nil) - args = [id].compact - session = new(*args) + session = new(id) session.before_find if session.find_record session.after_find @@ -92,7 +91,7 @@ module Authlogic end end end - + attr_accessor :new_session attr_reader :record, :unauthorized_record attr_writer :authenticating_with, :id, :persisting lib/authlogic/session/base.rb @@ -16,6 +16,7 @@ module ORMAdaptersTests old_cookie_key = @controller.cookies["user_credentials"] ben.password = "newpass" ben.password_confirmation = "newpass" + ben.first_name = "ass2" ben.save assert @controller.session["user_credentials"] assert @controller.cookies["user_credentials"] test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/session_maintenance_test.rb @@ -34,6 +34,7 @@ ActiveRecord::Schema.define(:version => 1) do create_table :users do |t| t.datetime :created_at t.datetime :updated_at + #t.integer :lock_version t.integer :company_id t.string :login t.string :crypted_password test/test_helper.rb lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic.rb febb7c170046fa6693bf0647fd6edb488045a20d binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/authlogic/commit/7cd869f49a264cb7ece7e72df8ff077c06fdc5d3 7cd869f49a264cb7ece7e72df8ff077c06fdc5d3 2009-02-16T23:45:12-08:00 2009-02-16T23:45:12-08:00 Small code cleanup b55ca4db7fea3c2d6bac63a8bfaf34733c3a0899 binarylogic bjohnson@binarylogic.com