alchemy_cms 6.0.6 → 6.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4238ff0e22f613444f1ae9124a20bf4e884f2f7c4f8fe05c1e8d0bd147cad7
-  data.tar.gz: 02e2877398db81eb4c58a1afbad4c0355020da0fb7505c895d493d40a93223d7
+  metadata.gz: 23531a0233f0633efb7c6c17b3bb79eb6a0fd5536e34766aa76840a43c594c9b
+  data.tar.gz: 3d8a8f2a8266b3fa5982de4009b9703d3ef3b585e1cb35ed2381daedfd110395
 SHA512:
-  metadata.gz: 2bacfe8d1e126cc3a3e31f5dfdb1346efb1398adf33dac32e4e58731bcfd11580d51544797a59d563361ee28c5d4a37a76a7659b7534651a574c7903820cc994
-  data.tar.gz: '04198e8f916fd87a5a1587129b86480cde12cbab889acfa2baaf23a34ed966292cc24312c1b731648c556e27fc3045b0a5b56d43ab6124abacbcb33cdf05fab2'
+  metadata.gz: 8ceb3ac0a3f6f833f5c15bfe3bc91d1e42970a03f32c373941d57574405395906fcfa16e373f2cc6db71648a93cfa6e7d37f479dc230f716270aba6539dcc62d
+  data.tar.gz: 02d7428a535cef3b642edec8cdfb2cc7ed77360ea5033de128c2da899d28a24819cbe3026b2dd21a98f280faf505caa76745a103800a0401c5d96f42ae31fcd4

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.0.9 (2022-07-25)
+
+- Allow Site managers to remove page locks [#2360](https://github.com/AlchemyCMS/alchemy_cms/pull/2360) ([mamhoff](https://github.com/mamhoff))
+- Add tags to Alchemy::EagerLoading [#2359](https://github.com/AlchemyCMS/alchemy_cms/pull/2359) ([mamhoff](https://github.com/mamhoff))
+- Delete Gutentag Taggings in Alchemy::DeleteElements [#2358](https://github.com/AlchemyCMS/alchemy_cms/pull/2358) ([mamhoff](https://github.com/mamhoff))
+- Fix PictureTransformations#inferred_sizes_from_string [#2356](https://github.com/AlchemyCMS/alchemy_cms/pull/2356) ([mamhoff](https://github.com/mamhoff))
+- add playsinline attribute to ingredient and essence [#2351](https://github.com/AlchemyCMS/alchemy_cms/pull/2351) ([pascalbetz](https://github.com/pascalbetz))
+
+## 6.0.8 (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))
+
+## 6.0.7 (2022-06-04)
+
+- Eagerly generate thumbs for srcset images in task as well [#2344](https://github.com/AlchemyCMS/alchemy_cms/pull/2344) ([tvdeyen](https://github.com/tvdeyen))
+- 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))
+
 ## 6.0.6 (2022-05-30)
 
 - Add task to eagerly generate ingredients pictures thumbnails [#2342](https://github.com/AlchemyCMS/alchemy_cms/pull/2342) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -4,15 +4,7 @@ source "https://rubygems.org"
 gemspec
 
 rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
-# Necessary until a new 6.1.5 version has been released
-# https://github.com/rails/rails/pull/44691
-if rails_version.to_s.match?(/6.1/)
-  gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
-elsif rails_version.to_s.match?(/7.0/)
-  gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
-else
-  gem "rails", "~> #{rails_version}.0"
-end
+gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
   gem "sqlite3", "~> 1.4.1"

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -94,7 +94,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/admin/essence_videos_controller.rb

@@ -24,6 +24,7 @@ module Alchemy
           :controls,
           :loop,
           :muted,
+          :playsinline,
           :preload,
           :attachment_id
         )

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

@@ -145,6 +145,8 @@ module Alchemy
           # Remove page from clipboard
           clipboard = get_clipboard("pages")
           clipboard.delete_if { |item| item["id"] == @page.id.to_s }
+        else
+          flash[:warning] = @page.errors.full_messages.to_sentence
         end
 
         respond_to do |format|

data/app/models/alchemy/eager_loading.rb

@@ -25,6 +25,7 @@ module Alchemy
               elements: [
                 :page,
                 :touchable_pages,
+                :tags,
                 {
                   ingredients: :related_object,
                   contents: :essence,

data/app/models/alchemy/ingredients/video.rb

@@ -12,6 +12,7 @@ module Alchemy
         :height,
         :loop,
         :muted,
+        :playsinline,
         :preload,
         :width
 

data/app/models/alchemy/page.rb

@@ -129,6 +129,11 @@ module Alchemy
     before_create -> { versions.build },
       if: -> { versions.none? }
 
+    before_destroy if: -> { nodes.any? } do
+      errors.add(:nodes, :still_present)
+      throw(:abort)
+    end
+
     before_save :set_language_code,
       if: -> { language.present? }
 
@@ -565,6 +570,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

@@ -98,10 +98,10 @@ module Alchemy
       ratio = image_file_width.to_f / image_file_height
 
       if sizes[:width].zero?
-        sizes[:width] = image_file_width * ratio
+        sizes[:width] = (sizes[:height] * ratio).round.to_i
       end
       if sizes[:height].zero?
-        sizes[:height] = image_file_width / ratio
+        sizes[:height] = (sizes[:width] / ratio).round.to_i
       end
 
       sizes

data/app/services/alchemy/delete_elements.rb

@@ -21,6 +21,7 @@ module Alchemy
           class_name.constantize.where(id: ids).delete_all
         end
       contents.delete_all
+      Gutentag::Tagging.where(taggable: elements).delete_all
       delete_elements
     end
 

data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb

@@ -36,7 +36,7 @@
         <% end %>
       </td>
       <td>
-        <% if current_alchemy_user.id == page.locked_by %>
+        <% if (current_alchemy_user.id == page.locked_by) || can?(:manage, Alchemy::Site.current) %>
         <%= form_tag(alchemy.unlock_admin_page_path(page, :redirect_to => alchemy.admin_dashboard_url)) do %>
           <button class="icon_button small" title="<%= Alchemy.t(:explain_unlocking) %>">
             <%= render_icon(:times, size: 'xs') %>

data/app/views/alchemy/admin/essence_videos/edit.html.erb

@@ -5,6 +5,7 @@
   <%= f.input :controls %>
   <%= f.input :loop %>
   <%= f.input :muted %>
+  <%= f.input :playsinline %>
   <%= f.input :preload, collection: %w(auto none metadata),
     include_blank: false, input_html: {class: 'alchemy_selectbox'} %>
   <%= f.submit Alchemy.t(:save) %>

data/app/views/alchemy/admin/ingredients/_video_fields.html.erb

@@ -4,5 +4,6 @@
 <%= f.input :controls, as: :boolean %>
 <%= f.input :loop, as: :boolean %>
 <%= f.input :muted, as: :boolean %>
+<%= f.input :playsinline, as: :boolean %>
 <%= f.input :preload, collection: %w(auto none metadata),
   include_blank: false, input_html: {class: 'alchemy_selectbox'} %>

data/app/views/alchemy/admin/pages/update.js.erb

@@ -18,7 +18,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_video_view.html.erb

@@ -5,6 +5,7 @@
     autoplay: content.essence.autoplay,
     loop: content.essence.loop,
     muted: content.essence.muted,
+    playsinline: content.essence.playsinline,
     preload: content.essence.preload.presence,
     width: content.essence.width.presence,
     height: content.essence.height.presence do %>

data/app/views/alchemy/ingredients/_video_view.html.erb

@@ -4,6 +4,7 @@
     autoplay: video_view.autoplay,
     loop: video_view.loop,
     muted: video_view.muted,
+    playsinline: video_view.playsinline,
     preload: video_view.preload.presence,
     width: video_view.width.presence,
     height: video_view.height.presence do %>

data/config/locales/alchemy.en.yml

@@ -777,6 +777,10 @@ en:
           attributes:
             pages:
               still_present: "are still attached to this language. Please remove them first."
+        alchemy/page:
+          attributes:
+            nodes:
+              still_present: "are still attached to this page. Please remove them first."
     models:
       gutentag/tag:
         one: Tag

data/db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RestrictOnDeletePageIdForeignKeyFromAlchemyNodes < ActiveRecord::Migration[6.0]
+  def up
+    remove_foreign_key :alchemy_nodes, :alchemy_pages
+    add_foreign_key :alchemy_nodes, :alchemy_pages, column: :page_id, on_delete: :restrict
+  end
+
+  def down
+    remove_foreign_key :alchemy_nodes, :alchemy_pages
+    add_foreign_key :alchemy_nodes, :alchemy_pages, column: :page_id, on_delete: :cascade
+  end
+end

data/db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddPlaysinlineToAlchemyEssenceVideos < ActiveRecord::Migration[6.0]
+  def change
+    return if column_exists?(:alchemy_essence_videos, :playsinline)
+
+    add_column :alchemy_essence_videos, :playsinline, :boolean, default: false, null: false
+  end
+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.
@@ -151,11 +151,13 @@ module Alchemy
       #
       def read_definitions_file
         if File.exist?(layouts_file_path)
-          YAML.safe_load(
-            ERB.new(File.read(layouts_file_path)).result,
-            permitted_classes: YAML_PERMITTED_CLASSES,
-            aliases: true,
-          ) || []
+          Array.wrap(
+            YAML.safe_load(
+              ERB.new(File.read(layouts_file_path)).result,
+              permitted_classes: YAML_PERMITTED_CLASSES,
+              aliases: 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 = "6.0.6"
+  VERSION = "6.0.9"
 
   def self.version
     VERSION

data/lib/tasks/alchemy/thumbnails.rake

@@ -6,6 +6,7 @@ namespace :alchemy do
     task thumbnails: [
       "alchemy:generate:picture_thumbnails",
       "alchemy:generate:essence_picture_thumbnails",
+      "alchemy:generate:ingredient_picture_thumbnails",
     ]
 
     desc "Generates thumbnails for Alchemy Pictures."
@@ -31,6 +32,10 @@ namespace :alchemy do
       essence_pictures.find_each do |essence_picture|
         puts essence_picture.picture_url
         puts essence_picture.thumbnail_url
+
+        essence_picture.settings.fetch(:srcset, []).each do |src|
+          puts essence_picture.picture_url(src)
+        end
       end
 
       puts "Done!"
@@ -55,6 +60,10 @@ namespace :alchemy do
       ingredient_pictures.find_each do |ingredient_picture|
         puts ingredient_picture.picture_url
         puts ingredient_picture.thumbnail_url
+
+        ingredient_picture.settings.fetch(:srcset, []).each do |src|
+          puts ingredient_picture.picture_url(src)
+        end
       end
 
       puts "Done!"

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.6",
+  "version": "6.0.9",
   "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: 6.0.6
+  version: 6.0.9
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1293,6 +1293,8 @@ files:
 - db/migrate/20210506135919_create_essence_audios.rb
 - db/migrate/20210506140258_create_essence_videos.rb
 - db/migrate/20210508091432_create_alchemy_ingredients.rb
+- db/migrate/20220514072456_restrict_on_delete_page_id_foreign_key_from_alchemy_nodes.rb
+- db/migrate/20220622130905_add_playsinline_to_alchemy_essence_videos.rb
 - lib/alchemy.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb