alchemy-dragonfly-s3 3.6.5 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 43d486949d83cda52100aab656f93b8c276ecc4e2c4577e84dd1921b2abcb32f
-  data.tar.gz: 772ceb298066554a3fe690ce5aeeb155c373700a8fde26fc50c713be5a33a2d2
+SHA1:
+  metadata.gz: 07e27d0972c3f7d205fea44ca18707a60674ba3a
+  data.tar.gz: 4cbf280831ab503c0acac159cd26bd6f397e229d
 SHA512:
-  metadata.gz: 7262efcb1a894beaf15a5a6429ea2896f5b82f43f74640838d0ae47a6eb14e00e25becc132410bae0707ee264ab62ffa196b38435ee608ab09275bcb67fcf06c
-  data.tar.gz: 6c3d12b410d694577530a88aa2c2060d36037f5ff1fd832499538585cec2de1cc1370e65b3afa9fada0b7c62a1f379a72fa7aca770482951561c143d69d05589
+  metadata.gz: d59f579103e7976a83f252389eb0a81ca82c4c0d852ecbc8f0d81f9c0e705b36decc74576eaa1157f25257e5c193a2dd3a10aa048b1174697eafd2adf485dcd2
+  data.tar.gz: d386023a14465cf7d6f218f24fccdf3ff40165a6a2c031698ed9d9ab034c7b107a64d9944393192a59c048d6bbc09d2271f4d076cc186692a2d4aa4744bda22d

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 = "3.6.5"
+      VERSION = "3.6.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 3.6.5
+  version: 3.6.6
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -158,7 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project:
+rubygems_version: 2.6.14.4
 signing_key:
 specification_version: 4
 summary: AlchemyCMS Dragonfly S3.