minimalist_authentication 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cda06c345d4fa37142558f9d0dbeaf836214efebc30d05d0a048fbe914ded344
-  data.tar.gz: 462cc4702b9a9c5d2c6311743faeb22647da2900cea5650908641026635e9fdf
+  metadata.gz: b86110ca5e209864047e3c499a09401a264019ea2bd4311d3eb11e02ac95c29c
+  data.tar.gz: '0493e05bb52e0090890c785149bfb237309b2ad6e81988258f5fda308f8bf8bf'
 SHA512:
-  metadata.gz: 22ee36a9560fff58c576faa9e11d5a17ebfdd920b84a64c2673affe0a0abe39c98d256aaaf261e988e8c720a3a420984658a92073050520345974bb888421851
-  data.tar.gz: 11150ad09e46ef906e1d5b2f47172b33a8608867f4e5686d5c9d63636155be3eff0eb16509d74a8dccdd3da98c2e5985a9bf40c253f463762a0d44dd9d0072be
+  metadata.gz: eade9a93179f92c337ed21258d438861fbe70210d1a252dab6998fe10f49d18e0b6ddf250bef8bc6ebae69aa068e44bf00e366d4aeae4e9c4c55775402c21a8f
+  data.tar.gz: b1fcc6eb5d0dcd5bfcb8e1e740a72faff20c397f8ed9bc216a0eba343cddbd36457e2bf03aa09ec1fee51c6f82f429c97b7dfc6becdf4562b555d744074f5d21

data/lib/minimalist_authentication/user.rb

@@ -5,7 +5,6 @@ module MinimalistAuthentication
     extend ActiveSupport::Concern
 
     GUEST_USER_EMAIL  = 'guest'
-    EMAIL_REGEX       = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
     PASSWORD_MIN      = 8
     PASSWORD_MAX      = 40
 
@@ -20,14 +19,22 @@ module MinimalistAuthentication
       before_save :hash_password
 
       # Email validations
-      validates_presence_of     :email,                                           if: :validate_email_presence?
-      validates_uniqueness_of   :email, allow_blank: true, case_sensitive: false, if: :validate_email?
-      validates_format_of       :email, allow_blank: true, with: EMAIL_REGEX,     if: :validate_email?
+      validates(
+        :email,
+        format:     { allow_blank: true, with: URI::MailTo::EMAIL_REGEXP },
+        uniqueness: { allow_blank: true, case_sensitive: false, scope: :active },
+        if:         :validate_email?
+      )
+      validates(:email, presence: true, if: :validate_email_presence?)
 
       # Password validations
-      validates_presence_of     :password,                                      if: :validate_password?
-      validates_confirmation_of :password,                                      if: :validate_password?
-      validates_length_of       :password, within: PASSWORD_MIN..PASSWORD_MAX,  if: :validate_password?
+      validates(
+        :password,
+        confirmation: true,
+        length:       { within: PASSWORD_MIN..PASSWORD_MAX },
+        presence:     true,
+        if:           :validate_password?
+      )
 
       # Active scope
       scope :active,    ->(state = true)  { where(active: state) }

data/lib/minimalist_authentication/version.rb

@@ -1,3 +1,3 @@
 module MinimalistAuthentication
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minimalist_authentication
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - Aaron Baldwin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: A Rails authentication plugin that takes a minimalist approach.