alchemy_cms 8.0.0.b → 8.0.0.c

data/lib/alchemy.rb

@@ -35,170 +35,26 @@ module Alchemy
     end
     deprecate enable_searchable: enable_searchable_deprecation_msg, deprecator: Alchemy::Deprecation
 
-    # Define page preview sources
-    #
-    # A preview source is a Ruby class returning an URL
-    # that is used as source for the preview frame in the
-    # admin UI.
-    #
-    # == Example
-    #
-    #     # lib/acme/preview_source.rb
-    #     class Acme::PreviewSource < Alchemy::Admin::PreviewUrl
-    #       def url_for(page)
-    #         if page.site.name == "Next"
-    #           "https://user:#{ENV['PREVIEW_HTTP_PASS']}@next.acme.com"
-    #         else
-    #           "https://www.acme.com"
-    #         end
-    #       end
-    #     end
-    #
-    #     # config/initializers/alchemy.rb
-    #     require "acme/preview_source"
-    #     Alchemy.preview_sources << Acme::PreviewSource
-    #
-    #     # config/locales/de.yml
-    #     de:
-    #       activemodel:
-    #         models:
-    #           acme/preview_source: Acme Vorschau
-    #
-    def preview_sources
-      @_preview_sources ||= Set.new << Alchemy::Admin::PreviewUrl
-    end
-
-    def preview_sources=(sources)
-      @_preview_sources = Array(sources)
-    end
-
-    # Additional JS modules to be imported in the Alchemy admin UI
-    #
-    # Be sure to also pin the modules with +Alchemy.importmap+.
-    #
-    # == Example
-    #
-    #    Alchemy.importmap.pin "flatpickr/de",
-    #      to: "https://ga.jspm.io/npm:flatpickr@4.6.13/dist/l10n/de.js"
-    #
-    #    Alchemy.admin_js_imports << "flatpickr/de"
-    #
-    def admin_js_imports
-      @_admin_js_imports ||= Set.new
-    end
+    delegate :preview_sources, to: :config
+    delegate :preview_sources=, to: :config
+    deprecate preview_sources: "Use `Alchemy.config.preview_sources` instead.", deprecator: Alchemy::Deprecation
+    deprecate :preview_sources= => "Use `Alchemy.config.preview_sources=` instead.", :deprecator => Alchemy::Deprecation
 
-    def admin_js_imports=(sources)
-      @_admin_js_imports = Set[sources]
-    end
+    delegate :admin_js_imports, to: :config
+    delegate :admin_js_imports=, to: :config
+    deprecate admin_js_imports: "Use `Alchemy.config.admin_js_imports` instead", deprecator: Alchemy::Deprecation
+    deprecate :admin_js_imports= => "Use `Alchemy.config.admin_js_imports=` instead", :deprecator => Alchemy::Deprecation
 
-    # Additional importmaps to be included in the Alchemy admin UI
-    #
-    # Be sure to also pin modules with +Alchemy.importmap+.
-    #
-    # == Example
-    #
-    #    # config/alchemy/importmap.rb
-    #    Alchemy.importmap.pin "alchemy_solidus", to: "alchemy_solidus.js", preload: true
-    #    Alchemy.importmap.pin_all_from Alchemy::Solidus::Engine.root.join("app/javascript/alchemy_solidus"),
-    #      under: "alchemy_solidus",
-    #      preload: true
-    #
-    #    # lib/alchemy/solidus/engine.rb
-    #    initializer "alchemy_solidus.assets", before: "alchemy.importmap" do |app|
-    #      Alchemy.admin_importmaps.add({
-    #        importmap_path: root.join("config/importmap.rb"),
-    #        source_paths: [
-    #          root.join("app/javascript")
-    #        ],
-    #        name: "alchemy_solidus"
-    #      })
-    #      app.config.assets.precompile << "alchemy_solidus/manifest.js"
-    #    end
-    #
-    # @return [Set<Hash>]
-    def admin_importmaps
-      @_admin_importmaps ||= Set.new([{
-        importmap_path: Engine.root.join("config/importmap.rb"),
-        source_paths: [
-          Engine.root.join("app/javascript"),
-          Engine.root.join("vendor/javascript")
-        ],
-        name: "alchemy_admin"
-      }])
-    end
+    delegate :admin_importmaps, to: :config
+    deprecate admin_importmaps: "Use Alchemy.config.admin_importmaps instead", deprecator: Alchemy::Deprecation
 
-    # Additional stylesheets to be included in the Alchemy admin UI
-    #
-    # == Example
-    #
-    #    # lib/alchemy/devise/engine.rb
-    #    initializer "alchemy.devise.stylesheets", before: "alchemy.admin_stylesheets" do
-    #      Alchemy.admin_stylesheets << "alchemy/devise/admin.css"
-    #    end
-    #
-    # @return [Set<String>]
-    def admin_stylesheets
-      @_admin_stylesheets ||= Set.new(["alchemy/admin/custom.css"])
-    end
+    delegate :admin_stylesheets, to: :config
+    deprecate admin_stylesheets: "Use Alchemy.config.admin_stylesheets instead", deprecator: Alchemy::Deprecation
 
-    # Define page publish targets
-    #
-    # A publish target is a ActiveJob that gets performed
-    # whenever a user clicks the publish page button.
-    #
-    # Use this to trigger deployment hooks of external
-    # services in an asychronous way.
-    #
-    # == Example
-    #
-    #     # app/jobs/publish_job.rb
-    #     class PublishJob < ApplicationJob
-    #       def perform(page)
-    #         RestClient.post(ENV['BUILD_HOOK_URL'])
-    #       end
-    #     end
-    #
-    #     # config/initializers/alchemy.rb
-    #     Alchemy.publish_targets << PublishJob
-    #
-    def publish_targets
-      @_publish_targets ||= Set.new
-    end
+    delegate :publish_targets, to: :config
+    deprecate publish_targets: "Use Alchemy.config.publish_targets instead", deprecator: Alchemy::Deprecation
 
-    # Configure tabs in the link dialog
-    #
-    # With this configuration that tabs in the link dialog can be extended
-    # without overwriting or defacing the Admin Interface.
-    #
-    # == Example
-    #
-    #    # components/acme/link_tab.rb
-    #    module Acme
-    #      class LinkTab < ::Alchemy::Admin::LinkDialog::BaseTab
-    #        def title
-    #          "Awesome Tab Title"
-    #        end
-    #
-    #        def name
-    #          :unique_name
-    #        end
-    #
-    #        def fields
-    #           [ title_input, target_select ]
-    #        end
-    #      end
-    #    end
-    #
-    #    # config/initializers/alchemy.rb
-    #    Alchemy.link_dialog_tabs << Acme::LinkTab
-    #
-    def link_dialog_tabs
-      @_link_dialog_tabs ||= Set.new([
-        Alchemy::Admin::LinkDialog::InternalTab,
-        Alchemy::Admin::LinkDialog::AnchorTab,
-        Alchemy::Admin::LinkDialog::ExternalTab,
-        Alchemy::Admin::LinkDialog::FileTab
-      ])
-    end
+    delegate :link_dialog_tabs, to: :config
+    deprecate link_dialog_tabs: "Use Alchemy.config.link_dialog_tabs instead", deprecator: Alchemy::Deprecation
   end
 end

data/lib/generators/alchemy/install/templates/alchemy.rb.tt

@@ -137,8 +137,8 @@ Alchemy.configure do |config|
   #   mailer.mail_from = <%= @default_config.mailer.mail_from.inspect %>
   #   mailer.mail_to = <%= @default_config.mailer.mail_to.inspect %>
   #   mailer.subject = <%= @default_config.mailer.subject.inspect %>
-  #   mailer.fields = <%= @default_config.mailer.fields.inspect %>
-  #   mailer.validate_fields = <%= @default_config.mailer.validate_fields.inspect %>
+  #   mailer.fields = <%= @default_config.mailer.fields.map(&:to_s) %>
+  #   mailer.validate_fields = <%= @default_config.mailer.validate_fields.map(&:to_s) %>
   # end
 
   # === User roles
@@ -157,7 +157,7 @@ Alchemy.configure do |config|
   #     user_roles:
   #       rolename: Name of the role
   #
-  # config.user_roles = <%= @default_config.user_roles.inspect %>
+  # config.user_roles = <%= @default_config.user_roles.map(&:to_s) %>
 
   # === Uploader Settings
   #
@@ -170,8 +170,8 @@ Alchemy.configure do |config|
   #   uploader.upload_limit = <%= @default_config.uploader.upload_limit.inspect %>
   #   uploader.file_size_limit = <%= @default_config.uploader.file_size_limit.inspect %>
   #   uploader.allowed_filetypes.tap do |file_types|
-  #     file_types.alchemy_attachments = <%= @default_config.uploader.allowed_filetypes.alchemy_attachments.inspect %>
-  #     file_types.alchemy_pictures = <%= @default_config.uploader.allowed_filetypes.alchemy_pictures.inspect %>
+  #     file_types.alchemy_attachments = <%= @default_config.uploader.allowed_filetypes.alchemy_attachments.map(&:to_s) %>
+  #     file_types.alchemy_pictures = <%= @default_config.uploader.allowed_filetypes.alchemy_pictures.map(&:to_s) %>
   #   end
   # end
 
@@ -186,15 +186,86 @@ Alchemy.configure do |config|
   #
   #   jQuery(a[data-link-target="overlay"]).dialog();
   #
-  # config.link_target_options = <%= @default_config.link_target_options.inspect %>
+  # config.link_target_options = <%= @default_config.link_target_options.map(&:to_s) %>
+
+  # === Format matchers
+  #
+  # Named aliases for regular expressions that can be used in various places.
+  # The most common use case is the format validation of ingredients, or attribute validations of your individual models.
+  #
+  # == Example:
+  #
+  #   validates_format_of :url, with: Alchemy.config.format_matchers.url
+  #
+  # config.format_matchers.tap do |format|
+  #   format.email = <%= @default_config.format_matchers.email.inspect %>
+  #   format.url = <%= @default_config.format_matchers.url.inspect %>
+  #   format.link_url = <%= @default_config.format_matchers.link_url.inspect %>
+  # end
 
   # The layout used for rendering the +alchemy/admin/pages#show+ action.
   # config.admin_page_preview_layout = <%= @default_config.admin_page_preview_layout.inspect %>
 
   # The sizes for the preview size select in the page editor.
-  # config.page_preview_sizes = <%= @default_config.page_preview_sizes.inspect %>
+  # config.page_preview_sizes = <%= @default_config.page_preview_sizes.map(&:to_s) %>
+
+  # Enable full text search configuration
+  #
+  # It enables a searchable checkbox in the page form to toggle
+  # the searchable field. These information can used in a search
+  # plugin (e.g. https://github.com/AlchemyCMS/alchemy-pg_search).
+  #
+  # == Example
+  #
+  #     # config/initializers/alchemy.rb
+  #     Alchemy.config.page_searchable_checkbox = true
+  #
+  # config.show_page_searchable_checkbox = <%= @default_config.show_page_searchable_checkbox.inspect %>
 
   # The storage adapter for Pictures and Attachments
   #
   config.storage_adapter = <%= @default_config.storage_adapter.inspect %>
+
+  # Additional JS modules to be imported in the Alchemy admin UI
+  #
+  # Be sure to also pin the modules with +Alchemy.importmap+.
+  #
+  # == Example
+  #
+  #    Alchemy.importmap.pin "flatpickr/de",
+  #      to: "https://ga.jspm.io/npm:flatpickr@4.6.13/dist/l10n/de.js"
+  #
+  # config.admin_js_imports << "flatpickr/de"
+
+  # Additional importmaps to be included in the Alchemy admin UI
+  #
+  # Be sure to also pin modules with +Alchemy.importmap+.
+  #
+  # config.admin_importmaps.add(
+  #   importmap_path: root.join("config/importmap.rb"),
+  #   source_paths: [
+  #     root.join("app/javascript")
+  #   ],
+  #   name: "admin_extension"
+  # )
+
+  # Additional stylesheets to be included in the Alchemy admin UI
+  # config.admin_stylesheets.add("my_app/admin_extension")
+
+  # Define page publish targets
+  #
+  # A publish target is a ActiveJob that gets performed
+  # whenever a user clicks the publish page button.
+  #
+  # Use this to trigger deployment hooks of external
+  # services in an asychronous way.
+  #
+  # config.publish_targets << "MyPublishJob"
+
+  # Configure tabs in the link dialog
+  #
+  # With this configuration that tabs in the link dialog can be extended
+  # without overwriting or defacing the Admin Interface.
+  #
+  # config.link_dialog_tabs << "Acme::LinkTab"
 end

data/lib/tasks/alchemy/assets.rake

@@ -6,7 +6,7 @@ if Rake::Task.task_defined?("assets:precompile") && defined?(Propshaft)
     manifest.select { |k| k.include?("tinymce/") }.each do |k, v|
       Propshaft.logger.info "Copying #{v} to #{k}"
       FileUtils.cp(
-        assets_path.join(v),
+        assets_path.join(v.dig("digested_path") || v),
         assets_path.join(k)
       )
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 8.0.0.b
+  version: 8.0.0.c
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -660,7 +660,7 @@ files:
 - app/assets/config/alchemy_manifest.js
 - app/assets/images/alchemy/alchemy-logo.png
 - app/assets/images/alchemy/alchemy-logo.svg
-- app/assets/images/alchemy/element_icons/default.svg
+- app/assets/images/alchemy/element_icons/layout-bottom-2-line.svg
 - app/assets/images/alchemy/favicon.ico
 - app/assets/images/alchemy/icon-white.svg
 - app/assets/images/alchemy/icon.svg
@@ -676,6 +676,7 @@ files:
 - app/components/alchemy/admin/link_dialog/internal_tab.rb
 - app/components/alchemy/admin/link_dialog/tabs.rb
 - app/components/alchemy/admin/list_filter.rb
+- app/components/alchemy/admin/locale_select.rb
 - app/components/alchemy/admin/message.rb
 - app/components/alchemy/admin/node_select.rb
 - app/components/alchemy/admin/page_select.rb
@@ -1235,17 +1236,17 @@ files:
 - lib/alchemy/configuration/base_option.rb
 - lib/alchemy/configuration/boolean_option.rb
 - lib/alchemy/configuration/class_option.rb
-- lib/alchemy/configuration/class_set_option.rb
-- lib/alchemy/configuration/integer_list_option.rb
+- lib/alchemy/configuration/collection_option.rb
+- lib/alchemy/configuration/configuration_option.rb
 - lib/alchemy/configuration/integer_option.rb
-- lib/alchemy/configuration/list_option.rb
+- lib/alchemy/configuration/pathname_option.rb
 - lib/alchemy/configuration/regexp_option.rb
-- lib/alchemy/configuration/string_list_option.rb
 - lib/alchemy/configuration/string_option.rb
 - lib/alchemy/configuration_methods.rb
 - lib/alchemy/configurations/default_language.rb
 - lib/alchemy/configurations/default_site.rb
 - lib/alchemy/configurations/format_matchers.rb
+- lib/alchemy/configurations/importmap.rb
 - lib/alchemy/configurations/mailer.rb
 - lib/alchemy/configurations/main.rb
 - lib/alchemy/configurations/page_cache.rb

data/app/assets/images/alchemy/element_icons/default.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 19H19V5H5V19ZM3 4C3 3.44772 3.44772 3 4 3H20C20.5523 3 21 3.44772 21 4V20C21 20.5523 20.5523 21 20 21H4C3.44772 21 3 20.5523 3 20V4ZM7 9H17V7H7V9ZM17 13H7V11H17V13ZM7 17H17V15H7V17Z"></path></svg>

data/lib/alchemy/configuration/class_set_option.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require "alchemy/configuration/base_option"
-
-module Alchemy
-  class Configuration
-    class ClassSetOption < BaseOption
-      include Enumerable
-
-      def value = self
-
-      def <<(klass)
-        @value << klass.to_s
-      end
-
-      def concat(klasses)
-        klasses.each do |klass|
-          self << klass
-        end
-
-        self
-      end
-
-      delegate :clear, :empty?, to: :@value
-
-      def delete(object)
-        @value.delete(object.to_s)
-      end
-
-      def each
-        @value.each do |klass|
-          yield klass.constantize
-        end
-      end
-
-      def as_json = @value
-
-      private
-
-      def validate(value)
-        raise TypeError, "each #{name} must be set as a String" unless value.all? { _1.is_a?(String) }
-        value
-      end
-    end
-  end
-end

data/lib/alchemy/configuration/integer_list_option.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "alchemy/configuration/list_option"
-
-module Alchemy
-  class Configuration
-    class IntegerListOption < ListOption
-      def self.item_class
-        Integer
-      end
-    end
-  end
-end

data/lib/alchemy/configuration/list_option.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require "alchemy/configuration/base_option"
-
-module Alchemy
-  class Configuration
-    class ListOption < BaseOption
-      def self.item_class
-        raise NotImplementedError
-      end
-
-      private
-
-      def validate(value)
-        unless value.is_a?(Array) && value.all? { _1.is_a?(self.class.item_class) }
-          raise TypeError, "#{@name} must be an Array of #{self.class.item_class.name.downcase.pluralize}, given #{value.inspect}"
-        end
-        value
-      end
-    end
-  end
-end

data/lib/alchemy/configuration/string_list_option.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "alchemy/configuration/list_option"
-
-module Alchemy
-  class Configuration
-    class StringListOption < ListOption
-      def self.item_class
-        String
-      end
-    end
-  end
-end