effective_resources 2.36.5 → 2.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '086e9b2c0d5f9e843a39a880c48ca7467c454d96d426b7a789f474ed6db2d37f'
-  data.tar.gz: 7ad84343ab0180ecb8b2c73a767af2904f23b27f4d497fe3f45f729abed23337
+  metadata.gz: 34000b998f97e0525a90ba9ee7691dc4b114460e4bbf6e0f25dd17e428408a4a
+  data.tar.gz: 2e546baaa6091446448894796e9ab8869532f9dd68c478e96bf3a9d749adb511
 SHA512:
-  metadata.gz: cf277644616c40600656c124b3982f5a39e27a87805b2b38d11adde65ae58672d974488d7745ee141724cf05a8a9a2dac9b37d8a42e1cfd05177a358e4be63dc
-  data.tar.gz: 0c70a0926f46a18b73edb4a045bd7b1764dccab54e610aa4e389ea129024c7b1e9f48e1c9f2b660d2087e4ea18b45dffbdbbc2f90764176141032058bf329e12
+  metadata.gz: 4ecc3665cc1e92b791074c01921ef422310ed10706b6f0948f9b13e4a4a3be537e562e6e0e043e55736738a6afe94e78f9fb9d9a0ae96173827c8c707a5d479b
+  data.tar.gz: f53e5948e27a4b43155a3ec53de5085389d917932f020acb929142b13cefa050baccc54e8beeee58161f72ef371609cdc7707884c868ac287618118165011635

data/app/models/concerns/acts_as_purchasable_wizard.rb

@@ -250,9 +250,11 @@ module ActsAsPurchasableWizard
   end
 
   # A hook to extend
+  # These are not for use when extending a fee payment
   def before_submit_purchased!
   end
 
+  # These are not for use when extending a fee payment
   def after_submit_purchased!
   end
 
@@ -269,6 +271,14 @@ module ActsAsPurchasableWizard
     wizard_steps[:checkout] ||= Time.zone.now
     wizard_steps[:submitted] = Time.zone.now
     submitted!
+
+    after_submit!
+
+    true
+  end
+
+  # A hook to extend. Safe for fee payments.
+  def after_submit!
   end
 
   module ClassMethods

data/app/models/concerns/has_many_purgable.rb

@@ -5,8 +5,8 @@
 #
 # Pass 'has_many_purgable :files, :avatar' to only allow the files and avatar to be purged.
 #
-# Works with effective_bootstrap file_field to display a Delete file on save checkbox
-# to submit a _purge array of attachments to purge.
+# Works with effective_bootstrap file_field, which renders a Remove button per attachment
+# that submits the attachment's signed_id in the _purge array.
 #
 # You must permit the attribute _purge: []
 
@@ -53,34 +53,33 @@ module HasManyPurgable
   # All the possible names, merging the actual associations and the given options
   def has_many_purgable_names
     names = has_many_purgable_options.fetch(:names)
-
-    associations = self.class.reflect_on_all_associations
-      .select { |ass| ass.class_name == 'ActiveStorage::Attachment' }
-      .map { |ass| ass.name.to_s.chomp('_attachments').chomp('_attachment').to_sym }
-
+    associations = self.class.attachment_reflections.keys.map(&:to_sym)
     names == :all ? associations : (names & associations)
   end
 
   private
 
-  # As submitted by the form and permitted by our associations and options
+  # Returns the ActiveStorage::Attachment records selected for purging, matched by signed_id.
   def has_many_purgable_attachments
-    submitted = (Array(_purge) - [nil, '', '0', ' ', 'false', 'f', 'off']).map(&:to_sym)
-    submitted & has_many_purgable_names
+    submitted = Array(_purge) - [nil, '', '0', ' ', 'false', 'f', 'off']
+    return [] if submitted.blank?
+
+    all_attachments = has_many_purgable_names.flat_map { |name| Array(public_send(name)) }
+    all_attachments.select { |attachment| submitted.include?(attachment.signed_id) }
   end
 
   def has_many_purgable_mark_for_destruction
-    has_many_purgable_attachments.each do |name|
-      Array(public_send(name)).each { |attachment| attachment.mark_for_destruction unless attachment.new_record? }
+    has_many_purgable_attachments.each do |attachment|
+      attachment.mark_for_destruction unless attachment.new_record?
     end
 
     true
   end
 
   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 if attachment.marked_for_destruction? }
+    has_many_purgable_attachments.each do |attachment|
+      Rails.logger.info "[has_many_purgable] Purging attachment #{attachment.id} (#{attachment.name})"
+      attachment.purge if attachment.marked_for_destruction?
     end
 
     true

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.36.5'.freeze
+  VERSION = '2.37.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.36.5
+  version: 2.37.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-25 00:00:00.000000000 Z
+date: 2026-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails