active_record_better_dependent_error_messages 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a0a04498f2fbd313b0da51b8f73abf5b6c28b5e9
-  data.tar.gz: 7bd5cfdf351a48964eb1c8538a6286db3e37612f
+SHA256:
+  metadata.gz: d6ff57c47d56bcc5839e00341215cd0ce6c1acba1367ca7cf8c74044e2bd0857
+  data.tar.gz: 9e6d9be7924d9ae510c0b416ef96af83a5b4fba56cf55c4bcbb807bc272c4026
 SHA512:
-  metadata.gz: b94f561f468a0ec7eb708449662d06a851cfeaba94f418524335202fedb67cc586367c658a6dc6ecb5c821172223e6578e524615bf6a058f61b284e97f06241b
-  data.tar.gz: 3e903a6b729312e84344d2f5c4ce5595f1b73f1b313e9d9e9ad51532cf72142b5a822d78edf3fdd947d9dcc14685ba9b5fb90ec5785595eadafbc11d1aad239c
+  metadata.gz: 6b5a02c387eaf465974fab7c6874037f50d462c7a669ca6da557e90ae69edee10b912d53a89dd7813c47769b1f83af5d417dd47325c7b72703ed824329be317b
+  data.tar.gz: ce22197b91a3875b1493ebd5325ee5e10f8f6221a1030aea92d043fedd19fb8c4364b3c1b54bba5ed8113ecd2cf7ae2994fd7c787b521206984ab7b8a5627fee

data/README.md

@@ -28,6 +28,18 @@ class MyModel < ApplicationRecord
 end
 ```
 
+You can add a custom error message like this:
+```yaml
+en:
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            base:
+              cannot_delete_because_of_restriction: Cannot delete because the user has dependent %{association_name}
+```
+
 ## Contributing
 Contribution directions go here.
 

data/lib/active_record_better_dependent_error_messages.rb

@@ -5,4 +5,6 @@ module ActiveRecordBetterDependentErrorMessages
 
   autoload :DestroyModule, "#{path}/destroy_module"
   autoload :DestroyValidator, "#{path}/destroy_validator"
+  autoload :ErrorsCollector, "#{path}/errors_collector"
+  autoload :SaveModule, "#{path}/save_module"
 end

data/lib/active_record_better_dependent_error_messages/destroy_module.rb

@@ -1,5 +1,5 @@
 module ActiveRecordBetterDependentErrorMessages::DestroyModule
-  def destroy
+  def destroy(*_args)
     result = super
 
     if !result && errors.empty?

data/lib/active_record_better_dependent_error_messages/destroy_validator.rb

@@ -31,13 +31,27 @@ private
     if association.macro == :has_one
       has_one_model = model.__send__(association.name)
 
-      if has_one_model
-        root_model.errors.add(:base, "Cannot delete because of #{trace_as_string} has dependent record: #{association.name} with ID: #{has_one_model.id}")
+      if has_one_model && !has_error?
+        root_model.errors.add(
+          :base,
+          :cannot_delete_because_of_restriction,
+          association_name: association.klass.model_name.human(count: 1).downcase,
+          count: 1,
+          message: "Cannot delete because of #{trace_as_string} has dependent record: #{association.name} with ID: #{has_one_model.id}",
+          model_name: model.model_name.human.downcase
+        )
       end
-    elsif association.macro == :has_many
+    elsif association.macro == :has_many && !has_error?
       ids = model.__send__(association.name).pluck(:id)
       if ids.any?
-        root_model.errors.add(:base, "Cannot delete because of #{trace_as_string} has dependent records: #{association.name} with IDs: #{ids.join(", ")}")
+        root_model.errors.add(
+          :base,
+          :cannot_delete_because_of_restriction,
+          association_name: association.klass.model_name.human(count: 2).downcase,
+          count: ids.length,
+          message: "Cannot delete because of #{trace_as_string} has dependent records: #{association.name} with IDs: #{ids.join(", ")}",
+          model_name: model.model_name.human.downcase
+        )
       end
     end
   end
@@ -54,6 +68,10 @@ private
     end
   end
 
+  def has_error?
+    root_model.errors.details[:base] && root_model.errors.details[:base].any? { |error| error[:error] == :cannot_delete_because_of_restriction }
+  end
+
   def trace_as_string
     trace.map do |model|
       "#{model.class.name}(#{model.id})"

data/lib/active_record_better_dependent_error_messages/errors_collector.rb

@@ -0,0 +1,40 @@
+class ActiveRecordBetterDependentErrorMessages::ErrorsCollector
+  attr_reader :model, :root_model
+
+  def self.call(model:, root_model: nil)
+    root_model ||= model
+
+    collector = ActiveRecordBetterDependentErrorMessages::ErrorsCollector.new(model: model, root_model: root_model)
+    collector.collect!
+  end
+
+  def initialize(model:, root_model:)
+    @model = model
+    @root_model = root_model
+  end
+
+  def collect!
+    model._reflections.each do |reflection_name, reflection|
+      association = model.association(reflection_name)
+
+      next if reflection.options[:dependent] != :destroy
+
+      if reflection.macro == :has_many
+        model.__send__(reflection_name).each do |sub_model|
+          scan_sub_model_for_errors(sub_model)
+          ActiveRecordBetterDependentErrorMessages::ErrorsCollector.(model: sub_model, root_model: model)
+        end
+      elsif reflection.macro == :has_one
+        sub_model = model.__send__(reflection_name)
+        scan_sub_model_for_errors(sub_model)
+        ActiveRecordBetterDependentErrorMessages::ErrorsCollector.(model: sub_model, root_model: model)
+      end
+    end
+  end
+
+  def scan_sub_model_for_errors(sub_model)
+    return if sub_model.errors.none?
+
+    root_model.errors.add(:base, sub_model.errors.full_messages.join(". "))
+  end
+end

data/lib/active_record_better_dependent_error_messages/save_module.rb

@@ -0,0 +1,10 @@
+module ActiveRecordBetterDependentErrorMessages::SaveModule
+  def update(*args)
+    super
+  rescue ActiveRecord::RecordNotDestroyed => e
+    raise e unless errors.empty?
+
+    ActiveRecordBetterDependentErrorMessages::ErrorsCollector.(model: self)
+    false
+  end
+end

data/lib/active_record_better_dependent_error_messages/version.rb

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

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: active_record_better_dependent_error_messages
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-29 00:00:00.000000000 Z
+date: 2020-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: factory_bot_rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A gem that makes better dependent error messages telling exactly which
   relationship tree failed with which ID's.
 email:
@@ -63,6 +119,8 @@ files:
 - lib/active_record_better_dependent_error_messages/destroy_module.rb
 - lib/active_record_better_dependent_error_messages/destroy_validator.rb
 - lib/active_record_better_dependent_error_messages/engine.rb
+- lib/active_record_better_dependent_error_messages/errors_collector.rb
+- lib/active_record_better_dependent_error_messages/save_module.rb
 - lib/active_record_better_dependent_error_messages/version.rb
 - lib/tasks/active_record_better_dependent_error_messages_tasks.rake
 homepage: https://github.com/kaspernj/active-record-better-dependent-error-messages
@@ -84,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A gem that makes better dependent error messages telling exactly which relationship