effective_resources 2.4.4 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1cadfb1389e910933f803de6666e0951e5f9f616a9b309e9bdb90a660cc6701
-  data.tar.gz: 2bce5994615b5bc9c80c2dfe31da4476333d8eb6c77d8443f80a2001680ee760
+  metadata.gz: b34bdcaa231b87cff3e1f0ed43b8a1ecf7a8de5dfb784dae9dfcc677bb2a3754
+  data.tar.gz: 182008fc51596a0039e957fe9dfb49531c5e5b58466e4bf8d4f4d3f63d0091dd
 SHA512:
-  metadata.gz: 2188480dca4ed8d2a6bdd66a0867160338ecd7d5a9bc7e210c3ee5bb27594cc7eb53de5970714fb8e3b2551d1b3ea05b553d716d5f8838566dd7cef5df091c30
-  data.tar.gz: f6a0ef0ed60c286568c9a7a9fef1f6615557370c461c6c8159ead387df00cb170fb3e58c21ad8ccf403196b76ac77df21b0ed073e948269851bb180bbe5bac74
+  metadata.gz: b8a5e3bec0689b942e6bb95b8dc1ced888435dba9dc423a2b76684a88ce771ac7c1cbb6db6313f9f3c1454b4bee730d7571ab7a55ada80fcc341c042a729deb1
+  data.tar.gz: 0c983b39196510bbc506a2c8e6090310530632a015f68dfb5f99d13f65d4f1bac43dbbf82ebb6154eb4be7322562f7ea8f3903eced1ef1fb92f01a3b0762b7f8

data/app/models/concerns/has_many_purgable.rb

@@ -71,7 +71,7 @@ module HasManyPurgable
 
   def has_many_purgable_mark_for_destruction
     has_many_purgable_attachments.each do |name|
-      Array(public_send(name)).each { |attachment| attachment.mark_for_destruction }
+      Array(public_send(name)).each { |attachment| attachment.mark_for_destruction unless attachment.new_record? }
     end
 
     true
@@ -80,7 +80,7 @@ module HasManyPurgable
   def has_many_purgable_purge
     has_many_purgable_attachments.each do |name|
       Rails.logger.info "[has_many_purgable] Purging #{name} attachments"
-      Array(public_send(name)).each { |attachment| attachment.purge }
+      Array(public_send(name)).each { |attachment| attachment.purge if attachment.marked_for_destruction? }
     end
 
     true

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.4.4'.freeze
+  VERSION = '2.4.6'.freeze
 end

data/lib/effective_resources.rb

@@ -179,7 +179,9 @@ module EffectiveResources
   end
 
   def self.et(resource, attribute = nil)
-    if resource.respond_to?(:model_name) == false
+    if resource.respond_to?(:datatable_name)
+      resource.datatable_name
+    elsif resource.respond_to?(:model_name) == false
       value = I18n.t(resource)
       raise("Missing translation: #{resource}") if value.start_with?('translation missing:')
       value

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails