effective_resources 2.2.7 → 2.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6819b26bada9a724fa3389143b46e3d39988040cc58430440679672d8a437114
-  data.tar.gz: 604f9712d29693fd48ea06d357ac7f84a0ff07b717316f6378b3822db5fbdc87
+  metadata.gz: cb2b489df65b7ef3e426fa8e43fe5e142560f861c7c1f7a2d580b3ce864d74d4
+  data.tar.gz: 7776fbc00d3ad40f8c8ac6ccff80ff2e114c48b52f47d59ea054ae4bddfaf15d
 SHA512:
-  metadata.gz: 756414efa78b9f5517699e5cb61de0ea62de0f0180efadb24ee7ffb065985441e17f389de7b2452346946024da12f1131cd3fee3766d633a6b2956ba705f9bb1
-  data.tar.gz: a5d1dd0200866bfd0b7b1970d599203a72b5c9f3d08f57931e7679d8b0eb61f3f769921d3c7c634a9d250c73210f544468a9845aba368e60e0ad00f0be03cbce
+  metadata.gz: 1b3d35a468f47af10084426d26d461d5168a6637bfe973b0ba5182bf65cbd1a4804255f956d28a558bc227b4ed986d8ad47eaf39385639db18b9e27afa6a1a24
+  data.tar.gz: e9bfd478683a588e25f4a24986d9f695485e4d59451af70415c83852a7fe0f48ec7b7211b000b0541e19e931154df8f2ccf2362e6c785c1fba072dd42120fed7

data/app/controllers/concerns/effective/wizard_controller/before_actions.rb

@@ -49,7 +49,7 @@ module Effective
 
         existing = resource_scope.in_progress.order(:id).where.not(id: resource).first
         return unless existing.present?
-        return if (existing.id > resource.id) # Otherwise we get an infinite loop
+        return if resource.persisted? && (existing.id > resource.id) # Otherwise we get an infinite loop
 
         flash[:success] = "You have been redirected to your in-progress wizard"
         redirect_to resource_wizard_path(existing, existing.next_step)

data/app/models/concerns/has_many_purgable.rb

@@ -0,0 +1,80 @@
+# HasManyPurgable
+#
+# Mark your model with 'has_many_purgable' or 'has_one_purgable' to allow any has_many or has_one to be purgable
+# 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_attached array or association names to purge.
+
+module HasManyPurgable
+  extend ActiveSupport::Concern
+
+  module Base
+    def has_many_purgable(*args)
+      options = args.extract_options!
+      names = Array(args).compact.presence || :all
+
+      @has_many_purgable_options = options.merge(names: names)
+
+      include ::HasManyPurgable
+    end
+
+    def has_one_purgable(*args)
+      has_many_purgable(*args)
+    end
+
+  end
+
+  included do
+    options = @has_many_purgable_options
+    self.send(:define_method, :has_many_purgable_options) { options }
+
+    attr_accessor :_purge_attached
+
+    with_options(if: -> { _purge_attached.present? }) do
+      before_validation { has_many_purgable_mark_for_destruction }
+      after_save { has_many_purgable_purge }
+    end
+
+  end
+
+  module ClassMethods
+    def has_many_purgable?; true; end
+  end
+
+  # 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 }
+
+    names == :all ? associations : (names & associations)
+  end
+
+  private
+
+  # As submitted by the form and permitted by our associations and options
+  def has_many_purgable_attachments
+    submitted = (Array(_purge_attached) - [nil, '', '0', ' ', 'false', 'f', 'off']).map(&:to_sym)
+    submitted & has_many_purgable_names
+  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 }
+    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 }
+    end
+
+    true
+  end
+
+end

data/lib/effective_resources/engine.rb

@@ -29,6 +29,7 @@ module EffectiveResources
         ActiveRecord::Base.extend(ActsAsStatused::Base)
         ActiveRecord::Base.extend(ActsAsWizard::Base)
         ActiveRecord::Base.extend(ActsAsPurchasableWizard::Base)
+        ActiveRecord::Base.extend(HasManyPurgable::Base)
         ActiveRecord::Base.extend(HasManyRichTexts::Base)
 
         ActiveRecord::Base.extend(EffectiveDeviseUser::Base)

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.2.7'.freeze
+  VERSION = '2.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.2.7
+  version: 2.2.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -165,6 +165,7 @@ files:
 - app/models/concerns/effective_after_commit.rb
 - app/models/concerns/effective_devise_user.rb
 - app/models/concerns/effective_resource.rb
+- app/models/concerns/has_many_purgable.rb
 - app/models/concerns/has_many_rich_texts.rb
 - app/models/effective/access_denied.rb
 - app/models/effective/action_failed.rb