authlogic 2.0.2 → 2.0.3

data/CHANGELOG.rdoc

@@ -1,4 +1,12 @@
-== 2.0.2
+== 2.0.3 released 2009-3-26
+
+* Fixed error where default session class does not exist.
+* Fixed human_name for the model to use its own human name and not delegate to the associated model. Translation should be under authlogic.models.user_session (or whatever the name of your session is).
+* Fixed human_attribute_name to use Authlogic keys for translation instead of ActiveRecord: authlogic.attributes.user_session.login
+* For transitioning from restful_authentication, set the REST_AUTH_SITE_KEY to '' if it doesn't exist, instead of nil.
+* Completely rewrote Authlogic::Testing, it's now called Authlogic::TestCase. Testing Authlogic is much easier now. Please see Authlogic::TestCase for more info.
+
+== 2.0.2 released 2009-3-24
 
 * Reset failed_login_count if consecutive_failed_logins_limit has been exceed and the failed_login_ban_for has passed.
 * Update test helpers to use the new configuration scheme.

data/Manifest.txt

@@ -54,7 +54,10 @@ lib/authlogic/session/session.rb
 lib/authlogic/session/timeout.rb
 lib/authlogic/session/unauthorized_record.rb
 lib/authlogic/session/validation.rb
-lib/authlogic/testing/test_unit_helpers.rb
+lib/authlogic/test_case.rb
+lib/authlogic/test_case/mock_controller.rb
+lib/authlogic/test_case/mock_cookie_jar.rb
+lib/authlogic/test_case/mock_request.rb
 lib/authlogic/version.rb
 shoulda_macros/authlogic.rb
 test/acts_as_authentic_test/base_test.rb
@@ -65,6 +68,7 @@ test/acts_as_authentic_test/magic_columns_test.rb
 test/acts_as_authentic_test/password_test.rb
 test/acts_as_authentic_test/perishable_token_test.rb
 test/acts_as_authentic_test/persistence_token_test.rb
+test/acts_as_authentic_test/restful_authentication_test.rb
 test/acts_as_authentic_test/session_maintenance_test.rb
 test/acts_as_authentic_test/single_access_test.rb
 test/authenticates_many_test.rb
@@ -79,9 +83,6 @@ test/fixtures/users.yml
 test/libs/company.rb
 test/libs/employee.rb
 test/libs/employee_session.rb
-test/libs/mock_controller.rb
-test/libs/mock_cookie_jar.rb
-test/libs/mock_request.rb
 test/libs/ordered_hash.rb
 test/libs/project.rb
 test/libs/user.rb

data/README.rdoc

@@ -62,18 +62,18 @@ These modules are for the acts_as_authentic method you call in your model. It co
 
 These modules are for the "session side" of authentication. They create a new domain for session logic, allowing you to create, destroy, and ultimately manage your sessions.
 
-* Authlogic::Session::BruteForceProtection - Disables accounts after a certain number of consecutive failed login attempted.
-* Authlogic::Session::Callbacks - Your tools to extend Authlogic, lets you hook in and add/modify behavior, on top of overriding methods.
+* Authlogic::Session::BruteForceProtection - Disables accounts after a certain number of consecutive failed logins attempted.
+* Authlogic::Session::Callbacks - Your tools to extend, change, or add onto Authlogic. Lets you hook in and do just about anything you want.
 * Authlogic::Session::Cookies - Authentication via cookies.
 * Authlogic::Session::Existence - Creating, saving, and destroying objects.
 * Authlogic::Session::HttpAuth - Authentication via basic HTTP authentication.
 * Authlogic::Session::Id - Allows sessions to be separated by an id, letting you have multiple sessions for a single user.
 * Authlogic::Session::MagicColumns - Maintains "magic" database columns, similar to created_at and updated_at for ActiveRecord.
-* Authlogic::Session::MagicStates - Automatically validates based on the records states: active, approved, and confirmed.
+* Authlogic::Session::MagicStates - Automatically validates based on the records states: active?, approved?, and confirmed?. If those methods exist for the record.
 * Authlogic::Session::Params - Authentication via params, aka single access token.
 * Authlogic::Session::Password - Authentication via a traditional username and password.
 * Authlogic::Session::Persistence - Persisting sessions / finding sessions.
-* Authlogic::Session::Session - Authentication via the session.
+* Authlogic::Session::Session - Authentication via the session, the controller session that is.
 * Authlogic::Session::Timeout - Automatically logging out after a certain period of inactivity.
 * Authlogic::Session::UnauthorizedRecord - Handles authentication by passing an ActiveRecord object.
 * Authlogic::Session::Validation - Validation / errors.

data/lib/authlogic/acts_as_authentic/restful_authentication.rb

@@ -39,7 +39,7 @@ module Authlogic
             crypto_provider_key = act_like_restful_authentication ? :crypto_provider : :transition_from_crypto_providers
             self.send("#{crypto_provider_key}=", CryptoProviders::Sha1)
             if !defined?(::REST_AUTH_SITE_KEY) || ::REST_AUTH_SITE_KEY.nil?
-              class_eval("::REST_AUTH_SITE_KEY = nil") if !defined?(::REST_AUTH_SITE_KEY)
+              class_eval("::REST_AUTH_SITE_KEY = ''") if !defined?(::REST_AUTH_SITE_KEY)
               CryptoProviders::Sha1.stretches = 1
             end
           end

data/lib/authlogic/acts_as_authentic/session_maintenance.rb

@@ -42,7 +42,8 @@ module Authlogic
         # * <tt>Default:</tt> "#{klass.name}Session".constantize
         # * <tt>Accepts:</tt> Class
         def session_class(value = nil)
-          config(:session_class, value, "#{name}Session".constantize)
+          const = "#{name}Session".constantize rescue nil
+          config(:session_class, value, const)
         end
         alias_method :session_class=, :session_class
       end

data/lib/authlogic/acts_as_authentic/single_access_token.rb

@@ -12,6 +12,13 @@ module Authlogic
       
       # All configuration for the single_access token aspect of acts_as_authentic.
       module Config
+        # The single access token is used for authentication via URLs, such as a private feed. That being said,
+        # if the user changes their password, that token probably shouldn't change. If it did, the user would have
+        # to update all of their URLs. So be default this is option is disabled, if you need it, feel free to turn
+        # it on.
+        #
+        # * <tt>Default:</tt> false
+        # * <tt>Accepts:</tt> Boolean
         def change_single_access_token_with_password(value = nil)
           config(:change_single_access_token_with_password, value, false)
         end

data/lib/authlogic/i18n.rb

@@ -39,6 +39,14 @@ module Authlogic
   #       not_confirmed: Your account is not confirmed
   #       not_approved: Your account is not approved
   #       no_authentication_details: You did not provide any details for authentication.
+  #     models:
+  #       user_session: UserSession (or whatever name you are using)
+  #     attributes:
+  #       user_session: (or whatever name you are using)
+  #         login: login
+  #         email: email
+  #         passwword: password
+  #         remember_me: remember me
   class I18n
     class << self
       # All message translation is passed to this method. The first argument is the key for the message. The second is options, see the rails I18n library for a list of options used.
@@ -49,6 +57,7 @@ module Authlogic
           options[:default]
         end
       end
+      alias_method :translate, :t
     end
   end
 end

data/lib/authlogic/session/active_record_trickery.rb

@@ -11,12 +11,14 @@ module Authlogic
       end
       
       module ClassMethods
-        def human_attribute_name(*args)
-          klass.human_attribute_name(*args)
+        def human_attribute_name(attribute_key_name, options = {})
+          options[:count] ||= 1
+          options[:default] ||= attribute_key_name.humanize
+          I18n.t("attributes.#{name.underscore}.#{attribute_key_name}", options)
         end
         
         def human_name(*args)
-          klass.human_name(*args)
+          I18n.t("models.#{name.underscore}", {:count => 1, :default => name.humanize})
         end
         
         # For rails < 2.3, mispelled

data/lib/authlogic/session/callbacks.rb

@@ -1,8 +1,16 @@
 module Authlogic
   module Session
-    # Just like in ActiveRecord you have before_save, before_validation, etc. You have similar callbacks with Authlogic, see the METHODS constant below. The order of execution is as follows:
+    # Between these callsbacks and the configuration, this is the contract between me and you to safely
+    # modify Authlogic's behavior. The ONLY reason these things will change is during a big version upgrade.
+    # For example, going from v1.X.X to 2.0.0.
     #
-    # Here is the order they execute
+    # Check out the sub modules of Authlogic::Session. They are very concise, clear, and to the point. More
+    # importantly they use the same API that you would use to extend Authlogic. That being said, they are great
+    # examples of how to extend Authlogic and add / modify behavior. These modules could easily be pulled out
+    # into their own plugin and become an "add on" without any change.
+    #
+    # Now to the point of this module. Just like in ActiveRecord you have before_save, before_validation, etc.
+    # You have similar callbacks with Authlogic, see the METHODS constant below. The order of execution is as follows:
     #
     #   before_persisting
     #   persist
@@ -27,11 +35,13 @@ module Authlogic
     #   [save record if record.changed?]
     #   
     #   before_destroy
+    #   [save record if record.changed?]
     #   destroy
     #   after_destroy
     #
-    # Notice the "save record if changed?" lines above. This helps with performance. If you need to make changes to the associated record, there is no need to save the record, Authlogic will do it for you.
-    # This allow multiple modules to modify the record and execute as few queries as possible.
+    # Notice the "save record if changed?" lines above. This helps with performance. If you need to make
+    # changes to the associated record, there is no need to save the record, Authlogic will do it for you.
+    # This allows multiple modules to modify the record and execute as few queries as possible.
     #
     # **WARNING**: unlike ActiveRecord, these callbacks must be set up on the class level:
     #
@@ -41,7 +51,8 @@ module Authlogic
     #     # ..etc
     #   end
     #
-    # You can NOT define a "before_validation" method, this is bad practice and does not allow Authlogic to extend properly with multiple extensions. Please ONLY use the method above.
+    # You can NOT define a "before_validation" method, this is bad practice and does not allow Authlogic
+    # to extend properly with multiple extensions. Please ONLY use the method above.
     module Callbacks
       METHODS = [
         "before_persisting", "persist", "after_persisting",

data/lib/authlogic/session/existence.rb

@@ -42,6 +42,7 @@ module Authlogic
         # the user to authenticate again if it is needed.
         def destroy
           before_destroy
+          save_record
           errors.clear
           @record = nil
           after_destroy

data/lib/authlogic/session/magic_states.rb

@@ -17,7 +17,7 @@ module Authlogic
         klass.class_eval do
           extend Config
           include InstanceMethods
-          validate :validate_magic_states
+          validate :validate_magic_states, :unless => :disable_magic_states?
         end
       end
       
@@ -43,7 +43,7 @@ module Authlogic
           end
         
           def validate_magic_states
-            return true if disable_magic_states? || attempted_record.nil?
+            return true if attempted_record.nil?
             [:active, :approved, :confirmed].each do |required_status|
               if attempted_record.respond_to?("#{required_status}?") && !attempted_record.send("#{required_status}?")
                 errors.add_to_base(I18n.t("error_messages.not_#{required_status}", :default => "Your account is not #{required_status}"))

data/lib/authlogic/test_case.rb

@@ -0,0 +1,64 @@
+require "authlogic/test_case/mock_cookie_jar"
+require "authlogic/test_case/mock_request"
+require "authlogic/test_case/mock_controller"
+
+module Authlogic
+  # This is a collection of methods and classes that help you easily test Authlogic. In fact, I use these same tools
+  # to test the internals of Authlogic.
+  #
+  # Some important things to keep in mind when testing:
+  #
+  # Authlogic requires a "connection" to your controller. In the same manner that ActiveRecord requires a connection to
+  # your database. It can't do anything until it gets connnected. That being said, Authlogic will raise an
+  # Authlogic::Session::Activation::NotActivatedError any time you try to instantiate an object without a "connection".
+  # So before you do anything with Authlogic, you need to connect it. Let's walk through how to do this in tests:
+  #
+  # === Functional tests
+  #
+  # You shouldn't have to do anything. Authlogic automatically sets a before_filter in your ApplicationController that
+  # conntects Authlogic to the controller. So as soon as you make a request in your tests, it will connect Authlogic
+  # for you.
+  #
+  # === Integration tests
+  #
+  # Again, just like functional tests, you don't have to do anything. As soon as you make a request, Authlogic will be
+  # conntected.
+  #
+  # === Unit tests
+  #
+  # Now here is the tricky part of testing. Since there really is no controller here you need to "fake" Authlogic into
+  # thinking there is. Don't worry, because the Authlogic::TestCase takes care of this for you. Just do the following
+  # in your test's setup and you are good to go:
+  #
+  #   setup :activate_authlogic
+  #
+  # activate_authlogic is a method provided to you by this TestCase module.
+  #
+  # You can even test off of this controller to make sure everything is good. For example:
+  #
+  #   ben = users(:ben)
+  #   assert_nil controller.session["user_credentials"]
+  #   assert UserSession.create(ben)
+  #   assert_equal controller.session["user_credentials"], ben.persistence_token
+  #
+  # You also get the "controller" method to use in your tests as well. Now you have everything you need to properly test in unit tests.
+  #
+  # === How to use
+  #
+  # Just require the file in your test_helper.rb file.
+  #
+  #   require "authlogic/test_case"
+  module TestCase
+    # Activates authlogic with an Authlogic::TestCase::MockController object.
+    def activate_authlogic
+      Authlogic::Session::Base.controller = controller
+    end
+    
+    # The Authlogic::TestCase::MockController object passed to Authlogic to activate it.
+    def controller
+      @controller ||= Authlogic::TestCase::MockController.new
+    end
+  end
+  
+  ::Test::Unit::TestCase.send(:include, TestCase)
+end

data/lib/authlogic/test_case/mock_controller.rb

@@ -0,0 +1,39 @@
+module Authlogic
+  module TestCase
+    class MockController < ControllerAdapters::AbstractAdapter
+      attr_accessor :http_user, :http_password
+      attr_writer :request_content_type
+  
+      def initialize
+      end
+  
+      def authenticate_with_http_basic(&block)
+        yield http_user, http_password
+      end
+  
+      def cookies
+        @cookies ||= MockCookieJar.new
+      end
+  
+      def cookie_domain
+        nil
+      end
+  
+      def params
+        @params ||= {}
+      end
+  
+      def request
+        @request ||= MockRequest.new
+      end
+  
+      def request_content_type
+        @request_content_type ||= "text/html"
+      end
+  
+      def session
+        @session ||= {}
+      end
+    end
+  end
+end

data/lib/authlogic/test_case/mock_cookie_jar.rb

@@ -0,0 +1,14 @@
+module Authlogic
+  module TestCase
+    class MockCookieJar < Hash
+      def [](key)
+        hash = super
+        hash && hash[:value]
+      end
+  
+      def delete(key, options = {})
+        super(key)
+      end
+    end
+  end
+end

data/lib/authlogic/test_case/mock_request.rb

@@ -0,0 +1,9 @@
+module Authlogic
+  module TestCase
+    class MockRequest
+      def remote_ip
+        "1.1.1.1"
+      end
+    end
+  end
+end

data/lib/authlogic/version.rb

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

data/test/acts_as_authentic_test/password_test.rb

@@ -85,39 +85,6 @@ module ActsAsAuthenticTest
       assert_equal [], User.transition_from_crypto_providers
     end
     
-    def test_act_like_restful_authentication_config
-      assert !User.act_like_restful_authentication
-      assert !Employee.act_like_restful_authentication
-      
-      User.act_like_restful_authentication = true
-      assert User.act_like_restful_authentication
-      assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
-      assert defined?(::REST_AUTH_SITE_KEY)
-      assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
-
-      User.act_like_restful_authentication false
-      assert !User.act_like_restful_authentication
-      
-      User.crypto_provider = Authlogic::CryptoProviders::Sha512
-      User.transition_from_crypto_providers = []
-    end
-    
-    def test_transition_from_restful_authentication_config
-      assert !User.transition_from_restful_authentication
-      assert !Employee.transition_from_restful_authentication
-      
-      User.transition_from_restful_authentication = true
-      assert User.transition_from_restful_authentication
-      assert defined?(::REST_AUTH_SITE_KEY)
-      assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
-      
-      User.transition_from_restful_authentication false
-      assert !User.transition_from_restful_authentication
-      
-      User.crypto_provider = Authlogic::CryptoProviders::Sha512
-      User.transition_from_crypto_providers = []
-    end
-    
     def test_validates_length_of_password
       u = User.new
       u.password_confirmation = "test2"

data/test/acts_as_authentic_test/restful_authentication_test.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module ActsAsAuthenticTest
+  class RestfulAuthenticationTest < ActiveSupport::TestCase
+    def test_act_like_restful_authentication_config
+      assert !User.act_like_restful_authentication
+      assert !Employee.act_like_restful_authentication
+  
+      User.act_like_restful_authentication = true
+      assert User.act_like_restful_authentication
+      assert_equal Authlogic::CryptoProviders::Sha1, User.crypto_provider
+      assert defined?(::REST_AUTH_SITE_KEY)
+      assert_equal '', ::REST_AUTH_SITE_KEY
+      assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
+
+      User.act_like_restful_authentication false
+      assert !User.act_like_restful_authentication
+  
+      User.crypto_provider = Authlogic::CryptoProviders::Sha512
+      User.transition_from_crypto_providers = []
+    end
+
+    def test_transition_from_restful_authentication_config
+      assert !User.transition_from_restful_authentication
+      assert !Employee.transition_from_restful_authentication
+      
+      User.transition_from_restful_authentication = true
+      assert User.transition_from_restful_authentication
+      assert defined?(::REST_AUTH_SITE_KEY)
+      assert_equal '', ::REST_AUTH_SITE_KEY
+      assert_equal 1, Authlogic::CryptoProviders::Sha1.stretches
+  
+      User.transition_from_restful_authentication false
+      assert !User.transition_from_restful_authentication
+  
+      User.crypto_provider = Authlogic::CryptoProviders::Sha512
+      User.transition_from_crypto_providers = []
+    end
+  end
+end

data/test/acts_as_authentic_test/session_maintenance_test.rb

@@ -18,49 +18,49 @@ module ActsAsAuthenticTest
     def test_update_session_after_password_modify
       ben = users(:ben)
       UserSession.create(ben)
-      old_session_key = @controller.session["user_credentials"]
-      old_cookie_key = @controller.cookies["user_credentials"]
+      old_session_key = controller.session["user_credentials"]
+      old_cookie_key = controller.cookies["user_credentials"]
       ben.password = "newpass"
       ben.password_confirmation = "newpass"
       assert ben.save
-      assert @controller.session["user_credentials"]
-      assert @controller.cookies["user_credentials"]
-      assert_not_equal @controller.session["user_credentials"], old_session_key
-      assert_not_equal @controller.cookies["user_credentials"], old_cookie_key
+      assert controller.session["user_credentials"]
+      assert controller.cookies["user_credentials"]
+      assert_not_equal controller.session["user_credentials"], old_session_key
+      assert_not_equal controller.cookies["user_credentials"], old_cookie_key
     end
 
     def test_no_session_update_after_modify
       ben = users(:ben)
       UserSession.create(ben)
-      old_session_key = @controller.session["user_credentials"]
-      old_cookie_key = @controller.cookies["user_credentials"]
+      old_session_key = controller.session["user_credentials"]
+      old_cookie_key = controller.cookies["user_credentials"]
       ben.first_name = "Ben"
       assert ben.save
-      assert_equal @controller.session["user_credentials"], old_session_key
-      assert_equal @controller.cookies["user_credentials"], old_cookie_key
+      assert_equal controller.session["user_credentials"], old_session_key
+      assert_equal controller.cookies["user_credentials"], old_cookie_key
     end
     
     def test_creating_other_user
       ben = users(:ben)
       UserSession.create(ben)
-      old_session_key = @controller.session["user_credentials"]
-      old_cookie_key = @controller.cookies["user_credentials"]
+      old_session_key = controller.session["user_credentials"]
+      old_cookie_key = controller.cookies["user_credentials"]
       assert User.create(:login => "awesome", :password => "saweet", :password_confirmation => "saweet", :email => "awesome@saweet.com")
-      assert_equal @controller.session["user_credentials"], old_session_key
-      assert_equal @controller.cookies["user_credentials"], old_cookie_key
+      assert_equal controller.session["user_credentials"], old_session_key
+      assert_equal controller.cookies["user_credentials"], old_cookie_key
     end
 
     def test_updating_other_user
       ben = users(:ben)
       UserSession.create(ben)
-      old_session_key = @controller.session["user_credentials"]
-      old_cookie_key = @controller.cookies["user_credentials"]
+      old_session_key = controller.session["user_credentials"]
+      old_cookie_key = controller.cookies["user_credentials"]
       zack = users(:zack)
       zack.password = "newpass"
       zack.password_confirmation = "newpass"
       assert zack.save
-      assert_equal @controller.session["user_credentials"], old_session_key
-      assert_equal @controller.cookies["user_credentials"], old_cookie_key
+      assert_equal controller.session["user_credentials"], old_session_key
+      assert_equal controller.cookies["user_credentials"], old_cookie_key
     end
 
     def test_resetting_password_when_logged_out

data/test/session_test/activation_test.rb

@@ -36,7 +36,7 @@ module SessionTest
       def test_init
         UserSession.controller = nil
         assert_raise(Authlogic::Session::Activation::NotActivatedError) { UserSession.new }
-        UserSession.controller = @controller
+        UserSession.controller = controller
       end
     end
   end

data/test/session_test/active_record_trickery_test.rb

@@ -8,7 +8,7 @@ module SessionTest
       end
     
       def test_human_name
-        assert_equal "User", UserSession.human_name
+        assert_equal "Usersession", UserSession.human_name
       end
     
       def test_self_and_descendents_from_active_record

data/test/session_test/cookies_test.rb

@@ -91,16 +91,16 @@ module SessionTest
         ben = users(:ben)
         session = UserSession.new(ben)
         assert session.save
-        assert_equal ben.persistence_token, @controller.cookies["user_credentials"]
+        assert_equal ben.persistence_token, controller.cookies["user_credentials"]
       end
     
       def test_after_destroy_destroy_cookie
         ben = users(:ben)
         set_cookie_for(ben)
         session = UserSession.find
-        assert @controller.cookies["user_credentials"]
+        assert controller.cookies["user_credentials"]
         assert session.destroy
-        assert !@controller.cookies["user_credentials"]
+        assert !controller.cookies["user_credentials"]
       end
     end
   end

data/test/session_test/params_test.rb

@@ -31,22 +31,22 @@ module SessionTest
         assert !session.persisting?
         assert !session.unauthorized_record
         assert !session.record
-        assert_nil @controller.session["user_credentials"]
+        assert_nil controller.session["user_credentials"]
       
         set_request_content_type("text/plain")
         assert !session.persisting?
         assert !session.unauthorized_record
-        assert_nil @controller.session["user_credentials"]
+        assert_nil controller.session["user_credentials"]
       
         set_request_content_type("application/atom+xml")
         assert session.persisting?
         assert_equal ben, session.record
-        assert_nil @controller.session["user_credentials"] # should not persist since this is single access
+        assert_nil controller.session["user_credentials"] # should not persist since this is single access
       
         set_request_content_type("application/rss+xml")
         assert session.persisting?
         assert_equal ben, session.unauthorized_record
-        assert_nil @controller.session["user_credentials"]
+        assert_nil controller.session["user_credentials"]
       end
     end
   end

data/test/session_test/session_test.rb

@@ -18,41 +18,41 @@ module SessionTest
         set_session_for(ben)
         assert session = UserSession.find
         assert_equal ben, session.record
-        assert_equal ben.persistence_token, @controller.session["user_credentials"]
+        assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
       
       def test_persist_persist_by_session_with_token_only
         ben = users(:ben)
         set_session_for(ben)
-        @controller.session["user_credentials_id"] = nil
+        controller.session["user_credentials_id"] = nil
         assert session = UserSession.find
         assert_equal ben, session.record
-        assert_equal ben.persistence_token, @controller.session["user_credentials"]
+        assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
     
       def test_after_save_update_session
         ben = users(:ben)
         session = UserSession.new(ben)
-        assert @controller.session["user_credentials"].blank?
+        assert controller.session["user_credentials"].blank?
         assert session.save
-        assert_equal ben.persistence_token, @controller.session["user_credentials"]
+        assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
     
       def test_after_destroy_update_session
         ben = users(:ben)
         set_session_for(ben)
-        assert_equal ben.persistence_token, @controller.session["user_credentials"]
+        assert_equal ben.persistence_token, controller.session["user_credentials"]
         assert session = UserSession.find
         assert session.destroy
-        assert @controller.session["user_credentials"].blank?
+        assert controller.session["user_credentials"].blank?
       end
     
       def test_after_persisting_update_session
         ben = users(:ben)
         set_cookie_for(ben)
-        assert @controller.session["user_credentials"].blank?
+        assert controller.session["user_credentials"].blank?
         assert UserSession.find
-        assert_equal ben.persistence_token, @controller.session["user_credentials"]
+        assert_equal ben.persistence_token, controller.session["user_credentials"]
       end
     end
   end

data/test/session_test/timeout_test.rb

@@ -25,7 +25,7 @@ module SessionTest
         assert session.stale?
         assert_equal ben, session.stale_record
         assert_nil session.record
-        assert_nil @controller.session["user_credentials_id"]
+        assert_nil controller.session["user_credentials_id"]
       
         set_session_for(ben)
       

data/test/test_helper.rb

@@ -72,9 +72,7 @@ ActiveRecord::Schema.define(:version => 1) do
 end
 
 require File.dirname(__FILE__) + '/../lib/authlogic' unless defined?(Authlogic)
-require File.dirname(__FILE__) + '/libs/mock_request'
-require File.dirname(__FILE__) + '/libs/mock_cookie_jar'
-require File.dirname(__FILE__) + '/libs/mock_controller'
+require File.dirname(__FILE__) + '/../lib/authlogic/test_case'
 require File.dirname(__FILE__) + '/libs/project'
 require File.dirname(__FILE__) + '/libs/employee'
 require File.dirname(__FILE__) + '/libs/employee_session'
@@ -94,11 +92,6 @@ class ActiveSupport::TestCase
   setup :activate_authlogic
   
   private
-    def activate_authlogic
-      @controller = MockController.new
-      Authlogic::Session::Base.controller = @controller
-    end
-    
     def password_for(user)
       case user
       when users(:ben)
@@ -110,43 +103,43 @@ class ActiveSupport::TestCase
     
     def http_basic_auth_for(user = nil, &block)
       unless user.blank?
-        @controller.http_user = user.login
-        @controller.http_password = password_for(user)
+        controller.http_user = user.login
+        controller.http_password = password_for(user)
       end
       yield
-      @controller.http_user = @controller.http_password = nil
+      controller.http_user = controller.http_password = nil
     end
     
     def set_cookie_for(user, id = nil)
-      @controller.cookies["user_credentials"] = {:value => user.persistence_token, :expires => nil}
+      controller.cookies["user_credentials"] = {:value => user.persistence_token, :expires => nil}
     end
     
     def unset_cookie
-      @controller.cookies["user_credentials"] = nil
+      controller.cookies["user_credentials"] = nil
     end
     
     def set_params_for(user, id = nil)
-      @controller.params["user_credentials"] = user.single_access_token
+      controller.params["user_credentials"] = user.single_access_token
     end
     
     def unset_params
-      @controller.params["user_credentials"] = nil
+      controller.params["user_credentials"] = nil
     end
     
     def set_request_content_type(type)
-      @controller.request_content_type = type
+      controller.request_content_type = type
     end
     
     def unset_request_content_type
-      @controller.request_content_type = nil
+      controller.request_content_type = nil
     end
     
     def set_session_for(user, id = nil)
-      @controller.session["user_credentials"] = user.persistence_token
-      @controller.session["user_credentials_id"] = user.id
+      controller.session["user_credentials"] = user.persistence_token
+      controller.session["user_credentials_id"] = user.id
     end
     
     def unset_session
-      @controller.session["user_credentials"] = @controller.session["user_credentials_id"] = nil
+      controller.session["user_credentials"] = controller.session["user_credentials_id"] = nil
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 -04:00
+date: 2009-03-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,7 +99,10 @@ files:
 - lib/authlogic/session/timeout.rb
 - lib/authlogic/session/unauthorized_record.rb
 - lib/authlogic/session/validation.rb
-- lib/authlogic/testing/test_unit_helpers.rb
+- lib/authlogic/test_case.rb
+- lib/authlogic/test_case/mock_controller.rb
+- lib/authlogic/test_case/mock_cookie_jar.rb
+- lib/authlogic/test_case/mock_request.rb
 - lib/authlogic/version.rb
 - shoulda_macros/authlogic.rb
 - test/acts_as_authentic_test/base_test.rb
@@ -110,6 +113,7 @@ files:
 - test/acts_as_authentic_test/password_test.rb
 - test/acts_as_authentic_test/perishable_token_test.rb
 - test/acts_as_authentic_test/persistence_token_test.rb
+- test/acts_as_authentic_test/restful_authentication_test.rb
 - test/acts_as_authentic_test/session_maintenance_test.rb
 - test/acts_as_authentic_test/single_access_test.rb
 - test/authenticates_many_test.rb
@@ -124,9 +128,6 @@ files:
 - test/libs/company.rb
 - test/libs/employee.rb
 - test/libs/employee_session.rb
-- test/libs/mock_controller.rb
-- test/libs/mock_cookie_jar.rb
-- test/libs/mock_request.rb
 - test/libs/ordered_hash.rb
 - test/libs/project.rb
 - test/libs/user.rb
@@ -190,6 +191,7 @@ test_files:
 - test/acts_as_authentic_test/password_test.rb
 - test/acts_as_authentic_test/perishable_token_test.rb
 - test/acts_as_authentic_test/persistence_token_test.rb
+- test/acts_as_authentic_test/restful_authentication_test.rb
 - test/acts_as_authentic_test/session_maintenance_test.rb
 - test/acts_as_authentic_test/single_access_test.rb
 - test/crypto_provider_test/aes256_test.rb

data/lib/authlogic/testing/test_unit_helpers.rb

@@ -1,39 +0,0 @@
-module Authlogic
-  # Various utilities to help with testing. Keep in mind, Authlogic is thoroughly tested for you, the only thing you should be
-  # testing is code you write, such as code in your controller.
-  module Testing
-    # Provides useful methods for testing in Test::Unit, lets you log records in, etc. Just include this in your test_helper filter:
-    #
-    #   require "authlogic/testing/test_unit_helpers"
-    #
-    # Then you will have the methods below to use in your tests.
-    module TestUnitHelpers
-      private
-        def session_class(record)
-          record.class.session_class
-        end
-        
-        # Sets the session for a record. This way when you execute a request in your test, session values will be present.
-        def set_session_for(record)
-          session_class = session_class(record)
-          @request.session[session_class.session_key] = record.persistence_token
-          @request.session["#{session_class.session_key}_#{record.class.primary_key}"] = record.id
-        end
-        
-        # Sets the cookie for a record. This way when you execute a request in your test, cookie values will be present.
-        def set_cookie_for(record)
-          session_class = session_class(record)
-          @request.cookies[session_class.cookie_key] = record.persistence_token
-        end
-        
-        # Sets the HTTP_AUTHORIZATION header for basic HTTP auth. This way when you execute a request in your test that is trying to authenticate
-        # with HTTP basic auth, the neccessary headers will be present.
-        def set_http_auth_for(username, password)
-          session_class = session_class(record)
-          @request.env['HTTP_AUTHORIZATION'] = @controller.encode_credentials(username, password)
-        end
-    end
-  end
-end
-
-Test::Unit::TestCase.send(:include, Authlogic::Testing::TestUnitHelpers)

data/test/libs/mock_controller.rb

@@ -1,35 +0,0 @@
-class MockController < Authlogic::ControllerAdapters::AbstractAdapter
-  attr_accessor :http_user, :http_password
-  attr_writer :request_content_type
-  
-  def initialize
-  end
-  
-  def authenticate_with_http_basic(&block)
-    yield http_user, http_password
-  end
-  
-  def cookies
-    @cookies ||= MockCookieJar.new
-  end
-  
-  def cookie_domain
-    nil
-  end
-  
-  def params
-    @params ||= {}
-  end
-  
-  def request
-    @request ||= MockRequest.new
-  end
-  
-  def request_content_type
-    @request_content_type ||= "text/html"
-  end
-  
-  def session
-    @session ||= {}
-  end
-end

data/test/libs/mock_cookie_jar.rb

@@ -1,10 +0,0 @@
-class MockCookieJar < Hash
-  def [](key)
-    hash = super
-    hash && hash[:value]
-  end
-  
-  def delete(key, options = {})
-    super(key)
-  end
-end

data/test/libs/mock_request.rb

@@ -1,5 +0,0 @@
-class MockRequest
-  def remote_ip
-    "1.1.1.1"
-  end
-end