alchemy-dragonfly-s3 4.0.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5282390f9bee229c6deb6d78740307924c3ad12b6ed1ff964cb351b38896e1c9
-  data.tar.gz: 559baa3bee41168030536cb7d19c925399b422b1ecb72c2886dc455369b71998
+  metadata.gz: b7973574aa59a65ad12a8861ac4ce24825aa04780d2cf43e1ee7f0c3b4f91777
+  data.tar.gz: db0c7a9674dd17ae160aa7342da1dfa09760415d9549ad89c74ccf6bdc85d223
 SHA512:
-  metadata.gz: b1f5f13dedeea05be74e6889c7dcb6b021e02c48adcb0f0f1a991f4a709e24cdf9825cfbd1ec207100cd08aec8993a352a1ac1edb47dd1034106a4c07bb8caa2
-  data.tar.gz: 5a7371ad6b0e4d04ce7d1463c931a3dd350d89d5547c7cb2b83bb90c6bbd85af517cfea57f47e6606dd1004df0919c034966caa4ee6455ef5ec89bd44f6a83fc
+  metadata.gz: 9e6e47191ff8914f98781a22751823e9070a1cc6aae57c8156e88ca44b4236a2ff18b801f885a463f8720cc99348d88c1b56938a3390828f7109d3ace235e571
+  data.tar.gz: c1f4312d09b87cf37bf37778c681f9d0f45b68adaba6613096eb43a5ac1897f5d076685ec5e982183f270406d78150deceb9a30ceeda3fdde9acd57992aed813

data/README.md

@@ -1,22 +1,29 @@
-[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=alchemy-4)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=master)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
 
 # AlchemyCMS AWS S3
 
-Adds support for file attachments and rendered Alchemy thumbnails stored on Amazon AWS S3.
+Provides classes for storing Alchemy pictures and file attachments on Amazon AWS S3.
 
 ## Alchemy Version
 
-This branch works with Alchemy 4 only.
+This branch works with Alchemy 5.1 only.
 
-- For a Alchemy 5 compatible version use the `master` branch.
-- For a Alchemy 3.6 compatible version use the `alchemy-3` 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.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'alchemy-dragonfly-s3', github: 'AlchemyCMS/alchemy-dragonfly-s3', branch: 'alchemy-4'
+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:
@@ -25,10 +32,10 @@ And then execute:
 $ bundle install
 ```
 
-Install the picture thumbs migration
+Install the picture thumbs migration from Alchemy 5.1
 
 ```
-$ bin/rake alchemy_dragonfly_s3:install:migrations
+$ bin/rake alchemy:install:migrations
 $ bin/rake db:migrate
 ```
 

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

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

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Dragonfly
+    module S3
+      class CreatePictureThumb
+        def self.call(variant, signature, uid)
+          image = variant.image
+          image.store(path: uid)
+          variant.picture.thumbs.create!(
+            picture: variant.picture,
+            signature: signature,
+            uid: uid,
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -6,19 +6,10 @@ module Alchemy
       class Engine < ::Rails::Engine
         engine_name "alchemy_dragonfly_s3"
 
-        initializer "alchemy_dragonfly_s3.assets" do
-          Rails.application.config.assets.precompile << "alchemy_dragonfly_s3_manifest.js"
-        end
-
-        config.to_prepare do
-          files = [
-            "attachment_monkey_patch.rb",
-            "picture_monkey_patch.rb",
-            "essence_picture_monkey_patch.rb",
-          ].each do |filename|
-            file = Alchemy::Dragonfly::S3::Engine.root.join("lib", "alchemy", filename)
-            Rails.application.config.cache_classes ? require(file) : load(file)
-          end
+        config.after_initialize do
+          Alchemy::Attachment.url_class = Alchemy::Attachment::S3Url
+          Alchemy::Picture.url_class = Alchemy::Picture::S3Url
+          Alchemy::PictureThumb.generator_class = Alchemy::Dragonfly::S3::CreatePictureThumb
         end
       end
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 5.1.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -14,16 +14,22 @@ dependencies:
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.1.0.alpha
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.1.0.alpha
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +64,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.17'
-- !ruby/object:Gem::Dependency
-  name: shoulda-matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 description: AlchemyCMS Integration for the Dragonfly S3 datastore.
 email:
 - thomas@vondeyen.com
@@ -117,13 +95,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
+- app/models/alchemy/attachment/s3_url.rb
+- app/models/alchemy/picture/s3_url.rb
 - lib/alchemy-dragonfly-s3.rb
-- lib/alchemy/attachment_monkey_patch.rb
+- lib/alchemy/dragonfly/s3/create_picture_thumb.rb
 - lib/alchemy/dragonfly/s3/engine.rb
 - lib/alchemy/dragonfly/s3/version.rb
-- lib/alchemy/essence_picture_monkey_patch.rb
-- lib/alchemy/picture_monkey_patch.rb
-- lib/tasks/alchemy_dragonfly_s3/generate.rake
 homepage: https://alchemy-cms.com
 licenses:
 - MIT
@@ -143,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: AlchemyCMS Dragonfly S3.

data/lib/alchemy/attachment_monkey_patch.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module AttachmentMonkeyPatch
-    def url
-      if file
-        Alchemy::Attachment::S3Url.call(self)
-      end
-    end
-
-    Attachment.prepend(self)
-  end
-end

data/lib/alchemy/essence_picture_monkey_patch.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module EssencePictureMonkeyPatch
-    def picture_url(options = {})
-      super || "missing-image.png"
-    end
-
-    def thumbnail_url(options = {})
-      super || "alchemy/missing-image.svg"
-    end
-
-    def allow_image_cropping?(options = {})
-      super && !!picture.image_file
-    end
-
-    EssencePicture.prepend(self)
-  end
-end

data/lib/alchemy/picture_monkey_patch.rb

@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module PictureMonkeyPatch
-    def self.prepended(klass)
-      klass.has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
-      klass.after_create -> { PictureThumb.generate_thumbs!(self) }
-    end
-
-    # Returns an url (or relative path) to a processed image for use inside an image_tag helper.
-    #
-    # Any additional options are passed to the url method, so you can add params to your url.
-    #
-    # Example:
-    #
-    #   <%= image_tag picture.url(size: '320x200', format: 'png') %>
-    #
-    # @see Alchemy::PictureVariant#call for transformation options
-    # @see Alchemy::Picture::Url#call for url options
-    # @return [String|Nil]
-    def url(options = {})
-      return unless image_file
-
-      variant = PictureVariant.new(self, options.slice(*Picture::TRANSFORMATION_OPTIONS))
-      Picture::S3Url.new(variant).call(options.except(*Picture::TRANSFORMATION_OPTIONS).merge(
-        basename: name,
-        ext: variant.render_format,
-        name: name,
-      ))
-    rescue ::Dragonfly::Job::Fetch::NotFound => e
-      log_warning(e.message)
-      nil
-    end
-
-    Picture::THUMBNAIL_SIZES = {
-      small: "80x60",
-      medium: "160x120",
-      large: "240x180",
-    }.with_indifferent_access.freeze
-
-    Picture.prepend(self)
-  end
-end

data/lib/tasks/alchemy_dragonfly_s3/generate.rake

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-namespace :alchemy_dragonfly_s3 do
-  namespace :generate do
-    desc "Generates all thumbnails for Alchemy Pictures and EssencePictures."
-    task thumbnails: [
-      "alchemy_dragonfly_s3:generate:picture_thumbnails",
-      "alchemy_dragonfly_s3:generate:essence_picture_thumbnails"
-    ]
-
-    desc "Generates thumbnails for Alchemy Pictures."
-    task picture_thumbnails: :environment do
-      puts "Regenerate #{Alchemy::Picture.count} picture thumbnails."
-      puts "Please wait..."
-
-      Alchemy::Picture.find_each do |picture|
-        puts Alchemy::PictureThumb.generate_thumbs!(picture)
-      end
-
-      puts "Done!"
-    end
-
-    desc "Generates thumbnails for Alchemy EssencePictures."
-    task essence_picture_thumbnails: :environment do
-      essence_pictures = Alchemy::EssencePicture.joins(:content, :ingredient_association)
-      puts "Regenerate #{essence_pictures.count} essence picture thumbnails."
-      puts "Please wait..."
-
-      essence_pictures.find_each do |essence_picture|
-        puts essence_picture.picture_url
-        puts essence_picture.thumbnail_url
-      end
-
-      puts "Done!"
-    end
-  end
-end