alchemy-dragonfly-s3 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8731b036311b3a669e0644fe5fd9e0301bc981bdc431c102979961aa4db3671e
-  data.tar.gz: dbddcab7948012fe5d9a12a140fbc203dadac20157b039d74d82d86abb3a7390
+  metadata.gz: 715e203aa638cde6d1bdacfa0899db3b17571be9f81f394830c334209f881d6d
+  data.tar.gz: 745bc6ec00693d14a2828721752d435f43161f9393cdcb69af6cf4e125d9ad97
 SHA512:
-  metadata.gz: b0ca6b6a588e561c9c154853d4393e67aeaa7950810347f84d04cf3b61a6e7621c6d228c977d6bd9c3df02c07014e632fabf579392d82687828136b70cef3c75
-  data.tar.gz: cd8f538c29407ba748d89f6a6b71960b0e9f9812b4924a19151909b42ddad41a3ab14edb43f04b09d546bba3124ce2b4f9c152112f599bcadf04320ce0f52eaa
+  metadata.gz: 8f3e9a0a56de8053b3ae002ee26ecacbe384db2ff83e9fc35181356d451a5168421a1c3b1f5bde1ee1f0d1fe16f6d1590a5a798017369ac85c2a71ebde7f0a55
+  data.tar.gz: 5b0053f77ae559c11fbf95906e84a5eef4634e72d5772e9de791586edee302568a9f04bf40ab64f5bbfaa9612c621130d4a34bc14d43455cbca727a81872e0f0

data/CHANGELOG.md

@@ -1,34 +1,143 @@
-## v6.0.0
+# Changelog
 
-- Allow Alchemy 6.1
-- Drop support for Alchemy 5.x
+## [v7.0.0](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v7.0.0) (2023-03-31)
 
-## v5.2.0
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v6.0.1...v7.0.0)
 
-- Fix loading of Alchemy factories
-- Allow Alchemy 6
-- Use config.to_prepare as hook to register classes
+**Merged pull requests:**
 
-## v5.1.5
+- Add picture thumb store [\#21](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/21) ([tvdeyen](https://github.com/tvdeyen))
 
-- Prevent db race conditions while creating thumbs
+## [v6.0.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v6.0.1) (2023-02-27)
 
-## v5.1.4
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.2.1...v6.0.1)
 
-- Include necessary files in gem package
+**Merged pull requests:**
 
-## v5.1.3
+- Fix race condition in CreatePictureThumb [\#20](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/20) ([tvdeyen](https://github.com/tvdeyen))
 
-- Use Alchemy 5.1.0.alpha
+## [v5.2.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.2.1) (2023-02-27)
 
-## v5.1.2
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v6.0.0...v5.2.1)
 
-- Add support for file attachments stored on S3
+## [v6.0.0](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v6.0.0) (2023-01-20)
 
-## v5.1.1
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.2.0...v6.0.0)
 
-- Ensure to create new thumbs on in memory picture
+**Merged pull requests:**
 
-## v5.1.0
+- Allow Alchemy 6.1 [\#19](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/19) ([tvdeyen](https://github.com/tvdeyen))
+- CI: Run on latest ubuntu, update node and test all rubies [\#17](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/17) ([tvdeyen](https://github.com/tvdeyen))
+- Do not create thumbs for invalid pictures [\#16](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/16) ([tvdeyen](https://github.com/tvdeyen))
 
-- Alchemy 5.1 support
+## [v5.2.0](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.2.0) (2022-05-18)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.1.5...v5.2.0)
+
+**Closed issues:**
+
+- Errors when using different data stores based on the environment [\#10](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues/10)
+- Error when installing this gem on 4.0-stable [\#9](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues/9)
+- Not possible to use it on 4.6 [\#3](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues/3)
+- Excon::Error::Forbidden Expected\(200\) \<=\> Actual\(403 Forbidden\) [\#2](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues/2)
+
+**Merged pull requests:**
+
+- Fix loading of Alchemy factories [\#14](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/14) ([tvdeyen](https://github.com/tvdeyen))
+- Reflect AlchemyCMS supported versions in README [\#13](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/13) ([afdev82](https://github.com/afdev82))
+- Change the way we load Alchemy factories in tests [\#8](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/8) ([tvdeyen](https://github.com/tvdeyen))
+- Allow Alchemy 6 [\#7](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/7) ([tvdeyen](https://github.com/tvdeyen))
+- Use config.to\_prepare as hook to register classes [\#6](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/6) ([tvdeyen](https://github.com/tvdeyen))
+- Add more files to packaged Gem [\#4](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/pull/4) ([tvdeyen](https://github.com/tvdeyen))
+
+## [v5.1.5](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.1.5) (2020-07-21)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.6...v5.1.5)
+
+## [v3.6.6](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.6) (2020-07-21)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v4.0.5...v3.6.6)
+
+## [v4.0.5](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v4.0.5) (2020-07-20)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.6...v4.0.5)
+
+## [v5.0.6](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.6) (2020-07-20)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.1.4...v5.0.6)
+
+## [v5.1.4](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.1.4) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.5...v5.1.4)
+
+## [v5.0.5](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.5) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v4.0.4...v5.0.5)
+
+## [v4.0.4](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v4.0.4) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.5...v4.0.4)
+
+## [v3.6.5](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.5) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v4.0.3...v3.6.5)
+
+## [v4.0.3](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v4.0.3) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.4...v4.0.3)
+
+## [v3.6.4](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.4) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.1.3...v3.6.4)
+
+## [v5.1.3](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.1.3) (2020-07-17)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.4...v5.1.3)
+
+## [v5.0.4](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.4) (2020-07-16)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.3...v5.0.4)
+
+## [v5.0.3](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.3) (2020-07-16)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.1.2...v5.0.3)
+
+## [v5.1.2](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.1.2) (2020-06-30)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.2...v5.1.2)
+
+## [v5.0.2](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.2) (2020-06-30)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v4.0.2...v5.0.2)
+
+## [v4.0.2](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v4.0.2) (2020-06-30)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.3...v4.0.2)
+
+## [v3.6.3](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.3) (2020-06-30)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.1.1...v3.6.3)
+
+## [v5.1.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.1.1) (2020-06-25)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v5.0.1...v5.1.1)
+
+## [v5.0.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v5.0.1) (2020-06-25)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.2...v5.0.1)
+
+## [v3.6.2](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.2) (2020-06-25)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v4.0.1...v3.6.2)
+
+## [v4.0.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v4.0.1) (2020-06-25)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/v3.6.1...v4.0.1)
+
+## [v3.6.1](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/tree/v3.6.1) (2020-06-23)
+
+[Full Changelog](https://github.com/AlchemyCMS/alchemy-dragonfly-s3/compare/02ad3d212f611156769ec78a10a3f7332dd23672...v3.6.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/alchemy-dragonfly-s3.gemspec

@@ -10,11 +10,18 @@ Gem::Specification.new do |s|
   s.version = Alchemy::Dragonfly::S3::VERSION
   s.authors = ["Thomas von Deyen"]
   s.email = ["thomas@vondeyen.com"]
-  s.homepage = "https://alchemy-cms.com"
+  s.homepage = "https://github.com/AlchemyCMS/alchemy-dragonfly-s3"
   s.summary = "AlchemyCMS Dragonfly S3."
   s.description = "AlchemyCMS Integration for the Dragonfly S3 datastore."
   s.license = "MIT"
 
+  s.metadata = {
+    "source_code_uri" => "https://github.com/AlchemyCMS/alchemy-dragonfly-s3",
+    "changelog_uri" => "https://github.com/AlchemyCMS/alchemy-dragonfly-s3/blob/main/CHANGELOG.md",
+    "bug_tracker_uri" => "https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues",
+    "github_repo" => "https://github.com/AlchemyCMS/alchemy-dragonfly-s3",
+  }
+
   s.files = Dir[
     "app/**/*",
     "lib/**/*",
@@ -24,10 +31,11 @@ Gem::Specification.new do |s|
     "README.md",
   ]
 
-  s.add_dependency "alchemy_cms", [">= 6.0.0", "< 7"]
+  s.add_dependency "alchemy_cms", [">= 7.0.0-a", "< 8"]
   s.add_dependency "dragonfly-s3_data_store", "~> 1.3"
 
   s.add_development_dependency "rspec-rails", "~> 4.0"
   s.add_development_dependency "factory_bot_rails", "~> 6.0"
+  s.add_development_dependency "github_changelog_generator"
   s.add_development_dependency "simplecov", "~> 0.17"
 end

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

@@ -9,7 +9,7 @@ module Alchemy
         config.to_prepare do
           Alchemy::Attachment.url_class = Alchemy::Attachment::S3Url
           Alchemy::Picture.url_class = Alchemy::Picture::S3Url
-          Alchemy::PictureThumb.generator_class = Alchemy::Dragonfly::S3::CreatePictureThumb
+          Alchemy::PictureThumb.storage_class = Alchemy::Dragonfly::S3::Store
         end
       end
     end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Dragonfly
+    module S3
+      class Store
+        def self.call(variant, uid)
+          # download and process the image
+          image = variant.image
+          # upload the processed image
+          image.store(path: uid)
+        end
+      end
+    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 = "7.0.0"
     end
   end
 end

data/lib/alchemy-dragonfly-s3.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 require "alchemy_cms"
-require "alchemy/dragonfly/s3/create_picture_thumb"
+require "alchemy/dragonfly/s3/store"
 require "alchemy/dragonfly/s3/engine"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-20 00:00:00.000000000 Z
+date: 2023-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.pre.a
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.0.0.pre.a
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -100,13 +114,17 @@ files:
 - app/models/alchemy/attachment/s3_url.rb
 - app/models/alchemy/picture/s3_url.rb
 - lib/alchemy-dragonfly-s3.rb
-- lib/alchemy/dragonfly/s3/create_picture_thumb.rb
 - lib/alchemy/dragonfly/s3/engine.rb
+- lib/alchemy/dragonfly/s3/store.rb
 - lib/alchemy/dragonfly/s3/version.rb
-homepage: https://alchemy-cms.com
+homepage: https://github.com/AlchemyCMS/alchemy-dragonfly-s3
 licenses:
 - MIT
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/AlchemyCMS/alchemy-dragonfly-s3
+  changelog_uri: https://github.com/AlchemyCMS/alchemy-dragonfly-s3/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/AlchemyCMS/alchemy-dragonfly-s3/issues
+  github_repo: https://github.com/AlchemyCMS/alchemy-dragonfly-s3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -122,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: AlchemyCMS Dragonfly S3.

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module Dragonfly
-    module S3
-      class CreatePictureThumb
-        def self.call(variant, signature, uid)
-          # 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,
-            )
-          end
-          begin
-            # fetch and process the image
-            image = variant.image
-            # upload the processed image
-            image.store(path: uid)
-          rescue RuntimeError, Excon::Error => e
-            ErrorTracking.notification_handler.call(e)
-            # destroy the thumb if processing or upload fails
-            thumb&.destroy
-          end
-        end
-      end
-    end
-  end
-end