binarylogic-authlogic 2.1.0 → 2.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 2.1.1 released 2009-7-04
+
+* 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.
+* Added check to make sure Authlogic is not loaded too late, causing a NotActivated error.
+
 == 2.1.0 released 2009-6-27
 
 * Fixed bug when using act_like_restful_authentication and setting passwords, needed to add a 2nd parameter to tell if to check against the database or not.

data/README.rdoc

@@ -203,13 +203,13 @@ From rubyforge:
 
   $ sudo gem install authlogic
 
-OR from github:
+Or from github:
 
   $ sudo gem install binarylogic-authlogic
 
 Now just add the gem dependency in your projects configuration.
 
-Or you install this as a plugin (for older versions of rails)
+Or you can install this as a plugin:
 
   script/plugin install git://github.com/binarylogic/authlogic.git
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 2
 :minor: 1

data/authlogic.gemspec

@@ -0,0 +1,205 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{authlogic}
+  s.version = "2.1.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ben Johnson of Binary Logic"]
+  s.date = %q{2009-07-04}
+  s.email = %q{bjohnson@binarylogic.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG.rdoc",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION.yml",
+     "authlogic.gemspec",
+     "generators/session/session_generator.rb",
+     "generators/session/templates/session.rb",
+     "init.rb",
+     "lib/authlogic.rb",
+     "lib/authlogic/acts_as_authentic/base.rb",
+     "lib/authlogic/acts_as_authentic/email.rb",
+     "lib/authlogic/acts_as_authentic/logged_in_status.rb",
+     "lib/authlogic/acts_as_authentic/login.rb",
+     "lib/authlogic/acts_as_authentic/magic_columns.rb",
+     "lib/authlogic/acts_as_authentic/password.rb",
+     "lib/authlogic/acts_as_authentic/perishable_token.rb",
+     "lib/authlogic/acts_as_authentic/persistence_token.rb",
+     "lib/authlogic/acts_as_authentic/restful_authentication.rb",
+     "lib/authlogic/acts_as_authentic/session_maintenance.rb",
+     "lib/authlogic/acts_as_authentic/single_access_token.rb",
+     "lib/authlogic/acts_as_authentic/validations_scope.rb",
+     "lib/authlogic/authenticates_many/association.rb",
+     "lib/authlogic/authenticates_many/base.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/md5.rb",
+     "lib/authlogic/crypto_providers/sha1.rb",
+     "lib/authlogic/crypto_providers/sha512.rb",
+     "lib/authlogic/i18n.rb",
+     "lib/authlogic/random.rb",
+     "lib/authlogic/regex.rb",
+     "lib/authlogic/session/activation.rb",
+     "lib/authlogic/session/active_record_trickery.rb",
+     "lib/authlogic/session/base.rb",
+     "lib/authlogic/session/brute_force_protection.rb",
+     "lib/authlogic/session/callbacks.rb",
+     "lib/authlogic/session/cookies.rb",
+     "lib/authlogic/session/existence.rb",
+     "lib/authlogic/session/foundation.rb",
+     "lib/authlogic/session/http_auth.rb",
+     "lib/authlogic/session/id.rb",
+     "lib/authlogic/session/klass.rb",
+     "lib/authlogic/session/magic_columns.rb",
+     "lib/authlogic/session/magic_states.rb",
+     "lib/authlogic/session/params.rb",
+     "lib/authlogic/session/password.rb",
+     "lib/authlogic/session/perishable_token.rb",
+     "lib/authlogic/session/persistence.rb",
+     "lib/authlogic/session/priority_record.rb",
+     "lib/authlogic/session/scopes.rb",
+     "lib/authlogic/session/session.rb",
+     "lib/authlogic/session/timeout.rb",
+     "lib/authlogic/session/unauthorized_record.rb",
+     "lib/authlogic/session/validation.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_logger.rb",
+     "lib/authlogic/test_case/mock_request.rb",
+     "lib/authlogic/test_case/rails_request_adapter.rb",
+     "rails/init.rb",
+     "shoulda_macros/authlogic.rb",
+     "test/acts_as_authentic_test/base_test.rb",
+     "test/acts_as_authentic_test/email_test.rb",
+     "test/acts_as_authentic_test/logged_in_status_test.rb",
+     "test/acts_as_authentic_test/login_test.rb",
+     "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",
+     "test/crypto_provider_test/aes256_test.rb",
+     "test/crypto_provider_test/bcrypt_test.rb",
+     "test/crypto_provider_test/sha1_test.rb",
+     "test/crypto_provider_test/sha512_test.rb",
+     "test/fixtures/companies.yml",
+     "test/fixtures/employees.yml",
+     "test/fixtures/projects.yml",
+     "test/fixtures/users.yml",
+     "test/libs/affiliate.rb",
+     "test/libs/company.rb",
+     "test/libs/employee.rb",
+     "test/libs/employee_session.rb",
+     "test/libs/ldaper.rb",
+     "test/libs/ordered_hash.rb",
+     "test/libs/project.rb",
+     "test/libs/user.rb",
+     "test/libs/user_session.rb",
+     "test/random_test.rb",
+     "test/session_test/activation_test.rb",
+     "test/session_test/active_record_trickery_test.rb",
+     "test/session_test/brute_force_protection_test.rb",
+     "test/session_test/callbacks_test.rb",
+     "test/session_test/cookies_test.rb",
+     "test/session_test/credentials_test.rb",
+     "test/session_test/existence_test.rb",
+     "test/session_test/http_auth_test.rb",
+     "test/session_test/id_test.rb",
+     "test/session_test/klass_test.rb",
+     "test/session_test/magic_columns_test.rb",
+     "test/session_test/magic_states_test.rb",
+     "test/session_test/params_test.rb",
+     "test/session_test/password_test.rb",
+     "test/session_test/perishability_test.rb",
+     "test/session_test/persistence_test.rb",
+     "test/session_test/scopes_test.rb",
+     "test/session_test/session_test.rb",
+     "test/session_test/timeout_test.rb",
+     "test/session_test/unauthorized_record_test.rb",
+     "test/session_test/validation_test.rb",
+     "test/test_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/binarylogic/authlogic}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{authlogic}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{A clean, simple, and unobtrusive ruby authentication solution.}
+  s.test_files = [
+    "test/acts_as_authentic_test/base_test.rb",
+     "test/acts_as_authentic_test/email_test.rb",
+     "test/acts_as_authentic_test/logged_in_status_test.rb",
+     "test/acts_as_authentic_test/login_test.rb",
+     "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",
+     "test/crypto_provider_test/aes256_test.rb",
+     "test/crypto_provider_test/bcrypt_test.rb",
+     "test/crypto_provider_test/sha1_test.rb",
+     "test/crypto_provider_test/sha512_test.rb",
+     "test/libs/affiliate.rb",
+     "test/libs/company.rb",
+     "test/libs/employee.rb",
+     "test/libs/employee_session.rb",
+     "test/libs/ldaper.rb",
+     "test/libs/ordered_hash.rb",
+     "test/libs/project.rb",
+     "test/libs/user.rb",
+     "test/libs/user_session.rb",
+     "test/random_test.rb",
+     "test/session_test/activation_test.rb",
+     "test/session_test/active_record_trickery_test.rb",
+     "test/session_test/brute_force_protection_test.rb",
+     "test/session_test/callbacks_test.rb",
+     "test/session_test/cookies_test.rb",
+     "test/session_test/credentials_test.rb",
+     "test/session_test/existence_test.rb",
+     "test/session_test/http_auth_test.rb",
+     "test/session_test/id_test.rb",
+     "test/session_test/klass_test.rb",
+     "test/session_test/magic_columns_test.rb",
+     "test/session_test/magic_states_test.rb",
+     "test/session_test/params_test.rb",
+     "test/session_test/password_test.rb",
+     "test/session_test/perishability_test.rb",
+     "test/session_test/persistence_test.rb",
+     "test/session_test/scopes_test.rb",
+     "test/session_test/session_test.rb",
+     "test/session_test/timeout_test.rb",
+     "test/session_test/unauthorized_record_test.rb",
+     "test/session_test/validation_test.rb",
+     "test/test_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 0"])
+  end
+end

data/lib/authlogic/acts_as_authentic/login.rb

@@ -118,7 +118,7 @@ module Authlogic
             if sensitivity
               send("find_by_#{field}", value)
             else
-              first(:conditions => ["LOWER(#{quoted_table_name}.#{field}) = ?", value.downcase])
+              first(:conditions => ["LOWER(#{quoted_table_name}.#{field}) = ?", value.mb_chars.downcase])
             end
           end
       end

data/lib/authlogic/controller_adapters/rails_adapter.rb

@@ -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
@@ -12,7 +14,7 @@ module Authlogic
       end
       
       def cookie_domain
-        @cookie_domain_key ||= (Rails::VERSION::MAJOR >= 2 && Rails::VERSION::MINOR >= 3) ? :domain : :session_domain
+        @cookie_domain_key ||= Rails::VERSION::STRING >= '2.3' ? :domain : :session_domain
         ActionController::Base.session_options[@cookie_domain_key]
       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)
@@ -35,4 +45,4 @@ module Authlogic
   end
 end
 
-ActionController::Base.send(:include, Authlogic::ControllerAdapters::RailsAdapter::RailsImplementation)
+ActionController::Base.send(:include, Authlogic::ControllerAdapters::RailsAdapter::RailsImplementation)

data/lib/authlogic/session/cookies.rb

@@ -57,7 +57,7 @@ module Authlogic
           values = value.is_a?(Array) ? value : [value]
           case values.first
           when Hash
-            self.remember_me = values.first.with_indifferent_access[:remember_me]
+            self.remember_me = values.first.with_indifferent_access[:remember_me] if values.first.with_indifferent_access.key?(:remember_me)
           else
             r = values.find { |value| value.is_a?(TrueClass) || value.is_a?(FalseClass) }
             self.remember_me = r if !r.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: binarylogic-authlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-27 00:00:00 -07:00
+date: 2009-07-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- authlogic.gemspec
 - generators/session/session_generator.rb
 - generators/session/templates/session.rb
 - init.rb