alchemy_cms 5.3.4 → 5.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f7ca98f0e6c0d8729e8ba6ef3fd432449dc5dba0b900ef72f9bd7494e406d5
-  data.tar.gz: 0d3871f0f550d07b09eda00cd5a26427d9c80303cc0f008aea496a7a3e9a6579
+  metadata.gz: 2a2374c679c6d6962c9bb32d48f8f444def421fb927302b87f705a85e9e21d85
+  data.tar.gz: d3a682ccdf288d777e87f145b15121fa51d4008d3992ba39abb16e417e2ca1bb
 SHA512:
-  metadata.gz: c91fb49f9939ad01bb30e88fe3042898d4cca8126e0d3ebc143f7a2232cf67cbbc176ca796c8b14f517683e975172ed8d7f92359989297cce30274bdb5bc981d
-  data.tar.gz: a3e8bcf872db1d3276dffb0e56baa01a125e24f4ede546359854032a45446d5abc44b7559ab8f76fb1da8b692572ed7608f51542bf5a70dafb8a1ecb75b9bce3
+  metadata.gz: 1d40a29752e354e66b2186290cb229a2d0b89b77b258258c5488f4b8e6f56ffc7714bd6824e89e05a9075c53a3294c75eb5ebe70148c12d0b3fae84781f70a33
+  data.tar.gz: 1ddecd199116f699e351384bb460c39bb3203a71fa41a3d6e3319b8ad8107500049f1e37894f9a14f3e955930ae98e2dcc2d1458fff128dac2178b9d94cbeabc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 5.3.5 (2022-04-26)
+
+- Add thumbnail processor to support resizing on animated GIFs [#2316](https://github.com/AlchemyCMS/alchemy_cms/pull/2316) ([kulturbande](https://github.com/kulturbande))
+- Backport #2277 to 5.3 [#2306](https://github.com/AlchemyCMS/alchemy_cms/pull/2306) ([dbwinger](https://github.com/dbwinger))
+- add webp - support to 5.3 stable [#2294](https://github.com/AlchemyCMS/alchemy_cms/pull/2294) ([kulturbande](https://github.com/kulturbande))
+
 ## 5.3.4 (2022-04-11)
 
 - Don't delete locals in render_element so they can be used by all elem… [#2284](https://github.com/AlchemyCMS/alchemy_cms/pull/2284) ([dbwinger](https://github.com/dbwinger))

data/app/controllers/alchemy/api/nodes_controller.rb

@@ -8,6 +8,7 @@ module Alchemy
     def index
       @nodes = Node.all
       @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
       @nodes = @nodes.ransack(params[:filter]).result
 
       if params[:page]

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

@@ -67,7 +67,7 @@ module Alchemy
     # Returns the rendered resized image using imagemagick directly.
     #
     def resize(size, upsample = false)
-      image_file.thumb(upsample ? size : "#{size}>")
+      image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
     # Returns true if picture's width is greater than it's height
@@ -191,7 +191,7 @@ module Alchemy
       if is_smaller_than?(dimensions) && upsample == false
         dimensions = reduce_to_image(dimensions)
       end
-      image_file.thumb("#{dimensions_to_string(dimensions)}#")
+      image_file.thumbnail("#{dimensions_to_string(dimensions)}#")
     end
 
     # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.

data/app/models/alchemy/picture.rb

@@ -28,7 +28,7 @@ module Alchemy
       large: "240x180",
     }.with_indifferent_access.freeze
 
-    CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
+    CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
     TRANSFORMATION_OPTIONS = [
       :crop,

data/app/models/alchemy/picture_variant.rb

@@ -13,6 +13,8 @@ module Alchemy
     include Alchemy::Logger
     include Alchemy::Picture::Transformations
 
+    ANIMATED_IMAGE_FORMATS = %w[gif webp]
+
     attr_reader :picture, :render_format
 
     def_delegators :@picture,
@@ -86,7 +88,7 @@ module Alchemy
       end
 
       options = {
-        flatten: render_format != "gif" && picture.image_file_format == "gif",
+        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
       }.with_indifferent_access.merge(options)
 
       encoding_options = []

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

@@ -17,7 +17,7 @@
   }) %>
   $('#<%= essence_node_editor.form_field_id %>').alchemyNodeSelect({
     placeholder: "<%= Alchemy.t(:search_node) %>",
-    url: "<%= alchemy.api_nodes_path %>",
+    url: "<%= alchemy.api_nodes_path(language_id: essence_node_editor.page&.language_id) %>",
     query_params: <%== query_params.to_json %>,
     <% if essence_node_editor.essence.node %>
     <% serialized_node = ActiveModelSerializers::SerializableResource.new(essence_node_editor.essence.node, include: :ancestors) %>

data/config/alchemy/config.yml

@@ -173,6 +173,7 @@ uploader:
     - gif
     - png
     - svg
+    - webp
 
 # === Link Target Options
 #

data/config/initializers/dragonfly.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require "dragonfly_svg"
 require "alchemy/dragonfly/processors/crop_resize"
+require "alchemy/dragonfly/processors/thumbnail"
 
 # Logger
 Dragonfly.logger = Rails.logger
@@ -16,4 +17,5 @@ Dragonfly::ImageMagick::Processors::Encode::WHITELISTED_ARGS << "flatten"
 
 Rails.application.config.after_initialize do
   Dragonfly.app(:alchemy_pictures).add_processor(:crop_resize, Alchemy::Dragonfly::Processors::CropResize.new)
+  Dragonfly.app(:alchemy_pictures).add_processor(:thumbnail, Alchemy::Dragonfly::Processors::Thumbnail.new)
 end

data/lib/alchemy/dragonfly/processors/thumbnail.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "dragonfly/image_magick/processors/thumb"
+
+module Alchemy
+  module Dragonfly
+    module Processors
+      class Thumbnail < ::Dragonfly::ImageMagick::Processors::Thumb
+        def call(content, geometry, opts = {})
+          # store content into an instance variable to use it in args_for_geometry - method
+          @content = content
+          super
+        end
+
+        ##
+        # due to a missing ImageMagick parameter animated GIFs were broken with the default
+        # Dragonfly Thumb processor
+        def args_for_geometry(geometry)
+          # resize all frames in a GIF
+          # @link https://imagemagick.org/script/command-line-options.php#coalesce
+          # @link https://imagemagick.org/script/command-line-options.php#deconstruct
+          @content&.mime_type == "image/gif" ? "-coalesce #{super} -deconstruct" : super
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/engine.rb

@@ -45,6 +45,17 @@ module Alchemy
       end
     end
 
+    initializer "alchemy.webp-mime_type" do
+      # Rails does not know anything about webp even in 2022
+      unless Mime::Type.lookup_by_extension(:webp)
+        Mime::Type.register("image/webp", :webp)
+      end
+      # Dragonfly uses Rack to read the mime type and guess what
+      unless Rack::Mime::MIME_TYPES[".webp"]
+        Rack::Mime::MIME_TYPES[".webp"] = "image/webp"
+      end
+    end
+
     initializer "alchemy.error_tracking" do
       if defined?(Airbrake)
         require_relative "error_tracking/airbrake_handler"

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "5.3.4"
+  VERSION = "5.3.5"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.3.5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-11 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -1079,6 +1079,7 @@ files:
 - lib/alchemy/controller_actions.rb
 - lib/alchemy/deprecation.rb
 - lib/alchemy/dragonfly/processors/crop_resize.rb
+- lib/alchemy/dragonfly/processors/thumbnail.rb
 - lib/alchemy/element_definition.rb
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb