alchemy-dragonfly-s3 5.1.3 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67600fb3185cda4968bc3afc93e00209d196f92be2183499cebaffc2b9f70e6b
-  data.tar.gz: 6b7b797cbb3f0f0671dbac17670aad87abba125864da0fe72d86c29fc5bfd84c
+  metadata.gz: af1ac6f6e94915b4f4109740dc57784db1d23ea7e143e3f0baeed2d3cbc98444
+  data.tar.gz: 11a260d68a5557e38e58ee134eb757c7ceb7e394acf6236de15c14815fb8d3a6
 SHA512:
-  metadata.gz: 8350ee48b41e406e1abf57b3bc99daeaae738c560a8ed3b5e952fb624768ad4ee0c8de5047a064a39af81f6817fab9cf3db4a6cd3c69c0bbf3c1e7814ec6fa49
-  data.tar.gz: 38462e8f9b701908f4afe7c66bf40a2d547441a8885bdd2e1c1541d7126157c19dfabb293205dc1ab37396997664b1af29f56100b367e47dd6aa013fd1b73764
+  metadata.gz: 991203f9ad893a0f9d67357b48cc5dbccc612e0aa2d0d1e2332bead56972b54d5e2d4058463a5eb895e5a8f6be2e02afea376e4feeb327dab9e01e268ae48a05
+  data.tar.gz: 41ebab2ea26481a01e1866da5ab9de1538da882c42472df0477c2251bc61338bca5b4803116b5b2de4ee357b4c47f90c9298f4771b4bc1997b246d4678f2e083

data/CHANGELOG.md

@@ -0,0 +1,29 @@
+## v5.2.0
+
+- Fix loading of Alchemy factories
+- Allow Alchemy 6
+- Use config.to_prepare as hook to register classes
+
+## v5.1.5
+
+- Prevent db race conditions while creating thumbs
+
+## v5.1.4
+
+- Include necessary files in gem package
+
+## v5.1.3
+
+- Use Alchemy 5.1.0.alpha
+
+## v5.1.2
+
+- Add support for file attachments stored on S3
+
+## v5.1.1
+
+- Ensure to create new thumbs on in memory picture
+
+## v5.1.0
+
+- Alchemy 5.1 support

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=main)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
 
 # AlchemyCMS AWS S3
 
@@ -6,7 +6,7 @@ Provides classes for storing Alchemy pictures and file attachments on Amazon AWS
 
 ## Alchemy Version
 
-This branch works with Alchemy 5.1 only.
+This branch works with Alchemy 5.1 and above.
 
 - For a Alchemy 5.0 compatible version use the `alchemy-5` branch.
 - For a Alchemy 4 compatible version use the `alchemy-4` branch.
@@ -20,25 +20,12 @@ 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
-
-```ruby
-gem 'alchemy_cms', github: 'tvdeyen/alchemy_cms', branch: 'remote-images'
-```
-
 And then execute:
 
 ```
 $ bundle install
 ```
 
-Install the picture thumbs migration from Alchemy 5.1
-
-```
-$ bin/rake alchemy:install:migrations
-$ bin/rake db:migrate
-```
-
 ## Setup
 
 Configure a S3 datastore for Dragonfly
@@ -48,23 +35,17 @@ Configure a S3 datastore for Dragonfly
 
 require "dragonfly/s3_data_store"
 
-Dragonfly.app(:alchemy_pictures).configure do
-  plugin :imagemagick
-  plugin :svg
-
-  datastore :s3,
-    bucket_name: ENV.fetch("ALCHEMY_S3_BUCKET_NAME"),
-    access_key_id: ENV.fetch("ALCHEMY_S3_ACCESS_KEY_ID"),
-    secret_access_key: ENV.fetch("ALCHEMY_S3_SECRET_ACCESS_KEY"),
-    region: ENV.fetch("ALCHEMY_S3_REGION")
-end
-
-Dragonfly.app(:alchemy_attachments).configure do
-  datastore :s3,
-    bucket_name: ENV.fetch("ALCHEMY_S3_BUCKET_NAME"),
-    access_key_id: ENV.fetch("ALCHEMY_S3_ACCESS_KEY_ID"),
-    secret_access_key: ENV.fetch("ALCHEMY_S3_SECRET_ACCESS_KEY"),
-    region: ENV.fetch("ALCHEMY_S3_REGION")
+Rails.application.credentials.aws.tap do |aws_config|
+  Dragonfly.app(:alchemy_pictures).configure do
+    plugin :imagemagick
+    plugin :svg
+    secret: Rails.application.credentials.secret_key_base
+    datastore :s3, aws_config
+  end
+
+  Dragonfly.app(:alchemy_attachments).configure do
+    datastore :s3, aws_config
+  end
 end
 ```
 

data/alchemy-dragonfly-s3.gemspec

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+$:.push File.expand_path("lib", __dir__)
+
+require "alchemy/dragonfly/s3/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name = "alchemy-dragonfly-s3"
+  s.version = Alchemy::Dragonfly::S3::VERSION
+  s.authors = ["Thomas von Deyen"]
+  s.email = ["thomas@vondeyen.com"]
+  s.homepage = "https://alchemy-cms.com"
+  s.summary = "AlchemyCMS Dragonfly S3."
+  s.description = "AlchemyCMS Integration for the Dragonfly S3 datastore."
+  s.license = "MIT"
+
+  s.files = Dir[
+    "app/**/*",
+    "lib/**/*",
+    "alchemy-dragonfly-s3.gemspec",
+    "CHANGELOG.md",
+    "MIT-LICENSE",
+    "README.md",
+  ]
+
+  s.add_dependency "alchemy_cms", [">= 5.1.0", "< 6.1"]
+  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 "simplecov", "~> 0.17"
+end

data/app/models/alchemy/attachment/s3_url.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Attachment < BaseRecord
+    class S3Url < Url
+      def call(*)
+        @attachment.file.remote_url
+      end
+    end
+  end
+end

data/app/models/alchemy/picture/s3_url.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Picture < BaseRecord
+    class S3Url < Url
+      def call(*)
+        return variant.image.remote_url unless processible_image?
+
+        ::Dragonfly.app(:alchemy_pictures).remote_url_for(uid)
+      end
+    end
+  end
+end

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/engine.rb

@@ -6,7 +6,7 @@ module Alchemy
       class Engine < ::Rails::Engine
         engine_name "alchemy_dragonfly_s3"
 
-        config.after_initialize do
+        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

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

@@ -3,7 +3,7 @@
 module Alchemy
   module Dragonfly
     module S3
-      VERSION = "5.1.3"
+      VERSION = "5.2.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 5.1.3
+  version: 5.2.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-17 00:00:00.000000000 Z
+date: 2022-05-18 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.alpha
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0.alpha
+        version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
@@ -93,8 +93,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
+- alchemy-dragonfly-s3.gemspec
+- 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
@@ -118,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: AlchemyCMS Dragonfly S3.