alchemy_cms 6.1.8 → 6.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02b1827373388eef312f0827ecd2eb0420ed571ce65f733f18cfbe4f93792af
-  data.tar.gz: de56936cfd3185a8a285260d508de58e8ceb2bb72247cf34eabc4bc117cba672
+  metadata.gz: ce51fd15f81d2687ad1836dc8ee9afddad2864304d2e5306b06513145b37b921
+  data.tar.gz: ae782a4d9044f4a9ae0e996ab6e4cabf0c8e12f0181bde99459a75dfef797dd3
 SHA512:
-  metadata.gz: 4ced2c28559fbd0d3434135e9202cf6362983fc553e5e58e593cbb8195b9c2176e8c2649e8f27ad2117abc1394534094dedc4c15df92f7af831fa4202045dc9c
-  data.tar.gz: df9a73acf89ce60303c5fc55a7a9d869d589780ea7e9556318acea7e9cd63a8d2743f9593d325105c0294b0b680f30c870dc7cd7991ee0a4f847c38dc588f837
+  metadata.gz: c4d5c04accf616f6d709fc72e01402d92c00299fffcefe5e1d9f1ef9acb59111c202ebbf95f5b956cfe04f5acac02aa56bdb986a9f0a80b31a3a6172ce5f2367
+  data.tar.gz: 70c89a614cf5b039c74c869ced699f422f71c4fae5781b714469ef016ace6703a5ff4176003dafb83a386f48b3a80fab419b2abfe2a2978b00a92789f1c34b2b

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 6.1.10 (2024-08-21)
+
+- [6.1-stable] Fix combining search filters and pagination [#2983](https://github.com/AlchemyCMS/alchemy_cms/pull/2983) ([tvdeyen](https://github.com/tvdeyen))
+- [6.1-stable] Merge pull request #2556 from mamhoff/fix-nan-ratio-error [#2581](https://github.com/AlchemyCMS/alchemy_cms/pull/2581) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 6.1.9 (2023-08-29)
+
+- [6.1-stable] Merge pull request #2571 from tvdeyen/fix-non-stupid-digest-assets [#2573](https://github.com/AlchemyCMS/alchemy_cms/pull/2573) ([github-actions](https://github.com/apps/github-actions))
+- [6.1] Show if element is using contents or ingredients [#2568](https://github.com/AlchemyCMS/alchemy_cms/pull/2568) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.1.8 (2023-07-31)
 
 - [v6.1]  Use selenium-webdriver instead of webdrivers gem  [#2531](https://github.com/AlchemyCMS/alchemy_cms/pull/2531) ([mamhoff](https://github.com/mamhoff))

data/app/models/alchemy/page.rb

@@ -121,6 +121,8 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
+    has_many :page_essences, class_name: "Alchemy::EssencePage", foreign_key: :page_id, inverse_of: :ingredient_association, dependent: :nullify
+
     before_validation :set_language,
       if: -> { language.nil? }
 

data/app/models/concerns/alchemy/picture_thumbnails.rb

@@ -115,6 +115,8 @@ module Alchemy
       return nil unless settings[:crop] && settings[:size]
 
       mask = inferred_dimensions_from_string(settings[:size])
+      return if mask.nil?
+
       zoom = thumbnail_zoom_factor(mask)
       return nil if zoom.zero?
 
@@ -150,6 +152,8 @@ module Alchemy
       width, height = dimensions_from_string(string)
       ratio = image_file_width.to_f / image_file_height.to_i
 
+      return if ratio.nan?
+
       if width.zero? && ratio.is_a?(Float)
         width = height * ratio
       end

data/app/views/alchemy/admin/resources/_per_page_select.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
-    <% if value.is_a? Hash %>
+    <% if value.respond_to?(:keys) %>
       <% value.each do |k, v| %>
         <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>

data/lib/alchemy/tasks/usage.rb

@@ -11,10 +11,11 @@ module Alchemy
           .group(:name)
           .order("count DESC, name ASC")
           .map { |e| {"name" => e.name, "count" => e.count} }
-        Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
-          res << {"name" => definition["name"], "count" => 0}
-        end
-        res
+        Alchemy::Element.definitions.map do |definition|
+          count = res.find { |r| r["name"] == definition["name"] }&.fetch("count") || 0
+          definition["count"] = count
+          definition
+        end.sort_by { |r| -1 * r["count"] }
       end
 
       def pages_count_by_type

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -385,6 +385,26 @@ RSpec.shared_examples_for "having picture thumbnails" do
           size: "160x120",
         )
       end
+
+      context "with settings indicating free height" do
+        let(:settings) do
+          {
+            crop: true,
+            size: "800x"
+          }
+        end
+
+        it "returns default thumbnail options" do
+          is_expected.to eq(
+            crop: true,
+            crop_from: nil,
+            crop_size: nil,
+            flatten: true,
+            format: "jpg",
+            size: "160x120"
+          )
+        end
+      end
     end
   end
 

data/lib/alchemy/version.rb

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

data/lib/non_stupid_digest_assets.rb

@@ -19,7 +19,7 @@ module NonStupidDigestAssets
     def whitelisted_assets(assets)
       assets.select do |logical_path, _digest_path|
         whitelist.any? do |item|
-          item =~ logical_path
+          /#{item}/ =~ logical_path
         end
       end
     end

data/lib/tasks/alchemy/usage.rake

@@ -30,7 +30,11 @@ namespace :alchemy do
       puts "  ----------------------"
       puts "\n"
       results.each do |row|
-        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["name"]}"
+        ingredients = row.key?("ingredients") ? "uses ingredients ✅" : nil
+        contents = row.key?("contents") ? "still uses contents ‼️" : nil
+        type = ingredients || contents
+        suffix = type ? " · #{type}" : nil
+        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["name"]}#{suffix}"
       end
       puts "\n  = #{number_with_delimiter(Alchemy::Element.count)} elements in total."
     else

data/package.json

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.1.8
+  version: 6.1.10
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1528,7 +1528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.17
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails