* Refactor params_enabled? so that the single_access_allowed? method …

…in controllers takes precedence.

CHANGELOG.rdoc

@@ -28,7 +28,7 @@
 
 == 2.0.6 release 2009-4-9
 
-* Don't use second, use [1] instead so older rails systems don't complain.
+* Don't use second, use [1] instead so older rails versions don't complain.
 * Update email regular expression to be less TLD specific: (?:[A-Z]{2,4}|museum|travel)
 * Update shoulda macro for 2.0
 * validates_length_of_password_confirmation_field_options defaults to validates_confirmation_of_password_field_options

lib/authlogic/controller_adapters/abstract_adapter.rb

@@ -42,8 +42,12 @@ def session
         controller.session
       end
 
+      def responds_to_single_access_allowed?
+        controller.respond_to?(:single_access_allowed?, true)
+      end
+
       def single_access_allowed?
-        controller.respond_to?(:single_access_allowed?, true) && controller.send(:single_access_allowed?)
+        controller.send(:single_access_allowed?)
       end
 
       private

lib/authlogic/session/params.rb

@@ -68,10 +68,15 @@ def persist_by_params
           end
 
           def params_enabled?
-            params_credentials && klass.column_names.include?("single_access_token") &&
-              (single_access_allowed_request_types.include?(controller.request_content_type) ||
-                single_access_allowed_request_types.include?(:all) || single_access_allowed_request_types == :all ||
-                  controller.single_access_allowed?)
+            return false if !params_credentials || !klass.column_names.include?("single_access_token")
+            return controller.single_access_allowed? if controller.responds_to_single_access_allowed?
+
+            case single_access_allowed_request_types
+            when Array
+              single_access_allowed_request_types.include?(controller.request_content_type) || single_access_allowed_request_types.include?(:all)
+            else
+              single_access_allowed_request_types == :all
+            end
           end
 
           def params_key