alchemy-dragonfly-s3 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8731b036311b3a669e0644fe5fd9e0301bc981bdc431c102979961aa4db3671e
-  data.tar.gz: dbddcab7948012fe5d9a12a140fbc203dadac20157b039d74d82d86abb3a7390
+  metadata.gz: db1e5c08edd7be1ceba98fb77b3882a31f2bdf49b665eed978cfeff75d87163d
+  data.tar.gz: 354c096e7451931b3db43cc949cf73a1c54a13b389a8707af496c17f0cf85157
 SHA512:
-  metadata.gz: b0ca6b6a588e561c9c154853d4393e67aeaa7950810347f84d04cf3b61a6e7621c6d228c977d6bd9c3df02c07014e632fabf579392d82687828136b70cef3c75
-  data.tar.gz: cd8f538c29407ba748d89f6a6b71960b0e9f9812b4924a19151909b42ddad41a3ab14edb43f04b09d546bba3124ce2b4f9c152112f599bcadf04320ce0f52eaa
+  metadata.gz: a928b88710af67671e36de32a46a68bb3cfdb59198b41dbdddd8eb5ecf3530c6bef7ce43ce8452b7af0a7dbff259269a1e22a3b70be0aadabd37353262fdc1f8
+  data.tar.gz: cdfc3fafb942ec4645f60760521c3c2bb19e8494c42697da1e4f0812fcbb18c1545fd6c7fd781fcfbc42b1449db970e1f04c62718a0837a5811ae071cd7d9027

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v6.0.1
+
+- Fix race condition in CreatePictureThumb
+
 ## v6.0.0
 
 - Allow Alchemy 6.1

data/lib/alchemy/dragonfly/s3/create_picture_thumb.rb

@@ -5,15 +5,13 @@ module Alchemy
     module S3
       class CreatePictureThumb
         def self.call(variant, signature, uid)
+          return if !variant.picture.valid?
+
           # create the thumb before uploading
           # to prevent db race conditions
-          thumb = nil
-          if variant.picture.valid?
-            thumb = Alchemy::PictureThumb.create!(
-              picture: variant.picture,
-              signature: signature,
-              uid: uid,
-            )
+          @thumb = Alchemy::PictureThumb.create_or_find_by!(signature: signature) do |thumb|
+            thumb.picture = variant.picture
+            thumb.uid = uid
           end
           begin
             # fetch and process the image
@@ -23,7 +21,7 @@ module Alchemy
           rescue RuntimeError, Excon::Error => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or upload fails
-            thumb&.destroy
+            @thumb&.destroy
           end
         end
       end

data/lib/alchemy/dragonfly/s3/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   module Dragonfly
     module S3
-      VERSION = "6.0.0"
+      VERSION = "6.0.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms