@@ -1,4 +1,4 @@ -== 2.1.1 released 2009-6-27 +== 2.1.1 * Use mb_chars when downcasing the login string to support international characters. * Check for the existence of the :remember_me key before setting remember_me off of a hash. CHANGELOG.rdoc @@ -3,6 +3,8 @@ module Authlogic # Adapts authlogic to work with rails. The point is to close the gap between what authlogic expects and what the rails controller object # provides. Similar to how ActiveRecord has an adapter for MySQL, PostgreSQL, SQLite, etc. class RailsAdapter < AbstractAdapter + class AuthlogicLoadedTooLateError < StandardError; end + def authenticate_with_http_basic(&block) controller.authenticate_with_http_basic(&block) end @@ -23,9 +25,17 @@ module Authlogic # Lets Authlogic know about the controller object via a before filter, AKA "activates" authlogic. module RailsImplementation def self.included(klass) # :nodoc: + if defined?(::ApplicationController) + raise AuthlogicLoadedTooLateError.new("Authlogic is trying to prepend a before_filter in ActionController::Base to active itself" + + ", the problem is that ApplicationController has already been loaded meaning the before_filter won't get copied into your" + + " application. Generally this is due to another gem or plugin requiring your ApplicationController prematurely, such as" + + " the resource_controller plugin. The solution is to require Authlogic before these other gems / plugins. Please require" + + " authlogic first to get rid of this error.") + end + klass.prepend_before_filter :activate_authlogic end - + private def activate_authlogic Authlogic::Session::Base.controller = RailsAdapter.new(self) lib/authlogic/controller_adapters/rails_adapter.rb 90626be0fcf743a182fecd70457bd18687bf4e86 binarylogic bjohnson@binarylogic.com http://github.com/binarylogic/authlogic/commit/694d75f464cb1f1f11be9072dd44b99babfd9249 694d75f464cb1f1f11be9072dd44b99babfd9249 2009-07-03T22:31:47-07:00 2009-07-03T22:31:47-07:00 * Added check to make sure Authlogic is not loaded too late, causing a NotActivated error. 08e8537afa15f1fe02a7f0c02b19398d98baa307 binarylogic bjohnson@binarylogic.com