stratocaster 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76d62f5aa583c126c93c03936721fee40c94e52f9a5c99b075deaef9f4eb0c46
-  data.tar.gz: 3e5a37e88a5f76d16c1c5fbb0295523fffa21953eea6b5da37d964618ef5da20
+  metadata.gz: 2b7b8160480bffa7931410db64dea27330921142958f7837122f18bc5f7eac9f
+  data.tar.gz: 7697cb85701d1b6aec1e2a1203b6215b6ba2a56f25203fb87575411b35d66590
 SHA512:
-  metadata.gz: b004638c553dea0929a9ad488e0f9d134f14bfdfa0d5b9da6a1d973bd1d89aec683a6e26ccae7f6945dbe20c799cd169d8d9e5d9f6b9563ff54b34da8d886e64
-  data.tar.gz: f73752ac70f201b5da23e6550b20a8edbea43ccb0cfb50fa09f691e832e894b0cbdf35bac40e3ab54b63221909ae8be96e04e6f49a67508cebac81cb5600fb62
+  metadata.gz: 5718f1372392ffe3a78c312fe74ba33714bbe5573b15831d7a544646ee9f88f04dc6729223108dbd1775901009b5d81e70efb6ad437aa8dd4d313e06773056d3
+  data.tar.gz: 35e75720fe35d562706f317f169c894ad559be2ada5af218f2c93a5a382197bcec987ce62bc2024ecbb260f76f52e6324d263c3d93c8e5f8b8fbca60f895a813

data/lib/stratocaster/attacher.rb

@@ -8,6 +8,7 @@ module Stratocaster
 
         define_method("#{base_name}?") { send("#{base_name}_filename").present? }
         strattachments.merge!(base_name => [])
+        Stratocaster.attachments << [name, "#{base_name}_filename"] if name
         block.call(base_name)
         before_save :upload_strattachment_originals
         after_commit :perform_processing_job, on: %i[create update]
@@ -67,14 +68,15 @@ module Stratocaster
       # it. Collect the keys and let a job do the deleting once the transaction has committed, so a rollback
       # also stops us from orphaning rows that still point at deleted files.
       def purge_strattachments
-        filenames = strattachments.flat_map do |base_name, variants|
+        files = Hash.new { |hash, filename| hash[filename] = [] }
+        strattachments.each do |base_name, variants|
           filename = send("#{base_name}_filename")
-          next [] if filename.blank?
+          next if filename.blank?
 
-          [filename] + variants.map { |variant_name, _options| strat_md5(filename, variant_name) }
+          files[filename].concat(variants.map { |variant_name, _options| strat_md5(filename, variant_name) })
         end
 
-        Stratocaster::PurgeJob.perform_later(filenames) if filenames.any?
+        Stratocaster::PurgeJob.perform_later(files.to_h) if files.any?
       end
     end
   end

data/lib/stratocaster/purge_job.rb

@@ -4,8 +4,12 @@ module Stratocaster
 
     self.priority = 3
 
-    def perform(filenames)
-      filenames.each { |filename| purge(filename) }
+    def perform(files)
+      files.each do |original, variants|
+        next if Stratocaster.referenced?(original)
+
+        [original, *variants].each { |filename| purge(filename) }
+      end
     end
 
     private

data/lib/stratocaster/version.rb

@@ -1,3 +1,3 @@
 module Stratocaster
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1".freeze
 end

data/lib/stratocaster.rb

@@ -12,4 +12,15 @@ require "image_processing/vips"
 
 module Stratocaster
   cattr_accessor :config
+  mattr_accessor :attachments, default: Set.new
+
+  # Filenames are content hashes, so two records holding the same image share every stored file. A file is only
+  # safe to delete once no attachment column anywhere still points at it.
+  def self.referenced?(filename)
+    Rails.application.eager_load! unless Rails.application.config.eager_load
+
+    attachments.any? do |class_name, column|
+      class_name.safe_constantize&.unscoped&.exists?(column => filename)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stratocaster
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Johan Halse
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.15
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Another flippin image uploader
 test_files: []