authlogic 1.3.9 → 1.4.0

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 1.4.0 released 2009-1-28
+
+* Added support for cookie domain, based on your frameworks session domain configuration
+* Updated test helper functions to use the persistence token config value
+* Check for UTC times when using Time.now for current_login_at and last_request_at
+* Single access now looks for a single_access_allowed? method in your controllers to determine if single access should be allowed or not. Allowing you to define exactly when single access is allowed.
+* Finding the authenticated record uses klass.primary_key instead of assuming id.
+* BREAKS BACKWARDS COMPATIBILITY: New I18n solution implemented. See Authlogic::I18n for more information.
+
 == 1.3.9 released 2009-1-9
 
 * Added the disable_perishable_token_maintenance option to disable the automatic resetting of the perishable_token, meaning you will have to maintain this yourself.

data/Manifest

@@ -9,6 +9,7 @@ lib/authlogic/crypto_providers/aes256.rb
 lib/authlogic/crypto_providers/bcrypt.rb
 lib/authlogic/crypto_providers/sha1.rb
 lib/authlogic/crypto_providers/sha512.rb
+lib/authlogic/i18n.rb
 lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb
 lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb
 lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb

data/README.rdoc

@@ -83,6 +83,9 @@ Or how about persisting the session...
 *	<b>Tutorial: Easily migrate from restful_authentication:</b> http://www.binarylogic.com/2008/11/23/tutorial-easily-migrate-from-restful_authentication-to-authlogic
 *	<b>Tutorial: Upgrade passwords easily with Authlogic:</b> http://www.binarylogic.com/2008/11/23/tutorial-upgrade-passwords-easily-with-authlogic
 * <b>Bugs / feature suggestions:</b> http://binarylogic.lighthouseapp.com/projects/18752-authlogic
+* <b>Google group:</b> http://groups.google.com/group/authlogic
+
+If you find a bug or a problem please post it on lighthouse. If you need help with something or it is specific to your app, please use google groups. I check both regularly and get emails when anything happens, so that is the best place to get help.
 
 == Install and use
 
@@ -297,7 +300,17 @@ This token is used to persist the user's session. This is the token that is stor
 
 === 2. Single access token (private feed access, etc.)
 
-This token is used for single access only, it is not persisted. Meaning the user provides it, Authlogic grants them access, and that's it. If they want access again they need to provide the token again. Authlogic will *NEVER* store this value in the session or a cookie. For added security, by default this token is *ONLY* allowed for RSS and ATOM requests. Also, this token does *NOT* change with the password. Meaning if the user changes their password, this token will remain the same. Lastly, this token uses a "friendly" toke (see the URL example below) so that it is easier to email / copy and paste. You can change all of this with configuration (see Authlogic::Session::config), so if you don't like how this works by default, just set some simple configuration in your session.
+This token is used for single access only, it is not persisted. Meaning the user provides it, Authlogic grants them access, and that's it. If they want access again they need to provide the token again. Authlogic will *NEVER* store this value in the session or a cookie. For added security, by default this token is *ONLY* allowed for RSS and ATOM requests. Also, this token does *NOT* change with the password. Meaning if the user changes their password, this token will remain the same. Lastly, this token uses a "friendly" token (see the URL example below) so that it is easier to email / copy and paste. You can change all of this with configuration (see Authlogic::Session::config), so if you don't like how this works by default, just set some simple configuration in your session.
+
+For even more flexibility Authlogic looks for a method in your controller called single_access_allowed?. If that method exists and returns true Authlogic will try to log in the user with this method. Here is a quick example:
+
+class UsersController < ApplicationController
+  private
+    def single_access_allowed?
+      action_name == "index"
+    end
+
+The above will only allow logging in via the single access toke with the index method only.
 
 This field is optional, if you want to use it just add the field to your database:
 
@@ -306,9 +319,9 @@ This field is optional, if you want to use it just add the field to your databas
 
 This is great for private feed access. So your URL to that user's private feed could look something like:
 
-  http://www.mydomain.com/account/feed.rss?single_access_token=4LiXF7FiGUppIPubBPey
+  http://www.mydomain.com/account/feed.rss?user_credentials=4LiXF7FiGUppIPubBPey
 
-The single_access_token parameter name is configurable (see Authlogic::Session::Config), but if that parameter exists Authlogic will automatically use it to try and grant that user access. You don't have to do a thing: UserSession.find will take care of it just like it does for everything else.
+The user_credentials parameter name is configurable (see Authlogic::Session::Config), but if that parameter exists Authlogic will automatically use it to try and grant that user access. You don't have to do a thing: UserSession.find will take care of it just like it does for everything else.
 
 For more information see: Authlogic::ORMAdapters::ActiveRecordAdapter::ActsAsAuthentic::SingleAccess
 
@@ -393,7 +406,7 @@ But what if you *don't* want to separate your cookies by subdomains? You can acc
 
   ActionController::Base.session_options[:session_domain] = '.mydomain.com'
 
-If for some reason the above doesn't work for you, do some simple Google searches. There are a million blog posts on this.
+Notice the above is configuration for your session, not your cookies. Authlogic notices this and assume this is how you want to treat your cookies as well. As a result, it applies this domain to the cookies it sets. Now your session and all cookies act the same and are scoped under the same domain under Authlogic.
 
 Now let's look at this from the other angle. What if you are *NOT* using subdomains, but still want to separate cookies for each account. Simple, set the :scope_cookies option for authenticate_many:
 
@@ -433,7 +446,7 @@ Think about financial websites, if you are inactive for a certain period of time
     logout_on_timeout true # default if false
   end
 
-This will require a user to log back in if they are inactive for more than 10 minutes. In order for this feature to be used you must have a last_request_at datetime field in your data for whatever model you are authenticating with.
+This will require a user to log back in if they are inactive for more than 10 minutes. In order for this feature to be used you must have a last_request_at datetime column in your table for whatever model you are authenticating with.
 
 == Automatic Session Updating
 
@@ -464,6 +477,10 @@ Obviously there is a little more to it than this, but hopefully this clarifies a
 
 When things come together like this I think its a sign that you are doing something right. Put that in your pipe and smoke it!
 
+== Internationalization (I18n)
+
+Please see Authlogic::I18n for more information. Internationalization is very easy to implement, in fact if you are using the default rails I18n library then you don't need to do anything other than defining the messages in your localization configuration files. See Authlogic::I18n for a complete list of keys you need to define.
+
 == Testing
 
 Testing with authlogic is easy, there is a helper file that will add some convenient test helpers for you. In your test_helper.rb file do the following:

data/Rakefile

@@ -10,4 +10,5 @@ Echoe.new 'authlogic' do |p|
   p.summary = "A clean, simple, and unobtrusive ruby authentication solution."
   p.url = "http://github.com/binarylogic/authlogic"
   p.dependencies = %w(activesupport echoe)
+  p.install_message = "BREAKS BACKWARDS COMPATIBILITY! This is only for those using I18n. If you were using the Authlogic configuration to implement I18n you need to update your configuration. A new cleaner approach has been implemented for I18n in Authlogic. See Authlogic::I18n for more details."
 end

data/authlogic.gemspec

@@ -2,17 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic}
-  s.version = "1.3.9"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-01-09}
+  s.date = %q{2009-01-28}
   s.description = %q{A clean, simple, and unobtrusive ruby authentication solution.}
   s.email = %q{bjohnson@binarylogic.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/authlogic/controller_adapters/abstract_adapter.rb", "lib/authlogic/controller_adapters/merb_adapter.rb", "lib/authlogic/controller_adapters/rails_adapter.rb", "lib/authlogic/crypto_providers/aes256.rb", "lib/authlogic/crypto_providers/bcrypt.rb", "lib/authlogic/crypto_providers/sha1.rb", "lib/authlogic/crypto_providers/sha512.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/perishability.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/persistence.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/session_maintenance.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/single_access.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic.rb", "lib/authlogic/orm_adapters/active_record_adapter/authenticates_many.rb", "lib/authlogic/session/active_record_trickery.rb", "lib/authlogic/session/authenticates_many_association.rb", "lib/authlogic/session/base.rb", "lib/authlogic/session/callbacks.rb", "lib/authlogic/session/config.rb", "lib/authlogic/session/cookies.rb", "lib/authlogic/session/errors.rb", "lib/authlogic/session/params.rb", "lib/authlogic/session/perishability.rb", "lib/authlogic/session/scopes.rb", "lib/authlogic/session/session.rb", "lib/authlogic/session/timeout.rb", "lib/authlogic/testing/test_unit_helpers.rb", "lib/authlogic/version.rb", "lib/authlogic.rb", "README.rdoc"]
-  s.files = ["CHANGELOG.rdoc", "generators/session/session_generator.rb", "generators/session/templates/session.rb", "init.rb", "lib/authlogic/controller_adapters/abstract_adapter.rb", "lib/authlogic/controller_adapters/merb_adapter.rb", "lib/authlogic/controller_adapters/rails_adapter.rb", "lib/authlogic/crypto_providers/aes256.rb", "lib/authlogic/crypto_providers/bcrypt.rb", "lib/authlogic/crypto_providers/sha1.rb", "lib/authlogic/crypto_providers/sha512.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/perishability.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/persistence.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/session_maintenance.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/single_access.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic.rb", "lib/authlogic/orm_adapters/active_record_adapter/authenticates_many.rb", "lib/authlogic/session/active_record_trickery.rb", "lib/authlogic/session/authenticates_many_association.rb", "lib/authlogic/session/base.rb", "lib/authlogic/session/callbacks.rb", "lib/authlogic/session/config.rb", "lib/authlogic/session/cookies.rb", "lib/authlogic/session/errors.rb", "lib/authlogic/session/params.rb", "lib/authlogic/session/perishability.rb", "lib/authlogic/session/scopes.rb", "lib/authlogic/session/session.rb", "lib/authlogic/session/timeout.rb", "lib/authlogic/testing/test_unit_helpers.rb", "lib/authlogic/version.rb", "lib/authlogic.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "shoulda_macros/authlogic.rb", "test/crypto_provider_tests/aes256_test.rb", "test/crypto_provider_tests/bcrypt_test.rb", "test/crypto_provider_tests/sha1_test.rb", "test/crypto_provider_tests/sha512_test.rb", "test/fixtures/companies.yml", "test/fixtures/employees.yml", "test/fixtures/projects.yml", "test/fixtures/users.yml", "test/libs/mock_controller.rb", "test/libs/mock_cookie_jar.rb", "test/libs/mock_request.rb", "test/libs/ordered_hash.rb", "test/libs/user.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/config_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/credentials_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/logged_in_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/perishability_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/persistence_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/session_maintenance_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/single_access_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/authenticates_many_test.rb", "test/session_tests/active_record_trickery_test.rb", "test/session_tests/authenticates_many_association_test.rb", "test/session_tests/base_test.rb", "test/session_tests/config_test.rb", "test/session_tests/cookies_test.rb", "test/session_tests/params_test.rb", "test/session_tests/perishability_test.rb", "test/session_tests/scopes_test.rb", "test/session_tests/session_test.rb", "test/session_tests/timeout_test.rb", "test/test_helper.rb", "authlogic.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/authlogic/controller_adapters/abstract_adapter.rb", "lib/authlogic/controller_adapters/merb_adapter.rb", "lib/authlogic/controller_adapters/rails_adapter.rb", "lib/authlogic/crypto_providers/aes256.rb", "lib/authlogic/crypto_providers/bcrypt.rb", "lib/authlogic/crypto_providers/sha1.rb", "lib/authlogic/crypto_providers/sha512.rb", "lib/authlogic/i18n.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/perishability.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/persistence.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/session_maintenance.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/single_access.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic.rb", "lib/authlogic/orm_adapters/active_record_adapter/authenticates_many.rb", "lib/authlogic/session/active_record_trickery.rb", "lib/authlogic/session/authenticates_many_association.rb", "lib/authlogic/session/base.rb", "lib/authlogic/session/callbacks.rb", "lib/authlogic/session/config.rb", "lib/authlogic/session/cookies.rb", "lib/authlogic/session/errors.rb", "lib/authlogic/session/params.rb", "lib/authlogic/session/perishability.rb", "lib/authlogic/session/scopes.rb", "lib/authlogic/session/session.rb", "lib/authlogic/session/timeout.rb", "lib/authlogic/testing/test_unit_helpers.rb", "lib/authlogic/version.rb", "lib/authlogic.rb", "README.rdoc"]
+  s.files = ["CHANGELOG.rdoc", "generators/session/session_generator.rb", "generators/session/templates/session.rb", "init.rb", "lib/authlogic/controller_adapters/abstract_adapter.rb", "lib/authlogic/controller_adapters/merb_adapter.rb", "lib/authlogic/controller_adapters/rails_adapter.rb", "lib/authlogic/crypto_providers/aes256.rb", "lib/authlogic/crypto_providers/bcrypt.rb", "lib/authlogic/crypto_providers/sha1.rb", "lib/authlogic/crypto_providers/sha512.rb", "lib/authlogic/i18n.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/perishability.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/persistence.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/session_maintenance.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/single_access.rb", "lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic.rb", "lib/authlogic/orm_adapters/active_record_adapter/authenticates_many.rb", "lib/authlogic/session/active_record_trickery.rb", "lib/authlogic/session/authenticates_many_association.rb", "lib/authlogic/session/base.rb", "lib/authlogic/session/callbacks.rb", "lib/authlogic/session/config.rb", "lib/authlogic/session/cookies.rb", "lib/authlogic/session/errors.rb", "lib/authlogic/session/params.rb", "lib/authlogic/session/perishability.rb", "lib/authlogic/session/scopes.rb", "lib/authlogic/session/session.rb", "lib/authlogic/session/timeout.rb", "lib/authlogic/testing/test_unit_helpers.rb", "lib/authlogic/version.rb", "lib/authlogic.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "shoulda_macros/authlogic.rb", "test/crypto_provider_tests/aes256_test.rb", "test/crypto_provider_tests/bcrypt_test.rb", "test/crypto_provider_tests/sha1_test.rb", "test/crypto_provider_tests/sha512_test.rb", "test/fixtures/companies.yml", "test/fixtures/employees.yml", "test/fixtures/projects.yml", "test/fixtures/users.yml", "test/libs/mock_controller.rb", "test/libs/mock_cookie_jar.rb", "test/libs/mock_request.rb", "test/libs/ordered_hash.rb", "test/libs/user.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/config_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/credentials_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/logged_in_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/perishability_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/persistence_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/session_maintenance_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_tests/single_access_test.rb", "test/orm_adapters_tests/active_record_adapter_tests/authenticates_many_test.rb", "test/session_tests/active_record_trickery_test.rb", "test/session_tests/authenticates_many_association_test.rb", "test/session_tests/base_test.rb", "test/session_tests/config_test.rb", "test/session_tests/cookies_test.rb", "test/session_tests/params_test.rb", "test/session_tests/perishability_test.rb", "test/session_tests/scopes_test.rb", "test/session_tests/session_test.rb", "test/session_tests/timeout_test.rb", "test/test_helper.rb", "authlogic.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/binarylogic/authlogic}
+  s.post_install_message = %q{BREAKS BACKWARDS COMPATIBILITY! This is only for those using I18n. If you were using the Authlogic configuration to implement I18n you need to update your configuration. A new cleaner approach has been implemented for I18n in Authlogic. See Authlogic::I18n for more details.}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Authlogic", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{authlogic}

data/lib/authlogic.rb

@@ -1,6 +1,7 @@
 require "active_support"
 
 require File.dirname(__FILE__) + "/authlogic/version"
+require File.dirname(__FILE__) + "/authlogic/i18n"
 
 require File.dirname(__FILE__) + "/authlogic/controller_adapters/abstract_adapter"
 require File.dirname(__FILE__) + "/authlogic/controller_adapters/rails_adapter" if defined?(Rails)

data/lib/authlogic/controller_adapters/abstract_adapter.rb

@@ -22,6 +22,10 @@ module Authlogic
       def cookies
         controller.cookies
       end
+      
+      def cookie_domain
+        raise NotImplementedError.new("The cookie_domain method has not been implemented by the controller adapter")
+      end
 
       def params
         controller.params
@@ -39,6 +43,10 @@ module Authlogic
         controller.session
       end
       
+      def single_access_allowed?
+        controller.respond_to?(:single_access_allowed?, true) && controller.send(:single_access_allowed?)
+      end
+      
       private
         def method_missing(id, *args, &block)
           controller.send(id, *args, &block)

data/lib/authlogic/controller_adapters/merb_adapter.rb

@@ -12,6 +12,10 @@ module Authlogic
         def self.included(klass) # :nodoc:
           klass.before :activate_authlogic
         end
+        
+        def cookie_domain
+          Merb::Config[:session_cookie_domain]
+        end
 
         private
           def activate_authlogic

data/lib/authlogic/controller_adapters/rails_adapter.rb

@@ -13,6 +13,10 @@ module Authlogic
         controller.send(:cookies)
       end
       
+      def cookie_domain
+        controller.class.session_options[:session_domain]
+      end
+      
       def request_content_type
         request.format.to_s
       end

data/lib/authlogic/i18n.rb

@@ -0,0 +1,52 @@
+module Authlogic
+  # I18n
+  #
+  # Allows any message, error message, etc to use internationalization. In earlier versions of Authlogic each message was translated via configuration.
+  # This cluttered up the configuration and cluttered up Authlogic. So all translation has been extracted out into this class. Now all messages pass through
+  # this class, making it much easier to implement in I18n library / plugin you want. Use this as a layer that sits between Authlogic and whatever I18n
+  # library you want to use.
+  #
+  # By default this uses the rails I18n library, if it exists. If it doesnt exist it just returns the default english message. Using the Authlogic I18n class
+  # works EXACTLY like the rails I18n class. Here is how all messages are translated internally with Authlogic:
+  #
+  #   Authlogic::I18n.t('error_messages.password_invalid', :default => "is invalid")
+  #
+  # If you use a different I18n library or plugin just redefine the t method in the Authlogic::I18n class to do whatever you want with those options. For example:
+  #
+  #   # config/initializers/authlogic.rb
+  #   module MyAuthlogicI18nAdapter
+  #     def t(key, options = {})
+  #       # you will have key which will be something like: "error_messages.password_invalid"
+  #       # you will also have options[:default], which will be the default english version of the message
+  #       # do whatever you want here with the arguments passed to you.
+  #     end
+  #   end
+  #   
+  #   Authlogic::I18n.extend MyAuthlogicI18nAdapter
+  #
+  #   That it's! Here is a complete list of the keys that are passed. Just defined these however you wish:
+  #
+  #   authlogic:
+  #     error_messages:
+  #       login_blank: can not be blank
+  #       login_not_found: does not exist
+  #       password_blank: can not be blank
+  #       password_invlid: is not valid
+  #       not_active: Your account is not active
+  #       not_confirmed: Your account is not confirmed
+  #       not_approved: Your account is not approved
+  #       blank_record: You can not login with a blank record
+  #       new_record: You can not login with a new record
+  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.
+      def t(key, options = {})
+        if defined?(::I18n)
+          ::I18n.t(key, options.merge(:scope => :authlogic))
+        else
+          options[:default]
+        end
+      end
+    end
+  end
+end

data/lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb

@@ -77,7 +77,7 @@ module Authlogic
         #   By default it tries to reset this token as much as possible, which is done via a before_validation callback. If for some reason you want to maintain this yourself just
         #   set this to true and use the reset_perishable_token and reset_perishable_token! methods to maintain it yourself.
         #   
-        # * <tt>persistence_field</tt> - default: :persistence_token, :remember_token, or :cookie_tokien, depending on which column is present,
+        # * <tt>persistence_token_field</tt> - default: :persistence_token, :remember_token, or :cookie_tokien, depending on which column is present,
         #   defaults to :persistence_token if none are present,
         #   This is the name of the field your persistence token is stored. The persistence token is a unique token that is stored in the users cookie and
         #   session. This way you have complete control of when sessions expire and you don't have to change passwords to expire sessions. This also

data/lib/authlogic/session/base.rb

@@ -9,14 +9,16 @@ module Authlogic
       class << self
         attr_accessor :methods_configured
         
-        # Returns true if a controller have been set and can be used properly. This MUST be set before anything can be done. Similar to how ActiveRecord won't allow you to do anything
-        # without establishing a DB connection. In your framework environment this is done for you, but if you are using Authlogic outside of your frameword, you need to assign a controller
-        # object to Authlogic via Authlogic::Session::Base.controller = obj.
+        # Returns true if a controller has been set and can be used properly. This MUST be set before anything can be done. Similar to how ActiveRecord won't allow you to do anything
+        # without establishing a DB connection. In your framework environment this is done for you, but if you are using Authlogic outside of your framework, you need to assign a controller
+        # object to Authlogic via Authlogic::Session::Base.controller = obj. See the controller= method for more information.
         def activated?
-          !controller.blank?
+          !controller.nil?
         end
         
-        def controller=(value) # :nodoc:
+        # This accepts a controller object wrapped with the Authlogic controller adapter. The controller adapters close the gap between the different controllers in each framework.
+        # That being said, Authlogic is expecting your object's class to extend Authlogic::ControllerAdapters::AbstractAdapter. See Authlogic::ControllerAdapters for more info.
+        def controller=(value)
           Thread.current[:authlogic_controller] = value
         end
         
@@ -33,7 +35,7 @@ module Authlogic
           session.save(&block)
         end
         
-        # Same as create but calls create!, which raises an exception when authentication fails
+        # Same as create but calls create!, which raises an exception when authentication fails.
         def create!(*args)
           session = new(*args)
           session.save!
@@ -67,7 +69,7 @@ module Authlogic
         end
         
         # The name of the class that this session is authenticating with. For example, the UserSession class will authenticate with the User class
-        # unless you specify otherwise in your configuration.
+        # unless you specify otherwise in your configuration. See authenticate_with for information on how to change this value.
         def klass
           @klass ||=
             if klass_name
@@ -275,7 +277,7 @@ module Authlogic
           
           if record.respond_to?(:current_login_at)
             record.last_login_at = record.current_login_at if record.respond_to?(:last_login_at)
-            record.current_login_at = Time.now
+            record.current_login_at = klass.default_timezone == :utc ? Time.now.utc : Time.now
           end
           
           if record.respond_to?(:current_login_ip)
@@ -410,19 +412,19 @@ module Authlogic
           
           case authenticating_with
           when :password
-            errors.add(login_field, login_blank_message) if send(login_field).blank?
-            errors.add(password_field, password_blank_message) if send("protected_#{password_field}").blank?
+            errors.add(login_field, I18n.t('error_messages.login_blank', :default => "can not be blank")) if send(login_field).blank?
+            errors.add(password_field, I18n.t('error_messages.password_blank', :default => "can not be blank")) if send("protected_#{password_field}").blank?
             return false if errors.count > 0
             
             unchecked_record = search_for_record(find_by_login_method, send(login_field))
             
             if unchecked_record.blank?
-              errors.add(login_field, login_not_found_message)
+              errors.add(login_field, I18n.t('error_messages.login_not_found', :default => "does not exist"))
               return false
             end
             
             unless unchecked_record.send(verify_password_method, send("protected_#{password_field}"))
-              errors.add(password_field, password_invalid_message)
+              errors.add(password_field, I18n.t('error_messages.password_invalid', :default => "is not valid"))
               return false
             end
             
@@ -431,12 +433,12 @@ module Authlogic
             unchecked_record = unauthorized_record
             
             if unchecked_record.blank?
-              errors.add_to_base("You can not login with a blank record.")
+              errors.add_to_base(I18n.t('error_messages.blank_record', :default => "You can not login with a blank record"))
               return false
             end
             
             if unchecked_record.new_record?
-              errors.add_to_base("You can not login with a new record.")
+              errors.add_to_base(I18n.t('error_messages.new_record', :default => "You can not login with a new record"))
               return false
             end
             
@@ -450,7 +452,7 @@ module Authlogic
           return true if disable_magic_states?
           [:active, :approved, :confirmed].each do |required_status|
             if record.respond_to?("#{required_status}?") && !record.send("#{required_status}?")
-              errors.add_to_base(send("not_#{required_status}_message"))
+              errors.add_to_base(I18n.t("errors_messages.not_#{required_status}", :default => "Your account is not #{required_status}"))
               return false
             end
           end

data/lib/authlogic/session/config.rb

@@ -134,29 +134,13 @@ module Authlogic
         end
         alias_method :last_request_at_threshold=, :last_request_at_threshold
         
-        # The error message used when the login is left blank.
-        #
-        # * <tt>Default:</tt> "can not be blank"
-        # * <tt>Accepts:</tt> String
-        def login_blank_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:login_blank_message) || login_blank_message("can not be blank")
-          else
-            write_inheritable_attribute(:login_blank_message, value)
-          end
+        def login_blank_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :login_blank_message=, :login_blank_message
         
-        # The error message used when the login could not be found in the database.
-        #
-        # * <tt>Default:</tt> "does not exist"
-        # * <tt>Accepts:</tt> String
-        def login_not_found_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:login_not_found_message) || login_not_found_message("does not exist")
-          else
-            write_inheritable_attribute(:login_not_found_message, value)
-          end
+        def login_not_found_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :login_not_found_message=, :login_not_found_message
         
@@ -196,42 +180,18 @@ module Authlogic
         end
         alias_method :logout_on_timeout=, :logout_on_timeout
         
-        # The error message used when the record returns false to active?
-        #
-        # * <tt>Default:</tt> "Your account is not active"
-        # * <tt>Accepts:</tt> String
-        def not_active_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:not_active_message) || not_active_message("Your account is not active")
-          else
-            write_inheritable_attribute(:not_active_message, value)
-          end
+        def not_active_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :not_active_message=, :not_active_message
         
-        # The error message used when the record returns false to approved?
-        #
-        # * <tt>Default:</tt> "Your account is not approved"
-        # * <tt>Accepts:</tt> String
-        def not_approved_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:not_approved_message) || not_approved_message("Your account is not approved")
-          else
-            write_inheritable_attribute(:not_approved_message, value)
-          end
+        def not_approved_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :not_approved_message=, :not_approved_message
         
-        # The error message used when the record returns false to confirmed?
-        #
-        # * <tt>Default:</tt> "Your account is not confirmed"
-        # * <tt>Accepts:</tt> String
-        def not_confirmed_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:not_confirmed_message) || not_confirmed_message("Your account is not confirmed")
-          else
-            write_inheritable_attribute(:not_confirmed_message, value)
-          end
+        def not_confirmed_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :not_confirmed_message=, :not_confirmed_message
         
@@ -253,16 +213,8 @@ module Authlogic
         end
         alias_method :params_key=, :params_key
         
-        # The error message used when the password is left blank.
-        #
-        # * <tt>Default:</tt> "can not be blank"
-        # * <tt>Accepts:</tt> String
-        def password_blank_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:password_blank_message) || password_blank_message("can not be blank")
-          else
-            write_inheritable_attribute(:password_blank_message, value)
-          end
+        def password_blank_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :password_blank_message=, :password_blank_message
         
@@ -279,16 +231,8 @@ module Authlogic
         end
         alias_method :password_field=, :password_field
         
-        # The error message used when the password is invalid.
-        #
-        # * <tt>Default:</tt> "is invalid"
-        # * <tt>Accepts:</tt> String
-        def password_invalid_message(value = nil)
-          if value.nil?
-            read_inheritable_attribute(:password_invalid_message) || password_invalid_message("is invalid")
-          else
-            write_inheritable_attribute(:password_invalid_message, value)
-          end
+        def password_invalid_message(value = nil) # :nodoc:
+          new_i18n_error
         end
         alias_method :password_invalid_message=, :password_invalid_message
         
@@ -357,6 +301,11 @@ module Authlogic
           end
         end
         alias_method :verify_password_method=, :verify_password_method
+        
+        private
+          def new_i18n_error
+            raise NotImplementedError.new("As of v 1.4.0 Authlogic implements a new I18n solution that is much cleaner and easier. Please see Authlogic::I18n for more information on how to provide internationalization in Authlogic.")
+          end
       end
       
       module InstanceMethods # :nodoc:
@@ -383,14 +332,6 @@ module Authlogic
         def last_request_at_threshold
           self.class.last_request_at_threshold
         end
-        
-        def login_blank_message
-          self.class.login_blank_message
-        end
-        
-        def login_not_found_message
-          self.class.login_not_found_message
-        end
       
         def login_field
           self.class.login_field
@@ -400,18 +341,6 @@ module Authlogic
           self.class.logout_on_timeout == true
         end
         
-        def not_active_message
-          self.class.not_active_message
-        end
-        
-        def not_approved_message
-          self.class.not_approved_message
-        end
-        
-        def not_confirmed_message
-          self.class.not_confirmed_message
-        end
-        
         def params_allowed_request_types
           build_key(self.class.params_allowed_request_types)
         end
@@ -419,19 +348,11 @@ module Authlogic
         def params_key
           build_key(self.class.params_key)
         end
-        
-        def password_blank_message
-          self.class.password_blank_message
-        end
       
         def password_field
           self.class.password_field
         end
         
-        def password_invalid_message
-          self.class.password_invalid_message
-        end
-        
         def perishable_token_field
           klass.acts_as_authentic_config[:perishable_token_field]
         end

data/lib/authlogic/session/cookies.rb

@@ -27,12 +27,13 @@ module Authlogic
         def save_cookie
           controller.cookies[cookie_key] = {
             :value => record.send(persistence_token_field),
-            :expires => remember_me_until
+            :expires => remember_me_until,
+            :domain => controller.cookie_domain
           }
         end
         
         def destroy_cookie
-          controller.cookies.delete cookie_key
+          controller.cookies.delete cookie_key, :domain => controller.cookie_domain
         end
     end
   end

data/lib/authlogic/session/params.rb

@@ -9,10 +9,11 @@ module Authlogic
     #
     # Wait, what is a single access token? It is all explained in the README. Checkout the "Tokens" section in the README, there is section about
     # single access tokens. For security reasons, this type of authentication is ONLY available via single access tokens, you can NOT pass your persistence token.
+    # Which means you must have a single_access_token field in your database.
     module Params
       # Tries to validate the session from information in the params token
       def valid_params?
-        if params_credentials && single_access_token_field && (single_access_allowed_request_types.include?(controller.request_content_type) || single_access_allowed_request_types.include?(:all))
+        if params_credentials && single_access_token_field && (single_access_allowed_request_types.include?(controller.request_content_type) || single_access_allowed_request_types.include?(:all) || controller.single_access_allowed?)
           self.unauthorized_record = search_for_record("find_by_#{single_access_token_field}", params_credentials)
           self.persisting = false
           return true if valid?

data/lib/authlogic/session/session.rb

@@ -15,7 +15,7 @@ module Authlogic
         persistence_token, record_id = session_credentials
         if !persistence_token.blank?
           if record_id
-            record = search_for_record("find_by_id", record_id)
+            record = search_for_record("find_by_#{klass.primary_key}", record_id)
             self.unauthorized_record = record if record && record.send(persistence_token_field) == persistence_token
           else
             # For backwards compatibility, will eventually be removed, just need to let the sessions update theirself

data/lib/authlogic/session/timeout.rb

@@ -19,7 +19,7 @@ module Authlogic
       private
         def update_last_request_at!
           if record.class.column_names.include?("last_request_at") && (record.last_request_at.blank? || last_request_at_threshold.to_i.seconds.ago >= record.last_request_at)
-            record.last_request_at = Time.now
+            record.last_request_at = klass.default_timezone == :utc ? Time.now.utc : Time.now
             record.save_without_session_maintenance(false)
           end
         end

data/lib/authlogic/testing/test_unit_helpers.rb

@@ -16,14 +16,14 @@ module Authlogic
         # 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.send(record.class.acts_as_authentic_config[:persistence_token_field])
           @request.session["#{session_class.session_key}_id"] = 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
+          @request.cookies[session_class.cookie_key] = record.record.send(record.class.acts_as_authentic_config[:persistence_token_field])
         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

data/lib/authlogic/version.rb

@@ -43,8 +43,8 @@ module Authlogic # :nodoc:
     end
 
     MAJOR = 1
-    MINOR = 3
-    TINY  = 9
+    MINOR = 4
+    TINY  = 0
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/test/libs/mock_controller.rb

@@ -13,6 +13,10 @@ class MockController < Authlogic::ControllerAdapters::AbstractAdapter
     @cookies ||= MockCookieJar.new
   end
   
+  def cookie_domain
+    nil
+  end
+  
   def params
     @params ||= {}
   end

data/test/libs/mock_cookie_jar.rb

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

data/test/session_tests/base_test.rb

@@ -78,7 +78,6 @@ module SessionTests
       assert session.respond_to?(:password=)
       assert session.respond_to?(:protected_password, true)
       
-      
       session = UserSession.new(:my_id)
       assert_equal :my_id, session.id
       
@@ -259,36 +258,36 @@ module SessionTests
     end
     
     def test_valid_record
-      session = UserSession.new      
+      session = UserSession.new
       ben = users(:ben)
       session.send(:record=, ben)
-      assert session.send :valid_record?
+      assert session.send(:valid_record?)
       assert session.errors.empty?
-
+      
       ben.update_attribute(:active, false)
       assert !session.send(:valid_record?) 
       assert session.errors.on_base.size > 0
-
+      
       ben.active = true
       ben.approved = false
       ben.save
       assert !session.send(:valid_record?) 
       assert session.errors.on_base.size > 0
-
+      
       ben.approved = true
       ben.confirmed = false
       ben.save
-      assert !session.send(:valid_record?) 
+      assert !session.send(:valid_record?)
       assert session.errors.on_base.size > 0
-
+      
       ben.approved = false
       ben.confirmed = false
       ben.active = false
-
+      
       UserSession.disable_magic_states = true
       session = UserSession.new
-      session.send(:record=, ben)   
-      assert session.send :valid_record?
+      session.send(:record=, ben)
+      assert session.send(:valid_record?)
     end
     
     def test_valid_http_auth

data/test/session_tests/config_test.rb

@@ -76,30 +76,6 @@ module SessionTests
       session = UserSession.new
       assert_equal 0, session.last_request_at_threshold
     end
-  
-    def test_login_blank_message
-      UserSession.login_blank_message = "message"
-      assert_equal "message", UserSession.login_blank_message
-      session = UserSession.new
-      assert_equal "message", session.login_blank_message
-    
-      UserSession.login_blank_message "can not be blank"
-      assert_equal "can not be blank", UserSession.login_blank_message
-      session = UserSession.new
-      assert_equal "can not be blank", session.login_blank_message
-    end
-    
-    def test_login_not_found_message
-      UserSession.login_not_found_message = "message"
-      assert_equal "message", UserSession.login_not_found_message
-      session = UserSession.new
-      assert_equal "message", session.login_not_found_message
-    
-      UserSession.login_not_found_message "does not exist"
-      assert_equal "does not exist", UserSession.login_not_found_message
-      session = UserSession.new
-      assert_equal "does not exist", session.login_not_found_message
-    end
     
     def test_login_field
       UserSession.methods_configured = false
@@ -116,42 +92,6 @@ module SessionTests
       assert session.respond_to?(:login)
     end
     
-    def test_not_active_message
-      UserSession.not_active_message = "message"
-      assert_equal "message", UserSession.not_active_message
-      session = UserSession.new
-      assert_equal "message", session.not_active_message
-    
-      UserSession.not_active_message "Your account is not active"
-      assert_equal "Your account is not active", UserSession.not_active_message
-      session = UserSession.new
-      assert_equal "Your account is not active", session.not_active_message
-    end
-    
-    def test_not_approved_message
-      UserSession.not_approved_message = "message"
-      assert_equal "message", UserSession.not_approved_message
-      session = UserSession.new
-      assert_equal "message", session.not_approved_message
-    
-      UserSession.not_approved_message "Your account is not approved"
-      assert_equal "Your account is not approved", UserSession.not_approved_message
-      session = UserSession.new
-      assert_equal "Your account is not approved", session.not_approved_message
-    end
-    
-    def test_not_confirmed_message
-      UserSession.not_confirmed_message = "message"
-      assert_equal "message", UserSession.not_confirmed_message
-      session = UserSession.new
-      assert_equal "message", session.not_confirmed_message
-    
-      UserSession.not_confirmed_message "Your account is not confirmed"
-      assert_equal "Your account is not confirmed", UserSession.not_confirmed_message
-      session = UserSession.new
-      assert_equal "Your account is not confirmed", session.not_confirmed_message
-    end
-    
     def test_params_key
       UserSession.params_key = "my_params_key"
       assert_equal "my_params_key", UserSession.params_key
@@ -163,18 +103,6 @@ module SessionTests
       session = UserSession.new
       assert_equal "user_credentials", session.params_key
     end
-    
-    def test_password_blank_message
-      UserSession.password_blank_message = "message"
-      assert_equal "message", UserSession.password_blank_message
-      session = UserSession.new
-      assert_equal "message", session.password_blank_message
-    
-      UserSession.password_blank_message "can not be blank"
-      assert_equal "can not be blank", UserSession.password_blank_message
-      session = UserSession.new
-      assert_equal "can not be blank", session.password_blank_message
-    end
   
     def test_password_field
       UserSession.methods_configured = false
@@ -190,18 +118,6 @@ module SessionTests
       assert_equal :password, session.password_field
       assert session.respond_to?(:password)
     end
-    
-    def test_password_invalid_message
-      UserSession.password_invalid_message = "message"
-      assert_equal "message", UserSession.password_invalid_message
-      session = UserSession.new
-      assert_equal "message", session.password_invalid_message
-    
-      UserSession.password_invalid_message "is invalid"
-      assert_equal "is invalid", UserSession.password_invalid_message
-      session = UserSession.new
-      assert_equal "is invalid", session.password_invalid_message
-    end
   
     def test_remember_me
       UserSession.remember_me = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 1.3.9
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -05:00
+date: 2009-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - lib/authlogic/crypto_providers/bcrypt.rb
 - lib/authlogic/crypto_providers/sha1.rb
 - lib/authlogic/crypto_providers/sha512.rb
+- lib/authlogic/i18n.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb
@@ -94,6 +95,7 @@ files:
 - lib/authlogic/crypto_providers/bcrypt.rb
 - lib/authlogic/crypto_providers/sha1.rb
 - lib/authlogic/crypto_providers/sha512.rb
+- lib/authlogic/i18n.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/config.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/credentials.rb
 - lib/authlogic/orm_adapters/active_record_adapter/acts_as_authentic/logged_in.rb
@@ -158,7 +160,7 @@ files:
 - authlogic.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
-post_install_message: 
+post_install_message: BREAKS BACKWARDS COMPATIBILITY! This is only for those using I18n. If you were using the Authlogic configuration to implement I18n you need to update your configuration. A new cleaner approach has been implemented for I18n in Authlogic. See Authlogic::I18n for more details.
 rdoc_options: 
 - --line-numbers
 - --inline-source