effective_storage 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4d882d7dc41b30bee6a440cffcbcc0008dc697fc5ace3455ff2f427910325d1
-  data.tar.gz: a6a536963a71e23feeb0106193a7d731372f3190cf48632aa5cb70388636df31
+  metadata.gz: 4f1b5a4ba6185fdd5c81e33afacd6dfb6ec8dc2e5c24fa07fb05be840d196740
+  data.tar.gz: e82b0d3bea47958aabd007a0a444088b92124421149357dd9998e1f0c30c4346
 SHA512:
-  metadata.gz: fc59eaafef6892fb1b3826e7ad0ee0f5aacf175f553cdae2eb8bc15a2631a72ea4681f2ef6b7c594f5497007df06f7acfd91c9f76480b4d49e96811b1a637781
-  data.tar.gz: 12d4c064a19a72670545e52f61c986c80455c90ae4852af9c3e272aea56a4331d7e7e0065e9cdfeff860f25f1e12f282b180815dd1145e1af33e66d7e2c863a4
+  metadata.gz: aebccce481ef3f36dac0a1f1855e957abca8f6d30465f3bb214875210a98aa24fd1ea7df14b5de80c727d503fb69ef2a226e81f23b7b7381ea88165ccdf85df3
+  data.tar.gz: af51fe35aeed80cd5409aa39c3048b6e4128ad80429d383e2639d8b3afa19500ba05ee2647e6ff93c46fdca6d4af3700cfcc914d81aa3f1136afcf27e873d6ad

data/app/models/concerns/active_storage_blob_extension.rb

@@ -9,6 +9,8 @@ module ActiveStorageBlobExtension
     scope :deep, -> { includes(:active_storage_extensions, attachments: [record: :record]) }
 
     scope :attached, -> { joins(:attachments) }
+    scope :unattached, -> { where.not(id: attached) }
+
   end
 
   module ClassMethods
@@ -47,8 +49,55 @@ module ActiveStorageBlobExtension
     save!
   end
 
+  # The purge! command is not part of the regular ActiveStorage::Blob class
+  # This is the command called by the admin/storage datatable
+  # When config.never_delete_active_storage is enabled, this is the only way to delete a Blob
+  # And they will not be deleted in the background.
   def purge!
-    purge
+    before = EffectiveStorage.never_delete
+
+    begin
+      EffectiveStorage.never_delete = false
+      purge
+    ensure
+      EffectiveStorage.never_delete = before
+    end
+  end
+
+  def delete
+    if EffectiveStorage.never_delete?
+      Rails.logger.info "[effective_storage] Skipping ActiveStorage::Blob delete"
+      return
+    end
+
+    super
+  end
+
+  def destroy
+    if EffectiveStorage.never_delete?
+      Rails.logger.info "[effective_storage] Skipping ActiveStorage::Blob destroy"
+      return
+    end
+
+    super
+  end
+
+  def purge
+    if EffectiveStorage.never_delete?
+      Rails.logger.info "[effective_storage] Skipping ActiveStorage::Blob purge"
+      return
+    end
+
+    super
+  end
+
+  def purge_later
+    if EffectiveStorage.never_delete?
+      Rails.logger.info "[effective_storage] Skipping ActiveStorage::Blob purge_later"
+      return
+    end
+
+    super
   end
 
 end

data/config/effective_storage.rb

@@ -6,4 +6,7 @@ EffectiveStorage.setup do |config|
   # Perform authorization on ActiveStorage downloads
   # When false any request will be permitted (the default)
   config.authorize_active_storage = true
+
+  # Do not delete ActiveStorage::Blobs
+  config.never_delete = true
 end

data/lib/effective_storage/version.rb

@@ -1,3 +1,3 @@
 module EffectiveStorage
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/lib/effective_storage.rb

@@ -6,7 +6,7 @@ require 'effective_storage/version'
 module EffectiveStorage
 
   def self.config_keys
-    [:layout, :authorize_active_storage]
+    [:layout, :authorize_active_storage, :never_delete]
   end
 
   include EffectiveGem
@@ -15,4 +15,8 @@ module EffectiveStorage
     authorize_active_storage == true
   end
 
+  def self.never_delete?
+    never_delete == true
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_storage
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails