effective_storage 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e291eec4a68519b15b3bd9364f6ee39f82efcfcdf5a50b9503716feb74685e60
-  data.tar.gz: febfb716cde67d02e88b9f2ec5d819a40a961ab2a467e76dd9201ddaec58562c
+  metadata.gz: d31c97986b5166e4bd1fa34d329ea5a6b8f7c355a9ab952f010100ba8ed33f63
+  data.tar.gz: e88cce63f52489de5fed02e3c5119f4ff17cb5ca07fba05472b15d5cfcfdd814
 SHA512:
-  metadata.gz: d7ababb553f86b947c43c9b25ce0f7afcb6469477c1777c0f641e687f90b11da385a92f40859f02ec474b61324d23851f6a05695f53a7858f7079704c141cc7f
-  data.tar.gz: b99b47de7953cca44d41430184d0fc92b6520638674ed02096ee8e45d24676fe55c84d14ac8f8e6224ddf3a05b6e76d3a4b2facae078c3dad652c0791fbec24c
+  metadata.gz: 405aa9bb4a51b937c3c551af74327774078418ed01e96b13340806c0dca6dc6fc1bd9824147d3472f65aec8bdc8db49d9dfe5903215e87ee17f3958aefa3f518
+  data.tar.gz: d6058d78e87602fdfbb7639e0e66628c691edd6c22c1823c6697343a8ede5359d09da98c3daa729f146c2e608cc1bf66045cad9785c228d01e1b69ce4b60d55f

data/app/models/concerns/active_storage_authorization.rb

@@ -67,8 +67,8 @@ module ActiveStorageAuthorization
     # If we are authorized on any attached record, permit the download
     return true if @blob.attachments.any? { |attachment| authorized_attachment_download?(attachment) }
 
-    # Otherwise raise a 403 Forbidden and block the download
-    head(:forbidden, 'X-Robots-Tag': 'noindex')
+    # Otherwise raise a 404 Not Found and block the download
+    head(:not_found)
 
     # Raise an exception to log unauthorized request
     raise_exception()

data/app/models/concerns/active_storage_blob_extension.rb

@@ -47,8 +47,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.1'.freeze
+  VERSION = '0.4.0'.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.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails