alchemy_cms 5.3.4 → 5.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37f7ca98f0e6c0d8729e8ba6ef3fd432449dc5dba0b900ef72f9bd7494e406d5
-  data.tar.gz: 0d3871f0f550d07b09eda00cd5a26427d9c80303cc0f008aea496a7a3e9a6579
+  metadata.gz: 848962eb77be3975e32f4c7e5bbb17ecdd28095e390c468781cae673de03d394
+  data.tar.gz: 4c4ad856ccc2fb65a9caca38fdca4e5e64185739694c81738e907d3ef9767457
 SHA512:
-  metadata.gz: c91fb49f9939ad01bb30e88fe3042898d4cca8126e0d3ebc143f7a2232cf67cbbc176ca796c8b14f517683e975172ed8d7f92359989297cce30274bdb5bc981d
-  data.tar.gz: a3e8bcf872db1d3276dffb0e56baa01a125e24f4ede546359854032a45446d5abc44b7559ab8f76fb1da8b692572ed7608f51542bf5a70dafb8a1ecb75b9bce3
+  metadata.gz: 44c3dcb6bf2264875564056a6653e750b716717b2efd147312b75cc641018df7bbb7e56dbe4d621d0b6175cc42de8d86b69df0b1a004bebd6b1afd271b040710
+  data.tar.gz: b02f343d94a7b42cca11776189ab424d3ba90468fd43e7f60273000a80509da6cfc553521f22fac31383992c5c3d38494f42badd7afecd2cc91049b4ceb2a20a

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 5.3.7 (2022-06-10)
+
+- Fix admin page tree links after update [#2348](https://github.com/AlchemyCMS/alchemy_cms/pull/2348) ([tvdeyen](https://github.com/tvdeyen))
+- Fix initial selection of internal page link select [#2346](https://github.com/AlchemyCMS/alchemy_cms/pull/2346) ([tvdeyen](https://github.com/tvdeyen))
+
+## 5.3.6 (2022-06-04)
+
+- Use HashWithIndifferentAccess for Page definition.  Key hint translation by page_layout [#2343](https://github.com/AlchemyCMS/alchemy_cms/pull/2343) ([dbwinger](https://github.com/dbwinger))
+
+## 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/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -87,7 +87,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
         urlname = $element.val()
         $.get Alchemy.routes.api_pages_path,
           q:
-            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '')
+            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?(.+?)\/?$/, '$3')
           page: 1
           per_page: 1,
           (data) =>

data/app/assets/stylesheets/alchemy/selects.scss

@@ -42,10 +42,6 @@ select {
       font-weight: normal;
       text-align: left;
 
-      .select2-chosen {
-        overflow: visible;
-      }
-
       .select2-arrow {
         top: 0;
         width: $form-field-height;

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

@@ -523,6 +523,12 @@ module Alchemy
       locker.try(:name) || Alchemy.t("unknown")
     end
 
+    # Key hint translations by page layout, rather than the default name.
+    #
+    def hint_translation_attribute
+      page_layout
+    end
+
     # Menus (aka. root nodes) this page is attached to
     #
     def menus

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/admin/pages/update.js.erb

@@ -23,7 +23,7 @@
 <% else -%>
 
   if (page) {
-    var page_html = "<%= j render('page', page: @page) %>";
+    var page_html = "<%= j render('page', page: @page) %>".replace(/__ID__/g, "<%= @page.id %>");;
     var compiler = Handlebars.compile(page_html);
     var tree = <%== @tree.to_json %>;
     page.outerHTML = compiler(tree.pages[0]);

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

@@ -37,19 +37,23 @@ module Alchemy
     def hint
       hint = definition["hint"]
       if hint == true
-        Alchemy.t(name, scope: hint_translation_scope)
+        Alchemy.t(hint_translation_attribute, scope: hint_translation_scope)
       else
         hint
       end
     end
 
-    # Returns true if the element has a hint
+    # Returns true if the element has a hint defined
     def has_hint?
-      hint.present?
+      !!definition[:hint]
     end
 
     private
 
+    def hint_translation_attribute
+      name
+    end
+
     def hint_translation_scope
       "#{self.class.model_name.to_s.demodulize.downcase}_hints"
     end

data/lib/alchemy/page_layout.rb

@@ -8,7 +8,7 @@ module Alchemy
       # They are defined in +config/alchemy/page_layout.yml+ file.
       #
       def all
-        @definitions ||= read_definitions_file
+        @definitions ||= read_definitions_file.map(&:with_indifferent_access)
       end
 
       # Add additional page definitions to collection.
@@ -164,7 +164,11 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true) || []
+          Array.wrap(
+            YAML.safe_load(
+              ERB.new(File.read(layouts_file_path)).result, YAML_WHITELIST_CLASSES, [], true
+          	) || []
+          )
         else
           raise LoadError, "Could not find page_layouts.yml file! Please run `rails generate alchemy:install`"
         end

data/lib/alchemy/version.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "5.3.4",
+  "version": "5.3.7",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

data/vendor/assets/stylesheets/alchemy_admin/select2.scss

@@ -64,7 +64,7 @@ html[dir="rtl"] .select2-container .select2-choice {
 }
 
 .select2-container.select2-allowclear .select2-choice .select2-chosen {
-  margin-right: 42px;
+  margin-right: 38px;
 }
 
 .select2-container .select2-choice > .select2-chosen {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.3.7
 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-06-10 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