authlogic 1.0.0 → 1.1.0

data/test/session_tests/config_test.rb

@@ -0,0 +1,165 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SessionTests
+  class ConfigTest < ActiveSupport::TestCase
+    def test_authenticate_with
+      UserSession.authenticate_with = Employee
+      assert_equal "Employee", UserSession.klass_name
+      assert_equal Employee, UserSession.klass
+    
+      UserSession.authenticate_with User
+      assert_equal "User", UserSession.klass_name
+      assert_equal User, UserSession.klass
+    end
+  
+    def test_cookie_key
+      UserSession.cookie_key = "my_cookie_key"
+      assert_equal "my_cookie_key", UserSession.cookie_key
+      session = UserSession.new
+      assert_equal "my_cookie_key", session.cookie_key
+    
+      UserSession.cookie_key "user_credentials"
+      assert_equal "user_credentials", UserSession.cookie_key
+      session = UserSession.new
+      assert_equal "user_credentials", session.cookie_key
+    end
+  
+    def test_find_by_login_method
+      UserSession.find_by_login_method = "my_login_method"
+      assert_equal "my_login_method", UserSession.find_by_login_method
+      session = UserSession.new
+      assert_equal "my_login_method", session.find_by_login_method
+    
+      UserSession.find_by_login_method "find_by_login"
+      assert_equal "find_by_login", UserSession.find_by_login_method
+      session = UserSession.new
+      assert_equal "find_by_login", session.find_by_login_method
+    end
+  
+    def test_find_with
+      UserSession.find_with = [:session]
+      assert_equal [:session], UserSession.find_with
+      session = UserSession.new
+      assert_equal [:session], session.find_with
+    
+      set_cookie_for(users(:ben))
+      assert !UserSession.find
+    
+      UserSession.find_with :session, :cookie, :http_auth
+      assert_equal [:session, :cookie, :http_auth], UserSession.find_with
+      session = UserSession.new
+      assert_equal [:session, :cookie, :http_auth], session.find_with
+    
+      assert UserSession.find
+    end
+    
+    def test_last_request_at_threshold
+      ben = users(:ben)
+      set_session_for(ben)
+      UserSession.last_request_at_threshold = 2.seconds
+      assert_equal 2.seconds, UserSession.last_request_at_threshold
+      
+      assert UserSession.find
+      last_request_at = ben.reload.last_request_at
+      sleep(1)
+      assert UserSession.find
+      assert_equal last_request_at, ben.reload.last_request_at
+      sleep(1)
+      assert UserSession.find
+      assert_not_equal last_request_at, ben.reload.last_request_at
+      
+      UserSession.last_request_at_threshold 0
+      assert_equal 0, UserSession.last_request_at_threshold
+    end
+  
+    def test_login_field
+      UserSession.login_field = :saweet
+      assert_equal :saweet, UserSession.login_field
+      session = UserSession.new
+      assert_equal :saweet, session.login_field
+      assert session.respond_to?(:saweet)
+    
+      UserSession.login_field :login
+      assert_equal :login, UserSession.login_field
+      session = UserSession.new
+      assert_equal :login, session.login_field
+      assert session.respond_to?(:login)
+    end
+  
+    def test_password_field
+      UserSession.password_field = :saweet
+      assert_equal :saweet, UserSession.password_field
+      session = UserSession.new
+      assert_equal :saweet, session.password_field
+      assert session.respond_to?(:saweet)
+    
+      UserSession.password_field :password
+      assert_equal :password, UserSession.password_field
+      session = UserSession.new
+      assert_equal :password, session.password_field
+      assert session.respond_to?(:password)
+    end
+  
+    def test_remember_me
+      UserSession.remember_me = true
+      assert_equal true, UserSession.remember_me
+      session = UserSession.new
+      assert_equal true, session.remember_me
+    
+      UserSession.remember_me false
+      assert_equal false, UserSession.remember_me
+      session = UserSession.new
+      assert_equal false, session.remember_me
+    end
+  
+    def test_remember_me_for
+      UserSession.remember_me_for = 3.years
+      assert_equal 3.years, UserSession.remember_me_for
+      session = UserSession.new
+      session.remember_me = true
+      assert_equal 3.years, session.remember_me_for
+    
+      UserSession.remember_me_for 3.months
+      assert_equal 3.months, UserSession.remember_me_for
+      session = UserSession.new
+      session.remember_me = true
+      assert_equal 3.months, session.remember_me_for
+    end
+  
+    def test_remember_token_field
+      UserSession.remember_token_field = :saweet
+      assert_equal :saweet, UserSession.remember_token_field
+      session = UserSession.new
+      assert_equal :saweet, session.remember_token_field
+    
+      UserSession.remember_token_field :remember_token
+      assert_equal :remember_token, UserSession.remember_token_field
+      session = UserSession.new
+      assert_equal :remember_token, session.remember_token_field
+    end
+  
+    def test_session_key
+      UserSession.session_key = "my_session_key"
+      assert_equal "my_session_key", UserSession.session_key
+      session = UserSession.new
+      assert_equal "my_session_key", session.session_key
+    
+      UserSession.session_key "user_credentials"
+      assert_equal "user_credentials", UserSession.session_key
+      session = UserSession.new
+      assert_equal "user_credentials", session.session_key
+    end
+  
+    def test_verify_password_method
+      UserSession.verify_password_method = "my_login_method"
+      assert_equal "my_login_method", UserSession.verify_password_method
+      session = UserSession.new
+      assert_equal "my_login_method", session.verify_password_method
+    
+      UserSession.verify_password_method "valid_password?"
+      assert_equal "valid_password?", UserSession.verify_password_method
+      session = UserSession.new
+      assert_equal "valid_password?", session.verify_password_method
+    end
+  end
+end

data/test/session_tests/cookies_test.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SessionTests
+  class CookiesTest < ActiveSupport::TestCase
+    def test_valid_cookie
+      ben = users(:ben)
+      session = UserSession.new
+    
+      assert !session.valid_cookie?
+    
+      set_cookie_for(ben)
+      assert session.valid_cookie?
+      assert_equal ben, session.unauthorized_record
+    end
+    
+    def test_save
+      ben = users(:ben)
+      session = UserSession.new(ben)
+      assert session.save
+      assert_equal ben.remember_token, @controller.cookies["user_credentials"]
+    end
+    
+    def test_destroy
+      ben = users(:ben)
+      set_cookie_for(ben)
+      session = UserSession.find
+      assert @controller.cookies["user_credentials"]
+      assert session.destroy
+      assert !@controller.cookies["user_credentials"]
+    end
+  end
+end

data/test/session_tests/params_test.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SessionTests
+  class ParamsTest < ActiveSupport::TestCase
+    def test_valid_params
+      ben = users(:ben)
+      session = UserSession.new
+    
+      assert !session.valid_params?
+    
+      set_params_for(ben)
+      assert session.valid_params?
+      assert_equal ben, session.unauthorized_record
+    end
+  end
+end

data/test/session_tests/scopes_test.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SessionTests
+  class ScopesTest < ActiveSupport::TestCase
+    def test_scope_method
+      assert_equal 0, Authlogic::Session::Base.send(:scopes).size 
+      thread1 = Thread.new do
+        scope = {:id => :scope1}
+        Authlogic::Session::Base.send(:scope=, scope)
+        assert_equal scope, Authlogic::Session::Base.scope
+      end
+      thread1.join
+      assert_equal 1, Authlogic::Session::Base.send(:scopes).size
+      assert_nil Authlogic::Session::Base.scope
+      thread2 = Thread.new do
+        scope = {:id => :scope2}
+        Authlogic::Session::Base.send(:scope=, scope)
+        assert_equal scope, Authlogic::Session::Base.scope
+      end
+      thread2.join
+      assert_equal 2, Authlogic::Session::Base.send(:scopes).size
+      assert_nil Authlogic::Session::Base.scope
+      Authlogic::Session::Base.send(:scopes).clear
+    end
+  
+    def test_with_scope_method
+      assert_raise(ArgumentError) { UserSession.with_scope }
+      
+      UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
+        assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, UserSession.scope)
+      end
+      
+      assert_nil UserSession.scope
+    end
+  
+    def test_initialize
+      UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
+        session = UserSession.new
+        assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, session.scope)
+        session.id = :another_id
+        assert_equal "another_id_some_id_user_credentials", session.cookie_key
+        assert_equal "another_id_some_id_user_credentials", session.session_key
+      end
+    end
+    
+    def test_search_for_record_with_scopes
+      binary_logic = companies(:binary_logic)
+      ben = users(:ben)
+      zack = users(:zack)
+      
+      session = UserSession.new
+      assert_equal zack, session.send(:search_for_record, "find_by_login", zack.login)
+      
+      session.scope = {:find_options => {:conditions => ["company_id = ?", binary_logic.id]}}
+      assert_nil session.send(:search_for_record, "find_by_login", zack.login)
+      
+      assert_equal ben, session.send(:search_for_record, "find_by_login", ben.login)
+    end
+  end
+end

data/test/session_tests/session_test.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module SessionTests
+  class SessionTest < ActiveSupport::TestCase
+    def test_valid_session
+      ben = users(:ben)
+      session = UserSession.new
+      
+      assert !session.valid_session?
+      
+      set_session_for(ben)
+      assert session.valid_session?
+      assert session.find_record
+      assert_equal ben, session.record
+      assert_equal ben.remember_token, @controller.session["user_credentials"]
+      assert_equal ben, session.unauthorized_record
+      assert !session.new_session?
+    end
+    
+    def test_save
+      ben = users(:ben)
+      session = UserSession.new(ben)
+      assert @controller.session["user_credentials"].blank?
+      assert session.save
+      assert_equal ben.remember_token, @controller.session["user_credentials"]
+    end
+    
+    def test_destroy
+      ben = users(:ben)
+      set_session_for(ben)
+      assert_equal ben.remember_token, @controller.session["user_credentials"]
+      session = UserSession.find
+      assert session.destroy
+      assert @controller.session["user_credentials"].blank?
+    end
+    
+    def test_find
+      ben = users(:ben)
+      set_cookie_for(ben)
+      assert @controller.session["user_credentials"].blank?
+      assert UserSession.find
+      assert_equal ben.remember_token, @controller.session["user_credentials"]
+    end
+  end
+end

data/test/test_helper.rb

@@ -3,11 +3,11 @@ require "rubygems"
 require "ruby-debug"
 require "active_record"
 require 'active_record/fixtures'
-require File.dirname(__FILE__) + '/../lib/authlogic'
-require File.dirname(__FILE__) + '/../test_libs/aes128_crypto_provider'
-require File.dirname(__FILE__) + '/../test_libs/mock_request'
-require File.dirname(__FILE__) + '/../test_libs/mock_cookie_jar'
-require File.dirname(__FILE__) + '/../test_libs/mock_controller'
+require File.dirname(__FILE__) + '/../lib/authlogic' unless defined?(Authlogic)
+require File.dirname(__FILE__) + '/libs/aes128_crypto_provider'
+require File.dirname(__FILE__) + '/libs/mock_request'
+require File.dirname(__FILE__) + '/libs/mock_cookie_jar'
+require File.dirname(__FILE__) + '/libs/mock_controller'
 
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
@@ -38,6 +38,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string    :login
     t.string    :crypted_password
     t.string    :password_salt
+    t.string    :openid
     t.string    :remember_token
     t.string    :first_name
     t.string    :last_name
@@ -132,6 +133,14 @@ class Test::Unit::TestCase
       @controller.cookies["user_credentials"] = nil
     end
     
+    def set_params_for(user, id = nil)
+      @controller.params["user_credentials"] = user.remember_token
+    end
+    
+    def unset_params
+      @controller.params["user_credentials"] = nil
+    end
+    
     def set_session_for(user, id = nil)
       @controller.session["user_credentials"] = user.remember_token
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-05 00:00:00 -05:00
+date: 2008-11-13 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Framework agnostic object based authentication solution that handles all of the non sense for you. It's as easy as ActiveRecord is with a database.
+description: A clean, simple, and unobtrusive ruby authentication solution.
 email: bjohnson@binarylogic.com
 executables: []
 
@@ -50,60 +50,84 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG.rdoc
-- lib/authlogic/active_record/acts_as_authentic.rb
-- lib/authlogic/active_record/authenticates_many.rb
-- lib/authlogic/active_record/scoped_session.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/sha1.rb
+- lib/authlogic/crypto_providers/sha512.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/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.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/openid.rb
+- lib/authlogic/session/params.rb
 - lib/authlogic/session/scopes.rb
-- lib/authlogic/sha512_crypto_provider.rb
+- lib/authlogic/session/session.rb
+- lib/authlogic/testing/shoulda_macros.rb
 - lib/authlogic/version.rb
 - lib/authlogic.rb
 - README.rdoc
 files: 
 - CHANGELOG.rdoc
 - init.rb
-- lib/authlogic/active_record/acts_as_authentic.rb
-- lib/authlogic/active_record/authenticates_many.rb
-- lib/authlogic/active_record/scoped_session.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/sha1.rb
+- lib/authlogic/crypto_providers/sha512.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/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.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/openid.rb
+- lib/authlogic/session/params.rb
 - lib/authlogic/session/scopes.rb
-- lib/authlogic/sha512_crypto_provider.rb
+- lib/authlogic/session/session.rb
+- lib/authlogic/testing/shoulda_macros.rb
 - lib/authlogic/version.rb
 - lib/authlogic.rb
 - Manifest
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/active_record_acts_as_authentic_test.rb
-- test/active_record_authenticates_many_test.rb
 - test/fixtures/companies.yml
 - test/fixtures/employees.yml
 - test/fixtures/projects.yml
 - test/fixtures/users.yml
+- test/libs/aes128_crypto_provider.rb
+- test/libs/mock_controller.rb
+- test/libs/mock_cookie_jar.rb
+- test/libs/mock_request.rb
+- test/libs/ordered_hash.rb
+- test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_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/scopes_test.rb
+- test/session_tests/session_test.rb
 - test/test_helper.rb
-- test/user_session_active_record_trickery_test.rb
-- test/user_session_base_test.rb
-- test/user_session_config_test.rb
-- test/user_session_scopes_test.rb
-- test_libs/aes128_crypto_provider.rb
-- test_libs/mock_controller.rb
-- test_libs/mock_cookie_jar.rb
-- test_libs/mock_request.rb
-- test_libs/ordered_hash.rb
 - authlogic.gemspec
 has_rdoc: true
 homepage: http://github.com/binarylogic/authlogic
@@ -135,12 +159,16 @@ rubyforge_project: authlogic
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Framework agnostic object based authentication solution that handles all of the non sense for you. It's as easy as ActiveRecord is with a database.
+summary: A clean, simple, and unobtrusive ruby authentication solution.
 test_files: 
-- test/active_record_acts_as_authentic_test.rb
-- test/active_record_authenticates_many_test.rb
+- test/orm_adapters_tests/active_record_adapter_tests/acts_as_authentic_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/scopes_test.rb
+- test/session_tests/session_test.rb
 - test/test_helper.rb
-- test/user_session_active_record_trickery_test.rb
-- test/user_session_base_test.rb
-- test/user_session_config_test.rb
-- test/user_session_scopes_test.rb