authlogic 2.1.11 → 3.0.0

data/lib/authlogic/session/foundation.rb

@@ -53,6 +53,14 @@ module Authlogic
           "#<#{self.class.name}: #{credentials.blank? ? "no credentials provided" : credentials.inspect}>"
         end
         
+        def persisted?
+          !(new_record? || destroyed?)
+        end
+        
+        def to_key
+          new_record? ? nil : [ self.send(self.class.primary_key) ]
+        end
+        
         private
           def build_key(last_part)
             last_part

data/lib/authlogic/session/validation.rb

@@ -13,8 +13,8 @@ module Authlogic
       #         errors.add(:base, "You must be awesome to log in") unless attempted_record.awesome?
       #       end
       #   end
-      class Errors < (defined?(::ActiveModel.version) ? ::ActiveModel::Errors : ::ActiveRecord::Errors)
-        unless defined?(::ActiveModel.version)
+      class Errors < (defined?(::ActiveModel) ? ::ActiveModel::Errors : ::ActiveRecord::Errors)
+        unless defined?(::ActiveModel)
           def [](key)
             value = super
             value.is_a?(Array) ? value : [value].compact

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,98 +1,102 @@
-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
+
+      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,105 +1,105 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoginTest < ActiveSupport::TestCase
     def test_login_field_config
       assert_equal :login, User.login_field
       assert_nil Employee.login_field
-
+      
       User.login_field = :nope
       assert_equal :nope, User.login_field
       User.login_field :login
       assert_equal :login, User.login_field
     end
-
+    
     def test_validate_login_field_config
       assert User.validate_login_field
       assert Employee.validate_login_field
-
+      
       User.validate_login_field = false
       assert !User.validate_login_field
       User.validate_login_field true
       assert User.validate_login_field
     end
-
+    
     def test_validates_length_of_login_field_options_config
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
       assert_equal({:within => 3..100}, Employee.validates_length_of_login_field_options)
-
+      
       User.validates_length_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_length_of_login_field_options)
       User.validates_length_of_login_field_options({:within => 3..100})
       assert_equal({:within => 3..100}, User.validates_length_of_login_field_options)
     end
-
+    
     def test_validates_format_of_login_field_options_config
-      default = {:with => /\A\w[\w\.+\-_@ ]+\z/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
+      default = {:with => /\A\w[\w\.+\-_@ ]+$/, :message => I18n.t('error_messages.login_invalid', :default => "should use only letters, numbers, spaces, and .-_@ please.")}
       assert_equal default, User.validates_format_of_login_field_options
       assert_equal default, Employee.validates_format_of_login_field_options
-
+      
       User.validates_format_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_format_of_login_field_options)
       User.validates_format_of_login_field_options default
       assert_equal default, User.validates_format_of_login_field_options
     end
-
+    
     def test_validates_uniqueness_of_login_field_options_config
       default = {:case_sensitive => false, :scope => User.validations_scope, :if => "#{User.login_field}_changed?".to_sym}
       assert_equal default, User.validates_uniqueness_of_login_field_options
-
+      
       User.validates_uniqueness_of_login_field_options = {:yes => "no"}
       assert_equal({:yes => "no"}, User.validates_uniqueness_of_login_field_options)
       User.validates_uniqueness_of_login_field_options default
       assert_equal default, User.validates_uniqueness_of_login_field_options
     end
-
+    
     def test_validates_length_of_login_field
       u = User.new
       u.login = "a"
       assert !u.valid?
       assert u.errors[:login].size > 0
-
+      
       u.login = "aaaaaaaaaa"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-
+    
     def test_validates_format_of_login_field
       u = User.new
       u.login = "fdsf@^&*"
       assert !u.valid?
       assert u.errors[:login].size > 0
-
+      
       u.login = "fdsfdsfdsfdsfs"
       assert !u.valid?
       assert u.errors[:login].size == 0
-
+      
       u.login = "dakota.dux+1@gmail.com"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-
+    
     def test_validates_uniqueness_of_login_field
       u = User.new
       u.login = "bjohnson"
       assert !u.valid?
       assert u.errors[:login].size > 0
-
+      
       u.login = "BJOHNSON"
       assert !u.valid?
       assert u.errors[:login].size > 0
-
+      
       u.login = "fdsfdsf"
       assert !u.valid?
       assert u.errors[:login].size == 0
     end
-
+    
     def test_find_by_smart_case_login_field
       ben = users(:ben)
       assert_equal ben, User.find_by_smart_case_login_field("bjohnson")
       assert_equal ben, User.find_by_smart_case_login_field("BJOHNSON")
       assert_equal ben, User.find_by_smart_case_login_field("Bjohnson")
-
+      
       drew = employees(:drew)
       assert_equal drew, Employee.find_by_smart_case_login_field("dgainor@binarylogic.com")
       assert_equal drew, Employee.find_by_smart_case_login_field("Dgainor@binarylogic.com")

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,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class RandomTest < ActiveSupport::TestCase
   def test_random_tokens_are_indeed_random

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
@@ -7,26 +7,36 @@ module SessionTest
         assert_equal "Some attribute", UserSession.human_attribute_name("some_attribute")
         assert_equal "Some attribute", UserSession.human_attribute_name(:some_attribute)
       end
-
+    
       def test_human_name
         assert_equal "Usersession", UserSession.human_name
       end
-
+    
       def test_self_and_descendents_from_active_record
         assert_equal [UserSession], UserSession.self_and_descendents_from_active_record
       end
-
+    
       def test_self_and_descendants_from_active_record
         assert_equal [UserSession], UserSession.self_and_descendants_from_active_record
       end
-    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
       def test_new_record
         session = UserSession.new
         assert session.new_record?
       end
-
+      
       def test_to_model
         session = UserSession.new
         assert_equal session, session.to_model