authlogic 4.4.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ddee07d72769ceaa9ba7e1cb47f8f4642df0ab981de7bac607f69796c9d0d6f
-  data.tar.gz: b1ee15e2637cf3379e6c24b1dda35abcf05527fb848c0d73ed25cf64633cf5fb
+  metadata.gz: f33a408b68b3809a5f68ee4a2c42aa60f472fd139f9e0a10fc1e20a6e32eb9a7
+  data.tar.gz: 75bfa342ae455b28fa5c12b46c6f03f3a872b3a65654a3bd911e4891b8b8e611
 SHA512:
-  metadata.gz: e9f6bab4ddc5418fc74229a12912ef3411cf6252f8c9b22f88343ee9d8241bf7b3f4b82b159ea1375b1f69c107ebfb37cefb8503d8ba8971f9446994f21016dd
-  data.tar.gz: b8da5a086e0bb4b9047d16dda29877a2ddd5c791a2fa7998d1ffbd1d56dec04cb78026525070d008f05b7267e2a16c49810e688131c725b625499ecda53af0cf
+  metadata.gz: dbdfd4e20f62d723e1171326aae2b48d195b2ffcb8e31ed0b4ec451a118abcd6f5b8c9bbf3a2b0a7206383f73f81e7fb9983c81d02f6c76cef732deda40f2736
+  data.tar.gz: dac40f1a0049cb1e63d699f6dda6a1df5bdedcc4e1a5f412d3908e515edd877ce3c9ba1d4955f154da18c515381e9bbcb551ba84afbc4a8c8bbe53ae02e10b17

data/lib/authlogic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Authlogic uses ActiveSupport's core extensions like `strip_heredoc` and
 # `squish`. ActiveRecord does not `require` these exensions, so we must.
 #
@@ -13,16 +15,13 @@ path = File.dirname(__FILE__) + "/authlogic/"
 [
   "i18n",
   "random",
-  "regex",
   "config",
 
   "controller_adapters/abstract_adapter",
+  "cookie_credentials",
 
   "crypto_providers",
 
-  "authenticates_many/base",
-  "authenticates_many/association",
-
   "acts_as_authentic/email",
   "acts_as_authentic/logged_in_status",
   "acts_as_authentic/login",
@@ -30,34 +29,11 @@ path = File.dirname(__FILE__) + "/authlogic/"
   "acts_as_authentic/password",
   "acts_as_authentic/perishable_token",
   "acts_as_authentic/persistence_token",
-  "acts_as_authentic/restful_authentication",
   "acts_as_authentic/session_maintenance",
   "acts_as_authentic/single_access_token",
-  "acts_as_authentic/validations_scope",
   "acts_as_authentic/base",
 
-  "session/activation",
-  "session/active_record_trickery",
-  "session/brute_force_protection",
-  "session/callbacks",
-  "session/cookies",
-  "session/existence",
-  "session/foundation",
-  "session/http_auth",
-  "session/id",
-  "session/klass",
-  "session/magic_columns",
-  "session/magic_states",
-  "session/params",
-  "session/password",
-  "session/perishable_token",
-  "session/persistence",
-  "session/priority_record",
-  "session/scopes",
-  "session/session",
-  "session/timeout",
-  "session/unauthorized_record",
-  "session/validation",
+  "session/magic_column/assigns_last_request_at",
   "session/base"
 ].each do |library|
   require path + library

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,19 +30,8 @@ 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
+        def acts_as_authentic
           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
-
           yield self if block_given?
           acts_as_authentic_modules.each { |mod| include mod }
         end
@@ -106,11 +97,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