alchemy_cms 6.1.5 → 7.0.0.pre.b

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

@@ -8,9 +8,7 @@
       redirect_url: alchemy.admin_pictures_path(
         size: search_filter_params[:size],
         filter: { misc: 'last_upload' },
-        form_field_id: @form_field_id,
-        content_id: @content.try(:id),
-        element_id: @element.try(:id)
+        form_field_id: @form_field_id
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>

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

@@ -22,7 +22,7 @@
   <div id="pictures_page_list">
     <% if @assignments.any? %>
       <ul>
-        <% @assignments.group_by(&:page).each do |page, essence_pictures| %>
+        <% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
           <% if page %>
             <li>
               <h3>
@@ -30,20 +30,18 @@
                 <p><%= link_to page.name, edit_admin_page_path(page) %></p>
               </h3>
               <ul class="list">
-                <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
+                <% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
                   <li class="<%= cycle('even', 'odd') %>">
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% pictures = essence_pictures.collect do |e|
-                                    e.content.name_for_label
-                                  end.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 %>
                       <%= render_icon('window-close') %>
                     <% end %>
                     <p>
-                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
                     </p>
                   </li>
                 <% end %>

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_editor.html.erb

@@ -3,7 +3,7 @@
   data: boolean_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
     <%= f.label :value, style: "display: inline-block" do %>
-      <%= f.check_box :value, id: nil %>
+      <%= f.check_box :value, id: boolean_editor.form_field_id %>
       <%= render_ingredient_role(boolean_editor) %>
     <% end %>
     <%= render_hint_for(boolean_editor) %>

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_editor.html.erb

@@ -6,7 +6,7 @@
   data: headline_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, headline_editor.ingredient) do |f| %>
     <%= ingredient_label(headline_editor) %>
-    <%= f.text_field :value, id: nil %>
+    <%= f.text_field :value, id: headline_editor.form_field_id %>
 
     <% if headline_editor.settings[:anchor] %>
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>

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_editor.html.erb

@@ -3,6 +3,6 @@
   data: html_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, html_editor.ingredient) do |f| %>
     <%= ingredient_label(html_editor) %>
-    <%= f.text_area :value, id: nil %>
+    <%= f.text_area :value, id: html_editor.form_field_id %>
   <% end %>
 <% end %>

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_editor.html.erb

@@ -16,7 +16,7 @@
   }) %>
   $('#<%= node_editor.form_field_id(:node_id) %>').alchemyNodeSelect({
     placeholder: "<%= Alchemy.t(:search_node) %>",
-    url: "<%= alchemy.api_nodes_path %>",
+    url: "<%= alchemy.api_nodes_path(language_id: node_editor.page&.language_id) %>",
     query_params: <%== query_params.to_json %>,
     <% if node_editor.node %>
     <% serialized_node = ActiveModelSerializers::SerializableResource.new(node_editor.node, include: :ancestors) %>

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_editor.html.erb

@@ -31,10 +31,10 @@
           <% end %>
         </div>
       </div>
-      <%- if picture_editor.essence.css_class.present? -%>
-        <div class="essence_picture_css_class">
-          <%= Alchemy.t("alchemy.essence_pictures.css_classes.#{picture_editor.essence.css_class}",
-            default: picture_editor.essence.css_class.camelcase) %>
+      <%- if picture_editor.css_class.present? -%>
+        <div class="picture_ingredient_css_class">
+          <%= Alchemy.t("alchemy.picture_ingredients.css_classes.#{picture_editor.css_class}",
+            default: picture_editor.css_class.camelcase) %>
         </div>
       <%- end -%>
       <div class="edit_images_bottom">

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_editor.html.erb

@@ -12,7 +12,7 @@
       <%= warning(':select_values is nil',
       "<strong>No select values given.</strong>
       <br>Please provide <code>select_values</code> on the
-      content definition <code>settings</code> in
+      ingredient definition <code>settings</code> in
       <code>elements.yml</code>.") %>
     <% else %>
       <%
@@ -22,7 +22,7 @@
         options_tags = options_for_select(select_values, select_editor.value)
       end %>
       <%= f.select :value, options_tags, {}, {
-        id: nil,
+        id: select_editor.form_field_id,
         class: ["alchemy_selectbox", "ingredient-editor-select"]
       } %>
     <% end %>

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_editor.html.erb

@@ -7,7 +7,7 @@
     <%= ingredient_label(text_editor) %>
     <%= f.text_field :value,
       class: text_editor.settings[:linkable] ? "text_with_icon" : "",
-      id: nil,
+      id: text_editor.form_field_id,
       type: text_editor.settings[:input_type] || "text" %>
     <% if text_editor.settings[:anchor] %>
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: text_editor %>

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

@@ -1,10 +1,11 @@
-<span class="linkable_essence_tools">
+<span class="ingredient_link_buttons">
   <%= link_to(
     render_icon(:link),
     '#',
     onclick: 'new Alchemy.LinkDialog(this).open(); return false;',
-    class: "icon_button#{ingredient_editor.linked? ? ' linked' : ''} link-essence",
+    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}"
   ) %>
@@ -12,7 +13,7 @@
     render_icon(:unlink),
     '#',
     onclick: "return Alchemy.LinkDialog.removeLink(this, '[data-ingredient-id=\"#{ingredient_editor.id}\"]')",
-    class: "icon_button unlink-essence #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
+    class: "icon_button unlink-ingredient #{ingredient_editor.linked? ? 'linked' : 'disabled'}",
     tabindex: ingredient_editor.linked? ? nil : '-1',
     'data-ingredient-id' => ingredient_editor.id,
     title: Alchemy.t(:unlink)

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/alchemy/pages/_meta_data.html.erb

@@ -5,5 +5,4 @@
   <%= tag(:meta, name: 'robots', content: meta_robots) %>
   <%= tag(:meta, name: 'description', content: meta_description, lang: @page.language_code) if meta_description.present? %>
   <%= tag(:meta, name: 'keywords', content: meta_keywords, lang: @page.language_code) if meta_keywords.present? %>
-  <%= auto_discovery_link_tag(:rss, show_alchemy_page_url(@page, format: :rss)) if @page.contains_feed? %>
 <% end %>

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

@@ -25,18 +25,20 @@
       // 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) %>
-    <%= javascript_pack_tag('alchemy/admin') %>
+    <% if respond_to?(:javascript_pack_tag) %>
+      <%= javascript_pack_tag('alchemy/admin', 'data-turbolinks-track' => true) %>
+    <% else %>
+      <%= javascript_include_tag('alchemy_admin', 'data-turbolinks-track' => true) %>
+    <% end %>
     <%= yield :javascript_includes %>
   </head>
   <%= content_tag :body, id: 'alchemy', class: alchemy_body_class do %>

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/alchemy/config.yml

@@ -66,9 +66,9 @@ items_per_page: 15
 #
 # Example:
 # - name: some_element
-#   contents:
-#   - name: some_picture
-#     type: EssencePicture
+#   ingredients:
+#   - role: some_picture
+#     type: Picture
 #     settings:
 #       hint: true
 #       crop: true  # turns on image cropping
@@ -82,7 +82,7 @@ items_per_page: 15
 #   preprocess_image_resize   [String]        # Use this option to resize images to the given size when they are uploaded to the image library. Downsizing example: '1000x1000>' (Default nil)
 #   image_output_format       [String]        # The global image output format setting. (Default +original+)
 #
-# NOTE: You can always override the output format in the settings of your Essence in elements.yml, I.E. {format: 'gif'}
+# NOTE: You can always override the output format in the settings of your ingredients in elements.yml, I.E. {format: 'gif'}
 #
 output_image_jpg_quality: 85
 preprocess_image_resize:
@@ -91,7 +91,7 @@ image_output_format: original
 # This is used by the seeder to create the default site.
 default_site:
   name: Default Site
-  host: '*'
+  host: "*"
 
 # This is the default language when seeding.
 default_language:
@@ -191,7 +191,7 @@ link_target_options: [blank]
 # === Format matchers
 #
 # Named aliases for regular expressions that can be used in various places.
-# The most common use case is the format validation of essences, or attribute validations of your individual models.
+# The most common use case is the format validation of ingredients, or attribute validations of your individual models.
 #
 # == Example:
 #