alchemy_cms 8.0.0.b → 8.0.0.c

data/lib/alchemy/configuration/base_option.rb

@@ -9,15 +9,28 @@ module Alchemy
 
       def initialize(value:, name:, **args)
         @name = name
-        @value = validate(value) unless value.nil?
+        validate(value) unless value.nil?
+        @value = value
       end
       attr_reader :name, :value
 
-      private
-
       def validate(value)
-        raise TypeError, "#{name} must be set as a #{self.class.value_class.name}, given #{value.inspect}" unless value.is_a?(self.class.value_class)
-        value
+        raise ConfigurationError.new(name, value, allowed_classes) unless allowed_classes.any? { value.is_a?(_1) }
+      end
+
+      def allowed_classes
+        [self.class.value_class]
+      end
+
+      def raw_value = @value
+
+      def ==(other)
+        self.class == other.class && raw_value == other.raw_value
+      end
+      alias_method :eql?, :==
+
+      def hash
+        [self.class, raw_value].hash
       end
     end
   end

data/lib/alchemy/configuration/boolean_option.rb

@@ -5,11 +5,8 @@ require "alchemy/configuration/base_option"
 module Alchemy
   class Configuration
     class BooleanOption < BaseOption
-      private
-
-      def validate(value)
-        raise TypeError, "#{name} must be a Boolean, given #{value.inspect}" unless value.is_a?(TrueClass) || value.is_a?(FalseClass)
-        value
+      def allowed_classes
+        [TrueClass, FalseClass]
       end
     end
   end

data/lib/alchemy/configuration/collection_option.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "alchemy/configuration/base_option"
+
+module Alchemy
+  class Configuration
+    class CollectionOption < BaseOption
+      include Enumerable
+
+      def self.value_class
+        Enumerable
+      end
+
+      attr_reader :collection_class, :item_class, :item_args
+
+      def initialize(value:, name:, item_type:, collection_class: Array, **args)
+        @collection_class = collection_class
+        @item_class = get_item_class(item_type)
+        @item_args = args
+        value = [] if value.nil?
+        collection = @collection_class.new(value.map { |value| to_item(value) })
+        super(value: collection, name: name)
+      rescue ConfigurationError => configuration_error
+        raise ConfigurationError.new(name, configuration_error.value, configuration_error.allowed_classes)
+      end
+
+      def value
+        self
+      end
+
+      def <<(value)
+        @value << to_item(value)
+      end
+      alias_method(:add, :<<)
+
+      def concat(values)
+        values.each do |value|
+          add(value)
+        end
+      end
+
+      delegate :join, :[], to: :to_a
+
+      delegate :clear, :empty?, to: :@value
+
+      def each(&block)
+        @value.each do |option|
+          yield option.value
+        end
+      end
+
+      def to_serializable_array
+        to_a.map do |item|
+          item.respond_to?(:to_h) ? item.to_h : item
+        end
+      end
+
+      private
+
+      def to_item(value)
+        @item_class.new(value: value, name: "#{name}_item", **item_args)
+      end
+
+      def get_item_class(item_type)
+        "Alchemy::Configuration::#{item_type.to_s.classify}Option".constantize
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/configuration_option.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "alchemy/configuration/base_option"
+
+module Alchemy
+  class Configuration
+    class ConfigurationOption < BaseOption
+      def self.value_class
+        Hash
+      end
+
+      attr_reader :config_class
+
+      def initialize(value:, name:, config_class:, **args)
+        @name = name
+        @config_class = config_class
+        validate(value)
+        @value = if value.is_a?(config_class)
+          value
+        else
+          config_class.new(value)
+        end
+      end
+
+      def validate(value)
+        return true if value.is_a?(config_class)
+        super
+      end
+
+      def allowed_classes
+        super + [config_class]
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/pathname_option.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require "alchemy/configuration/base_option"
+module Alchemy
+  class Configuration
+    class PathnameOption < BaseOption
+      def self.value_class
+        Pathname
+      end
+    end
+  end
+end

data/lib/alchemy/configuration.rb

@@ -4,16 +4,28 @@ require "active_support"
 require "active_support/core_ext/string"
 
 require "alchemy/configuration/boolean_option"
+require "alchemy/configuration/collection_option"
+require "alchemy/configuration/configuration_option"
 require "alchemy/configuration/class_option"
-require "alchemy/configuration/class_set_option"
 require "alchemy/configuration/integer_option"
-require "alchemy/configuration/integer_list_option"
+require "alchemy/configuration/pathname_option"
 require "alchemy/configuration/regexp_option"
-require "alchemy/configuration/string_list_option"
 require "alchemy/configuration/string_option"
 
 module Alchemy
   class Configuration
+    class ConfigurationError < StandardError
+      attr_reader :name, :value, :allowed_classes
+
+      def initialize(name, value, allowed_classes)
+        @name = name
+        @value = value
+        @allowed_classes = allowed_classes
+        expected_classes_message = allowed_classes.map(&:name).to_sentence(two_words_connector: " or ", last_word_connector: ", or ")
+        super("Invalid configuration value for #{name}: #{value.inspect} (expected #{expected_classes_message})")
+      end
+    end
+
     def initialize(configuration_hash = {})
       set(configuration_hash)
     end
@@ -45,7 +57,8 @@ module Alchemy
 
     def to_h
       self.class.defined_options.map do |option|
-        [option, send(option)]
+        value = send(option)
+        [option, value.respond_to?(:to_serializable_array) ? value.to_serializable_array : value]
       end.concat(
         self.class.defined_configurations.map do |configuration|
           [configuration, send(configuration).to_h]
@@ -58,6 +71,10 @@ module Alchemy
 
       def defined_options = []
 
+      def defined_values
+        defined_options + defined_configurations
+      end
+
       def configuration(name, configuration_class)
         # The defined configurations on a class are all those defined directly on
         # that class as well as those defined on ancestors.
@@ -99,11 +116,19 @@ module Alchemy
           super() + singleton_options
         end
 
-        define_method(name) do
+        define_method("#{name}_option") do
           unless instance_variable_defined?(:"@#{name}")
             send(:"#{name}=", default)
           end
-          instance_variable_get(:"@#{name}").value
+          instance_variable_get(:"@#{name}")
+        end
+
+        define_method(name) do
+          send("#{name}_option").value
+        end
+
+        define_method("raw_#{name}") do
+          send("#{name}_option").raw_value
         end
 
         define_method(:"#{name}=") do |value|
@@ -111,5 +136,18 @@ module Alchemy
         end
       end
     end
+
+    def hash
+      self.class.defined_values.map do |ivar|
+        [ivar, send(ivar).hash]
+      end.hash
+    end
+
+    def ==(other)
+      equal?(other) || self.class == other.class && self.class.defined_values.all? do |var|
+        send(var) == other.send(var)
+      end
+    end
+    alias_method :eql?, :==
   end
 end

data/lib/alchemy/configurations/importmap.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class Importmap < Alchemy::Configuration
+      option :importmap_path, :pathname
+      option :source_paths, :collection, item_type: :pathname
+      option :name, :string
+    end
+  end
+end

data/lib/alchemy/configurations/mailer.rb

@@ -9,8 +9,8 @@ module Alchemy
       option :mail_from, :string, default: "your.mail@your-domain.com"
       option :mail_to, :string, default: "your.mail@your-domain.com"
       option :subject, :string, default: "A new contact form message"
-      option :fields, :string_list, default: %w[salutation firstname lastname address zip city phone email message]
-      option :validate_fields, :string_list, default: %w[lastname email]
+      option :fields, :collection, item_type: :string, default: %w[salutation firstname lastname address zip city phone email message]
+      option :validate_fields, :collection, item_type: :string, default: %w[lastname email]
     end
   end
 end

data/lib/alchemy/configurations/main.rb

@@ -3,6 +3,7 @@
 require "alchemy/configuration"
 require "alchemy/configurations/default_language"
 require "alchemy/configurations/default_site"
+require "alchemy/configurations/importmap"
 require "alchemy/configurations/format_matchers"
 require "alchemy/configurations/mailer"
 require "alchemy/configurations/page_cache"
@@ -162,7 +163,7 @@ module Alchemy
       #     user_roles:
       #       rolename: Name of the role
       #
-      option :user_roles, :string_list, default: %w[member author editor admin]
+      option :user_roles, :collection, item_type: :string, default: %w[member author editor admin]
 
       # === Uploader Settings
       #
@@ -184,7 +185,7 @@ module Alchemy
       #
       #   jQuery(a[data-link-target="overlay"]).dialog();
       #
-      option :link_target_options, :string_list, default: %w[blank]
+      option :link_target_options, :collection, item_type: :string, default: %w[blank]
 
       # === Format matchers
       #
@@ -201,7 +202,7 @@ module Alchemy
       option :admin_page_preview_layout, :string, default: "application"
 
       # The sizes for the preview size select in the page editor.
-      option :page_preview_sizes, :integer_list, default: [360, 640, 768, 1024, 1280, 1440]
+      option :page_preview_sizes, :collection, item_type: :integer, default: [360, 640, 768, 1024, 1280, 1440]
 
       # Enable full text search configuration
       #
@@ -218,6 +219,143 @@ module Alchemy
       # The storage adapter for Pictures and Attachments
       #
       option :storage_adapter, :string, default: "dragonfly"
+
+      # 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.config.preview_sources << "Acme::PreviewSource"
+      #
+      #     # config/locales/de.yml
+      #     de:
+      #       activemodel:
+      #         models:
+      #           acme/preview_source: Acme Vorschau
+      #
+      option :preview_sources, :collection, item_type: :class, collection_class: Set, default: ["Alchemy::Admin::PreviewUrl"]
+
+      # 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.config.admin_js_imports << "flatpickr/de"
+      #
+      option :admin_js_imports, :collection, item_type: :string, collection_class: Set, default: []
+
+      # 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
+      #
+      option :admin_importmaps, :collection, collection_class: Set, item_type: :configuration, config_class: Alchemy::Configurations::Importmap, default: []
+
+      # 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.config.admin_stylesheets << "alchemy/devise/admin.css"
+      #    end
+      #
+      option :admin_stylesheets, :collection, collection_class: Set, item_type: :string, default: ["alchemy/admin/custom.css"]
+
+      # 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.config.publish_targets << PublishJob
+      #
+      option :publish_targets, :collection, collection_class: Set, item_type: :class, default: []
+
+      # 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.config.link_dialog_tabs << "Acme::LinkTab"
+      #
+      option :link_dialog_tabs, :collection, collection_class: Set, item_type: :class, default: [
+        "Alchemy::Admin::LinkDialog::InternalTab",
+        "Alchemy::Admin::LinkDialog::AnchorTab",
+        "Alchemy::Admin::LinkDialog::ExternalTab",
+        "Alchemy::Admin::LinkDialog::FileTab"
+      ]
     end
   end
 end

data/lib/alchemy/configurations/uploader.rb

@@ -4,8 +4,8 @@ module Alchemy
   module Configurations
     class Uploader < Alchemy::Configuration
       class AllowedFileTypes < Alchemy::Configuration
-        option :alchemy_attachments, :string_list, default: ["*"]
-        option :alchemy_pictures, :string_list, default: %w[jpg jpeg gif png svg webp]
+        option :alchemy_attachments, :collection, item_type: :string, default: ["*"]
+        option :alchemy_pictures, :collection, item_type: :string, default: %w[jpg jpeg gif png svg webp]
 
         def set(configuration_hash)
           super(configuration_hash.transform_keys { transform_key(_1) })

data/lib/alchemy/deprecation.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alchemy
-  Deprecation = ActiveSupport::Deprecation.new("8.0", "Alchemy")
+  Deprecation = ActiveSupport::Deprecation.new("9.0", "Alchemy")
 end

data/lib/alchemy/engine.rb

@@ -26,7 +26,7 @@ module Alchemy
 
     initializer "alchemy.admin_stylesheets" do |app|
       if defined?(Sprockets)
-        Alchemy.admin_stylesheets.each do |stylesheet|
+        Alchemy.config.admin_stylesheets.each do |stylesheet|
           app.config.assets.precompile << stylesheet
         end
       end
@@ -42,22 +42,35 @@ module Alchemy
       end
     end
 
+    initializer "alchemy.admin_importmap" do
+      Alchemy.config.admin_importmaps.add(
+        importmap_path: root.join("config/importmap.rb"),
+        source_paths: [
+          root.join("app/javascript"),
+          root.join("vendor/javascript")
+        ],
+        name: "alchemy_admin"
+      )
+    end
+
     initializer "alchemy.importmap" do |app|
-      watch_paths = []
-
-      Alchemy.admin_importmaps.each do |admin_import|
-        Alchemy.importmap.draw admin_import[:importmap_path]
-        watch_paths += admin_import[:source_paths]
-        app.config.assets.paths += admin_import[:source_paths]
-        if admin_import[:name] != "alchemy_admin"
-          Alchemy.admin_js_imports.add(admin_import[:name])
+      app.config.to_prepare do
+        watch_paths = []
+
+        Alchemy.config.admin_importmaps.each do |admin_import|
+          Alchemy.importmap.draw admin_import.importmap_path
+          watch_paths += admin_import.source_paths.to_a
+          app.config.assets.paths += admin_import.source_paths.to_a
+          if admin_import[:name] != "alchemy_admin"
+            Alchemy.config.admin_js_imports.add(admin_import.name)
+          end
         end
-      end
 
-      if app.config.importmap.sweep_cache
-        Alchemy.importmap.cache_sweeper(watches: watch_paths)
-        ActiveSupport.on_load(:action_controller_base) do
-          before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
+        if app.config.importmap.sweep_cache
+          Alchemy.importmap.cache_sweeper(watches: watch_paths)
+          ActiveSupport.on_load(:action_controller_base) do
+            before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
+          end
         end
       end
     end

data/lib/alchemy/test_support/config_stubbing.rb

@@ -13,11 +13,20 @@ module Alchemy
     module ConfigStubbing
       # Stub a key from the Alchemy config
       #
-      # @param key [Symbol] The configuration key you want to stub
-      # @param value [Object] The value you want to return instead of the original one
+      # @param hash [Hash] The keys you would like to stub along with their values
       #
-      def stub_alchemy_config(key, value)
-        allow(Alchemy.config).to receive(key).and_return(value)
+      def stub_alchemy_config(hash)
+        stub_config(Alchemy.config, hash)
+      end
+
+      def stub_config(config, hash)
+        hash.each do |key, value|
+          if value.is_a?(Hash)
+            stub_config(config.send(key), value)
+          else
+            allow(config).to receive(key).and_return(value)
+          end
+        end
       end
     end
   end

data/lib/alchemy/test_support/factories/language_factory.rb

@@ -3,7 +3,8 @@
 FactoryBot.define do
   factory :alchemy_language, class: "Alchemy::Language" do
     name { "Your Language" }
-    code { ::I18n.available_locales.first.to_s }
+    language_code { "en" }
+    locale { ::I18n.default_locale }
     default { true }
     frontpage_name { "Intro" }
     page_layout { Alchemy.config.default_language.page_layout }
@@ -14,20 +15,23 @@ FactoryBot.define do
 
     trait :klingon do
       name { "Klingon" }
-      code { "kl" }
+      language_code { "kl" }
+      locale { :kl }
       frontpage_name { "Tuq" }
       default { false }
     end
 
     trait :english do
       name { "English" }
-      code { "en" }
+      language_code { "en" }
+      locale { :en }
       default { false }
     end
 
     trait :german do
       name { "Deutsch" }
-      code { "de" }
+      language_code { "de" }
+      locale { :de }
       default { false }
     end
   end

data/lib/alchemy/test_support/factories/page_factory.rb

@@ -32,6 +32,7 @@ FactoryBot.define do
         public_on { Time.current }
         public_until { nil }
       end
+      published_at { Time.current }
       after(:build) do |page, evaluator|
         page.build_public_version(
           public_on: evaluator.public_on,

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "8.0.0.b"
+  VERSION = "8.0.0.c"
 
   def self.version
     VERSION