alchemy_cms 6.1.5 → 7.0.0.pre.b

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -38,7 +38,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
     end
 
     context "with format in the options" do
-      let(:options) { { format: "gif" } }
+      let(:options) { {format: "gif"} }
 
       it "takes this as format." do
         expect(picture_url).to match(/\.gif/)
@@ -53,24 +53,24 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "if cropping is enabled" do
         before do
-          allow(record).to receive(:settings) { { crop: true } }
+          allow(record).to receive(:settings) { {crop: true} }
         end
 
         it "passes these crop values to the picture's url method." do
           expect(picture).to receive(:url).with(
-            hash_including(crop_from: "10x10", crop_size: "200x200"),
+            hash_including(crop_from: "10x10", crop_size: "200x200")
           )
           picture_url
         end
 
         context "but with crop values in the options" do
           let(:options) do
-            { crop_from: "30x30", crop_size: "75x75" }
+            {crop_from: "30x30", crop_size: "75x75"}
           end
 
           it "passes these crop values instead." do
             expect(picture).to receive(:url).with(
-              hash_including(crop_from: "30x30", crop_size: "75x75"),
+              hash_including(crop_from: "30x30", crop_size: "75x75")
             )
             picture_url
           end
@@ -79,7 +79,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
     end
 
     context "with other options" do
-      let(:options) { { foo: "baz" } }
+      let(:options) { {foo: "baz"} }
 
       context "and the image does not need to be processed" do
         before do
@@ -129,7 +129,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with cropping enabled" do
         before do
-          allow(record).to receive(:settings) { { crop: true } }
+          allow(record).to receive(:settings) { {crop: true} }
         end
 
         it "includes these crop values.", :aggregate_failures do
@@ -140,7 +140,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with cropping disabled" do
         before do
-          allow(record).to receive(:settings) { { crop: nil } }
+          allow(record).to receive(:settings) { {crop: nil} }
         end
 
         it "does not include these crop values.", :aggregate_failures do
@@ -165,7 +165,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "having size setting" do
       before do
-        allow(record).to receive(:settings) { { size: "30x70" } }
+        allow(record).to receive(:settings) { {size: "30x70"} }
       end
 
       it "includes this size." do
@@ -175,7 +175,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "having crop setting" do
       before do
-        allow(record).to receive(:settings) { { crop: true } }
+        allow(record).to receive(:settings) { {crop: true} }
       end
 
       it "includes this setting" do
@@ -214,7 +214,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when crop is enabled in the settings" do
       let(:settings) do
-        { crop: true }
+        {crop: true}
       end
 
       context "and crop sizes are present" do
@@ -228,8 +228,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: "10x10",
               crop_size: "200x200",
-              crop: true,
-            ),
+              crop: true
+            )
           )
           thumbnail_url
         end
@@ -241,8 +241,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: true,
-            ),
+              crop: true
+            )
           )
           thumbnail_url
         end
@@ -251,7 +251,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is disabled in the settings" do
       let(:settings) do
-        { crop: false }
+        {crop: false}
       end
 
       context "but crop sizes are present" do
@@ -265,8 +265,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_size: nil,
               crop_from: nil,
-              crop: false,
-            ),
+              crop: false
+            )
           )
           thumbnail_url
         end
@@ -316,7 +316,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is enabled in settings" do
       let(:settings) do
-        { crop: true }
+        {crop: true}
       end
 
       context "and crop values are present" do
@@ -330,7 +330,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: "10x10",
               crop_size: "200x200",
-              crop: true,
+              crop: true
             )
           )
         end
@@ -342,7 +342,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: true,
+              crop: true
             )
           )
         end
@@ -351,7 +351,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
     context "when cropping is disabled in settings" do
       let(:settings) do
-        { crop: false }
+        {crop: false}
       end
 
       context "but crop values are present" do
@@ -365,7 +365,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             hash_including(
               crop_from: nil,
               crop_size: nil,
-              crop: false,
+              crop: false
             )
           )
         end
@@ -382,7 +382,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           crop_size: nil,
           flatten: true,
           format: "jpg",
-          size: "160x120",
+          size: "160x120"
         )
       end
     end
@@ -405,7 +405,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           0,
           0,
           300,
-          250,
+          250
         ]
       end
 
@@ -424,7 +424,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
         context "with sizes in  settings" do
           let(:settings) do
-            { size: "300x250" }
+            {size: "300x250"}
           end
 
           it "sets sizes to given values" do
@@ -453,7 +453,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
           context "and aspect ratio set" do
             let(:settings) do
-              { fixed_ratio: "2" }
+              {fixed_ratio: "2"}
             end
 
             it "does not infer the height from the image file preserving the aspect ratio" do
@@ -466,7 +466,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
         context "when width or height is not fixed and an aspect ratio is given" do
           context "and aspect ratio set" do
             let(:settings) do
-              { fixed_ratio: "0.5" }
+              {fixed_ratio: "0.5"}
             end
 
             it "width is given, it infers the height from width and ratio" do
@@ -503,7 +503,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with fixed_ratio set to false" do
         let(:settings) do
-          { fixed_ratio: false }
+          {fixed_ratio: false}
         end
 
         it "sets ratio to false" do
@@ -513,7 +513,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with fixed_ratio set to a non float string" do
         let(:settings) do
-          { fixed_ratio: "123,45" }
+          {fixed_ratio: "123,45"}
         end
 
         it "raises an error" do
@@ -523,7 +523,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
       context "with no fixed_ratio set" do
         let(:settings) do
-          { size: "80x60" }
+          {size: "80x60"}
         end
 
         it "sets a fixed ratio from sizes" do
@@ -532,7 +532,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
       end
 
       context "with size set to different values" do
-        let(:settings) { { crop: true, size: size } }
+        let(:settings) { {crop: true, size: size} }
 
         before do
           picture.image_file_width = 200
@@ -623,7 +623,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
 
         context "with crop set to true" do
           before do
-            allow(record).to receive(:settings) { { crop: true } }
+            allow(record).to receive(:settings) { {crop: true} }
           end
 
           context "if picture.image_file is nil" do

data/lib/alchemy/test_support/integration_helpers.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   module TestSupport
     # Helpers for integration specs
@@ -11,11 +12,11 @@ module Alchemy
       # Pass either a user object or a symbol in the format of ':as_admin'.
       #
       def authorize_user(user_or_role = nil)
-        case user_or_role
+        user = case user_or_role
         when Symbol, String
-          user = build(:alchemy_dummy_user, user_or_role)
+          build(:alchemy_dummy_user, user_or_role)
         else
-          user = user_or_role
+          user_or_role
         end
         allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
       end

data/lib/alchemy/test_support/shared_contexts.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 RSpec.shared_context "with invalid file" do
   let(:invalid_file) do
     fixture_file_upload(
       File.expand_path("../../../spec/fixtures/users.yml", __dir__),
-      "text/x-yaml",
+      "text/x-yaml"
     )
   end
 

data/lib/alchemy/test_support/shared_dom_ids_examples.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples_for "having dom ids" do
-  let(:element) { build(:alchemy_element, name: "element_with_ingredients") }
+  let(:element) { build(:alchemy_element, name: "article") }
 
   let(:ingredient) do
     described_class.new(
       element: element,
-      role: "headline",
+      role: "headline"
     )
   end
 
@@ -31,7 +31,7 @@ RSpec.shared_examples_for "having dom ids" do
 
     context "with anchor setting set to true" do
       let(:settings) do
-        { anchor: true }
+        {anchor: true}
       end
 
       it "parameterizes dom_id" do
@@ -42,7 +42,7 @@ RSpec.shared_examples_for "having dom ids" do
 
     context "with anchor setting set to from_value" do
       let(:settings) do
-        { anchor: "from_value" }
+        {anchor: "from_value"}
       end
 
       context "with a value present" do
@@ -50,7 +50,7 @@ RSpec.shared_examples_for "having dom ids" do
           described_class.new(
             element: element,
             role: "headline",
-            value: "Hello World",
+            value: "Hello World"
           )
         end
 
@@ -64,7 +64,7 @@ RSpec.shared_examples_for "having dom ids" do
           described_class.new(
             element: element,
             role: "headline",
-            value: "",
+            value: ""
           )
         end
 
@@ -77,7 +77,7 @@ RSpec.shared_examples_for "having dom ids" do
     context "with anchor setting set to fixed value" do
       context "that is false" do
         let(:settings) do
-          { anchor: false }
+          {anchor: false}
         end
 
         it "sets no dom_id" do
@@ -87,7 +87,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is true" do
         let(:settings) do
-          { anchor: true }
+          {anchor: true}
         end
 
         it "sets no dom_id" do
@@ -97,7 +97,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is from_value" do
         let(:settings) do
-          { anchor: true }
+          {anchor: true}
         end
 
         it "sets no dom_id" do
@@ -107,7 +107,7 @@ RSpec.shared_examples_for "having dom ids" do
 
       context "that is a non reserved value" do
         let(:settings) do
-          { anchor: "FixED VALUE" }
+          {anchor: "FixED VALUE"}
         end
 
         it "sets the dom_id to fixed value" do

data/lib/alchemy/test_support/shared_ingredient_examples.rb

@@ -3,12 +3,12 @@
 require "shoulda-matchers"
 
 RSpec.shared_examples_for "an alchemy ingredient" do
-  let(:element) { build(:alchemy_element, name: "element_with_ingredients") }
+  let(:element) { build(:alchemy_element, name: "article") }
 
   subject(:ingredient) do
     described_class.new(
       element: element,
-      role: "headline",
+      role: "headline"
     )
   end
 
@@ -31,13 +31,13 @@ RSpec.shared_examples_for "an alchemy ingredient" do
         expect(element).to receive(:ingredient_definition_for).at_least(:once) do
           {
             settings: {
-              linkable: true,
-            },
+              linkable: true
+            }
           }.with_indifferent_access
         end
       end
 
-      it { is_expected.to eq({ linkable: true }.with_indifferent_access) }
+      it { is_expected.to eq({linkable: true}.with_indifferent_access) }
     end
   end
 
@@ -57,8 +57,8 @@ RSpec.shared_examples_for "an alchemy ingredient" do
           type: "Text",
           default: "Hello World",
           settings: {
-            linkable: true,
-          },
+            linkable: true
+          }
         }.with_indifferent_access
       end
 
@@ -73,4 +73,10 @@ RSpec.shared_examples_for "an alchemy ingredient" do
       end
     end
   end
+
+  describe "#as_view_component" do
+    subject { ingredient.as_view_component }
+
+    it { is_expected.to be_a("#{described_class}View".constantize) }
+  end
 end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 RSpec.shared_examples_for "having a json uploader error message" do
   it "renders json response with error message" do
     subject

data/lib/alchemy/tinymce.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table)
+    @@plugins = %w[alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table]
     @@init = {
       skin: "alchemy",
       width: "auto",
@@ -15,14 +15,14 @@ module Alchemy
       statusbar: true,
       toolbar: [
         "bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen",
-        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code",
+        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code"
       ],
       fix_list_elements: true,
       convert_urls: false,
       entity_encoding: "raw",
       paste_as_text: true,
       element_format: "html",
-      branding: false,
+      branding: false
     }
 
     class << self
@@ -33,46 +33,6 @@ module Alchemy
       def init
         @@init
       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)
-      end
-
-      def custom_config_ingredients(page)
-        ingredient_definitions_from_elements(page.descendent_element_definitions)
-      end
-
-      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?
-
-          ingredients = el["ingredients"].select do |c|
-            c["settings"] && c["settings"]["tinymce"].is_a?(Hash)
-          end
-          next if ingredients.blank?
-
-          ingredients.map { |c| c.merge("element" => el["name"]) }
-        end.flatten.compact
-      end
     end
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/shell"
 
 module Alchemy
@@ -26,9 +27,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.5"
+  VERSION = "7.0.0-b"
 
   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,7 @@ require "sassc-rails"
 require "simple_form"
 require "turbolinks"
 require "userstamp"
-require "webpacker"
+require "view_component"
 
 # Require globally used Alchemy mixins
 require_relative "alchemy/ability_helper"
@@ -39,7 +39,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 +52,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/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy
@@ -11,7 +12,7 @@ module Alchemy
       def conditional_template(source, destination)
         files = Dir.glob(destination.gsub(/\.([a-z]+)$/, "*"))
         if files.any?
-          ext = File.extname(files.first)[1..-1]
+          ext = File.extname(files.first)[1..]
 
           # If view already exists using a different template engine, change
           # source and destination file names to use that engine.
@@ -36,7 +37,7 @@ module Alchemy
         YAML.safe_load(
           ERB.new(File.read(Rails.root.join("config", "alchemy", name))).result,
           permitted_classes: YAML_PERMITTED_CLASSES,
-          aliases: true,
+          aliases: true
         )
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: `rails generate alchemy:install`"