Empact-authlogic 2.1.5 → 3.0.3

data/lib/generators/authlogic/USAGE

@@ -0,0 +1,8 @@
+Description:
+    Create session model that represents the user’s current session.
+
+Example:
+    rails generate authlogic:session UserSession
+
+    This will create:
+        Model UserSession in app/models directory 

data/lib/generators/authlogic/session_generator.rb

@@ -0,0 +1,14 @@
+module Authlogic
+  class SessionGenerator < Rails::Generators::Base
+    source_root File.expand_path('../templates', __FILE__)
+    argument :session_class_name, :type => :string, :default => "Session"
+
+    def self.banner
+      "rails generate authlogic:#{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]"
+    end
+  
+    def generate_session
+      template "session.rb", "app/models/#{session_class_name.underscore}.rb"
+    end
+  end
+end

data/lib/generators/authlogic/templates/session.rb

@@ -0,0 +1,2 @@
+class <%= session_class_name %> < Authlogic::Session::Base
+end

data/test/acts_as_authentic_test/base_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class BaseTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/email_test.rb

@@ -1,79 +1,83 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
     def test_email_field_config
       assert_equal :email, User.email_field
       assert_equal :email, Employee.email_field
-      
+
       User.email_field = :nope
       assert_equal :nope, User.email_field
       User.email_field :email
       assert_equal :email, User.email_field
     end
-    
+
     def test_validate_email_field_config
       assert User.validate_email_field
       assert Employee.validate_email_field
-      
+
       User.validate_email_field = false
       assert !User.validate_email_field
       User.validate_email_field true
       assert User.validate_email_field
     end
-    
+
     def test_validates_length_of_email_field_options_config
-      assert_equal({:within => 6..100}, User.validates_length_of_email_field_options)
-      assert_equal({:within => 6..100}, Employee.validates_length_of_email_field_options)
-      
+      assert_equal({:maximum => 100}, User.validates_length_of_email_field_options)
+      assert_equal({:maximum => 100}, Employee.validates_length_of_email_field_options)
+
       User.validates_length_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_email_field_options)
       User.validates_length_of_email_field_options({:within => 6..100})
       assert_equal({:within => 6..100}, User.validates_length_of_email_field_options)
     end
-    
+
     def test_validates_format_of_email_field_options_config
       default = {:with => Authlogic::Regex.email, :message => I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}
       assert_equal default, User.validates_format_of_email_field_options
       assert_equal default, Employee.validates_format_of_email_field_options
-      
+
       User.validates_format_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_format_of_email_field_options)
       User.validates_format_of_email_field_options default
       assert_equal default, User.validates_format_of_email_field_options
     end
-    
+
     def test_validates_uniqueness_of_email_field_options_config
       default = {:case_sensitive => false, :scope => Employee.validations_scope, :if => "#{Employee.email_field}_changed?".to_sym}
       assert_equal default, Employee.validates_uniqueness_of_email_field_options
-      
+
       Employee.validates_uniqueness_of_email_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, Employee.validates_uniqueness_of_email_field_options)
       Employee.validates_uniqueness_of_email_field_options default
       assert_equal default, Employee.validates_uniqueness_of_email_field_options
     end
-    
+
     def test_validates_length_of_email_field
       u = User.new
       u.email = "a@a.a"
       assert !u.valid?
       assert u.errors[:email].size > 0
-      
+
       u.email = "a@a.com"
       assert !u.valid?
       assert u.errors[:email].size == 0
     end
-    
+
     def test_validates_format_of_email_field
       u = User.new
       u.email = "aaaaaaaaaaaaa"
       u.valid?
-      assert u.errors[:email].size > 0 
-      
+      assert u.errors[:email].size > 0
+
       u.email = "a@a.com"
       u.valid?
       assert u.errors[:email].size == 0
-      
+
+      u.email = "damien+test1...etc..@mydomain.com"
+      u.valid?
+      assert u.errors[:email].size == 0
+
       u.email = "dakota.dux+1@gmail.com"
       u.valid?
       assert u.errors[:email].size == 0
@@ -85,18 +89,22 @@ module ActsAsAuthenticTest
       u.email = "dakota.O'Malley+1@gmail.com"
       u.valid?
       assert u.errors[:email].size == 0
+
+      u.email = "dakota.d'ux@gmail.com"
+      u.valid?
+      assert u.errors[:email].size == 0
     end
-    
+
     def test_validates_uniqueness_of_email_field
       u = User.new
       u.email = "bjohnson@binarylogic.com"
       assert !u.valid?
       assert u.errors[:email].size > 0
-      
+
       u.email = "BJOHNSON@binarylogic.com"
       assert !u.valid?
       assert u.errors[:email].size > 0
-      
+
       u.email = "a@a.com"
       assert !u.valid?
       assert u.errors[:email].size == 0

data/test/acts_as_authentic_test/logged_in_status_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoggedInStatusTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/login_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoginTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/magic_columns_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class MagicColumnsTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/password_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PasswordTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/perishable_token_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PerishableTokenTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/persistence_token_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PersistenceTokenTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/restful_authentication_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class RestfulAuthenticationTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/session_maintenance_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SessionMaintenanceTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/single_access_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SingleAccessTest < ActiveSupport::TestCase

data/test/authenticates_many_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
   def test_scoping

data/test/crypto_provider_test/aes256_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class AES256Test < ActiveSupport::TestCase

data/test/crypto_provider_test/bcrypt_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class BCrpytTest < ActiveSupport::TestCase

data/test/crypto_provider_test/sha1_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha1Test < ActiveSupport::TestCase

data/test/crypto_provider_test/sha256_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha256Test < ActiveSupport::TestCase

data/test/crypto_provider_test/sha512_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha512Test < ActiveSupport::TestCase

data/test/i18n_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default

data/test/random_test.rb

@@ -1,13 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class RandomTest < ActiveSupport::TestCase
-  def test_random_tokens_have_consisten_length
-    with_any_random do
-      assert_equal 128, Authlogic::Random.hex_token.length
-      assert_equal 20,  Authlogic::Random.friendly_token.length
-    end
-  end
-  
   def test_random_tokens_are_indeed_random
     # this might fail if you are *really* unlucky :)
     with_any_random do

data/test/session_test/activation_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActivationTest

data/test/session_test/active_record_trickery_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActiveRecordTrickeryTest
@@ -19,6 +19,16 @@ module SessionTest
       def test_self_and_descendants_from_active_record
         assert_equal [UserSession], UserSession.self_and_descendants_from_active_record
       end
+
+      def test_i18n_of_human_name
+        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        assert_equal "MySession", UserSession.human_name
+      end
+
+      def test_i18n_of_model_name_human
+        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        assert_equal "MySession", UserSession.model_name.human
+      end
     end
     
     class InstanceMethodsTest < ActiveSupport::TestCase
@@ -29,7 +39,7 @@ module SessionTest
       
       def test_to_model
         session = UserSession.new
-        assert session, session.to_model
+        assert_equal session, session.to_model
       end
     end
   end

data/test/session_test/brute_force_protection_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module BruteForceProtectionTest

data/test/session_test/callbacks_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase

data/test/session_test/cookies_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module CookiesTest
@@ -41,6 +41,30 @@ module SessionTest
         session.remember_me = true
         assert_equal 3.months, session.remember_me_for
       end
+
+      def test_secure
+        UserSession.secure = true
+        assert_equal true, UserSession.secure
+        session = UserSession.new
+        assert_equal true, session.secure
+
+        UserSession.secure false
+        assert_equal false, UserSession.secure
+        session = UserSession.new
+        assert_equal false, session.secure
+      end
+
+      def test_httponly
+        UserSession.httponly = true
+        assert_equal true, UserSession.httponly
+        session = UserSession.new
+        assert_equal true, session.httponly
+
+        UserSession.httponly false
+        assert_equal false, UserSession.httponly
+        session = UserSession.new
+        assert_equal false, session.httponly
+      end
     end
     
     class InstanceMethodsTest < ActiveSupport::TestCase
@@ -109,4 +133,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/existence_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ExistenceTest

data/test/session_test/http_auth_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class HttpAuthTest < ActiveSupport::TestCase
@@ -10,19 +10,47 @@ module SessionTest
         UserSession.allow_http_basic_auth true
         assert_equal true, UserSession.allow_http_basic_auth
       end
+
+      def test_request_http_basic_auth
+        UserSession.request_http_basic_auth = true
+        assert_equal true, UserSession.request_http_basic_auth
+
+        UserSession.request_http_basic_auth = false
+        assert_equal false, UserSession.request_http_basic_auth
+      end
+
+      def test_http_basic_auth_realm
+        assert_equal 'Application', UserSession.http_basic_auth_realm
+
+        UserSession.http_basic_auth_realm = 'TestRealm'
+        assert_equal 'TestRealm', UserSession.http_basic_auth_realm
+      end
     end
     
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_http_auth
         ben = users(:ben)
-        http_basic_auth_for { assert !UserSession.find }
+        http_basic_auth_for do
+          assert !UserSession.find
+        end
+        http_basic_auth_for(ben) do
+          assert session = UserSession.find
+          assert_equal ben, session.record
+          assert_equal ben.login, session.login
+          assert_equal "benrocks", session.send(:protected_password)
+          assert !controller.http_auth_requested?
+        end
+        UserSession.request_http_basic_auth = true
+        UserSession.http_basic_auth_realm = 'PersistTestRealm'
         http_basic_auth_for(ben) do
           assert session = UserSession.find
           assert_equal ben, session.record
           assert_equal ben.login, session.login
           assert_equal "benrocks", session.send(:protected_password)
+          assert_equal 'PersistTestRealm', controller.realm
+          assert controller.http_auth_requested?
         end
       end
     end
   end
-end
+end