authlogic 3.4.6 → 3.5.0

data/lib/authlogic/session/unauthorized_record.rb

@@ -18,7 +18,7 @@ module Authlogic
           validate :validate_by_unauthorized_record, :if => :authenticating_with_unauthorized_record?
         end
       end
-      
+
       # Returning meaningful credentials
       def credentials
         if authenticating_with_unauthorized_record?
@@ -29,22 +29,23 @@ module Authlogic
           super
         end
       end
-      
+
       # Setting the unauthorized record if it exists in the credentials passed.
       def credentials=(value)
         super
         values = value.is_a?(Array) ? value : [value]
         self.unauthorized_record = values.first if values.first.class < ::ActiveRecord::Base
       end
-      
+
       private
+
         def authenticating_with_unauthorized_record?
           !unauthorized_record.nil?
         end
-        
+
         def validate_by_unauthorized_record
           self.attempted_record = unauthorized_record
         end
     end
   end
-end
+end

data/lib/authlogic/session/validation.rb

@@ -21,19 +21,19 @@ module Authlogic
           end
         end
       end
-      
+
       # You should use this as a place holder for any records that you find during validation. The main reason for this is to
       # allow other modules to use it if needed. Take the failed_login_count feature, it needs this in order to increase
       # the failed login count.
       def attempted_record
         @attempted_record
       end
-      
+
       # See attempted_record
       def attempted_record=(value)
         @attempted_record = value
       end
-      
+
       # The errors in Authlogic work JUST LIKE ActiveRecord. In fact, it uses the exact same ActiveRecord errors class.
       # Use it the same way:
       #
@@ -51,31 +51,40 @@ module Authlogic
       def errors
         @errors ||= Errors.new(self)
       end
-      
+
       # Determines if the information you provided for authentication is valid or not. If there is
       # a problem with the information provided errors will be added to the errors object and this
       # method will return false.
       def valid?
         errors.clear
         self.attempted_record = nil
-        
+
         before_validation
         new_session? ? before_validation_on_create : before_validation_on_update
         validate
         ensure_authentication_attempted
-                
+
         if errors.size == 0
           new_session? ? after_validation_on_create : after_validation_on_update
           after_validation
         end
-        
+
         save_record(attempted_record)
         errors.size == 0
       end
-      
+
       private
+
         def ensure_authentication_attempted
-          errors.add(:base, I18n.t('error_messages.no_authentication_details', :default => "You did not provide any details for authentication.")) if errors.empty? && attempted_record.nil?
+          if errors.empty? && attempted_record.nil?
+            errors.add(
+              :base,
+              I18n.t(
+                'error_messages.no_authentication_details',
+                :default => "You did not provide any details for authentication."
+              )
+            )
+          end
         end
     end
   end

data/lib/authlogic/test_case.rb

@@ -31,7 +31,7 @@ module Authlogic
   # Now that everything is ready to go, let's move onto actually testing. Here is the basic idea behind testing:
   #
   # Authlogic requires a "connection" to your controller to activate it. In the same manner that ActiveRecord requires a connection to
-  # your database. It can't do anything until it gets connnected. That being said, Authlogic will raise an
+  # your database. It can't do anything until it gets connected. That being said, Authlogic will raise an
   # Authlogic::Session::Activation::NotActivatedError any time you try to instantiate an object without a "connection".
   # So before you do anything with Authlogic, you need to activate / connect Authlogic. Let's walk through how to do this in tests:
   #
@@ -100,7 +100,7 @@ module Authlogic
     #
     #   setup :activate_authlogic
     def activate_authlogic
-      if @request && ! @request.respond_to?(:params)
+      if @request && !@request.respond_to?(:params)
         class <<@request
           alias_method :params, :parameters
         end

data/lib/authlogic/test_case/mock_controller.rb

@@ -5,14 +5,14 @@ module Authlogic
     class MockController < ControllerAdapters::AbstractAdapter
       attr_accessor :http_user, :http_password, :realm
       attr_writer :request_content_type
-  
+
       def initialize
       end
-  
+
       def authenticate_with_http_basic(&block)
         yield http_user, http_password
       end
-  
+
       def authenticate_or_request_with_http_basic(realm = 'DefaultRealm', &block)
         self.realm = realm
         @http_auth_requested = true
@@ -22,27 +22,27 @@ module Authlogic
       def cookies
         @cookies ||= MockCookieJar.new
       end
-  
+
       def cookie_domain
         nil
       end
-      
+
       def logger
         @logger ||= MockLogger.new
       end
-  
+
       def params
         @params ||= {}
       end
-  
+
       def request
         @request ||= MockRequest.new(controller)
       end
-  
+
       def request_content_type
         @request_content_type ||= "text/html"
       end
-  
+
       def session
         @session ||= {}
       end

data/lib/authlogic/test_case/mock_cookie_jar.rb

@@ -5,7 +5,7 @@ module Authlogic
         hash = super
         hash && hash[:value]
       end
-  
+
       def delete(key, options = {})
         super(key)
       end
@@ -36,4 +36,4 @@ module Authlogic
       end
     end
   end
-end
+end

data/lib/authlogic/test_case/mock_logger.rb

@@ -7,4 +7,4 @@ module Authlogic
       end
     end
   end
-end
+end

data/lib/authlogic/test_case/mock_request.rb

@@ -12,8 +12,9 @@ module Authlogic
       end
 
       private
+
         def method_missing(*args, &block)
         end
     end
   end
-end
+end

data/lib/authlogic/test_case/rails_request_adapter.rb

@@ -5,7 +5,7 @@ module Authlogic
     class RailsRequestAdapter < ControllerAdapters::AbstractAdapter
       def authenticate_with_http_basic(&block)
       end
-      
+
       def cookies
         new_cookies = MockCookieJar.new
         super.each do |key, value|
@@ -13,18 +13,18 @@ module Authlogic
         end
         new_cookies
       end
-      
+
       def cookie_domain
         nil
       end
-      
+
       def request
         @request ||= MockRequest.new(controller)
       end
-      
+
       def request_content_type
         request.format.to_s
       end
     end
   end
-end
+end

data/test/acts_as_authentic_test/email_test.rb

@@ -3,7 +3,6 @@ require 'test_helper'
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
-
     GOOD_ASCII_EMAILS = [
       "a@a.com",
       "damien+test1...etc..@mydomain.com",
@@ -83,17 +82,25 @@ module ActsAsAuthenticTest
     end
 
     def test_validates_length_of_email_field_options_config
-      assert_equal({:maximum => 100}, User.validates_length_of_email_field_options)
-      assert_equal({:maximum => 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)
+      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 => Proc.new{I18n.t('error_messages.email_invalid', :default => "should look like an email address.")}}
+      default = {
+        :with => Authlogic::Regex.email,
+        :message => Proc.new do
+          I18n.t(
+            'error_messages.email_invalid',
+            :default => "should look like an email address."
+          )
+        end
+      }
       dmessage = default.delete(:message).call
 
       options = User.validates_format_of_email_field_options
@@ -108,13 +115,20 @@ module ActsAsAuthenticTest
       assert_equal dmessage, message.call
       assert_equal default, 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 = { :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
 
-      with_email_nonascii = {:with => Authlogic::Regex.email_nonascii, :message => Proc.new{I18n.t('error_messages.email_invalid_international', :default => "should look like an international email address.")}}
+      with_email_nonascii = {
+        :with => Authlogic::Regex.email_nonascii,
+        :message => Proc.new do
+          I18n.t(
+            'error_messages.email_invalid_international',
+            :default => "should look like an international email address."
+          )
+        end
+      }
       User.validates_format_of_email_field_options = with_email_nonascii
       assert_equal(with_email_nonascii, User.validates_format_of_email_field_options)
       User.validates_format_of_email_field_options with_email_nonascii
@@ -141,11 +155,11 @@ module ActsAsAuthenticTest
     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}
+      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 = { :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
@@ -193,7 +207,6 @@ module ActsAsAuthenticTest
     end
 
     def test_validates_format_of_nonascii_email_field
-
       (GOOD_ASCII_EMAILS + GOOD_ISO88591_EMAILS + GOOD_UTF8_EMAILS).each do |e|
         assert e =~  Authlogic::Regex.email_nonascii, "Good email should validate: #{e}"
       end
@@ -201,7 +214,6 @@ module ActsAsAuthenticTest
       (BAD_ASCII_EMAILS + BAD_ISO88591_EMAILS + BAD_UTF8_EMAILS).each do |e|
         assert e !~  Authlogic::Regex.email_nonascii, "Bad email should not validate: #{e}"
       end
-
     end
 
     def test_validates_uniqueness_of_email_field

data/test/acts_as_authentic_test/logged_in_status_test.rb

@@ -19,9 +19,12 @@ module ActsAsAuthenticTest
       # slightly different. This is an attempt to make sure the scope is lambda wrapped
       # so that it is re-evaluated every time its called. My biggest concern is that the
       # test happens so fast that the test fails... I just don't know a better way to test it!
-      query1 = User.logged_in.where_values
+
+      # for rails 5 I've changed the where_values to to_sql to compare
+
+      query1 = User.logged_in.to_sql
       sleep 0.1
-      query2 = User.logged_in.where_values
+      query2 = User.logged_in.to_sql
       assert query1 != query2, ERROR_MSG % '#logged_in'
 
       assert_equal 0, User.logged_in.count
@@ -37,7 +40,10 @@ module ActsAsAuthenticTest
       # slightly different. This is an attempt to make sure the scope is lambda wrapped
       # so that it is re-evaluated every time its called. My biggest concern is that the
       # test happens so fast that the test fails... I just don't know a better way to test it!
-      assert User.logged_in.where_values != User.logged_out.where_values, ERROR_MSG % '#logged_out'
+
+      # for rails 5 I've changed the where_values to to_sql to compare
+
+      assert User.logged_in.to_sql != User.logged_out.to_sql, ERROR_MSG % '#logged_out'
 
       assert_equal 3, User.logged_out.count
       User.first.update_attribute(:last_request_at, Time.now)

data/test/acts_as_authentic_test/login_test.rb

@@ -23,32 +23,38 @@ module ActsAsAuthenticTest
     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)
+      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)
+      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[a-zA-Z0-9_][a-zA-Z0-9\.+\-_@ ]+\z/,
+        :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 = { :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}
+      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 = { :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
@@ -77,6 +83,34 @@ module ActsAsAuthenticTest
       u.login = "dakota.dux+1@gmail.com"
       assert !u.valid?
       assert u.errors[:login].size == 0
+
+      u.login = "marks .-_@+"
+      assert !u.valid?
+      assert u.errors[:login].size == 0
+
+      u.login = " space"
+      assert !u.valid?
+      assert u.errors[:login].size > 0
+
+      u.login = ".dot"
+      assert !u.valid?
+      assert u.errors[:login].size > 0
+
+      u.login = "-hyphen"
+      assert !u.valid?
+      assert u.errors[:login].size > 0
+
+      u.login = "_underscore"
+      assert !u.valid?
+      assert u.errors[:login].size == 0
+
+      u.login = "@atmark"
+      assert !u.valid?
+      assert u.errors[:login].size > 0
+
+      u.login = "+plus"
+      assert !u.valid?
+      assert u.errors[:login].size > 0
     end
 
     def test_validates_uniqueness_of_login_field
@@ -106,4 +140,4 @@ module ActsAsAuthenticTest
       assert_equal drew, Employee.find_by_smart_case_login_field("DGAINOR@BINARYLOGIC.COM")
     end
   end
-end
+end