alchemy-dragonfly-s3 4.0.4 → 4.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b874666e4ea078bbbd88849204a3817c5460d3578a30b9a5e6ecbef8a411912
-  data.tar.gz: b755cef56da8ba88634bf18b07571c21c4d7d43e37d331697893fceb15d1bd80
+  metadata.gz: 6256465573974ec82c6ceee7c1b72484bce11c7194151f571718fd48b763f482
+  data.tar.gz: 0b2b2e665659e02c81754287efb25e4025a678efceba5ae28462bac22faeb43a
 SHA512:
-  metadata.gz: 65e050d8241328e3d1daac76e8eeb0cb83022216be1f1534ec98e7a93d25b4e04e9fceccd9db0b6a005cf528281256288d32d573fefcaec4c8209661ee66aff2
-  data.tar.gz: 4b10af37543c65d84ae518a2e14fbeacb60436a9f59cf486c49ce8c6ad49679b08636300f4ade1d273288acf2c7785e241678dfd4bfe564886ae2b4950906a23
+  metadata.gz: 3c3b5d672dde007412c96d300b7c533d13897f805877d42e1242c33e72e65d1e319214cebab1a86f806f9007fb20c2f24aee05b7fb2120ae3577a14663c5784a
+  data.tar.gz: 87bac607d1459905241d76e77167c668c1c1a7a5cc10ffd85754f41a1ead60df500211d784c76d5eacac9455f8e39ddf06bc18e4df6fe514880aa04c56e01f30

data/app/models/alchemy/picture_thumb/create.rb

@@ -5,13 +5,23 @@ module Alchemy
     #
     class Create
       def self.call(variant, signature, uid)
-        image = variant.image
-        image.store(path: uid)
-        variant.picture.thumbs.create!(
+        # create the thumb before uploading
+        # to prevent db race conditions
+        thumb = variant.picture.thumbs.create!(
           picture: variant.picture,
           signature: signature,
           uid: uid,
         )
+        begin
+          # fetch and process the image
+          image = variant.image
+          # upload the processed image
+          image.store(path: uid)
+        rescue RuntimeError, Excon::Error => e
+          Rails.logger.warn(e)
+          # destroy the thumb if processing or upload fails
+          thumb.destroy
+        end
       end
     end
   end

data/app/models/alchemy/picture_variant.rb

@@ -91,7 +91,7 @@ module Alchemy
 
       encoding_options = []
 
-      convert_format = render_format != picture.image_file_format.sub("jpeg", "jpg")
+      convert_format = render_format.sub("jpeg", "jpg") != picture.image_file_format.sub("jpeg", "jpg")
 
       if render_format =~ /jpe?g/ && convert_format
         quality = options[:quality] || Config.get(:output_image_jpg_quality)

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

@@ -3,7 +3,7 @@
 module Alchemy
   module Dragonfly
     module S3
-      VERSION = "4.0.4"
+      VERSION = "4.0.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.0.5
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms