authlogic 2.0.1 → 2.1.0

data/test/session_test/magic_states_test.rb

@@ -31,7 +31,7 @@ module SessionTest
       
         ben.update_attribute(:active, false)
         assert !session.valid?
-        assert session.errors.on_base.size > 0
+        assert session.errors[:base].size > 0
       end
     
       def test_validate_validate_magic_states_approved
@@ -42,7 +42,7 @@ module SessionTest
       
         ben.update_attribute(:approved, false)
         assert !session.valid?
-        assert session.errors.on_base.size > 0
+        assert session.errors[:base].size > 0
       end
     
       def test_validate_validate_magic_states_confirmed
@@ -53,7 +53,7 @@ module SessionTest
       
         ben.update_attribute(:confirmed, false)
         assert !session.valid?
-        assert session.errors.on_base.size > 0
+        assert session.errors[:base].size > 0
       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/password_test.rb

@@ -19,6 +19,14 @@ module SessionTest
         assert_equal "valid_password?", UserSession.verify_password_method
       end
     
+      def test_generalize_credentials_error_messages
+        UserSession.generalize_credentials_error_messages = true
+        assert UserSession.generalize_credentials_error_messages
+    
+        UserSession.generalize_credentials_error_messages false
+        assert !UserSession.generalize_credentials_error_messages
+      end
+      
       def test_login_field
         UserSession.configured_password_methods = false
         UserSession.login_field = :saweet

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)
       
@@ -38,6 +38,15 @@ module SessionTest
       
         UserSession.logout_on_timeout = false
       end
+      
+      def test_successful_login
+        UserSession.logout_on_timeout = true
+        ben = users(:ben)
+        assert UserSession.create(:login => ben.login, :password => "benrocks")
+        assert session = UserSession.find
+        assert_equal ben, session.record
+        UserSession.logout_on_timeout = false
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -2,7 +2,17 @@ require "test/unit"
 require "rubygems"
 require "ruby-debug"
 require "active_record"
-require 'active_record/fixtures'
+require "active_record/fixtures"
+
+# A temporary fix to bring active record errors up to speed with rails edge.
+# I need to remove this once the new gem is released. This is only here so my tests pass.
+class ActiveRecord::Errors
+  def [](key)
+    value = on(key)
+    value.is_a?(Array) ? value : [value].compact
+  end
+end
+
 
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
@@ -69,15 +79,32 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :current_login_ip
     t.string    :last_login_ip
   end
+  
+  create_table :affiliates do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.integer   :company_id
+    t.string    :username
+    t.string    :pw_hash
+    t.string    :pw_salt
+    t.string    :persistence_token
+  end
+  
+  create_table :ldapers do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.string    :ldap_login
+    t.string    :persistence_token
+  end
 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/affiliate'
 require File.dirname(__FILE__) + '/libs/employee'
 require File.dirname(__FILE__) + '/libs/employee_session'
+require File.dirname(__FILE__) + '/libs/ldaper'
 require File.dirname(__FILE__) + '/libs/user'
 require File.dirname(__FILE__) + '/libs/user_session'
 require File.dirname(__FILE__) + '/libs/company'
@@ -94,11 +121,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 +132,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.1
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-23 00:00:00 -04:00
+date: 2009-06-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,32 +22,23 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.11.0
-    version: 
-description: A clean, simple, and unobtrusive ruby authentication solution.
+description: 
 email: bjohnson@binarylogic.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- Manifest.txt
-- CHANGELOG.rdoc
+- LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG.rdoc
-- MIT-LICENSE
-- Manifest.txt
+- LICENSE
 - README.rdoc
 - Rakefile
+- VERSION.yml
+- authlogic.gemspec
 - generators/session/session_generator.rb
 - generators/session/templates/session.rb
 - init.rb
@@ -76,6 +67,7 @@ files:
 - 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
@@ -99,8 +91,13 @@ 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/version.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
@@ -110,6 +107,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
@@ -121,12 +119,11 @@ files:
 - 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/mock_controller.rb
-- test/libs/mock_cookie_jar.rb
-- test/libs/mock_request.rb
+- test/libs/ldaper.rb
 - test/libs/ordered_hash.rb
 - test/libs/project.rb
 - test/libs/user.rb
@@ -156,10 +153,11 @@ files:
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
-post_install_message: "Version 2.0 introduces some changes that break backwards compatibility. The big change is how acts_as_authentic accepts configuration options. Instead of a hash, it now accepts a block: acts_as_authentic { |c| c.my_config_option = my_value}. See the docs for more details."
+licenses: []
+
+post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -177,9 +175,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: authlogic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A clean, simple, and unobtrusive ruby authentication solution.
 test_files: 
 - test/acts_as_authentic_test/base_test.rb
@@ -190,12 +188,24 @@ 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/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
@@ -217,3 +227,4 @@ test_files:
 - test/session_test/timeout_test.rb
 - test/session_test/unauthorized_record_test.rb
 - test/session_test/validation_test.rb
+- test/test_helper.rb

data/Manifest.txt

@@ -1,111 +0,0 @@
-CHANGELOG.rdoc
-MIT-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-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/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/testing/test_unit_helpers.rb
-lib/authlogic/version.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/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/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
-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

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) # :nodoc:
-          record.class.acts_as_authentic_config[:session_class].constantize
-        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.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.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
-        # 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/lib/authlogic/version.rb

@@ -1,56 +0,0 @@
-module Authlogic # :nodoc:
-  # = Version
-  #
-  # A class for describing the current version of a library. The version
-  # consists of three parts: the +major+ number, the +minor+ number, and the
-  # +tiny+ (or +patch+) number.
-  class Version
-    
-    include Comparable
-  
-    # A convenience method for instantiating a new Version instance with the
-    # given +major+, +minor+, and +tiny+ components.
-    def self.[](major, minor, tiny)
-      new(major, minor, tiny)
-    end
-
-    attr_reader :major, :minor, :tiny
-
-    # Create a new Version object with the given components.
-    def initialize(major, minor, tiny)
-      @major, @minor, @tiny = major, minor, tiny
-    end
-
-    # Compare this version to the given +version+ object.
-    def <=>(version)
-      to_i <=> version.to_i
-    end
-
-    # Converts this version object to a string, where each of the three
-    # version components are joined by the '.' character. E.g., 2.0.0.
-    def to_s
-      @to_s ||= [@major, @minor, @tiny].join(".")
-    end
-
-    # Converts this version to a canonical integer that may be compared
-    # against other version objects.
-    def to_i
-      @to_i ||= @major * 1_000_000 + @minor * 1_000 + @tiny
-    end
-    
-    def to_a
-      [@major, @minor, @tiny]
-    end
-
-    MAJOR = 2
-    MINOR = 0
-    TINY  = 1
-
-    # The current version as a Version instance
-    CURRENT = new(MAJOR, MINOR, TINY)
-    # The current version as a String
-    STRING = CURRENT.to_s
-    
-  end
-  
-end

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