alchemy_cms 7.0.0.pre.a → 7.0.0.pre.b

data/app/models/alchemy/picture.rb

@@ -25,7 +25,7 @@ module Alchemy
     THUMBNAIL_SIZES = {
       small: "80x60",
       medium: "160x120",
-      large: "240x180",
+      large: "240x180"
     }.with_indifferent_access.freeze
 
     CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
@@ -38,7 +38,7 @@ module Alchemy
       :format,
       :quality,
       :size,
-      :upsample,
+      :upsample
     ]
 
     include Alchemy::Logger
@@ -64,7 +64,7 @@ module Alchemy
     # to ensure this runs before Dragonfly's before_destroy callback.
     #
     before_destroy unless: :deletable? do
-      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % { name: name }
+      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % {name: name}
     end
 
     # Image preprocessing class
@@ -117,7 +117,7 @@ module Alchemy
       -> {
         where("#{table_name}.id NOT IN (SELECT related_object_id FROM alchemy_ingredients WHERE related_object_type = 'Alchemy::Picture')")
       }
-    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) }
+    scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
     scope :by_file_format, ->(format) { where(image_file_format: format) }
 
     # Class methods
@@ -138,20 +138,21 @@ module Alchemy
       end
 
       def alchemy_resource_filters
+        @_file_formats ||= distinct.pluck(:image_file_format).compact.presence || []
         [
           {
             name: :by_file_format,
-            values: distinct.pluck(:image_file_format),
+            values: @_file_formats
           },
           {
             name: :misc,
-            values: %w(recent last_upload without_tag),
-          },
+            values: %w[recent last_upload without_tag deletable]
+          }
         ]
       end
 
       def searchable_alchemy_resource_attributes
-        %w(name image_file_name)
+        %w[name image_file_name]
       end
 
       def last_upload
@@ -183,7 +184,7 @@ module Alchemy
         options.except(*TRANSFORMATION_OPTIONS).merge(
           basename: name,
           ext: variant.render_format,
-          name: name,
+          name: name
         )
       )
     rescue ::Dragonfly::Job::Fetch::NotFound => e
@@ -211,7 +212,7 @@ module Alchemy
       {
         name: image_file_name,
         size: image_file_size,
-        error: errors[:image_file].join,
+        error: errors[:image_file].join
       }
     end
 

data/app/models/alchemy/picture_thumb/create.rb

@@ -27,7 +27,7 @@ module Alchemy
           end
           begin
             Alchemy::PictureThumb.storage_class.call(variant, uid)
-          rescue StandardError => e
+          rescue => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or storing fails
             @thumb&.destroy

data/app/models/alchemy/picture_thumb.rb

@@ -42,7 +42,7 @@ module Alchemy
         Alchemy::Picture::THUMBNAIL_SIZES.values.each do |size|
           variant = Alchemy::PictureVariant.new(picture, {
             size: size,
-            flatten: true,
+            flatten: true
           })
           signature = Alchemy::PictureThumb::Signature.call(variant)
           thumb = find_by(signature: signature)

data/app/models/alchemy/picture_variant.rb

@@ -54,8 +54,7 @@ module Alchemy
       raise MissingImageFileError, "Missing image file for #{picture.inspect}" if image.nil?
 
       image = processed_image(image, @options)
-      image = encoded_image(image, @options)
-      image
+      encoded_image(image, @options)
     rescue MissingImageFileError, WrongImageFormatError => e
       log_warning(e.message)
       nil
@@ -88,7 +87,7 @@ module Alchemy
       end
 
       options = {
-        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && 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/models/alchemy/tag.rb

@@ -13,6 +13,14 @@
 # The original Tag model is Gutentag::Tag
 module Alchemy
   class Tag < Gutentag::Tag
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[created_at id name taggings_count updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[taggings]
+    end
+
     # Replaces tag with new tag on all models tagged with tag.
     def self.replace(tag, new_tag)
       tag.taggings.collect(&:taggable).each do |taggable|

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

@@ -56,7 +56,7 @@ module Alchemy
         crop: crop,
         crop_from: crop && crop_from.presence || nil,
         crop_size: crop && crop_size.presence || nil,
-        size: settings[:size],
+        size: settings[:size]
       }.with_indifferent_access
     end
 
@@ -84,7 +84,7 @@ module Alchemy
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: picture&.image_file_format || "jpg",
+        format: picture&.image_file_format || "jpg"
       }
     end
 
@@ -96,7 +96,7 @@ module Alchemy
         default_crop_size: default_crop_size,
         fixed_ratio: settings[:fixed_ratio],
         image_width: picture&.image_file_width,
-        image_height: picture&.image_file_height,
+        image_height: picture&.image_file_height
       ).to_h
     end
 
@@ -105,7 +105,7 @@ module Alchemy
       settings[:crop] && picture &&
         picture.can_be_cropped_to?(
           settings[:size],
-          settings[:upsample],
+          settings[:upsample]
         ) && !!picture.image_file
     end
 
@@ -124,7 +124,7 @@ module Alchemy
     def thumbnail_zoom_factor(mask)
       [
         mask[0].to_f / (image_file_width || 1),
-        mask[1].to_f / (image_file_height || 1),
+        mask[1].to_f / (image_file_height || 1)
       ].max
     end
 
@@ -134,7 +134,7 @@ module Alchemy
 
       [
         ((image_file_width || 0) - default_crop_size[0]) / 2,
-        ((image_file_height || 0) - default_crop_size[1]) / 2,
+        ((image_file_height || 0) - default_crop_size[1]) / 2
       ].map(&:round)
     end
 

data/app/serializers/alchemy/base_serializer.rb

@@ -14,7 +14,7 @@ module Alchemy
     # The attributes to be serialized. See ActiveModel::Serialization.
     # By default, serialize all columns from the AR object.
     def attributes
-      Hash[object.class.column_names.map { |c| [c, nil] }]
+      object.class.column_names.map { |c| [c, nil] }.to_h
     end
 
     private

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      { "pages" => nil }
+      {"pages" => nil}
     end
 
     def pages
       tree = []
-      path = [{ id: object.parent_id, children: tree }]
-      page_list = object.self_and_descendants.includes(:public_version, { language: :site })
+      path = [{id: object.parent_id, children: tree}]
+      page_list = object.self_and_descendants.includes(:public_version, {language: :site})
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -61,7 +61,7 @@ module Alchemy
         level: level,
         root: page.root?,
         root_or_leaf: page.root? || page.leaf?,
-        children: [],
+        children: []
       }
 
       if opts[:elements]
@@ -75,7 +75,7 @@ module Alchemy
           locked: page.locked?,
           locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil,
           permissions: page_permissions(page, opts[:ability]),
-          status_titles: page_status_titles(page),
+          status_titles: page_status_titles(page)
         })
       else
         p_hash
@@ -98,14 +98,14 @@ module Alchemy
         copy: ability.can?(:copy, page),
         destroy: ability.can?(:destroy, page),
         create: ability.can?(:create, Alchemy::Page),
-        edit_content: ability.can?(:edit_content, page),
+        edit_content: ability.can?(:edit_content, page)
       }
     end
 
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        restricted: page.status_title(:restricted),
+        restricted: page.status_title(:restricted)
       }
     end
   end

data/app/services/alchemy/duplicate_element.rb

@@ -10,7 +10,7 @@ module Alchemy
       "id",
       "folded",
       "updated_at",
-      "updater_id",
+      "updater_id"
     ].freeze
 
     attr_reader :source_element, :repository
@@ -27,7 +27,7 @@ module Alchemy
         .merge(
           autogenerate_ingredients: false,
           autogenerate_nested_elements: false,
-          tags: source_element.tags,
+          tags: source_element.tags
         )
 
       new_element = Element.new(attributes)
@@ -40,7 +40,7 @@ module Alchemy
           self.class.new(nested_element, repository: repository).call(
             parent_element: new_element,
             page_version: new_element.page_version,
-            position: position,
+            position: position
           )
         end
       end

data/app/services/alchemy/tag_validations.rb

@@ -11,7 +11,7 @@ module Alchemy
     end
 
     def call
-      klass.validates :name, presence: true, uniqueness: { case_sensitive: true }
+      klass.validates :name, presence: true, uniqueness: {case_sensitive: true}
     end
 
     private

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -56,6 +56,9 @@
     <% end %>
   <% end %>
 
+  <%# We need to render nested elements even if the element is folded,
+      because we need the element present in the DOM for the feature
+      "click element in the preview => load and expand element editor". %>
   <% if element.nestable_elements.any? %>
     <div class="nestable-elements">
       <%= content_tag :div,

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

@@ -138,9 +138,6 @@
 <% end %>
 
 <% content_for :javascripts do %>
-<% if Alchemy::Tinymce.custom_configs_present?(@page) %>
-  <%= render 'tinymce_custom_config' %>
-<% end %>
 
 <% content_for :javascript_includes do %>
   <meta name="turbolinks-cache-control" content="no-cache">

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

@@ -18,10 +18,16 @@
 <% else -%>
 
   if (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]);
+
+    <% if @page.layoutpage %>
+       page.outerHTML = "<%= j render('alchemy/admin/layoutpages/layoutpage', layoutpage: @page) %>"
+    <% else %>
+       const page_html = "<%= j render('page', page: @page) %>".replace(/__ID__/g, "<%= @page.id %>");
+       const compiler = Handlebars.compile(page_html);
+       const tree = <%== @tree.to_json %>;
+       page.outerHTML = compiler(tree.pages[0]);
+    <% end %>
+
     Alchemy.growl("<%= j @notice %>");
     Alchemy.closeCurrentDialog();
   } else {

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -34,7 +34,7 @@
                   <li class="<%= cycle('even', 'odd') %>">
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% ingredients = picture_ingredients.collect(&:translated_role).to_sentence %>
+                    <% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
                     <% if element.public? %>
                       <%= render_icon('window-maximize', style: 'regular') %>
                     <% else %>

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

@@ -1,14 +1 @@
-<%- if audio_view.attachment -%>
-  <%= content_tag :audio,
-      controls: audio_view.controls,
-      autoplay: audio_view.autoplay,
-      loop: audio_view.loop,
-      muted: audio_view.muted do %>
-    <%= tag :source,
-      src: alchemy.show_attachment_path(
-        audio_view.attachment,
-        format: audio_view.attachment.suffix
-      ),
-      type: audio_view.attachment.file_mime_type %>
-  <% end %>
-<%- end -%>
+<%= render audio_view.as_view_component -%>

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

@@ -1 +1 @@
-<%= Alchemy.t(boolean_view.value, scope: "ingredient_values.boolean") unless boolean_view.value.nil? -%>
+<%= render boolean_view.as_view_component -%>

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

@@ -1,9 +1,3 @@
-<%- date_format = datetime_view.settings_value(:date_format,
-  local_assigns.fetch(:options, {})) -%>
-<%- if datetime_view.value.present? -%>
-<%- if date_format == 'rfc822' -%>
-<%= datetime_view.value.to_s(:rfc822) %>
-<%- else -%>
-<%= l(datetime_view.value, format: date_format) %>
-<%- end -%>
-<%- end -%>
+<%= render datetime_view.as_view_component(
+  **local_assigns.slice(:options)
+) -%>

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

@@ -1,17 +1,4 @@
-<%- if attachment = file_view.attachment -%>
-<%- html_options = local_assigns.fetch(:html_options, {}) -%>
-<%= link_to(
-  file_view.link_text.presence ||
-    file_view.settings_value(:link_text, local_assigns.fetch(:options, {})) ||
-    attachment.name,
-  attachment.url(
-    download: true,
-    name: attachment.slug,
-    format: attachment.suffix
-  ),
-  {
-    class: file_view.css_class.presence,
-    title: file_view.title.presence
-  }.merge(html_options)
+<%= render file_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
 ) -%>
-<%- end -%>

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

@@ -1,10 +1,4 @@
-<%- html_options = local_assigns.fetch(:html_options, {}) -%>
-
-<%= content_tag "h#{headline_view.level}",
-    headline_view.value,
-    id: headline_view.dom_id.presence,
-    class: [
-      headline_view.size ? "h#{headline_view.size}" : nil,
-      html_options[:class]
-    ]
-%>
+<%= render headline_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

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

@@ -1 +1 @@
-<%= raw html_view.value -%>
+<%= render html_view.as_view_component -%>

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

@@ -1,9 +1,4 @@
-<%- if link_view.value.present? -%>
-<%- html_options = {
-  target: link_view.link_target == "blank" ? "_blank" : nil
-}.merge(local_assigns.fetch(:html_options, {})) -%>
-<%= link_to(link_view.value, html_options) do -%>
-<%= link_view.settings_value(:text, local_assigns.fetch(:options, {})) ||
-  link_view.value -%>
-<%- end -%>
-<%- end -%>
+<%= render link_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

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

@@ -1 +1 @@
-<%= render node_view.node if node_view.node %>
+<%= render node_view.as_view_component -%>

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

@@ -1,4 +1 @@
-<% page = page_view.page %>
-<% if page %>
-<%= link_to page.name, alchemy.show_page_path(urlname: page.urlname) %>
-<% end %>
+<%= render page_view.as_view_component -%>

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

@@ -1,5 +1,4 @@
-<%= Alchemy::PictureView.new(
-  picture_view,
-  local_assigns[:options],
-  local_assigns[:html_options]
-).render %>
+<%= render picture_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
+) -%>

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

@@ -5,8 +5,17 @@
     <%= ingredient_label(richtext_editor) %>
     <div class="tinymce_container">
       <%= f.text_area :value,
-        class: richtext_editor.tinymce_class_name,
-        id: "tinymce_#{richtext_editor.id}" %>
+        class: "has_tinymce",
+        id: richtext_editor.element_id %>
     </div>
   <% end %>
+  <% if richtext_editor.has_custom_tinymce_config? %>
+    <script type="text/javascript" charset="utf-8">
+      Alchemy.Tinymce.setCustomConfig("<%= richtext_editor.element_id %>", {
+        <% richtext_editor.custom_tinymce_config.each do |k, v| %>
+        <%= k %>: <%== v.to_json %>,
+        <% end %>
+      });
+    </script>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,3 @@
-<%- options = local_assigns.fetch(:options, {}) -%>
-<%- plain_text = !!richtext_view.settings_value(:plain_text, options) -%>
-<%= raw richtext_view.public_send(plain_text ? :stripped_body : :value) -%>
+<%= render richtext_view.as_view_component(
+  **local_assigns.slice(:options)
+) -%>

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

@@ -1 +1 @@
-<%= select_view.value %>
+<%= render select_view.as_view_component -%>

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

@@ -1,20 +1,4 @@
-<%- options = local_assigns.fetch(:options, {}) -%>
-<%- html_options = local_assigns.fetch(:html_options, {}) -%>
-<%- if text_view.link.blank? || text_view.settings_value(:disable_link, options) -%>
-  <%- if text_view.dom_id.present? -%>
-    <%= content_tag :a, text_view.value, id: text_view.dom_id %>
-  <% else %>
-    <%= text_view.value -%>
-  <%- end -%>
-<%- else -%>
-  <%= link_to(
-    text_view.value,
-    url_for(text_view.link),
-    {
-      id: text_view.dom_id.presence,
-      title: text_view.link_title,
-      target: (text_view.link_target == "blank" ? "_blank" : nil),
-      'data-link-target' => text_view.link_target
-    }.merge(html_options)
+<%= render text_view.as_view_component(
+  **local_assigns.slice(:options),
+  **local_assigns.slice(:html_options)
 ) -%>
-<%- end -%>

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

@@ -1,18 +1,3 @@
-<%- if video_view.attachment -%>
-  <%= content_tag :video,
-    controls: video_view.controls,
-    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 %>
-    <%= tag :source,
-      src: alchemy.show_attachment_path(
-        video_view.attachment,
-        format: video_view.attachment.suffix
-      ),
-      type: video_view.attachment.file_mime_type %>
-  <% end %>
-<%- end -%>
+<%= render video_view.as_view_component(
+  **local_assigns.slice(:html_options)
+) -%>

data/app/views/alchemy/ingredients/shared/_link_tools.html.erb

@@ -5,6 +5,7 @@
     onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
     class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-ingredient",
     "data-parent-selector": "[data-ingredient-id='#{ingredient_editor.id}']",
+    "data-language-id": ingredient_editor.page&.language_id,
     title: Alchemy.t(:place_link),
     id: "edit_link_#{ingredient_editor.id}"
   ) %>

data/app/views/alchemy/ingredients/shared/_picture_tools.html.erb

@@ -34,6 +34,7 @@
   class: picture_editor.linked? ? "linked" : nil,
   title: Alchemy.t(:link_image),
   "data-parent-selector": "[data-ingredient-id='#{picture_editor.id}']",
+  "data-language-id": picture_editor.page&.language_id,
   id: "edit_link_#{picture_editor.id}"
 } do %>
   <span class="disabled" tabindex="-1"><%= render_icon(:link) %></span>

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

@@ -25,21 +25,19 @@
       // Store regular expression for external link url matching.
       Alchemy.link_url_regexp = <%= link_url_regexp.inspect %>;
       // Holds the default Alchemy TinyMCE configuration
-      Alchemy.Tinymce = {
-        defaults: {
-          plugins: '<%= Alchemy::Tinymce.plugins.join(',') %>',
-          <% Alchemy::Tinymce.init.each do |k, v| %>
-          <%= k %>: <%== v.to_json %>,
-          <% end %>
-        }
+      Alchemy.TinymceDefaults = {
+        plugins: '<%= Alchemy::Tinymce.plugins.join(',') %>',
+        <% Alchemy::Tinymce.init.each do |k, v| %>
+        <%= k %>: <%== v.to_json %>,
+        <% end %>
       };
     </script>
     <%= render 'alchemy/admin/partials/routes' %>
     <%= javascript_include_tag('alchemy/admin/all', 'data-turbolinks-track' => true) %>
     <% if respond_to?(:javascript_pack_tag) %>
-      <%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true, defer: true) %>
+      <%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true) %>
     <% else %>
-      <%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true, defer: true) %>
+      <%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true) %>
     <% end %>
     <%= yield :javascript_includes %>
   </head>

data/bin/setup

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require "fileutils"
+
+# path to dummy application root.
+APP_ROOT = File.expand_path("../spec/dummy", __dir__)
+
+# path to alchemy gem
+GEM_ROOT = File.expand_path("../", __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+FileUtils.chdir GEM_ROOT do
+  puts "\n== Linking Admin JS package =="
+  system! "yarn link"
+  puts "== Installing dependencies =="
+  system! "yarn install"
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
+end
+
+FileUtils.chdir APP_ROOT do
+  puts "\n== Installing Alchemy into dummy app =="
+  system!("bin/rails javascript:install:esbuild")
+  system!("bin/rails g alchemy:install --skip --skip-demo-files --auto-accept")
+
+  puts "\n== Link Alchemy admin package =="
+  system! "yarn link @alchemy_cms/admin"
+  system! "yarn install"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! "bin/rails log:clear tmp:clear"
+end
+
+puts "\n== Alchemy is ready 🎉 =="
+puts "Start server by typing:\n\n  bin/start"

data/bin/start

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+require "fileutils"
+
+# path to dummy application root.
+APP_ROOT = File.expand_path("../spec/dummy", __dir__)
+
+# path to alchemy gem
+GEM_ROOT = File.expand_path("../", __dir__)
+
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
+
+FileUtils.chdir APP_ROOT do
+  puts "\n== Starting dummy app =="
+  system! "bin/dev"
+end

data/config/initializers/assets.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 # Add Alchemy assets for precompiling
 Rails.application.config.assets.precompile << "alchemy_manifest.js"