alchemy_cms 7.0.0.pre.a → 7.0.0.pre.c

data/app/models/alchemy/ingredients/richtext.rb

@@ -10,10 +10,10 @@ module Alchemy
         :sanitized_body
 
       allow_settings %i[
-          plain_text
-          sanitizer
-          tinymce
-        ]
+        plain_text
+        sanitizer
+        tinymce
+      ]
 
       before_save :strip_content
       before_save :sanitize_content
@@ -28,15 +28,23 @@ module Alchemy
         stripped_body.to_s[0..max_length - 1]
       end
 
-      # Returns css class names for the editor textarea.
-      def tinymce_class_name
-        "has_tinymce#{has_custom_tinymce_config? ? " #{element.name}_#{role}" : ""}"
+      def element_id
+        "tinymce_#{id}"
       end
 
       def has_tinymce?
         true
       end
 
+      # Returns true if there is a tinymce setting defined that contains settings.
+      def has_custom_tinymce_config?
+        custom_tinymce_config.is_a?(Hash)
+      end
+
+      def custom_tinymce_config
+        settings[:tinymce]
+      end
+
       private
 
       def strip_content
@@ -53,11 +61,6 @@ module Alchemy
       def sanitizer_settings
         settings[:sanitizer] || {}
       end
-
-      # Returns true if there is a tinymce setting defined that contains settings.
-      def has_custom_tinymce_config?
-        settings[:tinymce].is_a?(Hash)
-      end
     end
   end
 end

data/app/models/alchemy/ingredients/text.rb

@@ -17,12 +17,12 @@ module Alchemy
         :link_class_name
 
       allow_settings %i[
-          anchor
-          disable_link
-          display_inline
-          input_type
-          linkable
-        ]
+        anchor
+        disable_link
+        display_inline
+        input_type
+        linkable
+      ]
     end
   end
 end

data/app/models/alchemy/language/code.rb

@@ -17,7 +17,7 @@ module Alchemy::Language::Code
       codes << "" if codes.length == 1
       on_current_site.find_by(
         language_code: codes[0],
-        country_code: codes[1],
+        country_code: codes[1]
       )
     end
   end

data/app/models/alchemy/language.rb

@@ -38,11 +38,11 @@ module Alchemy
 
     validates :language_code,
       presence: true,
-      uniqueness: { scope: [:site_id, :country_code], case_sensitive: false },
-      format: { with: /\A[a-z]{2}\z/, if: -> { language_code.present? } }
+      uniqueness: {scope: [:site_id, :country_code], case_sensitive: false},
+      format: {with: /\A[a-z]{2}\z/, if: -> { language_code.present? }}
 
     validates :country_code,
-      format: { with: /\A[a-zA-Z]{2}\z/, if: -> { country_code.present? } }
+      format: {with: /\A[a-zA-Z]{2}\z/, if: -> { country_code.present? }}
 
     validate :presence_of_default_language
     validate :publicity_of_default_language
@@ -60,7 +60,7 @@ module Alchemy
     end
 
     scope :published, -> { where(public: true) }
-    scope :with_root_page, -> { joins(:pages).where(Page.table_name => { language_root: true }) }
+    scope :with_root_page, -> { joins(:pages).where(Page.table_name => {language_root: true}) }
 
     class << self
       def on_site(site)

data/app/models/alchemy/legacy_page_url.rb

@@ -18,5 +18,5 @@ class Alchemy::LegacyPageUrl < ActiveRecord::Base
 
   validates :urlname,
     presence: true,
-    format: {with: /\A[:\.\w\-+_\/\?&%;=#]*\z/}
+    format: {with: /\A[:.\w\-+_\/?&%;=#]*\z/}
 end

data/app/models/alchemy/node.rb

@@ -2,7 +2,7 @@
 
 module Alchemy
   class Node < BaseRecord
-    VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
+    VALID_URL_REGEX = /\A(\/|\D[a-z+\d.-]+:)/
 
     before_destroy :check_if_related_node_ingredients_present
 
@@ -24,7 +24,7 @@ module Alchemy
 
     validates :menu_type, presence: true
     validates :name, presence: true, if: -> { page.nil? }
-    validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? }
+    validates :url, format: {with: VALID_URL_REGEX}, unless: -> { url.nil? }
 
     # Returns the name
     #

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

@@ -12,7 +12,7 @@ module Alchemy
           class_name: "Alchemy::Element",
           through: :public_version,
           inverse_of: :page,
-          source: :elements,
+          source: :elements
         ) do
           has_many :all_elements
           has_many :elements, -> { not_nested.unfixed.published }
@@ -42,7 +42,7 @@ module Alchemy
               repository.not_nested.each.with_index(1) do |element, position|
                 Alchemy::DuplicateElement.new(element, repository: repository).call(
                   page_version_id: target.draft_version.id,
-                  position: position,
+                  position: position
                 )
               end
             end
@@ -72,11 +72,11 @@ module Alchemy
       #
       def available_element_definitions(only_element_named = nil)
         @_element_definitions ||= if only_element_named
-            definition = Element.definition_by_name(only_element_named)
-            element_definitions_by_name(definition["nestable_elements"])
-          else
-            element_definitions
-          end
+          definition = Element.definition_by_name(only_element_named)
+          element_definitions_by_name(definition["nestable_elements"])
+        else
+          element_definitions
+        end
 
         return [] if @_element_definitions.blank?
 
@@ -98,13 +98,13 @@ module Alchemy
       #
       def available_elements_within_current_scope(parent)
         @_available_elements = if parent
-            parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name)
-            available_element_definitions(parent.name).reject do |e|
-              parents_unique_nested_elements.include? e["name"]
-            end
-          else
-            available_element_definitions
+          parents_unique_nested_elements = parent.nested_elements.where(unique: true).pluck(:name)
+          available_element_definitions(parent.name).reject do |e|
+            parents_unique_nested_elements.include? e["name"]
           end
+        else
+          available_element_definitions
+        end
       end
 
       # All element definitions defined for page's page layout
@@ -160,7 +160,7 @@ module Alchemy
       #
       def richtext_ingredients_ids
         Alchemy::Ingredient.richtexts.joins(:element)
-          .where(Element.table_name => { page_version_id: draft_version.id, folded: false })
+          .where(Element.table_name => {page_version_id: draft_version.id, folded: false})
           .select(&:has_tinymce?)
           .collect(&:id)
       end

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

@@ -5,7 +5,7 @@ module Alchemy
     module PageNaming
       extend ActiveSupport::Concern
       include NameConversions
-      RESERVED_URLNAMES = %w(admin messages new)
+      RESERVED_URLNAMES = %w[admin messages new]
 
       included do
         before_validation :set_urlname,
@@ -15,9 +15,9 @@ module Alchemy
         validates :name,
           presence: true
         validates :urlname,
-          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false },
-          exclusion: { in: RESERVED_URLNAMES },
-          length: { minimum: 3, if: -> { urlname.present? } }
+          uniqueness: {scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false},
+          exclusion: {in: RESERVED_URLNAMES},
+          length: {minimum: 3, if: -> { urlname.present? }}
 
         before_save :set_title,
           if: -> { title.blank? }

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

@@ -58,7 +58,7 @@ module Alchemy
         {
           public: public?,
           locked: locked?,
-          restricted: restricted?,
+          restricted: restricted?
         }
       end
 

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

@@ -49,9 +49,9 @@ module Alchemy
         #
         scope :published,
           -> {
-            joins(:language, :versions).
-              merge(Language.published).
-              merge(PageVersion.public_on(Time.current))
+            joins(:language, :versions)
+              .merge(Language.published)
+              .merge(PageVersion.public_on(Time.current))
           }
 
         # All pages that are a published language root
@@ -59,7 +59,7 @@ module Alchemy
         scope :public_language_roots,
           -> {
             published.language_roots.where(
-              language_code: Language.published.pluck(:language_code),
+              language_code: Language.published.pluck(:language_code)
             )
           }
 
@@ -98,7 +98,7 @@ module Alchemy
         #
         scope :from_current_site,
           -> {
-            where(Language.table_name => { site_id: Site.current || Site.default }).joins(:language)
+            where(Language.table_name => {site_id: Site.current || Site.default}).joins(:language)
           }
 
         # All pages for xml sitemap

data/app/models/alchemy/page.rb

@@ -53,10 +53,10 @@ module Alchemy
       public_on: nil,
       public_until: nil,
       locked_at: nil,
-      locked_by: nil,
+      locked_by: nil
     }
 
-    SKIPPED_ATTRIBUTES_ON_COPY = %w(
+    SKIPPED_ATTRIBUTES_ON_COPY = %w[
       id
       updated_at
       created_at
@@ -67,7 +67,7 @@ module Alchemy
       depth
       urlname
       cached_tag_list
-    )
+    ]
 
     PERMITTED_ATTRIBUTES = [
       :meta_description,
@@ -85,7 +85,7 @@ module Alchemy
       :title,
       :urlname,
       :layoutpage,
-      :menu_id,
+      :menu_id
     ]
 
     acts_as_nested_set(dependent: :destroy, scope: [:layoutpage, :language_id])
@@ -185,12 +185,12 @@ module Alchemy
         [
           {
             name: :by_page_layout,
-            values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] },
+            values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] }
           },
           {
             name: :status,
-            values: %w[published not_public restricted],
-          },
+            values: %w[published not_public restricted]
+          }
         ]
       end
 
@@ -248,7 +248,7 @@ module Alchemy
           parent: new_parent,
           language: new_parent&.language,
           name: new_name,
-          title: new_name,
+          title: new_name
         })
         if source.children.any?
           source.copy_children_to(page)
@@ -276,7 +276,7 @@ module Alchemy
         link_target_options = Config.get(:link_target_options)
         link_target_options.each do |option|
           options << [Alchemy.t(option, scope: "link_target_options",
-                                        default: option.to_s.humanize), option]
+            default: option.to_s.humanize), option]
         end
         options
       end
@@ -450,7 +450,7 @@ module Alchemy
         new_child = Page.copy(child, {
           parent_id: new_parent.id,
           language_id: new_parent.language_id,
-          language_code: new_parent.language_code,
+          language_code: new_parent.language_code
         })
         new_child.move_to_child_of(new_parent)
         child.copy_children_to(new_child) unless child.children.blank?
@@ -491,7 +491,7 @@ module Alchemy
     #   A tree node with new lft, rgt, depth, url, parent_id and restricted indexes to be updated
     #
     def update_node!(node)
-      hash = { lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted }
+      hash = {lft: node.left, rgt: node.right, parent_id: node.parent, depth: node.depth, restricted: node.restricted}
 
       if urlname != node.url
         LegacyPageUrl.create(page_id: id, urlname: urlname)

data/app/models/alchemy/picture/calculations.rb

@@ -32,7 +32,7 @@ module Alchemy
 
         {
           width: width,
-          height: height,
+          height: height
         }
       end
 
@@ -41,7 +41,7 @@ module Alchemy
       def image_size
         {
           width: image_file_width,
-          height: image_file_height,
+          height: image_file_height
         }
       end
     end

data/app/models/alchemy/picture/transformations.rb

@@ -59,7 +59,7 @@ module Alchemy
       y = 0 if y.nil?
       {
         x: x,
-        y: y,
+        y: y
       }
     end
 
@@ -108,7 +108,7 @@ module Alchemy
     def reduce_to_image(dimensions)
       {
         width: [dimensions[:width].to_i, image_file_width.to_i].min,
-        height: [dimensions[:height].to_i, image_file_height.to_i].min,
+        height: [dimensions[:height].to_i, image_file_height.to_i].min
       }
     end
   end

data/app/models/alchemy/picture/url.rb

@@ -44,10 +44,10 @@ module Alchemy
 
       def find_thumb_by(signature)
         @thumb = if variant.picture.thumbs.loaded?
-            variant.picture.thumbs.find { |t| t.signature == signature }
-          else
-            variant.picture.thumbs.find_by(signature: signature)
-          end
+          variant.picture.thumbs.find { |t| t.signature == signature }
+        else
+          variant.picture.thumbs.find_by(signature: signature)
+        end
       end
     end
   end

data/app/models/alchemy/picture.rb

@@ -25,7 +25,7 @@ module Alchemy
     THUMBNAIL_SIZES = {
       small: "80x60",
       medium: "160x120",
-      large: "240x180",
+      large: "240x180"
     }.with_indifferent_access.freeze
 
     CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
@@ -38,7 +38,7 @@ module Alchemy
       :format,
       :quality,
       :size,
-      :upsample,
+      :upsample
     ]
 
     include Alchemy::Logger
@@ -64,7 +64,7 @@ module Alchemy
     # to ensure this runs before Dragonfly's before_destroy callback.
     #
     before_destroy unless: :deletable? do
-      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % { name: name }
+      raise PictureInUseError, Alchemy.t(:cannot_delete_picture_notice) % {name: name}
     end
 
     # Image preprocessing class
@@ -117,7 +117,7 @@ module Alchemy
       -> {
         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 :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: {id: nil}) }
     scope :by_file_format, ->(format) { where(image_file_format: format) }
 
     # Class methods
@@ -138,20 +138,21 @@ module Alchemy
       end
 
       def alchemy_resource_filters
+        @_file_formats ||= distinct.pluck(:image_file_format).compact.presence || []
         [
           {
             name: :by_file_format,
-            values: distinct.pluck(:image_file_format),
+            values: @_file_formats
           },
           {
             name: :misc,
-            values: %w(recent last_upload without_tag),
-          },
+            values: %w[recent last_upload without_tag deletable]
+          }
         ]
       end
 
       def searchable_alchemy_resource_attributes
-        %w(name image_file_name)
+        %w[name image_file_name]
       end
 
       def last_upload
@@ -183,7 +184,7 @@ module Alchemy
         options.except(*TRANSFORMATION_OPTIONS).merge(
           basename: name,
           ext: variant.render_format,
-          name: name,
+          name: name
         )
       )
     rescue ::Dragonfly::Job::Fetch::NotFound => e
@@ -211,7 +212,7 @@ module Alchemy
       {
         name: image_file_name,
         size: image_file_size,
-        error: errors[:image_file].join,
+        error: errors[:image_file].join
       }
     end
 

data/app/models/alchemy/picture_thumb/create.rb

@@ -27,7 +27,7 @@ module Alchemy
           end
           begin
             Alchemy::PictureThumb.storage_class.call(variant, uid)
-          rescue StandardError => e
+          rescue => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or storing fails
             @thumb&.destroy

data/app/models/alchemy/picture_thumb.rb

@@ -42,7 +42,7 @@ module Alchemy
         Alchemy::Picture::THUMBNAIL_SIZES.values.each do |size|
           variant = Alchemy::PictureVariant.new(picture, {
             size: size,
-            flatten: true,
+            flatten: true
           })
           signature = Alchemy::PictureThumb::Signature.call(variant)
           thumb = find_by(signature: signature)

data/app/models/alchemy/picture_variant.rb

@@ -54,8 +54,7 @@ module Alchemy
       raise MissingImageFileError, "Missing image file for #{picture.inspect}" if image.nil?
 
       image = processed_image(image, @options)
-      image = encoded_image(image, @options)
-      image
+      encoded_image(image, @options)
     rescue MissingImageFileError, WrongImageFormatError => e
       log_warning(e.message)
       nil
@@ -88,7 +87,7 @@ module Alchemy
       end
 
       options = {
-        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif",
+        flatten: !render_format.in?(ANIMATED_IMAGE_FORMATS) && picture.image_file_format == "gif"
       }.with_indifferent_access.merge(options)
 
       encoding_options = []

data/app/models/alchemy/tag.rb

@@ -13,6 +13,14 @@
 # The original Tag model is Gutentag::Tag
 module Alchemy
   class Tag < Gutentag::Tag
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[created_at id name taggings_count updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[taggings]
+    end
+
     # Replaces tag with new tag on all models tagged with tag.
     def self.replace(tag, new_tag)
       tag.taggings.collect(&:taggable).each do |taggable|

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

@@ -56,7 +56,7 @@ module Alchemy
         crop: crop,
         crop_from: crop && crop_from.presence || nil,
         crop_size: crop && crop_size.presence || nil,
-        size: settings[:size],
+        size: settings[:size]
       }.with_indifferent_access
     end
 
@@ -84,7 +84,7 @@ module Alchemy
         crop_from: crop && crop_from.presence || default_crop_from&.join("x"),
         crop_size: crop && crop_size.presence || default_crop_size&.join("x"),
         flatten: true,
-        format: picture&.image_file_format || "jpg",
+        format: picture&.image_file_format || "jpg"
       }
     end
 
@@ -96,7 +96,7 @@ module Alchemy
         default_crop_size: default_crop_size,
         fixed_ratio: settings[:fixed_ratio],
         image_width: picture&.image_file_width,
-        image_height: picture&.image_file_height,
+        image_height: picture&.image_file_height
       ).to_h
     end
 
@@ -105,7 +105,7 @@ module Alchemy
       settings[:crop] && picture &&
         picture.can_be_cropped_to?(
           settings[:size],
-          settings[:upsample],
+          settings[:upsample]
         ) && !!picture.image_file
     end
 
@@ -124,7 +124,7 @@ module Alchemy
     def thumbnail_zoom_factor(mask)
       [
         mask[0].to_f / (image_file_width || 1),
-        mask[1].to_f / (image_file_height || 1),
+        mask[1].to_f / (image_file_height || 1)
       ].max
     end
 
@@ -134,7 +134,7 @@ module Alchemy
 
       [
         ((image_file_width || 0) - default_crop_size[0]) / 2,
-        ((image_file_height || 0) - default_crop_size[1]) / 2,
+        ((image_file_height || 0) - default_crop_size[1]) / 2
       ].map(&:round)
     end
 

data/app/serializers/alchemy/base_serializer.rb

@@ -14,7 +14,7 @@ module Alchemy
     # The attributes to be serialized. See ActiveModel::Serialization.
     # By default, serialize all columns from the AR object.
     def attributes
-      Hash[object.class.column_names.map { |c| [c, nil] }]
+      object.class.column_names.map { |c| [c, nil] }.to_h
     end
 
     private

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      { "pages" => nil }
+      {"pages" => nil}
     end
 
     def pages
       tree = []
-      path = [{ id: object.parent_id, children: tree }]
-      page_list = object.self_and_descendants.includes(:public_version, { language: :site })
+      path = [{id: object.parent_id, children: tree}]
+      page_list = object.self_and_descendants.includes(:public_version, {language: :site})
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -61,7 +61,7 @@ module Alchemy
         level: level,
         root: page.root?,
         root_or_leaf: page.root? || page.leaf?,
-        children: [],
+        children: []
       }
 
       if opts[:elements]
@@ -75,7 +75,7 @@ module Alchemy
           locked: page.locked?,
           locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil,
           permissions: page_permissions(page, opts[:ability]),
-          status_titles: page_status_titles(page),
+          status_titles: page_status_titles(page)
         })
       else
         p_hash
@@ -98,14 +98,14 @@ module Alchemy
         copy: ability.can?(:copy, page),
         destroy: ability.can?(:destroy, page),
         create: ability.can?(:create, Alchemy::Page),
-        edit_content: ability.can?(:edit_content, page),
+        edit_content: ability.can?(:edit_content, page)
       }
     end
 
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        restricted: page.status_title(:restricted),
+        restricted: page.status_title(:restricted)
       }
     end
   end

data/app/services/alchemy/duplicate_element.rb

@@ -10,7 +10,7 @@ module Alchemy
       "id",
       "folded",
       "updated_at",
-      "updater_id",
+      "updater_id"
     ].freeze
 
     attr_reader :source_element, :repository
@@ -27,7 +27,7 @@ module Alchemy
         .merge(
           autogenerate_ingredients: false,
           autogenerate_nested_elements: false,
-          tags: source_element.tags,
+          tags: source_element.tags
         )
 
       new_element = Element.new(attributes)
@@ -40,7 +40,7 @@ module Alchemy
           self.class.new(nested_element, repository: repository).call(
             parent_element: new_element,
             page_version: new_element.page_version,
-            position: position,
+            position: position
           )
         end
       end