alchemy-dragonfly-s3 3.6.6 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 07e27d0972c3f7d205fea44ca18707a60674ba3a
-  data.tar.gz: 4cbf280831ab503c0acac159cd26bd6f397e229d
+SHA256:
+  metadata.gz: 07b85abda41c799474122920cea92e2fddfa003314bca025bf29ab055b62061c
+  data.tar.gz: 182e4d22390fee03f7c652fc6fe6ad925a811e1768ce09e2028315830cd72d00
 SHA512:
-  metadata.gz: d59f579103e7976a83f252389eb0a81ca82c4c0d852ecbc8f0d81f9c0e705b36decc74576eaa1157f25257e5c193a2dd3a10aa048b1174697eafd2adf485dcd2
-  data.tar.gz: d386023a14465cf7d6f218f24fccdf3ff40165a6a2c031698ed9d9ab034c7b107a64d9944393192a59c048d6bbc09d2271f4d076cc186692a2d4aa4744bda22d
+  metadata.gz: 82976ed6c263722910b05bbdd3cb0dd9a1434d1f767967c7ae49e9fa2eda75bff7fe9d9795f8af45d2718ce9afb0a00b4674c743f144de0db938992a630aebb4
+  data.tar.gz: 2c0fdccf15ac1fd8870e47255e51b90738bacb43828bef8edb19d9b46186fb10dfa1b5b6beb6ef08244b5d9e0db62210c95d897b5bca226147c256f9095b195b

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=alchemy-3)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
+[![Build Status](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3.svg?branch=alchemy-5)](https://travis-ci.com/AlchemyCMS/alchemy-dragonfly-s3)
 
 # AlchemyCMS AWS S3
 
@@ -6,16 +6,18 @@ Adds support for file attachments and rendered Alchemy thumbnails stored on Amaz
 
 ## Alchemy Version
 
-This branch works with Alchemy 3.6 only.
+This branch works with Alchemy 5.0 only.
 
-- For a Alchemy 5 compatible version use the `master` branch.
+- For a Alchemy 5.1 compatible version use the `master` branch.
+- For a Alchemy 4 compatible version use the `alchemy-4` branch.
+- For a Alchemy 3.6 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-3'
+gem 'alchemy-dragonfly-s3', github: 'AlchemyCMS/alchemy-dragonfly-s3', branch: 'alchemy-5'
 ```
 
 And then execute:

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

@@ -3,7 +3,7 @@
 module Alchemy
   module Dragonfly
     module S3
-      VERSION = "3.6.6"
+      VERSION = "5.0.4"
     end
   end
 end

data/lib/alchemy/essence_picture_monkey_patch.rb

@@ -6,11 +6,11 @@ module Alchemy
       super || "missing-image.png"
     end
 
-    def thumbnail_url(options = {})
+    def thumbnail_url
       super || "alchemy/missing-image.svg"
     end
 
-    def allow_image_cropping?(options = {})
+    def allow_image_cropping?
       super && !!picture.image_file
     end
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-dragonfly-s3
 version: !ruby/object:Gem::Version
-  version: 3.6.6
+  version: 5.0.4
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.beta1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.beta1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: dragonfly-s3_data_store
   requirement: !ruby/object:Gem::Requirement
@@ -67,19 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -117,21 +123,6 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- app/assets/config/alchemy_dragonfly_s3_manifest.js
-- app/assets/images/alchemy/missing-image.svg
-- app/models/alchemy/attachment/s3_url.rb
-- app/models/alchemy/picture/s3_url.rb
-- app/models/alchemy/picture_thumb.rb
-- app/models/alchemy/picture_thumb/create.rb
-- app/models/alchemy/picture_thumb/signature.rb
-- app/models/alchemy/picture_thumb/uid.rb
-- app/models/alchemy/picture_variant.rb
-- app/views/alchemy/admin/attachments/show.html.erb
-- app/views/alchemy/admin/pictures/_picture.html.erb
-- app/views/alchemy/admin/pictures/_picture_to_assign.html.erb
-- app/views/alchemy/admin/pictures/show.html.erb
-- app/views/alchemy/essences/_essence_file_view.html.erb
-- db/migrate/1_create_alchemy_picture_thumbs.rb
 - lib/alchemy-dragonfly-s3.rb
 - lib/alchemy/attachment_monkey_patch.rb
 - lib/alchemy/dragonfly/s3/engine.rb
@@ -158,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: AlchemyCMS Dragonfly S3.

data/app/assets/config/alchemy_dragonfly_s3_manifest.js

@@ -1 +0,0 @@
-//= link alchemy/missing-image.svg

data/app/assets/images/alchemy/missing-image.svg

@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" width="16" height="16"><path fill="#f7f7f7" d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z" class=""></path></svg>

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

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

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

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class Picture < ActiveRecord::Base
-    class S3Url
-      attr_reader :variant
-
-      # @param [Alchemy::PictureVariant]
-      #
-      def initialize(variant)
-        raise ArgumentError, "Variant missing!" if variant.nil?
-
-        @variant = variant
-      end
-
-      def call(*)
-        return variant.image.remote_url unless processible_image?
-
-        ::Dragonfly.app(:alchemy_pictures).remote_url_for(uid)
-      end
-
-      private
-
-      def processible_image?
-        variant.image.is_a?(::Dragonfly::Job)
-      end
-
-      def uid
-        signature = PictureThumb::Signature.call(variant)
-        thumb = variant.picture.thumbs.detect { |t| t.signature == signature }
-        if thumb
-          uid = thumb.uid
-        else
-          uid = PictureThumb::Uid.call(signature, variant)
-          PictureThumb::Create.call(variant, signature, uid)
-        end
-        uid
-      end
-    end
-  end
-end

data/app/models/alchemy/picture_thumb.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  # The persisted version of a rendered picture variant
-  #
-  class PictureThumb < ActiveRecord::Base
-    belongs_to :picture, class_name: "Alchemy::Picture"
-
-    validates :signature, presence: true
-    validates :uid, presence: true
-
-    class << self
-      # Upfront generation of picture thumbnails
-      #
-      # Called after a Alchemy::Picture has been created (after an image has been uploaded)
-      #
-      # Generates three types of thumbnails that are used by Alchemys picture archive and
-      # persists them in the configures file store (Default Dragonfly::FileDataStore).
-      #
-      # @see Picture::THUMBNAIL_SIZES
-      def generate_thumbs!(picture)
-        Alchemy::Picture::THUMBNAIL_SIZES.values.map do |size|
-          variant = Alchemy::PictureVariant.new(picture, {
-            size: size,
-            flatten: true,
-          })
-          signature = Alchemy::PictureThumb::Signature.call(variant)
-          thumb = find_by(signature: signature)
-          next if thumb
-
-          uid = Alchemy::PictureThumb::Uid.call(signature, variant)
-          Alchemy::PictureThumb::Create.call(variant, signature, uid)
-          uid
-        end
-      end
-    end
-  end
-end

data/app/models/alchemy/picture_thumb/create.rb

@@ -1,28 +0,0 @@
-module Alchemy
-  class PictureThumb < ActiveRecord::Base
-    # Stores the render result of a Alchemy::PictureVariant
-    # in the Dragonfly S3 datastore
-    #
-    class Create
-      def self.call(variant, signature, uid)
-        # 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
-end

data/app/models/alchemy/picture_thumb/signature.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class PictureThumb < ActiveRecord::Base
-    class Signature
-      # Returns a unique image process signature
-      #
-      # @param [Alchemy::PictureVariant]
-      #
-      # @return [String]
-      def self.call(variant)
-        steps_without_fetch = variant.image.steps.reject do |step|
-          step.is_a?(::Dragonfly::Job::Fetch)
-        end
-
-        steps_with_id = [[variant.picture.id]] + steps_without_fetch
-        job_string = steps_with_id.map(&:to_a).to_dragonfly_unique_s
-
-        Digest::SHA1.hexdigest(job_string)
-      end
-    end
-  end
-end

data/app/models/alchemy/picture_thumb/uid.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  class PictureThumb < ActiveRecord::Base
-    class Uid
-      # Returns a image variant uid for storage
-      #
-      # @param [String]
-      # @param [Alchemy::PictureVariant]
-      #
-      # @return [String]
-      def self.call(signature, variant)
-        picture = variant.picture
-        filename = variant.image_file_name || "image"
-        name = File.basename(filename, ".*").gsub(/[^\w.]+/, "_")
-        ext = variant.render_format
-
-        "pictures/#{picture.id}/#{signature}/#{name}.#{ext}"
-      end
-    end
-  end
-end

data/app/models/alchemy/picture_variant.rb

@@ -1,114 +0,0 @@
-# frozen_string_literal: true
-
-require "forwardable"
-
-module Alchemy
-  # Represents a rendered picture
-  #
-  # Resizes, crops and encodes the image with imagemagick
-  #
-  class PictureVariant
-    extend Forwardable
-
-    include Alchemy::Logger
-    include Alchemy::Picture::Transformations
-
-    attr_reader :picture, :render_format
-
-    def_delegators :@picture,
-      :image_file,
-      :image_file_width,
-      :image_file_height,
-      :image_file_name,
-      :image_file_size
-
-    # @param [Alchemy::Picture]
-    #
-    # @param [Hash] options passed to the image processor
-    # @option options [Boolean] :crop Pass true to enable cropping
-    # @option options [String] :crop_from Coordinates to start cropping from
-    # @option options [String] :crop_size Size of the cropping area
-    # @option options [Boolean] :flatten Pass true to flatten GIFs
-    # @option options [String|Symbol] :format Image format to encode the image in
-    # @option options [Integer] :quality JPEG compress quality
-    # @option options [String] :size Size of resulting image in WxH
-    # @option options [Boolean] :upsample Pass true to upsample (grow) an image if the original size is lower than the resulting size
-    #
-    def initialize(picture, options = {})
-      raise ArgumentError, "Picture missing!" if picture.nil?
-
-      @picture = picture
-      @options = options
-      @render_format = options[:format] || picture.default_render_format
-    end
-
-    # Process a variant of picture
-    #
-    # @return [Dragonfly::Attachment|Dragonfly::Job] The processed image variant
-    #
-    def image
-      image = image_file
-
-      raise MissingImageFileError, "Missing image file for #{picture.inspect}" if image.nil?
-
-      image = processed_image(image, @options)
-      image = encoded_image(image, @options)
-      image
-    rescue MissingImageFileError, WrongImageFormatError => e
-      log_warning(e.message)
-      nil
-    end
-
-    private
-
-    # Returns the processed image dependent of size and cropping parameters
-    def processed_image(image, options = {})
-      size = options[:size]
-      upsample = !!options[:upsample]
-
-      return image unless size.present? && picture.has_convertible_format?
-
-      if options[:crop]
-        crop(size, options[:crop_from], options[:crop_size], upsample)
-      else
-        resize(size, upsample)
-      end
-    end
-
-    # Returns the encoded image
-    #
-    # Flatten animated gifs, only if converting to a different format.
-    # Can be overwritten via +options[:flatten]+.
-    #
-    def encoded_image(image, options = {})
-      unless render_format.in?(Alchemy::Picture.allowed_filetypes)
-        raise WrongImageFormatError.new(picture, @render_format)
-      end
-
-      options = {
-        flatten: render_format != "gif" && picture.image_file_format == "gif",
-      }.with_indifferent_access.merge(options)
-
-      encoding_options = []
-
-      convert_format = render_format.sub("jpeg", "jpg") != picture.image_file_format.sub("jpeg", "jpg")
-
-      if render_format =~ /jpe?g/ && convert_format
-        quality = options[:quality] || Config.get(:output_image_jpg_quality)
-        encoding_options << "-quality #{quality}"
-      end
-
-      if options[:flatten]
-        encoding_options << "-flatten"
-      end
-
-      convertion_needed = convert_format || encoding_options.present?
-
-      if picture.has_convertible_format? && convertion_needed
-        image = image.encode(render_format, encoding_options.join(" "))
-      end
-
-      image
-    end
-  end
-end

data/app/views/alchemy/admin/attachments/show.html.erb

@@ -1,55 +0,0 @@
-<div class="resource_info">
-  <div class="value">
-    <label>
-      <%= render_icon @attachment.icon_css_class %>
-    </label>
-    <p><%= @attachment.file_name %></p>
-  </div>
-  <div class="value with-icon">
-    <label><%= Alchemy::Attachment.human_attribute_name(:url) %></label>
-    <p><%= @attachment.url %></p>
-    <a data-clipboard-text="<%= @attachment.url %>" class="icon_button--right">
-      <%= render_icon('clipboard full') %>
-    </a>
-  </div>
-  <div class="value with-icon">
-    <label><%= Alchemy::Attachment.human_attribute_name(:download_url) %></label>
-    <p><%= @attachment.url %></p>
-    <a data-clipboard-text="<%= @attachment.url %>" class="icon_button--right">
-      <%= render_icon('clipboard full') %>
-    </a>
-  </div>
-</div>
-
-<% case @attachment.icon_css_class %>
-<% when "image" %>
-<div class="attachment_preview_container image-preview">
-  <%= image_tag(@attachment.url, class: "full_width") %>
-</div>
-<% when "audio" %>
-<div class="attachment_preview_container player-preview">
-  <%= audio_tag(@attachment.url, preload: "none", controls: true, class: "full_width") %>
-</div>
-<% when "video" %>
-<div class="attachment_preview_container player-preview">
-  <%= video_tag(@attachment.url, preload: "metadata", controls: true, class: "full_width") %>
-</div>
-<% when "archive", "file" %>
-<% else %>
-<iframe src="<%= @attachment.url %>" frameborder=0 class="full-iframe">
-  Your browser does not support frames.
-</iframe>
-<% end %>
-
-<script type="text/javascript">
-  $(function() {
-    var clipboard = new Clipboard('.icon_button--right');
-    clipboard.on('success', function(e) {
-      Alchemy.growl('<%= Alchemy.t("Copied to clipboard") %>');
-      e.clearSelection();
-    });
-    Alchemy.currentDialog().dialog.on('DialogClose.Alchemy', function() {
-      clipboard.destroy();
-    });
-  });
-</script>

data/app/views/alchemy/admin/pictures/_picture.html.erb

@@ -1,53 +0,0 @@
-<div class="picture_thumbnail <%= @size %>" id="picture_<%= picture.id %>" name="<%= picture.name %>">
-  <span class="picture_tool select">
-    <%= check_box_tag "picture_ids[]", picture.id %>
-  </span>
-  <% if picture.deletable? && can?(:destroy, picture) %>
-  <span class="picture_tool delete">
-    <%= link_to_confirm_dialog(
-      "",
-      Alchemy.t(:confirm_to_delete_image_from_server),
-      alchemy.admin_picture_path(
-        id: picture,
-        q: params[:q],
-        page: params[:page],
-        tagged_with: params[:tagged_with],
-        size: params[:size],
-        filter: params[:filter]
-      ),
-      {
-        title: Alchemy.t('Delete image')
-      }
-    ) -%>
-  </span>
-  <% end %>
-  <% image = image_tag(
-    picture.url(size: preview_size(@size), flatten: true) || "alchemy/missing-image.svg",
-    alt: picture.name,
-    title: Alchemy.t(:zoom_image)
-  ) %>
-  <% if can?(:edit, picture) %>
-    <%= link_to(
-      image,
-      alchemy.admin_picture_path(
-        id: picture,
-        q: params[:q],
-        page: params[:page],
-        tagged_with: params[:tagged_with],
-        size: params[:size],
-        filter: params[:filter]
-      ),
-      class: 'thumbnail_background'
-    ) %>
-  <% else %>
-    <%= image %>
-  <% end %>
-  <span class="picture_name" title="<%= picture.name %>">
-    <%= picture.name %>
-  </span>
-  <div class="picture_tags">
-  <% picture.tag_list.each do |tag| %>
-    <span class="tag"><%= tag %></span>
-  <% end %>
-  </div>
-</div>

data/app/views/alchemy/admin/pictures/_picture_to_assign.html.erb

@@ -1,18 +0,0 @@
-<div class="picture_thumbnail assign_image_list_detail <%= size.blank? ? 'medium' : size %>" name="<%= picture_to_assign.name %>" id="picture_to_assign_<%= picture_to_assign.id %>">
-  <% action_url = create_or_assign_url(picture_to_assign, @options.to_json) %>
-  <%= link_to(
-    image_tag(
-      picture_to_assign.url(size: preview_size(size), flatten: true) || "alchemy/missing-image.svg",
-      alt: picture_to_assign.name
-    ),
-    action_url,
-    remote: true,
-    onclick: '$(self).attr("href", "#").off("click"); return false',
-    method: @content.blank? ? 'post' : 'put',
-    title: Alchemy.t(:assign_image),
-    class: 'thumbnail_background'
-  ) %>
-  <div class="picture_name" title="<%= picture_to_assign.name %>">
-    <%= picture_to_assign.name %>
-  </div>
-</div>

data/app/views/alchemy/admin/pictures/show.html.erb

@@ -1,43 +0,0 @@
-<div class="zoomed-picture-background">
-  <%= image_tag @picture.url || "alchemy/missing-image.svg" %>
-</div>
-
-<div class="picture-overlay-navigation">
-  <% if @previous %>
-    <%= link_to alchemy.admin_picture_path(
-        id: @previous,
-        q: params[:q],
-        page: params[:page],
-        tagged_with: params[:tagged_with],
-        size: params[:size],
-        filter: params[:filter]
-      ),
-      class: "previous-picture",
-      remote: true do %>
-      <span class="icon-angle-left"></span>
-    <% end %>
-  <% end %>
-  <% if @next %>
-    <%= link_to alchemy.admin_picture_path(
-        id: @next,
-        q: params[:q],
-        page: params[:page],
-        tagged_with: params[:tagged_with],
-        size: params[:size],
-        filter: params[:filter]
-      ),
-      class: "next-picture",
-      remote: true do %>
-      <span class="icon-angle-right"></span>
-    <% end %>
-  <% end %>
-</div>
-
-<div class="picture-details-overlay">
-  <%= render 'form' %>
-  <%= render 'infos' %>
-</div>
-
-<div class="picture-overlay-handle">
-  <span class="icon-angle-double-right"></span>
-</div>

data/app/views/alchemy/essences/_essence_file_view.html.erb

@@ -1,13 +0,0 @@
-<%- if attachment = content.ingredient -%>
-  <%- html_options = local_assigns.fetch(:html_options, {}) -%>
-  <%= link_to(
-    content.essence.link_text.presence ||
-      content.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
-      attachment.name,
-    attachment.url,
-    {
-      class: content.essence.css_class.presence,
-      title: content.essence.title.presence
-    }.merge(html_options)
-  ) -%>
-<%- end -%>

data/db/migrate/1_create_alchemy_picture_thumbs.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class CreateAlchemyPictureThumbs < ActiveRecord::Migration
-  def change
-    create_table :alchemy_picture_thumbs do |t|
-      t.integer :picture_id, null: false, index: true
-      t.string :signature, null: false
-      t.text :uid, null: false
-    end
-    add_foreign_key :alchemy_picture_thumbs, :alchemy_pictures, column: :picture_id
-    add_index :alchemy_picture_thumbs, :signature, unique: true
-  end
-end