alchemy-dragonfly-s3 5.2.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2741b9d0809ea0db39de700b0ca1b1181deec6d59606737c7620ec96faadf66
-  data.tar.gz: c8ce3d82fb9a790f2719ebeb39e69547602e68336e6ec345306b0c570c682aa5
+  metadata.gz: 8731b036311b3a669e0644fe5fd9e0301bc981bdc431c102979961aa4db3671e
+  data.tar.gz: dbddcab7948012fe5d9a12a140fbc203dadac20157b039d74d82d86abb3a7390
 SHA512:
-  metadata.gz: dffd05e4c6da9a3ceb21895c71c042e07ded2a7a8bd6556bfefeffa40af34a9ece18017050755f435ce34d1ae354dbcfe6d77dc5153b0a5e91d381d886d49821
-  data.tar.gz: 80e574fdc5b74a76d1278bf9b809ceb56b19778e76acf485afc76a914c7e3559ab7ab81c447b0c0c6f985bc7fdfdc894fc612816df7932168a32d3a1e87e4dab
+  metadata.gz: b0ca6b6a588e561c9c154853d4393e67aeaa7950810347f84d04cf3b61a6e7621c6d228c977d6bd9c3df02c07014e632fabf579392d82687828136b70cef3c75
+  data.tar.gz: cd8f538c29407ba748d89f6a6b71960b0e9f9812b4924a19151909b42ddad41a3ab14edb43f04b09d546bba3124ce2b4f9c152112f599bcadf04320ce0f52eaa

data/CHANGELOG.md

@@ -1,6 +1,7 @@
-## v5.2.1
+## v6.0.0
 
-- Fix race condition in CreatePictureThumb
+- Allow Alchemy 6.1
+- Drop support for Alchemy 5.x
 
 ## v5.2.0
 

data/README.md

@@ -6,8 +6,9 @@ Provides classes for storing Alchemy pictures and file attachments on Amazon AWS
 
 ## Alchemy Version
 
-This branch works with Alchemy 5.1 and above.
+This branch works with Alchemy 6.0 and above.
 
+- For a Alchemy 5.2/5.3 compatible version use the `5.2-stable` branch.
 - For a Alchemy 5.0 compatible version use the `alchemy-5` branch.
 - For a Alchemy 4 compatible version use the `alchemy-4` branch.
 - For a Alchemy 3 compatible version use the `alchemy-3` branch.

data/alchemy-dragonfly-s3.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
     "README.md",
   ]
 
-  s.add_dependency "alchemy_cms", [">= 5.1.0", "< 6.1"]
+  s.add_dependency "alchemy_cms", [">= 6.0.0", "< 7"]
   s.add_dependency "dragonfly-s3_data_store", "~> 1.3"
 
   s.add_development_dependency "rspec-rails", "~> 4.0"

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

@@ -5,13 +5,15 @@ 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 = Alchemy::PictureThumb.create_or_find_by!(signature: signature) do |thumb|
-            thumb.picture = variant.picture
-            thumb.uid = uid
+          thumb = nil
+          if variant.picture.valid?
+            thumb = Alchemy::PictureThumb.create!(
+              picture: variant.picture,
+              signature: signature,
+              uid: uid,
+            )
           end
           begin
             # fetch and process the image
@@ -21,7 +23,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 = "5.2.1"
+      VERSION = "6.0.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 6.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement