active_record_better_dependent_error_messages 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ff57c47d56bcc5839e00341215cd0ce6c1acba1367ca7cf8c74044e2bd0857
-  data.tar.gz: 9e6d9be7924d9ae510c0b416ef96af83a5b4fba56cf55c4bcbb807bc272c4026
+  metadata.gz: 9f6e4921f7713c0a6dfef6e39a317542af1a5573adeffd607cafccccb1e1bdc6
+  data.tar.gz: 70fd193c2aefd5c6a2a158505f0411dd90990d23c3be582fe22ac31c1a168a0f
 SHA512:
-  metadata.gz: 6b5a02c387eaf465974fab7c6874037f50d462c7a669ca6da557e90ae69edee10b912d53a89dd7813c47769b1f83af5d417dd47325c7b72703ed824329be317b
-  data.tar.gz: ce22197b91a3875b1493ebd5325ee5e10f8f6221a1030aea92d043fedd19fb8c4364b3c1b54bba5ed8113ecd2cf7ae2994fd7c787b521206984ab7b8a5627fee
+  metadata.gz: 03c815619cea44b48cb553db01156b81c28e6951d733a666078440b24427d53b6766c8883d324ebce8980b075ea73f4050648cacc08be691caecf1f601e30854
+  data.tar.gz: 5d1edbdd53d0c7766129a8c240088a694925a9590fa516f3712130fba42783c482f92d8c086cfeab3e5e64d952c65611a8005822518728a14d5f59d776d1fa33

data/lib/active_record_better_dependent_error_messages/destroy_validator.rb

@@ -43,6 +43,7 @@ private
       end
     elsif association.macro == :has_many && !has_error?
       ids = model.__send__(association.name).pluck(:id)
+
       if ids.any?
         root_model.errors.add(
           :base,
@@ -58,16 +59,50 @@ private
 
   def check_sub_destroy_association(association)
     if association.macro == :has_one
-      sub_model = model.__send__(association.name)
-      ActiveRecordBetterDependentErrorMessages::DestroyValidator.(root_model: root_model, model: sub_model, trace: trace + [sub_model]) if sub_model
+      sub_model = model.association(association.name).target
+
+      if sub_model
+        extract_sub_destroy_errors(association, sub_model)
+        ActiveRecordBetterDependentErrorMessages::DestroyValidator.(root_model: root_model, model: sub_model, trace: trace + [sub_model])
+      end
     elsif association.macro == :has_many
-      sub_models = model.__send__(association.name)
-      sub_models.find_each do |sub_model_i|
+      sub_models = model.association(association.name).target
+
+      sub_models.each do |sub_model_i|
+        extract_sub_destroy_errors(association, sub_model_i)
         ActiveRecordBetterDependentErrorMessages::DestroyValidator.(root_model: root_model, model: sub_model_i, trace: trace + [sub_model_i])
       end
     end
   end
 
+  def extract_sub_destroy_errors(association, model)
+    return unless model_has_custom_errors?(model)
+
+    root_model.errors.add(
+      :base,
+      :cannot_delete_because_of_child_errors,
+      association_name: association.klass.model_name.human(count: 2).downcase,
+      count: 1,
+      message: "Cannot delete because of child errors in #{association.name} with IDs: #{model.id}: #{model.errors.full_messages.join(". ")}",
+      model_name: model.model_name.human.downcase
+    )
+  end
+
+  def model_has_custom_errors?(model)
+    custom_errors = 0
+
+    model.errors.details.each do |error_types_with_detail|
+      attribute = error_types_with_detail.fetch(0)
+      errors = error_types_with_detail.fetch(1)
+
+      errors.each do |error|
+        custom_errors += 1 unless error.fetch(:error) == :"restrict_dependent_destroy.has_many"
+      end
+    end
+
+    custom_errors > 0
+  end
+
   def has_error?
     root_model.errors.details[:base] && root_model.errors.details[:base].any? { |error| error[:error] == :cannot_delete_because_of_restriction }
   end

data/lib/active_record_better_dependent_error_messages/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordBetterDependentErrorMessages
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_better_dependent_error_messages
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A gem that makes better dependent error messages telling exactly which relationship