alchemy_cms 7.4.6 → 8.0.0.a

data/config/initializers/dragonfly.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "dragonfly_svg"
 require "alchemy/dragonfly/processors/crop_resize"
 require "alchemy/dragonfly/processors/auto_orient"
 require "alchemy/dragonfly/processors/thumbnail"

data/config/initializers/mime_types.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 Mime::Type.register "image/svg+xml", :svg
+Mime::Type.register "image/webp", :webp

data/config/locales/alchemy.en.yml

@@ -89,6 +89,7 @@ en:
       image/tiff: TIFF Image
       image/x-psd: Photoshop File
       image/svg+xml: SVG Image
+      image/webp: WebP Image
       text/plain: Plain Text Document
       text/x-vcard: vCard
       video/mp4: MPEG-4 Video
@@ -104,41 +105,57 @@ en:
     filters:
       page:
         by_page_layout:
+          all: All page types
           name: Page Type
         status:
+          all: Do not filter
           name: Status
           values:
             not_public: Unpublished
             published: Published
             restricted: Restricted
+        not_public:
+          name: Unpublished
+        published:
+          name: Published
+        restricted:
+          name: Restricted
+        updated_at_lteq:
+          name: Updated before
+        updated_at_gteq:
+          name: Updated after
       picture:
         by_file_format:
+          all: Show all file types
           name: File Type
           values:
+            <<: *mime_types
             gif: GIF Image
             jpeg: JPG Image
             png: PNG Image
             svg: SVG Image
             tiff: TIFF Image
             webp: WebP Image
-        misc:
-          name: Miscellaneous
-          values:
-            last_upload: Last upload only
-            recent: Recently uploaded only
-            without_tag: Without tag
-            deletable: Not linked by file content
+        last_upload:
+          name: Last upload only
+        recent:
+          name: Recently uploaded only
+        without_tag:
+          name: Without tag
+        deletable:
+          name: Not linked by file content
       attachment:
         by_file_type:
           name: File Type
           values:
             <<: *mime_types
-        misc:
-          name: Miscellaneous
-          values:
-            last_upload: Last upload only
-            recent: Recently uploaded only
-            without_tag: Without tag
+          all: Show all file types
+        last_upload:
+          name: Last upload only
+        recent:
+          name: Recently uploaded only
+        without_tag:
+          name: Without tag
 
     default_ingredient_texts:
       lorem: "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
@@ -681,7 +698,7 @@ en:
   time:
     formats:
       alchemy:
-        default: "%m.%d.%Y %H:%M"
+        default: "%Y-%m-%d %H:%M"
         ingredient_date: "%Y-%m-%d"
         page_status: "%m.%d.%Y %H:%M"
         short_datetime: "%d %b %H:%M"
@@ -719,6 +736,7 @@ en:
         attributes:
           image_file:
             blank: "Please attach a picture."
+            too_big: must not be larger than %{maximum}MB
       alchemy/user:
         attributes:
           email:

data/config/routes.rb

@@ -68,7 +68,6 @@ Alchemy::Engine.routes.draw do
 
     resources :attachments, except: [:new] do
       member do
-        get :download
         put :assign
       end
     end
@@ -114,7 +113,6 @@ Alchemy::Engine.routes.draw do
     as: :show_attachment
 
   resources :messages, only: [:index, :new, :create]
-  resources :elements, only: :show
 
   namespace :api, defaults: {format: "json"} do
     resources :attachments, only: [:index]

data/eslint.config.js

@@ -1,5 +1,6 @@
-module.exports = [
+export default [
   {
+    ignores: ["spec/**/*"],
     rules: {
       "no-restricted-imports": [
         "error",

data/lib/alchemy/admin/preview_url.rb

@@ -41,7 +41,6 @@ module Alchemy
 
       def url_for(page)
         @preview_config = preview_config_for(page)
-
         if @preview_config && uri
           uri_class.build(
             host: uri.host,
@@ -60,10 +59,10 @@ module Alchemy
       attr_reader :routes
 
       def preview_config_for(page)
-        preview_config = Alchemy::Config.get(:preview)
+        preview_config = Alchemy.config.preview
         return unless preview_config
 
-        preview_config[page.site.name] || preview_config
+        preview_config.for_site(page.site) || preview_config
       end
 
       def uri
@@ -81,8 +80,8 @@ module Alchemy
       end
 
       def userinfo
-        auth = @preview_config["auth"]
-        auth ? "#{auth["username"]}:#{auth["password"]}" : nil
+        auth = @preview_config.auth
+        auth.username ? "#{auth["username"]}:#{auth["password"]}" : nil
       end
     end
   end

data/lib/alchemy/cache_digests/template_tracker.rb

@@ -14,15 +14,12 @@ module Alchemy
       def dependencies
         case @name.to_s
         when /^alchemy\/pages\/show/
-          PageLayout.all.map { |p| "alchemy/page_layouts/_#{p["name"]}" }
+          PageDefinition.all.map { "alchemy/page_layouts/_#{_1.name}" }
         when /^alchemy\/page_layouts\/_(\w+)/
-          page_layout = PageLayout.get($1)
-          layout_elements = page_layout.fetch("elements", [])
-          layout_elements.map { |name| "alchemy/elements/_#{name}" }
+          page_definition = PageDefinition.get($1)
+          page_definition.elements.map { "alchemy/elements/_#{_1}" }
         when /^alchemy\/elements\/_(\w+)/
-          ingredient_types($1).map { |type|
-            "alchemy/ingredients/_#{type.underscore}_view"
-          }.uniq
+          ingredient_types($1).map { "alchemy/ingredients/_#{_1.underscore}_view" }.tap(&:uniq!)
         else
           ActionView::DependencyTracker::ERBTracker.call(@name, @template)
         end
@@ -31,10 +28,10 @@ module Alchemy
       private
 
       def ingredient_types(name)
-        element = Element.definitions.detect { |e| e["name"] == name }
+        element = Element.definitions.detect { _1.name == name }
         return [] unless element
 
-        element.fetch("ingredients", []).collect { |c| c["type"] }
+        element.ingredients.map(&:type)
       end
     end
   end

data/lib/alchemy/config_missing.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module ConfigMissing
+    def const_missing(missing_const_name)
+      if missing_const_name == :Config
+        Alchemy::Deprecation.warn("Alchemy::Config is deprecated. Use Alchemy.config instead.")
+        Alchemy.config
+      else
+        super
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/base_option.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Configuration
+    class BaseOption
+      def self.value_class
+        raise NotImplementedError
+      end
+
+      def initialize(value:, name:, **args)
+        @name = name
+        @value = validate(value) unless value.nil?
+      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
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/boolean_option.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+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
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/class_option.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require "alchemy/configuration/base_option"
+
+module Alchemy
+  class Configuration
+    class ClassOption < BaseOption
+      def self.value_class
+        String
+      end
+
+      def value = @value.constantize
+    end
+  end
+end

data/lib/alchemy/configuration/class_set_option.rb

@@ -0,0 +1,46 @@
+# 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

@@ -0,0 +1,13 @@
+# 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/integer_option.rb

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

data/lib/alchemy/configuration/list_option.rb

@@ -0,0 +1,22 @@
+# 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/regexp_option.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Configuration
+    class RegexpOption < BaseOption
+      def self.value_class
+        Regexp
+      end
+    end
+  end
+end

data/lib/alchemy/configuration/string_list_option.rb

@@ -0,0 +1,13 @@
+# 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

data/lib/alchemy/configuration/string_option.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Configuration
+    class StringOption < BaseOption
+      def self.value_class
+        String
+      end
+    end
+  end
+end

data/lib/alchemy/configuration.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "active_support"
+require "active_support/core_ext/string"
+
+require "alchemy/configuration/boolean_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/regexp_option"
+require "alchemy/configuration/string_list_option"
+require "alchemy/configuration/string_option"
+
+module Alchemy
+  class Configuration
+    def initialize(configuration_hash = {})
+      set(configuration_hash)
+    end
+
+    def set(configuration_hash)
+      configuration_hash.each do |key, value|
+        send(:"#{key}=", value)
+      end
+    end
+
+    alias_method :get, :send
+    alias_method :[], :get
+
+    def show = self
+
+    def fetch(key, default = nil)
+      get(key) || default
+    end
+
+    def set_from_yaml(file)
+      set(
+        YAML.safe_load(
+          ERB.new(File.read(file)).result,
+          permitted_classes: YAML_PERMITTED_CLASSES,
+          aliases: true
+        ) || {}
+      )
+    end
+
+    def to_h
+      self.class.defined_options.map do |option|
+        [option, send(option)]
+      end.concat(
+        self.class.defined_configurations.map do |configuration|
+          [configuration, send(configuration).to_h]
+        end
+      ).to_h
+    end
+
+    class << self
+      def defined_configurations = []
+
+      def defined_options = []
+
+      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.
+        # We store these as a class instance variable on each class which has a
+        # configuration. super() collects configurations defined on ancestors.
+        singleton_configurations = (@defined_singleton_configurations ||= [])
+        singleton_configurations << name.to_sym
+
+        define_singleton_method :defined_configurations do
+          super() + singleton_configurations
+        end
+
+        define_method(name) do
+          unless instance_variable_get(:"@#{name}")
+            send(:"#{name}=", configuration_class.new)
+          end
+          instance_variable_get(:"@#{name}")
+        end
+
+        define_method(:"#{name}=") do |value|
+          if value.is_a?(configuration_class)
+            instance_variable_set(:"@#{name}", value)
+          else
+            send(name).set(value)
+          end
+        end
+      end
+
+      def option(name, type, default: nil, **args)
+        klass = "Alchemy::Configuration::#{type.to_s.camelize}Option".constantize
+        # The defined options on a class are all those defined directly on
+        # that class as well as those defined on ancestors.
+        # We store these as a class instance variable on each class which has a
+        # option. super() collects options defined on ancestors.
+        singleton_options = (@defined_singleton_options ||= [])
+        singleton_options << name.to_sym
+
+        define_singleton_method :defined_options do
+          super() + singleton_options
+        end
+
+        define_method(name) do
+          unless instance_variable_defined?(:"@#{name}")
+            send(:"#{name}=", default)
+          end
+          instance_variable_get(:"@#{name}").value
+        end
+
+        define_method(:"#{name}=") do |value|
+          instance_variable_set(:"@#{name}", klass.new(value:, name:, **args))
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/configuration_methods.rb

@@ -12,9 +12,11 @@ module Alchemy
     #
     # Config file is in +config/alchemy/config.yml+
     #
+    # @deprecated - Use Alchemy.config.get instead
     def configuration(name)
-      Config.get(name)
+      Alchemy.config.get(name)
     end
+    deprecate configuration: "Alchemy.config.get", deprecator: Alchemy::Deprecation
 
     # Returns true if more than one language is published on current site.
     #

data/lib/alchemy/configurations/default_language.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class DefaultLanguage < Alchemy::Configuration
+      option :name, :string, default: "English"
+      option :code, :string, default: "en"
+      option :page_layout, :string, default: "index"
+      option :frontpage_name, :string, default: "Index"
+    end
+  end
+end

data/lib/alchemy/configurations/default_site.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class DefaultSite < Alchemy::Configuration
+      option :name, :string, default: "Default Site"
+      option :host, :string, default: "*"
+    end
+  end
+end

data/lib/alchemy/configurations/format_matchers.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class FormatMatchers < Alchemy::Configuration
+      option :email, :regexp, default: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
+      option :url, :regexp, default: /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
+      option :link_url, :regexp, default: /^(tel:|mailto:|\/|[a-z]+:\/\/)/
+    end
+  end
+end

data/lib/alchemy/configurations/mailer.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Configurations
+    class Mailer < Alchemy::Configuration
+      option :page_layout_name, :string, default: "contact"
+      option :forward_to_page, :boolean, default: false
+      option :mail_success_page, :string, default: "thanks"
+      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]
+    end
+  end
+end