alchemy_cms 8.0.0.a → 8.0.0.c

data/app/models/alchemy/page/page_natures.rb

@@ -13,8 +13,21 @@ module Alchemy
         language.public? && !!public_version&.public?
       end
 
+      # Cache-Control max-age duration in seconds.
+      #
+      # You can set this via the `ALCHEMY_PAGE_CACHE_MAX_AGE` environment variable,
+      # in the `Alchemy.config.page_cache_max_age` configuration option,
+      # or in the pages definition in `config/alchemy/page_layouts.yml` file.
+      #
+      # Defaults to 600 seconds.
       def expiration_time
-        public_until ? public_until - Time.current : nil
+        return 0 unless cache_page?
+
+        if definition.cache.to_s.match?(/\d+/)
+          definition.cache.to_i
+        else
+          Alchemy.config.page_cache.max_age
+        end
       end
 
       def rootpage?
@@ -144,17 +157,9 @@ module Alchemy
       # @returns Boolean
       #
       def cache_page?
-        return false unless caching_enabled?
-
-        page_layout = PageDefinition.get(self.page_layout)
-        page_layout.cache != false && page_layout.searchresults != true
-      end
-
-      private
+        return false if !public? || restricted?
 
-      def caching_enabled?
-        Alchemy.config.cache_pages &&
-          Rails.application.config.action_controller.perform_caching
+        definition.cache != false && definition.searchresults != true
       end
     end
   end

data/app/models/alchemy/page/publisher.rb

@@ -40,7 +40,7 @@ module Alchemy
           end
         end
 
-        Alchemy.publish_targets.each { |p| p.perform_later(page) }
+        Alchemy.config.publish_targets.each { |p| p.perform_later(page) }
       end
 
       private

data/app/models/alchemy/page.rb

@@ -115,7 +115,7 @@ module Alchemy
     has_many :site_languages, through: :site, source: :languages
     has_many :folded_pages, dependent: :destroy
     has_many :legacy_urls, class_name: "Alchemy::LegacyPageUrl", dependent: :destroy
-    has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
+    has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page, dependent: :restrict_with_error
     has_many :versions, class_name: "Alchemy::PageVersion", inverse_of: :page, dependent: :destroy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
@@ -132,11 +132,6 @@ module Alchemy
     before_create -> { versions.build },
       if: -> { versions.none? }
 
-    before_destroy if: -> { nodes.any? } do
-      errors.add(:nodes, :still_present)
-      throw(:abort)
-    end
-
     before_save :set_language_code,
       if: -> { language.present? }
 

data/app/models/alchemy/page_definition.rb

@@ -13,7 +13,7 @@ module Alchemy
     attribute :autogenerate, default: []
     attribute :layoutpage, :boolean, default: false
     attribute :unique, :boolean, default: false
-    attribute :cache, :boolean, default: true
+    attribute :cache, default: true
     attribute :insert_elements_at, :string, default: "bottom"
     attribute :fixed_attributes, default: {}
     attribute :searchable, :boolean, default: true

data/app/models/alchemy/picture.rb

@@ -32,14 +32,8 @@ module Alchemy
     include Alchemy::NameConversions
     include Alchemy::Taggable
     include Alchemy::TouchElements
+    include Alchemy::RelatableResource
 
-    has_many :picture_ingredients,
-      class_name: "Alchemy::Ingredients::Picture",
-      foreign_key: "related_object_id",
-      inverse_of: :related_object
-
-    has_many :elements, through: :picture_ingredients
-    has_many :pages, through: :elements
     has_many :descriptions, class_name: "Alchemy::PictureDescription", dependent: :destroy
 
     accepts_nested_attributes_for :descriptions, allow_destroy: true, reject_if: ->(attr) { attr[:text].blank? }
@@ -86,15 +80,16 @@ module Alchemy
 
     scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
     scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
-    scope :deletable,
-      -> {
-        where("#{table_name}.id NOT IN (SELECT related_object_id FROM alchemy_ingredients WHERE related_object_type = 'Alchemy::Picture')")
-      }
     scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
     scope :by_file_format, ->(file_format) do
       Alchemy.storage_adapter.by_file_format_scope(file_format)
     end
 
+    # Case insensitive Ransack searching and sorting for name attribute
+    ransacker :name, type: :string do
+      arel_table[:name].lower
+    end
+
     # Class methods
 
     class << self
@@ -251,12 +246,6 @@ module Alchemy
       pages.any? && pages.not_restricted.blank?
     end
 
-    # Returns true if picture is not assigned to any Picture ingredient.
-    #
-    def deletable?
-      picture_ingredients.empty?
-    end
-
     def image_file_name
       Alchemy.storage_adapter.image_file_name(self)
     end

data/app/models/alchemy/resource.rb

@@ -152,7 +152,7 @@ module Alchemy
     end
 
     def attributes
-      @_attributes ||= model.columns.collect do |col|
+      @_attributes ||= model.columns.filter_map do |col|
         next if skipped_attributes.include?(col.name)
 
         {
@@ -161,7 +161,7 @@ module Alchemy
           relation: resource_relation(col.name),
           enum: enum_values_collection_for_select(col.name)
         }.delete_if { |_k, v| v.blank? }
-      end.compact
+      end
     end
 
     def enum_values_collection_for_select(column_name)
@@ -199,6 +199,19 @@ module Alchemy
       attributes.reject { |h| restricted_attributes.map(&:to_s).include?(h[:name].to_s) }
     end
 
+    # Returns a list of attribute names that are permitted to be updated.
+    # Uses {editable_attributes} and adds {tag_list} if model is taggable.
+    # Used in strong parameters of Alchemy::Admin::ResourcesController.
+    #
+    # @return [Array<String>]
+    def permitted_attributes
+      attrs = editable_attributes.map { _1[:name] }
+      if model < Alchemy::Taggable
+        attrs << "tag_list"
+      end
+      attrs
+    end
+
     # Returns all attribute names that are searchable in the admin interface
     #
     def searchable_attribute_names

data/app/models/alchemy/site/layout.rb

@@ -3,6 +3,7 @@
 module Alchemy
   module Site::Layout
     extend ActiveSupport::Concern
+
     SITE_DEFINITIONS_FILE = Rails.root.join("config/alchemy/site_layouts.yml")
 
     module ClassMethods

data/app/models/alchemy/site.rb

@@ -21,12 +21,7 @@ module Alchemy
     validates_uniqueness_of :host, case_sensitive: false
 
     # associations
-    has_many :languages
-
-    before_destroy if: -> { languages.any? } do
-      errors.add(:languages, :still_present)
-      throw(:abort)
-    end
+    has_many :languages, dependent: :restrict_with_error
 
     scope :published, -> { where(public: true) }
 

data/app/models/alchemy/storage_adapter/dragonfly/picture_url.rb

@@ -26,8 +26,9 @@ module Alchemy
       #
       # @return [String]
       #
-      def call(options = {})
-        @variant = PictureVariant.new(picture, options.slice(*TRANSFORMATION_OPTIONS))
+      def call(variant_options = {})
+        set_variant(variant_options)
+
         params = {
           basename: picture.name,
           ext: variant.render_format,
@@ -41,6 +42,10 @@ module Alchemy
 
       private
 
+      def set_variant(options = {})
+        @variant = PictureVariant.new(picture, options.slice(*TRANSFORMATION_OPTIONS))
+      end
+
       def processible_image?
         variant.image.is_a?(::Dragonfly::Job)
       end

data/app/models/alchemy/storage_adapter/dragonfly.rb

@@ -15,6 +15,10 @@ module Alchemy
 
             has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
 
+            before_save if: :image_file_name do
+              self.image_file_name = sanitized_filename(image_file_name)
+            end
+
             # Create important thumbnails upfront
             after_create -> { PictureThumb.generate_thumbs!(self) },
               if: :has_convertible_format?
@@ -30,6 +34,10 @@ module Alchemy
                 write_attribute(:file_mime_type, file.mime_type)
               }
             end
+
+            before_save if: :file_name do
+              self.file_name = sanitized_filename(file_name)
+            end
           end
         end
       end
@@ -38,16 +46,30 @@ module Alchemy
 
       CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
+      # Allows to set a custom Attachment Url class
+      def attachment_url_class=(klass)
+        @_attachment_url_class = klass
+      end
+
+      # Returns the class used to generate attachment urls
+      # @return [Class] - defaults to Alchemy::StorageAdapter::Dragonfly::AttachmentUrl
       def attachment_url_class
-        AttachmentUrl
+        @_attachment_url_class ||= AttachmentUrl
       end
 
       def preprocessor_class
         Preprocessor
       end
 
+      # Allows to set a custom Picture Url class
+      def picture_url_class=(klass)
+        @_picture_url_class = klass
+      end
+
+      # Returns the class used to generate picture urls
+      # @return [Class] - defaults to Alchemy::StorageAdapter::Dragonfly::PictureUrl
       def picture_url_class
-        PictureUrl
+        @_picture_url_class ||= PictureUrl
       end
 
       def file_formats(class_name, scope:)

data/app/models/concerns/alchemy/relatable_resource.rb

@@ -0,0 +1,28 @@
+module Alchemy
+  module RelatableResource
+    extend ActiveSupport::Concern
+
+    included do
+      scope :deletable, -> do
+        where(
+          "#{table_name}.id NOT IN (SELECT related_object_id FROM alchemy_ingredients WHERE related_object_id IS NOT NULL AND related_object_type = ?)",
+          name
+        )
+      end
+
+      has_many :related_ingredients,
+        class_name: "Alchemy::Ingredient",
+        foreign_key: "related_object_id",
+        as: :related_object
+
+      has_many :elements, through: :related_ingredients
+      has_many :pages, through: :elements
+    end
+
+    # Returns true if object is not assigned to any ingredient.
+    #
+    def deletable?
+      related_ingredients.none?
+    end
+  end
+end

data/app/stylesheets/alchemy/_custom-properties.scss

@@ -0,0 +1,162 @@
+:root {
+  /* Dark Colors */
+  --a-lightest-grey: hsl(200deg, 5%, 90%);
+  --a-lighter-grey: hsl(200deg, 5%, 70%);
+  --a-light-grey: hsl(200deg, 5%, 35%);
+  --a-grey: hsl(200deg, 5%, 22.5%);
+  --a-dark-grey: hsl(200deg, 5%, 17.5%);
+  --a-darker-grey: hsl(200deg, 5%, 15%);
+  --a-darkest-grey: hsl(200deg, 5%, 12.5%);
+
+  /* Light Colors */
+  --color-blue_very_light: hsl(203deg, 32%, 97%);
+  --color-blue_light: hsl(203deg, 32%, 85%);
+  --color-blue_medium: hsl(212deg, 52%, 36%);
+  --color-blue_dark: hsl(212deg, 52%, 26%);
+
+  --color-green_very_light: hsl(88deg, 47%, 88%);
+  --color-green_light: hsl(127deg, 25%, 69%);
+  --color-green_medium: hsl(127deg, 25%, 48%);
+  --color-green_dark: hsl(128deg, 32%, 26%);
+
+  --color-yellow_light: hsl(60deg, 81%, 92%);
+  --color-yellow_medium: hsl(56deg, 68%, 85%);
+  --color-yellow_dark: hsl(56deg, 53%, 29%);
+
+  --color-orange_medium: hsl(42deg, 100%, 74%);
+  --color-orange_dark: hsl(28deg, 77%, 68%);
+  --color-orange_very_dark: hsl(28deg, 77%, 48%);
+
+  --color-red_very_light: hsl(0deg, 47%, 88%);
+  --color-red_light: hsl(0deg, 25%, 69%);
+  --color-red_medium: hsl(0deg, 51%, 42%);
+  --color-red_dark: hsl(0deg, 51%, 25%);
+
+  --color-grey_very_light: hsl(0deg, 0%, 97%);
+  --color-grey_light: hsl(0deg, 0%, 94%);
+  --color-grey_medium: hsl(0deg, 0%, 78%);
+  --color-grey_dark: hsl(0deg, 0%, 40%);
+  --color-grey_very_dark: hsl(0deg, 0%, 20%);
+
+  --color-white: hsl(0deg, 0%, 100%);
+
+  /* Sizes */
+  --spacing-0: 2px;
+  --spacing-1: 4px;
+  --spacing-2: 8px;
+  --spacing-3: 12px;
+  --spacing-4: 16px;
+  --spacing-5: 20px;
+  --spacing-6: 24px;
+  --spacing-7: 28px;
+  --spacing-8: 32px;
+
+  /* Font Families */
+  --font-mono:
+    Menlo, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", Terminal,
+    monospace;
+  --font-sans:
+    "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Verdana,
+    Tahoma, sans-serif;
+
+  /* Font Size - at the moment only in Pixel, because the base font size is 12px */
+  --font-size_small: 10px; /* 0.875rem */
+  --font-size_medium: 12px; /* 1rem */
+  --font-size_large: 16px; /* 1.25 rem */
+
+  --font-weight_normal: 500;
+  --font-weight_bold: 700;
+
+  --font-default: var(--font-size_medium) var(--font-sans);
+
+  /* Borders */
+  --border-radius_medium: 3px;
+  --border-width_small: 1px;
+  --border-style: solid;
+  --border-default: var(--border-width_small) var(--border-style)
+    var(--border-color);
+
+  /* Transitions */
+  --transition-duration: 250ms;
+  --transition-easing: linear;
+
+  /* Button */
+  --button-border-radius: var(--border-radius_medium);
+  --button-border-style: var(--border-style);
+  --button-border-width: var(--border-width_small);
+  --button-border: var(--button-border-width) var(--button-border-style)
+    var(--button-border-color);
+  --button-font-size: var(--font-size_medium);
+  --button-font-weight: var(--font-weight_bold);
+  --button-height: 30px;
+  --button-line-height: var(--form-field-line-height);
+  --button-margin: var(--form-field-margin);
+  --button-padding: var(--spacing-1) var(--spacing-5);
+  --button-small-padding: 0.4em 0.8em;
+
+  /* Date Picker */
+  --datepicker-font-size: var(--font-size_medium);
+
+  /* Dialog */
+  --dialog-header-height: 36px;
+  --dialog-header-font-size: var(--font-size_medium);
+  --dialog-header-padding: 0 var(--spacing-2);
+  --dialog-transition-duration: 150ms;
+
+  /* Elements */
+  --elements-window-width: 0px;
+  --elements-window-min-width: 400px;
+
+  /* Form */
+  --form-left-column-width: 35%;
+  --form-right-column-width: 65%;
+
+  /* Form Field */
+  --form-field-margin: var(--spacing-1) 0;
+  --form-field-height: 31px;
+  --form-field-addon-width: 30px;
+  --form-field-border-width: var(--border-width_small);
+  --form-field-border-style: var(--border-style);
+  --form-field-padding: var(--spacing-1) var(--spacing-2);
+  --form-field-font-size: var(--font-size_medium);
+  --form-field-line-height: 1.25;
+
+  /* Header */
+  --header-height: 29px;
+  --header-border-bottom: var(--border-default);
+
+  /* Icon Button */
+  --icon-button-height: 30px;
+  --icon-button-width: 30px;
+  --icon-button-medium-height: 26px;
+  --icon-button-medium-width: 26px;
+  --icon-button-small-height: 15px;
+  --icon-button-small-width: 15px;
+
+  /* Icons */
+  --icon-size-xs: 0.75rem;
+  --icon-size-sm: 0.875rem;
+  --icon-size-1x: 1rem;
+  --icon-size-md: 1.3rem;
+  --icon-size-xl: 1.5rem;
+  --icon-size-xxl: 1.6rem;
+
+  /* Navigation */
+  --main-menu-width: 150px;
+  --top-menu-height: 75px;
+  --main-menu-entry-max-width: 110px;
+
+  /* Pagination */
+  --pagination-height: 52px;
+
+  /* Select */
+  --select-medium-width: 90px;
+  --select-large-width: 120px;
+
+  /* Sidebar */
+  --sidebar-width: 232px;
+
+  /* Toolbar */
+  --toolbar-height: 46px;
+  --toolbar-padding: var(--spacing-2) var(--spacing-1);
+}

data/app/stylesheets/alchemy/_mixins.scss

@@ -21,6 +21,7 @@
   $border-radius: var(--button-border-radius),
   $border: var(--button-border),
   $box-shadow: var(--button-box-shadow),
+  $height: var(--button-height),
   $padding: var(--button-padding),
   $margin: var(--button-margin),
   $color: var(--button-text-color),
@@ -34,7 +35,7 @@
   font-family: var(--font-sans);
   font-size: var(--button-font-size);
   font-weight: var(--button-font-weight);
-  height: var(--button-height);
+  height: $height;
   padding: $padding;
   cursor: pointer;
   border-radius: $border-radius;
@@ -66,14 +67,9 @@
   }
 
   &.disabled,
-  &[disabled],
-  &.disabled:active,
-  &[disabled]:active,
-  &.disabled:focus,
-  &[disabled]:focus,
-  &.disabled:hover,
-  &[disabled]:hover {
-    background-color: hsla(0deg, 0%, 100%, 0.5);
+  &[disabled] {
+    background-color: var(--button-disabled-bg-color);
+    border-color: var(--button-border-color);
     cursor: not-allowed;
     box-shadow: none;
     outline: none;
@@ -95,28 +91,20 @@
   float: left;
   text-align: right;
   font-size: var(--font-size_medium);
-}
-
-@mixin form-value-display {
-  float: right;
-  width: var(--form-right-column-width);
-  margin: var(--form-field-margin);
-  padding: var(--spacing-1) var(--spacing-2);
-  line-height: 21px;
-  min-height: var(--form-field-height);
-  background: white;
-  border-radius: var(--border-radius_medium);
+  color: var(--form-field-label-color);
 }
 
 @mixin form-hint(
-  $background-color: var(--color-yellow_light),
-  $border-color: var(--color-grey_light)
+  $background-color: var(--hint-background-color),
+  $border-color: var(--hint-border-color),
+  $color: var(--hint-text-color)
 ) {
   font-size: var(--font-size_small);
   line-height: 1.5em;
   padding: var(--spacing-1);
   background-color: $background-color;
   border: 1px solid $border-color;
+  color: $color;
   display: block;
   clear: both;
   border-radius: var(--border-radius_medium);
@@ -159,7 +147,7 @@
   vertical-align: middle;
   padding: $padding;
   margin: $margin;
-  background-color: var(--color-grey_light);
+  background-color: var(--tag-background-color);
   overflow: hidden;
   position: relative;
   border-radius: var(--border-radius_medium);
@@ -175,7 +163,7 @@
     align-self: start;
     flex-shrink: 0;
     content: "";
-    background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="hsla(224deg, 23%, 26%, 0.75)"><path d="M10.9042 2.10025L20.8037 3.51446L22.2179 13.414L13.0255 22.6063C12.635 22.9969 12.0019 22.9969 11.6113 22.6063L1.71184 12.7069C1.32131 12.3163 1.32131 11.6832 1.71184 11.2926L10.9042 2.10025ZM11.6113 4.22157L3.83316 11.9997L12.3184 20.485L20.0966 12.7069L19.036 5.28223L11.6113 4.22157ZM13.7327 10.5855C12.9516 9.80448 12.9516 8.53815 13.7327 7.7571C14.5137 6.97606 15.78 6.97606 16.5611 7.7571C17.3421 8.53815 17.3421 9.80448 16.5611 10.5855C15.78 11.3666 14.5137 11.3666 13.7327 10.5855Z"></path></svg>');
+    background-image: var(--tag-background-image);
     width: 12px;
     height: 12px;
     margin-top: var(--spacing-0);