authlogic 4.5.0 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97762cbf5ee158d5a18ebe77bc96a542241f16b813ddda3ca80d2271dcbd0098
-  data.tar.gz: 5a0bbb0e964b0d71f436dbabb729f6da9dddc83d5c3fd5bdd33dc003cc15097f
+  metadata.gz: b9fad0a99beb89fdac894ff1979b59459073fbf597d375b6749b263e86be930d
+  data.tar.gz: 4ea061519a7a881f78cfaddf1a86e312d082dba28ce22c51e52c38ac51c62581
 SHA512:
-  metadata.gz: c4e860a5ca9a8ccd511f99d55a25ba3a17d800eec68e8c074c40a9b5c9f2a717d906c01660878bac030d72c4d058331e6230dfaa7145889202dd1b05a0d39ea8
-  data.tar.gz: 88319378fcb41fdec36a2d35bd1b35f34d5459eb2f52d94469cfe47faf7613d4f0a4974d659d40df9812656270c8c916018e5dfb941f0699f11e7a3bf0c5de13
+  metadata.gz: db0557f858087739e3a292ab6ba63becbca9a0204874f2794e934e442c58fc6d7cf814450d9df4adc76c8d1e41d18f625fc7fa942df2810248aa7b9176aa60ee
+  data.tar.gz: 8c349c4e3a8579384c2e1b7f3fc2f85b2974e7871d02a9e9a93117f83777110e21ad57fa4f04493f8116aaba113ebd9f735cea7ff9ae8b02e73897a51b044593

data/lib/authlogic/acts_as_authentic/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Authlogic
   module ActsAsAuthentic
     # Provides the base functionality for acts_as_authentic
@@ -28,20 +30,9 @@ module Authlogic
         #   end
         #
         # See the various sub modules for the configuration they provide.
-        def acts_as_authentic(unsupported_options = nil)
-          # Stop all configuration if the DB is not set up
-          return unless db_setup?
-
-          unless unsupported_options.nil?
-            raise ArgumentError.new(
-              "You are using the old v1.X.X configuration method for " \
-                "Authlogic. Instead of passing a hash of configuration " \
-                "options to acts_as_authentic, pass a block: " \
-                "acts_as_authentic { |c| c.my_option = my_value }"
-            )
-          end
-
+        def acts_as_authentic
           yield self if block_given?
+          return unless db_setup?
           acts_as_authentic_modules.each { |mod| include mod }
         end
 
@@ -74,12 +65,27 @@ module Authlogic
           self.acts_as_authentic_modules = modules
         end
 
+        # Some Authlogic modules requires a database connection with a existing
+        # users table by the moment when you call the `acts_as_authentic`
+        # method. If you try to call `acts_as_authentic` without a database
+        # connection, it will raise a `Authlogic::ModelSetupError`.
+        #
+        # If you rely on the User model before the database is setup correctly,
+        # set this field to false.
+        # * <tt>Default:</tt> false
+        # * <tt>Accepts:</tt> Boolean
+        def raise_on_model_setup_error(value = nil)
+          rw_config(:raise_on_model_setup_error, value, false)
+        end
+        alias raise_on_model_setup_error= raise_on_model_setup_error
+
         private
 
         def db_setup?
           column_names
           true
         rescue StandardError
+          raise ModelSetupError if raise_on_model_setup_error
           false
         end
 
@@ -106,11 +112,5 @@ end
 ::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::Password
 ::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::PerishableToken
 ::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::PersistenceToken
-
-# RestfulAuthentication is deprecated. See comments in
-# acts_as_authentic/restful_authentication.rb
-::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::RestfulAuthentication
-
 ::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::SessionMaintenance
 ::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::SingleAccessToken
-::ActiveRecord::Base.send :include, Authlogic::ActsAsAuthentic::ValidationsScope

data/lib/authlogic/acts_as_authentic/email.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Authlogic
   module ActsAsAuthentic
     # Sometimes models won't have an explicit "login" or "username" field.
@@ -9,7 +11,6 @@ module Authlogic
       def self.included(klass)
         klass.class_eval do
           extend Config
-          add_acts_as_authentic_module(Methods)
         end
       end
 
@@ -22,175 +23,7 @@ module Authlogic
         def email_field(value = nil)
           rw_config(:email_field, value, first_column_to_exist(nil, :email, :email_address))
         end
-        alias_method :email_field=, :email_field
-
-        # Toggles validating the email field or not.
-        #
-        # * <tt>Default:</tt> true
-        # * <tt>Accepts:</tt> Boolean
-        #
-        # @deprecated
-        def validate_email_field(value = nil)
-          rw_config(:validate_email_field, value, true)
-        end
-        alias_method :validate_email_field=, :validate_email_field
-
-        # A hash of options for the validates_length_of call for the email
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_length_of_email_field_options to merge options.</b>
-        #
-        # * <tt>Default:</tt> {:maximum => 100}
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
-        #
-        # @deprecated
-        def validates_length_of_email_field_options(value = nil)
-          deprecate_authlogic_config("validates_length_of_email_field_options") if value
-          rw_config(:validates_length_of_email_field_options, value, maximum: 100)
-        end
-        alias_method(
-          :validates_length_of_email_field_options=,
-          :validates_length_of_email_field_options
-        )
-
-        # A convenience function to merge options into the
-        # validates_length_of_email_field_options. So instead of:
-        #
-        #   self.validates_length_of_email_field_options =
-        #     validates_length_of_email_field_options.merge(:my_option => my_value)
-        #
-        # You can do this:
-        #
-        #   merge_validates_length_of_email_field_options :my_option => my_value
-        #
-        # @deprecated
-        def merge_validates_length_of_email_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_length_of_email_field_options")
-          self.validates_length_of_email_field_options =
-            validates_length_of_email_field_options.merge(options)
-        end
-
-        # A hash of options for the validates_format_of call for the email
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_format_of_email_field_options to merge options.</b>
-        #
-        # To validate international email addresses, enable the provided
-        # alternate regex:
-        #
-        # ```
-        # validates_format_of_email_field_options(
-        #   with: Authlogic::Regex.email_nonascii
-        # )
-        # ```
-        #
-        # * <tt>Default:</tt>
-        #
-        #         {
-        #           :with => Authlogic::Regex.email,
-        #           :message => Proc.new {
-        #             I18n.t(
-        #               'error_messages.email_invalid',
-        #               :default => "should look like an email address."
-        #             )
-        #           }
-        #         }
-        #
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_format_of
-        #
-        # @deprecated
-        def validates_format_of_email_field_options(value = nil)
-          deprecate_authlogic_config("validates_format_of_email_field_options") if value
-          rw_config(
-            :validates_format_of_email_field_options,
-            value,
-            with: Authlogic::Regex::EMAIL,
-            message: proc do
-                       I18n.t(
-                         "error_messages.email_invalid",
-                         default: "should look like an email address."
-                       )
-                     end
-          )
-        end
-        alias_method(
-          :validates_format_of_email_field_options=,
-          :validates_format_of_email_field_options
-        )
-
-        # See merge_validates_length_of_email_field_options. The same thing
-        # except for validates_format_of_email_field_options.
-        #
-        # @deprecated
-        def merge_validates_format_of_email_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_format_of_email_field_options")
-          self.validates_format_of_email_field_options =
-            validates_format_of_email_field_options.merge(options)
-        end
-
-        # A hash of options for the validates_uniqueness_of call for the email
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_uniqueness_of_email_field_options to merge
-        # options.</b>
-        #
-        # * <tt>Default:</tt>
-        #
-        #         {
-        #           :case_sensitive => false,
-        #           :scope => validations_scope,
-        #           :if => "#{email_field}_changed?".to_sym
-        #         }
-        #
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_uniqueness_of
-        #
-        # @deprecated
-        def validates_uniqueness_of_email_field_options(value = nil)
-          deprecate_authlogic_config("validates_uniqueness_of_email_field_options") if value
-          rw_config(
-            :validates_uniqueness_of_email_field_options,
-            value,
-            case_sensitive: false,
-            scope: validations_scope,
-            if: "#{email_field}_changed?".to_sym
-          )
-        end
-        alias_method(
-          :validates_uniqueness_of_email_field_options=,
-          :validates_uniqueness_of_email_field_options
-        )
-
-        # See merge_validates_length_of_email_field_options. The same thing
-        # except for validates_uniqueness_of_email_field_options.
-        #
-        # @deprecated
-        def merge_validates_uniqueness_of_email_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_uniqueness_of_email_field_options")
-          self.validates_uniqueness_of_email_field_options =
-            validates_uniqueness_of_email_field_options.merge(options)
-        end
-      end
-
-      # All methods relating to the email field
-      module Methods
-        def self.included(klass)
-          klass.class_eval do
-            if validate_email_field && email_field
-              validates_length_of email_field, validates_length_of_email_field_options
-              validates_format_of email_field, validates_format_of_email_field_options
-              validates_uniqueness_of email_field, validates_uniqueness_of_email_field_options
-            end
-          end
-        end
+        alias email_field= email_field
       end
     end
   end

data/lib/authlogic/acts_as_authentic/logged_in_status.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Authlogic
   module ActsAsAuthentic
     # Since web applications are stateless there is not sure fire way to tell if
@@ -22,7 +24,7 @@ module Authlogic
         def logged_in_timeout(value = nil)
           rw_config(:logged_in_timeout, (!value.nil? && value.to_i) || value, 10.minutes.to_i)
         end
-        alias_method :logged_in_timeout=, :logged_in_timeout
+        alias logged_in_timeout= logged_in_timeout
       end
 
       # All methods for the logged in status feature seat.

data/lib/authlogic/acts_as_authentic/login.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require "authlogic/acts_as_authentic/queries/case_sensitivity"
 require "authlogic/acts_as_authentic/queries/find_with_case"
 
 module Authlogic
@@ -7,7 +10,6 @@ module Authlogic
       def self.included(klass)
         klass.class_eval do
           extend Config
-          add_acts_as_authentic_module(Methods)
         end
       end
 
@@ -20,152 +22,7 @@ module Authlogic
         def login_field(value = nil)
           rw_config(:login_field, value, first_column_to_exist(nil, :login, :username))
         end
-        alias_method :login_field=, :login_field
-
-        # Whether or not to validate the login field
-        #
-        # * <tt>Default:</tt> true
-        # * <tt>Accepts:</tt> Boolean
-        #
-        # @deprecated
-        def validate_login_field(value = nil)
-          rw_config(:validate_login_field, value, true)
-        end
-        alias_method :validate_login_field=, :validate_login_field
-
-        # A hash of options for the validates_length_of call for the login
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_length_of_login_field_options to merge options.</b>
-        #
-        # * <tt>Default:</tt> {:within => 3..100}
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_length_of
-        #
-        # @deprecated
-        def validates_length_of_login_field_options(value = nil)
-          deprecate_authlogic_config("validates_length_of_login_field_options") if value
-          rw_config(:validates_length_of_login_field_options, value, within: 3..100)
-        end
-        alias_method(
-          :validates_length_of_login_field_options=,
-          :validates_length_of_login_field_options
-        )
-
-        # A convenience function to merge options into the
-        # validates_length_of_login_field_options. So instead of:
-        #
-        #   self.validates_length_of_login_field_options =
-        #     validates_length_of_login_field_options.merge(:my_option => my_value)
-        #
-        # You can do this:
-        #
-        #   merge_validates_length_of_login_field_options :my_option => my_value
-        #
-        # @deprecated
-        def merge_validates_length_of_login_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_length_of_login_field_options")
-          self.validates_length_of_login_field_options =
-            validates_length_of_login_field_options.merge(options)
-        end
-
-        # A hash of options for the validates_format_of call for the login
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_format_of_login_field_options to merge options.</b>
-        #
-        # * <tt>Default:</tt>
-        #
-        #         {
-        #           :with => Authlogic::Regex.login,
-        #           :message => lambda {
-        #             I18n.t(
-        #               'error_messages.login_invalid',
-        #               :default => "should use only letters, numbers, spaces, and .-_@+ please."
-        #             )
-        #           }
-        #         }
-        #
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_format_of
-        #
-        # @deprecated
-        def validates_format_of_login_field_options(value = nil)
-          deprecate_authlogic_config("validates_format_of_login_field_options") if value
-          rw_config(
-            :validates_format_of_login_field_options,
-            value,
-            with: Authlogic::Regex::LOGIN,
-            message: proc do
-                       I18n.t(
-                         "error_messages.login_invalid",
-                         default: "should use only letters, numbers, spaces, and .-_@+ please."
-                       )
-                     end
-          )
-        end
-        alias_method(
-          :validates_format_of_login_field_options=,
-          :validates_format_of_login_field_options
-        )
-
-        # See merge_validates_length_of_login_field_options. The same thing,
-        # except for validates_format_of_login_field_options
-        #
-        # @deprecated
-        def merge_validates_format_of_login_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_format_of_login_field_options")
-          self.validates_format_of_login_field_options =
-            validates_format_of_login_field_options.merge(options)
-        end
-
-        # A hash of options for the validates_uniqueness_of call for the login
-        # field. Allows you to change this however you want.
-        #
-        # <b>Keep in mind this is ruby. I wanted to keep this as flexible as
-        # possible, so you can completely replace the hash or merge options into
-        # it. Checkout the convenience function
-        # merge_validates_format_of_login_field_options to merge options.</b>
-        #
-        # * <tt>Default:</tt>
-        #
-        #         {
-        #           :case_sensitive => false,
-        #           :scope => validations_scope,
-        #           :if => "#{login_field}_changed?".to_sym
-        #         }
-        #
-        # * <tt>Accepts:</tt> Hash of options accepted by validates_uniqueness_of
-        #
-        # @deprecated
-        def validates_uniqueness_of_login_field_options(value = nil)
-          deprecate_authlogic_config("validates_uniqueness_of_login_field_options") if value
-          rw_config(
-            :validates_uniqueness_of_login_field_options,
-            value,
-            case_sensitive: false,
-            scope: validations_scope,
-            if: "#{login_field}_changed?".to_sym
-          )
-        end
-        alias_method(
-          :validates_uniqueness_of_login_field_options=,
-          :validates_uniqueness_of_login_field_options
-        )
-
-        # See merge_validates_length_of_login_field_options. The same thing,
-        # except for validates_uniqueness_of_login_field_options
-        #
-        # @deprecated
-        def merge_validates_uniqueness_of_login_field_options(options = {})
-          deprecate_authlogic_config("merge_validates_uniqueness_of_login_field_options")
-          self.validates_uniqueness_of_login_field_options =
-            validates_uniqueness_of_login_field_options.merge(options)
-        end
+        alias login_field= login_field
 
         # This method allows you to find a record with the given login. If you
         # notice, with Active Record you have the UniquenessValidator class.
@@ -189,19 +46,9 @@ module Authlogic
         #
         # @api public
         def find_by_smart_case_login_field(login)
-          if login_field
-            find_with_case(
-              login_field,
-              login,
-              validates_uniqueness_of_login_field_options[:case_sensitive] != false
-            )
-          else
-            find_with_case(
-              email_field,
-              login,
-              validates_uniqueness_of_email_field_options[:case_sensitive] != false
-            )
-          end
+          field = login_field || email_field
+          sensitive = Queries::CaseSensitivity.new(self, field).sensitive?
+          find_with_case(field, login, sensitive)
         end
 
         private
@@ -211,20 +58,6 @@ module Authlogic
           Queries::FindWithCase.new(self, field, value, sensitive).execute
         end
       end
-
-      # All methods relating to the login field
-      module Methods
-        # Adds in various validations, modules, etc.
-        def self.included(klass)
-          klass.class_eval do
-            if validate_login_field && login_field
-              validates_length_of login_field, validates_length_of_login_field_options
-              validates_format_of login_field, validates_format_of_login_field_options
-              validates_uniqueness_of login_field, validates_uniqueness_of_login_field_options
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/authlogic/acts_as_authentic/magic_columns.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+
 module Authlogic
   module ActsAsAuthentic
-    # Magic columns are like ActiveRecord's created_at and updated_at columns. They are
-    # "magically" maintained for you. Authlogic has the same thing, but these are
-    # maintained on the session side. Please see Authlogic::Session::MagicColumns for more
-    # details. This module merely adds validations for the magic columns if they exist.
+    # Magic columns are like ActiveRecord's created_at and updated_at columns.
+    # They are "magically" maintained for you. Authlogic has the same thing, but
+    # these are maintained on the session side. Please see "Magic Columns" in
+    # `Session::Base` for more details. This module merely adds validations for
+    # the magic columns if they exist.
     module MagicColumns
       def self.included(klass)
         klass.class_eval do