alchemy-dragonfly-s3 5.1.4 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7973574aa59a65ad12a8861ac4ce24825aa04780d2cf43e1ee7f0c3b4f91777
-  data.tar.gz: db0c7a9674dd17ae160aa7342da1dfa09760415d9549ad89c74ccf6bdc85d223
+  metadata.gz: ec1c13a542a1b63dd195077cd647d1e1bc0bdfaeae8a4eb51b702566d5202c12
+  data.tar.gz: 646fe1fa7a99c9ee7cb68eb8cc1bbddbd78640624cfafb168f5fb9371239bce0
 SHA512:
-  metadata.gz: 9e6e47191ff8914f98781a22751823e9070a1cc6aae57c8156e88ca44b4236a2ff18b801f885a463f8720cc99348d88c1b56938a3390828f7109d3ace235e571
-  data.tar.gz: c1f4312d09b87cf37bf37778c681f9d0f45b68adaba6613096eb43a5ac1897f5d076685ec5e982183f270406d78150deceb9a30ceeda3fdde9acd57992aed813
+  metadata.gz: c16231755be826fc40a78542cfb864753a0403eed16feb51186d9e526c2c76dc450810a228105644a0233844fa97171e7a83d35bd52ecedcbdaf7205d639961a
+  data.tar.gz: 946cf698073d4940257b251f8f53eb1ef189b53c4bf91ea081ff3142360cef5ef05cbf97631a5fad8c2c51cc58a98f1048b41e3c5e6093439ddc323786181f03

data/README.md

@@ -20,12 +20,14 @@ Add this line to your application's Gemfile:
 gem 'alchemy-dragonfly-s3', github: 'AlchemyCMS/alchemy-dragonfly-s3'
 ```
 
-For now you also need a special AlchemyCMS branch
+For now you also need the master branch of AlchemyCMS*
 
 ```ruby
-gem 'alchemy_cms', github: 'tvdeyen/alchemy_cms', branch: 'remote-images'
+gem 'alchemy_cms', github: 'AlchemyCMS/alchemy_cms', branch: 'master'
 ```
 
+*only necessary until Alchemy 5.1 has been released.
+
 And then execute:
 
 ```

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

@@ -5,13 +5,23 @@ module Alchemy
     module S3
       class CreatePictureThumb
         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/lib/alchemy/dragonfly/s3/version.rb

@@ -3,7 +3,7 @@
 module Alchemy
   module Dragonfly
     module S3
-      VERSION = "5.1.4"
+      VERSION = "5.1.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.5
 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