effective_resources 2.11.4 → 2.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bdb3dc24c4beb4f3558641fc4f209ba7094d052033f766c67e54aa62c34735
-  data.tar.gz: 8d38b7bbfd0046d29c6489ffbd7373711436c9aecee76b1de111394dabd08ef6
+  metadata.gz: df20052518286a1ff3271eddb3e9007211d31ac6702cc4bb87ddf0c6706a0a31
+  data.tar.gz: 15b0d4740305154619c1cf4922ed567811149c60966d63d2c737c6306a2b8e1c
 SHA512:
-  metadata.gz: ecaa55c198d2616bfcfcea71b51adf36cd1f28deef42d698fd6e62c1981da827577f01ee4b1f9d51b4f625dadfd84b71f6c01eed9059f774ca7beb26294aa636
-  data.tar.gz: 3f76720e84164f7c15cbc08ffe92efdf665cce447d64c13b5ecfe50767769eff0d494b3647f3074156a31b5ce6ef9a48959bd2b6a42eaf1bbefa36d09a5d3ef4
+  metadata.gz: eccffe9230dd0ee3119e04c48cc8b05374d73d29ca18c7d5344c7d6be3cf39362622cadf17265b0f146773bd0be3dd77276b5988832d82c641c8c0f1f348a4c7
+  data.tar.gz: ab946a0050800cab2698955c69cdd27911ec110f7a68dacd19ef975b7800e2eadd1145c456f660d775b3f985d4e1e6a9f62776363191d78fae68f08ea0e81bb9

data/app/models/concerns/effective_devise_user.rb

@@ -48,12 +48,19 @@ module EffectiveDeviseUser
     # Devise invitable ignores model validations, so we manually check for duplicate email addresses.
     before_save(if: -> { new_record? && try(:invitation_sent_at).present? }) do
       if email.blank?
-        self.errors.add(:email, "can't be blank")
+        errors.add(:email, "can't be blank")
         raise("email can't be blank")
       end
 
-      if self.class.where(email: email.downcase.strip).exists?
-        self.errors.add(:email, 'has already been taken')
+      value = email.strip.downcase
+
+      if self.class.where(email: value).present?
+        errors.add(:email, 'has already been taken')
+        raise("email has already been taken")
+      end
+
+      if respond_to?(:alternate_email) && self.class.where(alternate_email: value).present?
+        errors.add(:email, 'has already been taken')
         raise("email has already been taken")
       end
     end
@@ -63,25 +70,29 @@ module EffectiveDeviseUser
       assign_attributes(provider: nil, access_token: nil, refresh_token: nil, token_expires_at: nil)
     end
 
+    validate(if: -> { email.present? && try(:alternate_email).present? }) do
+      errors.add(:alternate_email, 'cannot be the same as email') if email.strip.downcase == alternate_email.strip.downcase
+    end
+
     # Uniqueness validation of emails and alternate emails across all users
     validate(if: -> { respond_to?(:alternate_email) }) do
-      records = self.class.where.not(id: self.id) # exclude self
-      email_duplicates = records.where("lower(email) = :email OR lower(alternate_email) = :email", email: email.to_s.strip.downcase)
-      alternate_email_duplicates = records.where("lower(email) = :alternate_email OR lower(alternate_email) = :alternate_email", alternate_email: alternate_email.to_s.strip.downcase)
+      records = self.class.where.not(id: id)
 
-      # Check if a uniqueness validation was already performed before triggering the exists query
-      if !self.errors.added?(:email, 'has already been taken') && email_duplicates.exists?
-        self.errors.add(:email, 'has already been taken')
+      # Validate email uniqueness
+      if (value = email.to_s.strip.downcase).present? && !errors.added?(:email, 'has already been taken')
+        existing = records.where("email = :value OR alternate_email = :value", value: value)
+        errors.add(:email, 'has already been taken') if existing.present?
       end
 
-      # Check if the alternate email is set before triggering the exists query
-      if try(:alternate_email).present? && alternate_email_duplicates.exists?
-        self.errors.add(:alternate_email, 'has already been taken')
+      # Validate alternate_email uniqueness
+      if (value = alternate_email.to_s.strip.downcase).present?
+        existing = records.where("email = :value OR alternate_email = :value", value: value)
+        errors.add(:alternate_email, 'has already been taken') if existing.present?
       end
     end
 
     with_options(if: -> { respond_to?(:alternate_email) }) do
-      validates :alternate_email, email: true, allow_blank: true
+      validates :alternate_email, email: true
     end
 
   end

data/lib/effective_resources/engine.rb

@@ -6,13 +6,11 @@ module EffectiveResources
 
     config.autoload_paths += Dir[
       "#{config.root}/jobs/",
-      "#{config.root}/lib/validators/",
       "#{config.root}/app/controllers/concerns/"
     ]
 
     config.eager_load_paths += Dir[
       "#{config.root}/jobs/",
-      "#{config.root}/lib/validators/",
       "#{config.root}/app/controllers/concerns/"
     ]
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.11.4'.freeze
+  VERSION = '2.11.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.11.4
+  version: 2.11.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -223,8 +223,12 @@ files:
 - app/models/effective/resources/relation.rb
 - app/models/effective/resources/sql.rb
 - app/models/effective/resources/tenants.rb
+- app/validators/boolean_validator.rb
 - app/validators/content_type_validator.rb
+- app/validators/email_cc_validator.rb
+- app/validators/email_validator.rb
 - app/validators/size_validator.rb
+- app/validators/url_validator.rb
 - app/views/application/_flash.html.haml
 - app/views/application/create.js.erb
 - app/views/application/destroy.js.erb
@@ -251,10 +255,6 @@ files:
 - lib/effective_resources/engine.rb
 - lib/effective_resources/version.rb
 - lib/generators/effective_resources/install_generator.rb
-- lib/validators/boolean_validator.rb
-- lib/validators/email_cc_validator.rb
-- lib/validators/email_validator.rb
-- lib/validators/url_validator.rb
 homepage: https://github.com/code-and-effect/effective_resources
 licenses:
 - MIT