alchemy_cms 6.1.3 → 7.0.0.pre.a

data/lib/alchemy/tinymce.rb

@@ -35,11 +35,7 @@ module Alchemy
       end
 
       def custom_configs_present?(page)
-        custom_config_contents(page).any? || custom_config_ingredients(page).any?
-      end
-
-      def custom_config_contents(page)
-        content_definitions_from_elements(page.descendent_element_definitions)
+        custom_config_ingredients(page).any?
       end
 
       def custom_config_ingredients(page)
@@ -48,19 +44,6 @@ module Alchemy
 
       private
 
-      def content_definitions_from_elements(definitions)
-        definitions.collect do |el|
-          next if el["contents"].blank?
-
-          contents = el["contents"].select do |c|
-            c["settings"] && c["settings"]["tinymce"].is_a?(Hash)
-          end
-          next if contents.blank?
-
-          contents.map { |c| c.merge("element" => el["name"]) }
-        end.flatten.compact
-      end
-
       def ingredient_definitions_from_elements(definitions)
         definitions.collect do |el|
           next if el["ingredients"].blank?

data/lib/alchemy/upgrader/seven_point_zero.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module Alchemy
+  class Upgrader::SevenPointZero < Upgrader
+    include Thor::Base
+    include Thor::Actions
+
+    class << self
+      def update_admin_entrypoint
+        if File.exist? "app/javascript/packs/alchemy/admin.js"
+          FileUtils.mv "app/javascript/packs/alchemy/admin.js", "app/javascript/alchemy_admin.js"
+        else
+          log "Skipping. No alchemy/admin entrypoint found. Maybe already migrated from Webpacker?", :info
+        end
+        if Dir.exist?("app/javascript/packs/alchemy") && Dir.empty?("app/javascript/packs/alchemy")
+          FileUtils.rm_r "app/javascript/packs/alchemy"
+        end
+        if File.exist? "config/importmap.rb"
+          # We want the bundled package if using importmaps
+          task.gsub_file "app/javascript/alchemy_admin.js", 'import "@alchemy_cms/admin"', 'import "@alchemy_cms/dist/admin"'
+        end
+        if task.ask("Do you want to remove webpacker now? (y/N)", default: "N") == "y"
+          task.run "yarn remove @rails/webpacker webpack webpack-cli webpack-dev-server"
+          FileUtils.rm_r "app/javascript/packs"
+          FileUtils.rm_r "config/webpack"
+          FileUtils.rm "config/webpacker.yml"
+          FileUtils.rm "bin/webpack"
+          FileUtils.rm "bin/webpack-dev-server"
+        end
+        if task.ask("Do you want to add jsbundling-rails now? (Y/n)", default: "Y") == "Y"
+          task.run "bundle add jsbundling-rails"
+          task.run "bin/rails javascript:install:esbuild"
+        end
+      end
+
+      private
+
+      def task
+        @_task || new
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader.rb

@@ -26,9 +26,14 @@ module Alchemy
       end
 
       def update_npm_package
-        desc "Install new npm package."
-        `yarn add @alchemy_cms/admin@~#{Alchemy.version}`
-        log "Installed new npm package."
+        desc "Update npm package."
+        if File.exist? Rails.root.join("config/importmap.rb")
+          `bin/importmap pin @alchemy_cms/admin@~#{Alchemy.version}`
+        elsif File.exist? Rails.root.join("package.json")
+          `yarn add @alchemy_cms/admin@~#{Alchemy.version}`
+        else
+          log("Could not update alchemy admin package! Make sure you have a JS bundler installed", :warning)
+        end
       end
     end
   end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.1.3"
+  VERSION = "7.0.0-a"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -5,25 +5,6 @@ require "alchemy/admin/preview_url"
 module Alchemy
   YAML_PERMITTED_CLASSES = %w[Symbol Date Regexp]
 
-  DEPRECATED_ESSENCE_CLASS_MAPPING = {
-    "Alchemy::EssenceAudio" => "Alchemy::Ingredients::Audio",
-    "Alchemy::EssenceBoolean" => "Alchemy::Ingredients::Boolean",
-    "Alchemy::EssenceDate" => "Alchemy::Ingredients::Date",
-    "Alchemy::EssenceFile" => "Alchemy::Ingredients::File",
-    "Alchemy::EssenceHeadline" => "Alchemy::Ingredients::Headline",
-    "Alchemy::EssenceHtml" => "Alchemy::Ingredients::Html",
-    "Alchemy::EssenceLink" => "Alchemy::Ingredients::Link",
-    "Alchemy::EssenceNode" => "Alchemy::Ingredients::Node",
-    "Alchemy::EssencePage" => "Alchemy::Ingredients::Page",
-    "Alchemy::EssencePicture" => "Alchemy::Ingredients::Picture",
-    "Alchemy::EssenceRichtext" => "Alchemy::Ingredients::Richtext",
-    "Alchemy::EssenceSelect" => "Alchemy::Ingredients::Select",
-    "Alchemy::EssenceText" => "Alchemy::Ingredients::Text",
-    "Alchemy::EssenceVideo" => "Alchemy::Ingredients::Video",
-  }
-
-  DEPRECATED_ESSENCE_CLASSES = DEPRECATED_ESSENCE_CLASS_MAPPING.keys
-
   # Define page preview sources
   #
   # A preview source is a Ruby class returning an URL

data/lib/alchemy_cms.rb

@@ -23,7 +23,6 @@ require "sassc-rails"
 require "simple_form"
 require "turbolinks"
 require "userstamp"
-require "webpacker"
 
 # Require globally used Alchemy mixins
 require_relative "alchemy/ability_helper"
@@ -39,7 +38,6 @@ require_relative "alchemy/element_definition"
 require_relative "alchemy/elements_finder"
 require_relative "alchemy/error_tracking"
 require_relative "alchemy/errors"
-require_relative "alchemy/essence"
 require_relative "alchemy/filetypes"
 require_relative "alchemy/forms/builder"
 require_relative "alchemy/hints"
@@ -53,6 +51,7 @@ require_relative "alchemy/page_layout"
 require_relative "alchemy/paths"
 require_relative "alchemy/permissions"
 require_relative "alchemy/resource"
+require_relative "alchemy/searchable_resource"
 require_relative "alchemy/tinymce"
 require_relative "alchemy/taggable"
 require_relative "alchemy/version"

data/lib/generators/alchemy/elements/elements_generator.rb

@@ -13,7 +13,6 @@ module Alchemy
 
         @elements.each do |element|
           @element = element
-          @contents = element["contents"] || []
           @ingredients = element["ingredients"] || []
           @element_name = element_name(element)
           conditional_template "view.html.#{template_engine}", "#{elements_dir}/_#{@element_name}.html.#{template_engine}"

data/lib/generators/alchemy/elements/templates/view.html.erb

@@ -1,14 +1,5 @@
 <%%- cache(<%= @element_name %>) do -%>
   <%%= element_view_for(<%= @element_name %>) do |el| -%>
-  <%- @contents.each do |content| -%>
-    <%- if @contents.length > 1 -%>
-    <div class="<%= content["name"] %>">
-      <%%= el.render :<%= content["name"] %> %>
-    </div>
-    <%- else -%>
-    <%%= el.render :<%= content["name"] %> %>
-    <%- end -%>
-  <%- end -%>
   <%- @ingredients.each do |ingredient| -%>
     <%- if @ingredients.length > 1 -%>
     <div class="<%= ingredient["role"] %>">
@@ -19,7 +10,7 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    <%%= render <%= @element_name %>.nested_elements.available %>
+    <%%= render <%= @element_name %>.nested_elements.published %>
   <%- end -%>
   <%%- end -%>
 <%%- end -%>

data/lib/generators/alchemy/elements/templates/view.html.haml

@@ -1,13 +1,5 @@
 - cache(<%= @element_name -%>) do
   = element_view_for(<%= @element_name -%>) do |el|
-  <%- @contents.each do |content| -%>
-    <%- if @contents.length > 1 -%>
-    .<%= content["name"] %>
-      = el.render :<%= content["name"] %>
-    <%- else -%>
-    = el.render :<%= content["name"] %>
-    <%- end -%>
-  <%- end -%>
   <%- @ingredients.each do |ingredient| -%>
     <%- if @ingredients.length > 1 -%>
     .<%= ingredient["role"] %>
@@ -18,5 +10,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>.nested_elements.available
+    = render <%= @element_name -%>.nested_elements.published
   <%- end -%>

data/lib/generators/alchemy/elements/templates/view.html.slim

@@ -1,13 +1,5 @@
 - cache(<%= @element_name -%>) do
   = element_view_for(<%= @element_name -%>) do |el|
-  <%- @contents.each do |content| -%>
-    <%- if @contents.length > 1 -%>
-    .<%= content["name"] %>
-      = el.render :<%= content["name"] %>
-    <%- else -%>
-    = el.render :<%= content["name"] %>
-    <%- end -%>
-  <%- end -%>
   <%- @ingredients.each do |ingredient| -%>
     <%- if @ingredients.length > 1 -%>
     .<%= ingredient["role"] %>
@@ -18,5 +10,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>.nested_elements.available
+    = render <%= @element_name -%>.nested_elements.published
   <%- end -%>

data/lib/generators/alchemy/install/files/alchemy.en.yml

@@ -1,6 +1,5 @@
 en:
   alchemy:
-
     # Translations for page layout names
     page_layout_names:
       index: Homepage
@@ -9,23 +8,23 @@ en:
     element_names:
       article: Article
 
-    # Translations for content names
-    content_names:
+    # Translations for ingredient roles
+    ingredient_roles:
       headline: Headline
       text: Text
       picture: Picture
 
-    # Default texts for new contents created
-    default_content_texts:
+    # Default texts for new ingredients created
+    default_ingredient_texts:
       article_headline: "Welcome to your first Alchemy CMS page"
-      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: essences. The basic essences are:</p><ul><li>EssenceText - <em>A single line of text</em></li><li>EssenceRichtext - <em>A TinyMCE powered formatted text block</em></li><li>EssencePicture - <em>A reference to an image</em></li><li>EssenceHtml - <em>HTML embed code</em></li><li>EssenceSelect - <em>A selection of values</em></li><li>EssenceBoolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
+      article_text: '<p><strong>How to get started.</strong></p><p>First of all you should read about Alchemy and its architecture in the <a class="external" href="http://guides.alchemy-cms.com/alchemy_approach.html" target="_blank" data-link-target="blank">guidelines</a>.</p><p>The most important things to know about Alchemy are elements and page layouts.</p><p><span style="text-decoration: underline;"><strong>Elements:</strong></span></p><p>With Alchemy you can split pages into content parts, elements. These elements can be defined out of several base content types: ingredients. The ingredients are:</p><ul><li>Text - <em>A single line of text</em></li><li>Richtext - <em>A TinyMCE powered formatted text block</em></li><li>Picture - <em>A reference to an image</em></li><li>Html - <em>HTML embed code</em></li><li>Select - <em>A selection of values</em></li><li>Boolean - <em>A checkbox</em></li></ul><p>Elements get defined in a YAML file <strong>config/alchemy/elements.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/elements.html" target="_blank" data-link-target="blank">Read more about elements and how to define them in the guidelines.</a></p><p><span style="text-decoration: underline;"><strong>Page types:</strong></span></p><p>You can define several types of pages, called page layouts. You can assign elements to page layouts and control how elements and the page of a certain layout behave.</p><p>Page layouts get defined in a YAML file <strong>config/alchemy/page_layouts.yml</strong></p><p><a class="external" href="http://guides.alchemy-cms.com/page_layouts.html" target="_blank" data-link-target="blank">Read more about defining page layouts in the guidelines.</a></p>'
 
     # Hint texts for elements
     element_hints:
       article: "This is a hint text for the article element. You can change this text in `config/locales/alchemy.en.yml`. Feel free to change it as you like, it's yours."
 
-    # Hint texts for contents
-    content_hints:
+    # Hint texts for ingredients
+    ingredient_hints:
       headline: "This is a single line of unformatable Text"
       picture: "Pictures are stored in the library. You can assign a picture multiple times throughout your site. Alchemy has an image cropper build right in."
       text: "This is a rich text block powered by TinyMCE editor. You can change the configuration of the editor. See http://guides.alchemy-cms.com/customize_tinymce.html"

data/lib/generators/alchemy/install/files/application.html.erb

@@ -6,7 +6,7 @@
     <%= csp_meta_tag %>
 
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_link_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body>

data/lib/generators/alchemy/install/install_generator.rb

@@ -18,11 +18,6 @@ module Alchemy
         default: false,
         desc: "Skip creation of demo element, page and application layout."
 
-      class_option :skip_webpacker_installer,
-        type: :boolean,
-        default: false,
-        desc: "Skip running the webpacker installer."
-
       class_option :skip_db_create,
         type: :boolean,
         default: false,
@@ -103,27 +98,28 @@ module Alchemy
         rake "gutentag:install:migrations"
       end
 
-      def run_webpacker_installer
-        unless options[:skip_webpacker_installer]
-          # Webpacker does not create a package.json, but we need one
-          unless File.exist? app_root.join("package.json")
-            in_root { run "echo '{}' > package.json" }
-          end
-          rake("webpacker:install", abort_on_failure: true)
-        end
-      end
-
       def add_npm_package
-        run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
+        if File.exist? app_root.join("package.json")
+          run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
+        elsif File.exist? app_root.join("config/importmap.rb")
+          run "bin/importmap pin @alchemy_cms/admin@~#{Alchemy.version}"
+        else
+          log("Could not add alchemy admin package! Make sure you have a JS bundler installed", :warning)
+        end
       end
 
       def copy_alchemy_entry_point
-        webpack_config = YAML.safe_load(
-          File.read(app_root.join("config", "webpacker.yml")),
-          aliases: true
-        )[Rails.env]
-        copy_file "alchemy_admin.js",
-          app_root.join(webpack_config["source_path"], webpack_config["source_entry_path"], "alchemy/admin.js")
+        if Dir.exist? app_root.join("app/javascript")
+          if File.exist? app_root.join("config/importmap.rb")
+            # We want the bundled package if using importmaps
+            create_file app_root.join("app/javascript/alchemy_admin.js"), 'import "@alchemy_cms/dist/admin"'
+          else
+            # We want the normal package if using a bundler locally
+            create_file app_root.join("app/javascript/alchemy_admin.js"), 'import "@alchemy_cms/admin"'
+          end
+        else
+          log("Could not add alchemy admin entry point! Make sure you have a JS bundler installed", :warning)
+        end
       end
 
       def set_primary_language

data/lib/generators/alchemy/install/templates/elements.yml.tt

@@ -6,16 +6,16 @@
 - name: article
   hint: true
   unique: true
-  contents:
-  - name: headline
-    type: EssenceText
-    default: :article_headline
-    hint: true
-  - name: picture
-    type: EssencePicture
-    hint: true
-  - name: text
-    type: EssenceRichtext
-    default: :article_text
-    hint: true
+  ingredients:
+    - role: headline
+      type: Text
+      default: :article_headline
+      hint: true
+    - role: picture
+      type: Picture
+      hint: true
+    - role: text
+      type: Richtext
+      default: :article_text
+      hint: true
 <%- end -%>

data/lib/tasks/alchemy/thumbnails.rake

@@ -2,10 +2,9 @@
 
 namespace :alchemy do
   namespace :generate do
-    desc "Generates all thumbnails for Alchemy Pictures and EssencePictures."
+    desc "Generates all thumbnails for Alchemy Pictures and Picture Ingredients."
     task thumbnails: [
       "alchemy:generate:picture_thumbnails",
-      "alchemy:generate:essence_picture_thumbnails",
       "alchemy:generate:ingredient_picture_thumbnails",
     ]
 
@@ -23,30 +22,12 @@ namespace :alchemy do
       puts "Done!"
     end
 
-    desc "Generates thumbnails for Alchemy EssencePictures."
-    task essence_picture_thumbnails: :environment do
-      essence_pictures = Alchemy::EssencePicture.joins(:content, :ingredient_association)
-      puts "Regenerate #{essence_pictures.count} essence picture thumbnails."
-      puts "Please wait..."
-
-      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!"
-    end
-
     desc "Generates thumbnails for Alchemy Picture Ingredients (set ELEMENTS=element1,element2 to only generate thumbnails for a subset of elements)."
     task ingredient_picture_thumbnails: :environment do
       ingredient_pictures = Alchemy::Ingredients::Picture.
         joins(:element).
         preload({ related_object: :thumbs }).
-        merge(Alchemy::Element.available)
+        merge(Alchemy::Element.published)
 
       if ENV["ELEMENTS"].present?
         ingredient_pictures = ingredient_pictures.merge(

data/lib/tasks/alchemy/tidy.rake

@@ -17,15 +17,9 @@ namespace :alchemy do
       Alchemy::Tidy.update_element_positions
     end
 
-    desc "Fixes content positions."
-    task content_positions: [:environment] do
-      Alchemy::Tidy.update_content_positions
-    end
-
-    desc "Remove orphaned records (elements & contents)."
+    desc "Remove orphaned records (elements)."
     task remove_orphaned_records: [:environment] do
       Rake::Task["alchemy:tidy:remove_orphaned_elements"].invoke
-      Rake::Task["alchemy:tidy:remove_orphaned_contents"].invoke
     end
 
     desc "Remove orphaned elements."
@@ -33,11 +27,6 @@ namespace :alchemy do
       Alchemy::Tidy.remove_orphaned_elements
     end
 
-    desc "Remove orphaned contents."
-    task remove_orphaned_contents: [:environment] do
-      Alchemy::Tidy.remove_orphaned_contents
-    end
-
     desc "Remove trashed elements."
     task remove_trashed_elements: [:environment] do
       Alchemy::Tidy.remove_trashed_elements

data/lib/tasks/alchemy/upgrade.rake

@@ -6,8 +6,7 @@ namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     "alchemy:upgrade:prepare",
-    "alchemy:upgrade:5.0:run",
-    "alchemy:upgrade:6.0:run",
+    "alchemy:upgrade:7.0:run",
   ] do
     Alchemy::Upgrader.display_todos
   end
@@ -36,59 +35,23 @@ namespace :alchemy do
       Alchemy::Upgrader.update_npm_package
     end
 
-    desc "Upgrade Alchemy to v5.0"
-    task "5.0" => [
+    desc "Upgrade Alchemy to v7.0"
+    task "7.0" => [
       "alchemy:upgrade:prepare",
-      "alchemy:upgrade:5.0:run",
+      "alchemy:upgrade:7.0:run",
     ] do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace "5.0" do
+    namespace "7.0" do
       task "run" => [
-        "alchemy:upgrade:5.0:install_gutentag_migrations",
-        "alchemy:upgrade:5.0:remove_layout_roots",
-        "alchemy:upgrade:5.0:remove_root_page",
+        "alchemy:upgrade:7.0:update_admin_entrypoint",
       ]
 
-      desc "Install Gutentag migrations"
-      task install_gutentag_migrations: [:environment] do
-        Alchemy::Upgrader::FivePointZero.install_gutentag_migrations
-      end
-
-      desc "Remove layout root pages"
-      task remove_layout_roots: [:environment] do
-        Alchemy::Upgrader::FivePointZero.remove_layout_roots
-      end
-
-      desc "Remove root page"
-      task remove_root_page: [:environment] do
-        Alchemy::Upgrader::FivePointZero.remove_root_page
-      end
-    end
-
-    desc "Upgrade Alchemy to v6.0"
-    task "6.0" => [
-      "alchemy:upgrade:prepare",
-      "alchemy:upgrade:6.0:run",
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
-    namespace "6.0" do
-      task "run" => [
-        "alchemy:upgrade:6.0:create_public_page_versions",
-        "alchemy:upgrade:6.0:create_ingredients",
-      ]
-
-      desc "Create public page versions"
-      task create_public_page_versions: [:environment] do
-        Alchemy::Upgrader::SixPointZero.create_public_page_versions
-      end
-
-      desc "Create ingredients for elements with ingredients defined"
-      task create_ingredients: [:environment] do
-        Alchemy::Upgrader::SixPointZero.create_ingredients
+      desc "Update alchemy admin entrypoint"
+      task update_admin_entrypoint: [:environment] do
+        puts "adding npm_package..."
+        Alchemy::Upgrader::SevenPointZero.update_admin_entrypoint
       end
     end
   end