alchemy_cms 6.0.11 → 6.1.0

data/lib/alchemy/error_tracking.rb

@@ -9,6 +9,8 @@ module Alchemy
     end
 
     mattr_accessor :notification_handler
-    @@notification_handler = BaseHandler
   end
 end
+
+require "alchemy/error_tracking/error_logger"
+Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::ErrorLogger

data/lib/alchemy/install/tasks.rb

@@ -18,12 +18,10 @@ module Alchemy
           inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
         end
 
-        def set_primary_language(auto_accept = false)
-          code = "en"
+        def set_primary_language(code: "en", name: "English", auto_accept: false)
           unless auto_accept
             code = ask("- What is the language code of your site's primary language?", default: code)
           end
-          name = "English"
           unless auto_accept
             name = ask("- What is the name of your site's primary language?", default: name)
           end

data/lib/alchemy/modules.rb

@@ -32,13 +32,13 @@ module Alchemy
           defined_controllers = [definition_hash["navigation"]["controller"]]
 
           if definition_hash["navigation"]["sub_navigation"].is_a?(Array)
-            defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map{ |x| x["controller"] })
+            defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
           validate_controllers_existence(defined_controllers)
         end
 
-        @@alchemy_modules << definition_hash
+        @@alchemy_modules |= [definition_hash]
       end
 
       private

data/lib/alchemy/page_layout.rb

@@ -41,112 +41,8 @@ module Alchemy
         all.detect { |a| a["name"].casecmp(name).zero? }
       end
 
-      def get_all_by_attributes(attributes)
-        return [] if attributes.blank?
-
-        if attributes.is_a? Hash
-          layouts = []
-          attributes.stringify_keys.each do |key, value|
-            result = all.select { |l| l.key?(key) && l[key].to_s.casecmp(value.to_s).zero? }
-            layouts += result unless result.empty?
-          end
-          layouts
-        else
-          []
-        end
-      end
-
-      # Returns page layouts ready for Rails' select form helper.
-      #
-      def layouts_for_select(language_id, only_layoutpages = false)
-        @map_array = []
-        mapped_layouts_for_select(selectable_layouts(language_id, only_layoutpages))
-      end
-
-      # Returns all layouts that can be used for creating a new page.
-      #
-      # It removes all layouts from available layouts that are unique and already taken and that are marked as hide.
-      #
-      # @param [Fixnum]
-      #   language_id of current used Language.
-      # @param [Boolean] (false)
-      #   Pass true to only select layouts for global/layout pages.
-      #
-      def selectable_layouts(language_id, only_layoutpages = false)
-        @language_id = language_id
-        all.select do |layout|
-          if only_layoutpages
-            layout["layoutpage"] && layout_available?(layout)
-          else
-            !layout["layoutpage"] && layout_available?(layout)
-          end
-        end
-      end
-
-      # Returns all names of elements defined in given page layout.
-      #
-      def element_names_for(page_layout)
-        if definition = get(page_layout)
-          definition.fetch("elements", [])
-        else
-          Rails.logger.warn "\n+++ Warning: No layout definition for #{page_layout} found! in page_layouts.yml\n"
-          []
-        end
-      end
-
-      # Translates name for given layout
-      #
-      # === Translation example
-      #
-      #   en:
-      #     alchemy:
-      #       page_layout_names:
-      #         products_overview: Products Overview
-      #
-      # @param [String]
-      #   The layout name
-      #
-      def human_layout_name(layout)
-        Alchemy.t(layout, scope: "page_layout_names", default: layout.to_s.humanize)
-      end
-
       private
 
-      # Returns true if the given layout is unique and not already taken or it should be hidden.
-      #
-      def layout_available?(layout)
-        !layout["hide"] && !already_taken?(layout) && available_on_site?(layout)
-      end
-
-      # Returns true if this layout is unique and already taken by another page.
-      #
-      def already_taken?(layout)
-        layout["unique"] && page_with_layout_existing?(layout["name"])
-      end
-
-      # Returns true if one page already has the given layout
-      #
-      def page_with_layout_existing?(layout)
-        Alchemy::Page.where(page_layout: layout, language_id: @language_id).pluck(:id).any?
-      end
-
-      # Returns true if given layout is available for current site.
-      #
-      # If no site layouts are defined it always returns true.
-      #
-      # == Example
-      #
-      #   # config/alchemy/site_layouts.yml
-      #   - name: default_site
-      #     page_layouts: [default_intro]
-      #
-      def available_on_site?(layout)
-        return false unless Alchemy::Site.current
-
-        Alchemy::Site.current.definition.blank? ||
-          Alchemy::Site.current.definition.fetch("page_layouts", []).include?(layout["name"])
-      end
-
       # Reads the layout definitions from +config/alchemy/page_layouts.yml+.
       #
       def read_definitions_file
@@ -168,15 +64,6 @@ module Alchemy
       def layouts_file_path
         Rails.root.join "config/alchemy/page_layouts.yml"
       end
-
-      # Maps given layouts for Rails select form helper.
-      #
-      def mapped_layouts_for_select(layouts)
-        layouts.each do |layout|
-          @map_array << [human_layout_name(layout["name"]), layout["name"]]
-        end
-        @map_array
-      end
     end
   end
 end

data/lib/alchemy/test_support/shared_dom_ids_examples.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples_for "having dom ids" do
+  let(:element) { build(:alchemy_element, name: "element_with_ingredients") }
+
+  let(:ingredient) do
+    described_class.new(
+      element: element,
+      role: "headline",
+    )
+  end
+
+  describe "setting dom id from value" do
+    subject do
+      ingredient.valid? && ingredient.dom_id
+    end
+
+    before do
+      expect_any_instance_of(described_class).to receive(:settings).at_least(:once) { settings }
+    end
+
+    context "without anchor settings" do
+      let(:settings) do
+        {}
+      end
+
+      it "does not set a dom_id" do
+        is_expected.to be_nil
+      end
+    end
+
+    context "with anchor setting set to true" do
+      let(:settings) do
+        { anchor: true }
+      end
+
+      it "parameterizes dom_id" do
+        ingredient.dom_id = "SE Headline"
+        is_expected.to eq "se-headline"
+      end
+    end
+
+    context "with anchor setting set to from_value" do
+      let(:settings) do
+        { anchor: "from_value" }
+      end
+
+      context "with a value present" do
+        let(:ingredient) do
+          described_class.new(
+            element: element,
+            role: "headline",
+            value: "Hello World",
+          )
+        end
+
+        it "sets a dom_id from value" do
+          is_expected.to eq "hello-world"
+        end
+      end
+
+      context "with no value present" do
+        let(:ingredient) do
+          described_class.new(
+            element: element,
+            role: "headline",
+            value: "",
+          )
+        end
+
+        it "sets no dom_id" do
+          is_expected.to eq ""
+        end
+      end
+    end
+
+    context "with anchor setting set to fixed value" do
+      context "that is false" do
+        let(:settings) do
+          { anchor: false }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is true" do
+        let(:settings) do
+          { anchor: true }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is from_value" do
+        let(:settings) do
+          { anchor: true }
+        end
+
+        it "sets no dom_id" do
+          is_expected.to be_nil
+        end
+      end
+
+      context "that is a non reserved value" do
+        let(:settings) do
+          { anchor: "FixED VALUE" }
+        end
+
+        it "sets the dom_id to fixed value" do
+          is_expected.to eq "fixed-value"
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/tasks/add_page_versions.rb

@@ -15,10 +15,10 @@ module Alchemy::Upgrader::Tasks
             Alchemy::Page.transaction do
               page.versions.create!(
                 public_on: page.legacy_public_on,
-                public_until: page.legacy_public_until
+                public_until: page.legacy_public_until,
               ).tap do |version|
                 # We must not use .find_each here to not mess up the order of elements
-                page.draft_version.elements.not_nested.available.each do |element|
+                page.draft_version.elements.not_nested.published.each do |element|
                   Alchemy::Element.copy(element, page_version_id: version.id)
                 end
               end

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -7,7 +7,7 @@ module Alchemy::Upgrader::Tasks
     include Thor::Actions
 
     no_tasks do
-      def create_ingredients
+      def create_ingredients(verbose: !Rails.env.test?)
         Alchemy::Deprecation.silence do
           elements_with_ingredients = Alchemy::ElementDefinition.all.select { |d| d.key?(:ingredients) }
           if ENV["ONLY"]
@@ -22,13 +22,13 @@ module Alchemy::Upgrader::Tasks
           elements_with_ingredients.map do |element_definition|
             elements = all_elements.select { |e| e.name == element_definition[:name] }
             if elements.any?
-              puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)"
+              puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)" if verbose
               elements.each do |element|
                 MigrateElementIngredients.call(element)
-                print "."
+                print "." if verbose
               end
-              puts "\n"
-            else
+              puts "\n" if verbose
+            elsif verbose
               puts "-- No #{element_definition[:name]} elements found for migration."
             end
           end
@@ -56,6 +56,8 @@ module Alchemy::Upgrader::Tasks
                   ingredient.value = content.ingredient
                 end
                 data = ingredient.class.stored_attributes.fetch(:data, []).each_with_object({}) do |attr, d|
+                  next unless essence.respond_to?(attr)
+
                   d[attr] = essence.public_send(attr)
                 end
                 ingredient.data = data

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.11"
+  VERSION = "6.1.0"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -57,6 +57,10 @@ module Alchemy
     @_preview_sources ||= Set.new << Alchemy::Admin::PreviewUrl
   end
 
+  def self.preview_sources=(sources)
+    @_preview_sources = Array(sources)
+  end
+
   # Define page publish targets
   #
   # A publish target is a ActiveJob that gets performed

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

@@ -19,7 +19,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

@@ -18,5 +18,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

@@ -18,5 +18,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/install_generator.rb

@@ -26,7 +26,22 @@ module Alchemy
       class_option :skip_db_create,
         type: :boolean,
         default: false,
-        desc: "Skip creting the database during install."
+        desc: "Skip creating the database during install."
+
+      class_option :skip_mount,
+        type: :boolean,
+        default: false,
+        desc: "Skip mounting into routes.rb during install."
+
+      class_option :default_language_code,
+        type: :string,
+        default: "en",
+        desc: "The default language code of your site."
+
+      class_option :default_language_name,
+        type: :string,
+        default: "English",
+        desc: "The default language name of your site."
 
       source_root File.expand_path("files", __dir__)
 
@@ -34,6 +49,11 @@ module Alchemy
         header
         say "Welcome to AlchemyCMS!"
         say "Let's begin with some questions.\n\n"
+      end
+
+      def mount
+        return if options[:skip_mount]
+
         install_tasks.inject_routes(options[:auto_accept])
       end
 
@@ -108,13 +128,17 @@ module Alchemy
 
       def set_primary_language
         header
-        install_tasks.set_primary_language(options[:auto_accept])
+        install_tasks.set_primary_language(
+          code: options[:default_language_code],
+          name: options[:default_language_name],
+          auto_accept: options[:auto_accept]
+        )
       end
 
       def setup_database
         rake("db:create", abort_on_failure: true) unless options[:skip_db_create]
         # We can't invoke this rake task, because Rails will use wrong engine names otherwise
-        rake("railties:install:migrations", abort_on_failure: true)
+        rake("alchemy:install:migrations", abort_on_failure: true)
         rake("db:migrate", abort_on_failure: true)
         install_tasks.inject_seeder
         rake("db:seed", abort_on_failure: true)

data/lib/generators/alchemy/module/templates/ability.rb.tt

@@ -1,4 +1,4 @@
-class <%= @class_name %>Ability
+class <%= @controller_class %>Ability
   include CanCan::Ability
 
   def initialize(user)
@@ -7,5 +7,4 @@ class <%= @class_name %>Ability
       can :manage, :admin_<%= @controller_name %>
     end
   end
-
-end
+end

data/lib/generators/alchemy/module/templates/module_config.rb.tt

@@ -1,17 +1,19 @@
-Alchemy::Modules.register_module({
-  name: '<%= @module_name %>',
-  order: 1,
-  navigation: {
-    name: 'modules.<%= @module_name %>',
-    controller: '/admin/<%= @module_name %>',
-    action: 'index',
-    image: 'alchemy/<%= @module_name %>_module.png',
-    sub_navigation: [{
+Rails.application.config.to_prepare do
+  Alchemy::Modules.register_module({
+    name: '<%= @module_name %>',
+    order: 1,
+    navigation: {
       name: 'modules.<%= @module_name %>',
       controller: '/admin/<%= @module_name %>',
-      action: 'index'
-    }]
-  }
-})
+      action: 'index',
+      image: 'alchemy/<%= @module_name %>_module.png',
+      sub_navigation: [{
+        name: 'modules.<%= @module_name %>',
+        controller: '/admin/<%= @module_name %>',
+        action: 'index'
+      }]
+    }
+  })
 
-Alchemy.register_ability(<%= @class_name %>Ability)
+  Alchemy.register_ability(<%= @controller_class %>Ability)
+end

data/lib/tasks/alchemy/thumbnails.rake

@@ -46,7 +46,7 @@ namespace :alchemy 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/package/admin.js

@@ -2,6 +2,7 @@ import translate from "./src/i18n"
 import translationData from "./src/translations"
 import NodeTree from "./src/node_tree"
 import fileEditors from "./src/file_editors"
+import IngredientAnchorLink from "./src/ingredient_anchor_link"
 import pictureEditors from "./src/picture_editors"
 import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
@@ -24,6 +25,7 @@ Object.assign(Alchemy, {
   pictureEditors,
   ImageLoader: ImageLoader.init,
   ImageCropper,
+  IngredientAnchorLink,
   Datepicker,
   Sitemap,
   PagePublicationFields

data/package/src/ingredient_anchor_link.js

@@ -0,0 +1,17 @@
+export default class IngredientAnchorLink {
+  static updateIcon(ingredientId, active = false) {
+    const ingredientEditor = document.querySelector(
+      `[data-ingredient-id="${ingredientId}"]`
+    )
+    if (ingredientEditor) {
+      const icon = ingredientEditor.querySelector(
+        ".edit-ingredient-anchor-link > a > .icon"
+      )
+      if (icon) {
+        active
+          ? icon.classList.replace("far", "fas")
+          : icon.classList.replace("fas", "far")
+      }
+    }
+  }
+}

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.11",
+  "version": "6.1.0",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
-    "babel-jest": "^27.0.1",
+    "babel-jest": "^29.0.1",
     "jest": "^25.2.7",
     "prettier": "^2.0.2",
     "xhr-mock": "^2.5.1"