alchemy_cms 7.0.3 → 7.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b01898eaa0c9b209814972d61b137c1ee14f875ce1426db5cb45389ce435a1fe
-  data.tar.gz: 9b1edbdb5096b2384187e3282f4c28a854c2139474cf1dbc452e32c177f0f65c
+  metadata.gz: 4eb5a0535db07358911a52c75a9d3f0552119d547f6f6b7ff0d4b64ac51e1e96
+  data.tar.gz: 6d9009861880e870ca5cf9617a5bdaad8bc467a87ff842ff2722a10a1b08767a
 SHA512:
-  metadata.gz: ccf4b9760d9a8f286a245e36b399534df9b61ce6972567a5ccf4cbfd861ab037802cbcd91f74e0c62e28b7b45e108ce0c969e230430e8508e932a8c09af6751e
-  data.tar.gz: bc750d8c231526c3f560c7c09fd45994225e730be031954a1304a52d113bb10ac313e4c1bf699e1ab076245e4caf43a7583f501bae7ef2ae775c045a6fb0b0dd
+  metadata.gz: 64045d0762ec1a803b87992b154a9cde5f202603e415d5086f61d74ccb16db4f9de10d80b313b37883f104f8c0877bffa83b631ad705cde329229a7a873a4dff
+  data.tar.gz: 5da92fe5ed83c535ffdd683fcc00d5781e5be7e2563c6767d7d972176ac995346922b70a2b20541a3a6bf51688664bc2ba5e449630d57b862f65972a75b1fe1e

data/.standard.yml

@@ -1,3 +1,4 @@
 parallel: true
 ignore:
   - "spec/dummy/**/*"
+ruby_version: 3.0

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 7.0.5 (2023-10-06)
+
+- [7.0-stable] Merge pull request #2593 from tvdeyen/fix-turbo-redirect [#2594](https://github.com/AlchemyCMS/alchemy_cms/pull/2594) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
+## 7.0.4 (2023-10-04)
+
+- [7.0-stable] Merge pull request #2588 from tvdeyen/admin-js-imports [#2589](https://github.com/AlchemyCMS/alchemy_cms/pull/2589) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Merge pull request #2586 from AlchemyCMS/fix-leave-dialog [#2587](https://github.com/AlchemyCMS/alchemy_cms/pull/2587) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0-stable] Merge pull request #2556 from mamhoff/fix-nan-ratio-error [#2580](https://github.com/AlchemyCMS/alchemy_cms/pull/2580) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.0.3 (2023-08-29)
 
 - [7.0-stable] Merge pull request #2571 from tvdeyen/fix-non-stupid-digest-assets [#2572](https://github.com/AlchemyCMS/alchemy_cms/pull/2572) ([github-actions](https://github.com/apps/github-actions))

data/app/controllers/alchemy/admin/languages_controller.rb

@@ -22,7 +22,7 @@ module Alchemy
         @language = Alchemy::Language.new(resource_params)
         if @language.save
           flash[:notice] = Alchemy.t("Language successfully created")
-          redirect_to alchemy.admin_pages_path(language_id: @language)
+          do_redirect_to alchemy.admin_pages_path(language_id: @language)
         else
           render :new
         end
@@ -48,7 +48,7 @@ module Alchemy
         @current_site = Alchemy::Site.current
         if @current_site.nil?
           flash[:warning] = Alchemy.t("Please create a site first.")
-          redirect_to admin_sites_path
+          do_redirect_to admin_sites_path
         end
       end
     end

data/app/controllers/alchemy/admin/sites_controller.rb

@@ -7,7 +7,7 @@ module Alchemy
         @site = Alchemy::Site.new(resource_params)
         if @site.save
           flash[:notice] = Alchemy.t("Please create a default language for this site.")
-          redirect_to alchemy.admin_languages_path(site_id: @site)
+          do_redirect_to alchemy.admin_languages_path(site_id: @site)
         else
           render :new
         end

data/app/models/alchemy/node.rb

@@ -52,7 +52,7 @@ module Alchemy
       #
       def read_definitions_file
         if ::File.exist?(definitions_file_path)
-          ::YAML.safe_load(File.read(definitions_file_path)) || []
+          ::YAML.safe_load_file(definitions_file_path) || []
         else
           raise LoadError, "Could not find menus.yml file! Please run `rails generate alchemy:install`"
         end

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/leave.html.erb

@@ -1,11 +1,13 @@
 <%= render_message do %>
   <%= Alchemy.t("You are about to leave Alchemy") %>
 <% end %>
-<p class="buttons">
-  <label><%= Alchemy.t("Do you want to") %></label>
-  <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>
-</p>
-<%= form_tag Alchemy.logout_path, method: Alchemy.logout_method, class: 'buttons' do %>
-  <label><%= Alchemy.t('or to completely') %></label>
-  <%= button_tag Alchemy.t(:logout), autofocus: true %>
-<% end %>
+<div data-turbo="false">
+  <p class="buttons">
+    <label><%= Alchemy.t("Do you want to") %></label>
+    <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>
+  </p>
+  <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method, class: 'buttons' do %>
+    <label><%= Alchemy.t('or to completely') %></label>
+    <%= button_tag Alchemy.t(:logout), autofocus: true %>
+  <% end %>
+</div>

data/app/views/layouts/alchemy/admin.html.erb

@@ -35,6 +35,13 @@
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbo-track' => true) %>
     <%= javascript_importmap_tags("alchemy_admin", importmap: Alchemy.importmap) %>
+    <% if Alchemy.admin_js_imports.any? %>
+      <script type="module">
+        <% Alchemy.admin_js_imports.each do |path| %>
+          import "<%= path %>"
+        <% end %>
+      </script>
+    <% end %>
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>

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 = "7.0.3"
+  VERSION = "7.0.5"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -43,6 +43,25 @@ module Alchemy
     @_preview_sources = Array(sources)
   end
 
+  # Additional JS modules to be imported in the Alchemy admin UI
+  #
+  # Be sure to also pin the modules with +Alchemy.importmap+.
+  #
+  # == Example
+  #
+  #    Alchemy.importmap.pin "flatpickr/de",
+  #      to: "https://ga.jspm.io/npm:flatpickr@4.6.13/dist/l10n/de.js"
+  #
+  #    Alchemy.admin_js_imports << "flatpickr/de"
+  #
+  def self.admin_js_imports
+    @_admin_js_imports ||= Set.new
+  end
+
+  def self.admin_js_imports=(sources)
+    @_admin_js_imports = Set[sources]
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 7.0.3
+  version: 7.0.5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-29 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer