authlogic 3.4.6 → 4.2.0

data/lib/authlogic/test_case/mock_cookie_jar.rb

@@ -1,12 +1,20 @@
 module Authlogic
   module TestCase
+    # A mock of `ActionDispatch::Cookies::CookieJar`.
     class MockCookieJar < Hash # :nodoc:
+      attr_accessor :set_cookies
+
       def [](key)
         hash = super
         hash && hash[:value]
       end
-  
-      def delete(key, options = {})
+
+      def []=(key, options)
+        (@set_cookies ||= {})[key.to_s] = options
+        super
+      end
+
+      def delete(key, _options = {})
         super(key)
       end
 
@@ -23,8 +31,9 @@ module Authlogic
       end
 
       def [](val)
-        if signed_message = @parent_jar[val]
-          payload, signature = signed_message.split('--')
+        signed_message = @parent_jar[val]
+        if signed_message
+          payload, signature = signed_message.split("--")
           raise "Invalid signature" unless Digest::SHA1.hexdigest(payload) == signature
           payload
         end
@@ -36,4 +45,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

@@ -8,12 +8,17 @@ module Authlogic
       end
 
       def ip
-        (controller && controller.respond_to?(:env) && controller.env.is_a?(Hash) && controller.env['REMOTE_ADDR']) || "1.1.1.1"
+        controller &&
+          controller.respond_to?(:env) &&
+          controller.env.is_a?(Hash) &&
+          controller.env["REMOTE_ADDR"] ||
+          "1.1.1.1"
       end
 
       private
-        def method_missing(*args, &block)
-        end
+
+      def method_missing(*args, &block)
+      end
     end
   end
-end
+end

data/lib/authlogic/test_case/rails_request_adapter.rb

@@ -1,11 +1,12 @@
 module Authlogic
   module TestCase
-    # Adapts authlogic to work with the @request object when testing. This way Authlogic can set cookies and what not before
-    # a request is made, ultimately letting you log in users in functional tests.
+    # Adapts authlogic to work with the @request object when testing. This way Authlogic
+    # can set cookies and what not before a request is made, ultimately letting you log in
+    # users in functional tests.
     class RailsRequestAdapter < ControllerAdapters::AbstractAdapter
       def authenticate_with_http_basic(&block)
       end
-      
+
       def cookies
         new_cookies = MockCookieJar.new
         super.each do |key, value|
@@ -13,18 +14,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/lib/authlogic/version.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "rubygems"
+
+module Authlogic
+  # Returns a `::Gem::Version`, the version number of the authlogic gem.
+  #
+  # It is preferable for a library to provide a `gem_version` method, rather
+  # than a `VERSION` string, because `::Gem::Version` is easier to use in a
+  # comparison.
+  #
+  # We cannot return a frozen `Version`, because rubygems will try to modify it.
+  # https://github.com/binarylogic/authlogic/pull/590
+  #
+  # Added in 4.0.0
+  #
+  # @api public
+  def self.gem_version
+    ::Gem::Version.new("4.2.0")
+  end
+end

data/test/acts_as_authentic_test/base_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class BaseTest < ActiveSupport::TestCase

data/test/acts_as_authentic_test/email_test.rb

@@ -1,16 +1,15 @@
-# encoding: utf-8
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
-
     GOOD_ASCII_EMAILS = [
       "a@a.com",
       "damien+test1...etc..@mydomain.com",
       "dakota.dux+1@gmail.com",
       "dakota.d'ux@gmail.com",
       "a&b@c.com",
-    ]
+      "someuser@somedomain.travelersinsurance"
+    ].freeze
 
     BAD_ASCII_EMAILS = [
       "",
@@ -18,13 +17,14 @@ module ActsAsAuthenticTest
       "question?mark@gmail.com",
       "backslash@g\\mail.com",
       "<script>alert(123);</script>\nnobody@example.com",
-    ]
+      "someuser@somedomain.isreallytoolongandimeanreallytoolong"
+    ].freeze
 
     # http://en.wikipedia.org/wiki/ISO/IEC_8859-1#Codepage_layout
     GOOD_ISO88591_EMAILS = [
       "töm.öm@dömain.fi",  # https://github.com/binarylogic/authlogic/issues/176
       "Pelé@examplé.com",  # http://en.wikipedia.org/wiki/Email_address#Internationalization_examples
-    ]
+    ].freeze
 
     BAD_ISO88591_EMAILS = [
       "",
@@ -33,34 +33,34 @@ module ActsAsAuthenticTest
       "é[@example.com",  # L bracket
       "question?mark@gmail.com",  # question mark
       "back\\slash@gmail.com",    # backslash
-    ]
+    ].freeze
 
     GOOD_UTF8_EMAILS = [
-      "δκιμή@παράδεγμα.δοκμή",            # http://en.wikipedia.org/wiki/Email_address#Internationalization_examples
+      "δκιμή@παράδεγμα.δοκμή", # http://en.wikipedia.org/wiki/Email_address#Internationalization_examples
       "我本@屋企.香港",                     # http://en.wikipedia.org/wiki/Email_address#Internationalization_examples
       "甲斐@黒川.日買",                     # http://en.wikipedia.org/wiki/Email_address#Internationalization_examples
-      "чебурша@ящик-с-пельнами.рф",       # Contains dashes in domain head
-      "企斐@黒川.みんな",                                              #  https://github.com/binarylogic/authlogic/issues/176#issuecomment-55829320
-    ]
+      "чебурша@ящик-с-пельнами.рф", # Contains dashes in domain head
+      "企斐@黒川.みんな", #  https://github.com/binarylogic/authlogic/issues/176#issuecomment-55829320
+    ].freeze
 
     BAD_UTF8_EMAILS = [
       "",
-              ".みんな",                                                    #  https://github.com/binarylogic/authlogic/issues/176#issuecomment-55829320
-      'δκιμή@παράδεγμα.δ',          # short TLD
+      ".みんな", #  https://github.com/binarylogic/authlogic/issues/176#issuecomment-55829320
+      "δκιμή@παράδεγμα.δ",          # short TLD
       "öm(@ava.fi",                 # L paren
       "é)@domain.com",              # R paren
       "é[@example.com",             # L bracket
       "δ]@πράιγμα.δοκμή",           # R bracket
       "我\.香港",                    # slash
       "甲;.日本",                    # semicolon
-      "ч:@ящик-с-пельнами.рф",      # colon
-      "斐,.みんな",                                           #  comma
+      "ч:@ящик-с-пельнами.рф", # colon
+      "斐,.みんな", #  comma
       "香<.香港",                    # less than
       "我>.香港",                    # greater than
-      "我?本@屋企.香港",              # question mark
-      "чебурша@ьн\\ами.рф",         # backslash
-      "user@domain.com%0A<script>alert('hello')</script>",
-    ]
+      "我?本@屋企.香港", # question mark
+      "чебурша@ьн\\ами.рф", # backslash
+      "user@domain.com%0A<script>alert('hello')</script>"
+    ].freeze
 
     def test_email_field_config
       assert_equal :email, User.email_field
@@ -77,44 +77,59 @@ module ActsAsAuthenticTest
       assert Employee.validate_email_field
 
       User.validate_email_field = false
-      assert !User.validate_email_field
+      refute 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({: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.")}}
-      dmessage = default.delete(:message).call
+      default = {
+        with: Authlogic::Regex::EMAIL,
+        message: proc do
+          I18n.t(
+            "error_messages.email_invalid",
+            default: "should look like an email address."
+          )
+        end
+      }
+      default_message = default.delete(:message).call
 
       options = User.validates_format_of_email_field_options
       message = options.delete(:message)
-      assert message.kind_of?(Proc)
-      assert_equal dmessage, message.call
+      assert message.is_a?(Proc)
+      assert_equal default_message, message.call
       assert_equal default, options
 
       options = Employee.validates_format_of_email_field_options
       message = options.delete(:message)
-      assert message.kind_of?(Proc)
-      assert_equal dmessage, message.call
+      assert message.is_a?(Proc)
+      assert_equal default_message, 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 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
@@ -125,11 +140,11 @@ module ActsAsAuthenticTest
       # ensure we successfully loaded the test locale
       assert I18n.available_locales.include?(:lol), "Test locale failed to load"
 
-      I18n.with_locale('lol') do
+      I18n.with_locale("lol") do
         message = I18n.t("authlogic.error_messages.email_invalid")
 
         cat = User.new
-        cat.email = 'meow'
+        cat.email = "meow"
         cat.valid?
 
         # filter duplicate error messages
@@ -141,11 +156,15 @@ 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
@@ -153,70 +172,68 @@ module ActsAsAuthenticTest
     def test_validates_length_of_email_field
       u = User.new
       u.email = "a@a.a"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
-      assert !u.valid?
-      assert u.errors[:email].size == 0
+      refute u.valid?
+      assert u.errors[:email].empty?
     end
 
     def test_validates_format_of_email_field
       u = User.new
       u.email = "aaaaaaaaaaaaa"
       u.valid?
-      assert u.errors[:email].size > 0
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "damien+test1...etc..@mydomain.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "dakota.dux+1@gmail.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "dakota.d'ux@gmail.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
 
       u.email = "<script>alert(123);</script>\nnobody@example.com"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a&b@c.com"
       u.valid?
-      assert u.errors[:email].size == 0
+      assert u.errors[:email].empty?
     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}"
+        assert e =~ Authlogic::Regex::EMAIL_NONASCII, "Good email should validate: #{e}"
       end
 
       (BAD_ASCII_EMAILS + BAD_ISO88591_EMAILS + BAD_UTF8_EMAILS).each do |e|
-        assert e !~  Authlogic::Regex.email_nonascii, "Bad email should not validate: #{e}"
+        assert e !~ Authlogic::Regex::EMAIL_NONASCII, "Bad email should not validate: #{e}"
       end
-
     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
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "BJOHNSON@binarylogic.com"
-      assert !u.valid?
-      assert u.errors[:email].size > 0
+      refute u.valid?
+      refute u.errors[:email].empty?
 
       u.email = "a@a.com"
-      assert !u.valid?
-      assert u.errors[:email].size == 0
+      refute u.valid?
+      assert u.errors[:email].empty?
     end
   end
 end

data/test/acts_as_authentic_test/logged_in_status_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 module ActsAsAuthenticTest
   class LoggedInStatusTest < ActiveSupport::TestCase
-    ERROR_MSG = 'Multiple calls to %s should result in different relations'
+    ERROR_MSG = "Multiple calls to %s should result in different relations".freeze
 
     def test_logged_in_timeout_config
       assert_equal 10.minutes.to_i, User.logged_in_timeout
@@ -19,10 +19,13 @@ 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
-      assert query1 != query2, ERROR_MSG % '#logged_in'
+      query2 = User.logged_in.to_sql
+      assert query1 != query2, ERROR_MSG % "#logged_in"
 
       assert_equal 0, User.logged_in.count
       user = User.first
@@ -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)
@@ -46,11 +52,11 @@ module ActsAsAuthenticTest
 
     def test_logged_in_logged_out
       u = User.first
-      assert !u.logged_in?
+      refute u.logged_in?
       assert u.logged_out?
       u.last_request_at = Time.now
       assert u.logged_in?
-      assert !u.logged_out?
+      refute u.logged_out?
     end
   end
 end