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

data/config/routes.rb

@@ -1,21 +1,22 @@
 # frozen_string_literal: true
+
 require "alchemy/routing_constraints"
 
 Alchemy::Engine.routes.draw do
   root to: "pages#index"
 
-  get "/sitemap.xml" => "pages#sitemap", format: "xml"
+  get "/sitemap.xml" => "pages#sitemap", :format => "xml"
 
-  scope Alchemy.admin_path, { constraints: Alchemy.admin_constraints } do
-    get "/" => redirect("#{Alchemy.admin_path}/dashboard"), as: :admin
-    get "/dashboard" => "admin/dashboard#index", as: :admin_dashboard
-    get "/dashboard/info" => "admin/dashboard#info", as: :dashboard_info
-    get "/help" => "admin/dashboard#help", as: :help
-    get "/dashboard/update_check" => "admin/dashboard#update_check", as: :update_check
-    get "/leave" => "admin/base#leave", as: :leave_admin
+  scope Alchemy.admin_path, {constraints: Alchemy.admin_constraints} do
+    get "/" => redirect("#{Alchemy.admin_path}/dashboard"), :as => :admin
+    get "/dashboard" => "admin/dashboard#index", :as => :admin_dashboard
+    get "/dashboard/info" => "admin/dashboard#info", :as => :dashboard_info
+    get "/help" => "admin/dashboard#help", :as => :help
+    get "/dashboard/update_check" => "admin/dashboard#update_check", :as => :update_check
+    get "/leave" => "admin/base#leave", :as => :leave_admin
   end
 
-  namespace :admin, { path: Alchemy.admin_path, constraints: Alchemy.admin_constraints } do
+  namespace :admin, {path: Alchemy.admin_path, constraints: Alchemy.admin_constraints} do
     resources :nodes
 
     resources :pages do
@@ -106,21 +107,21 @@ Alchemy::Engine.routes.draw do
   end
 
   get "/attachment/:id/download(/:name)" => "attachments#download",
-      as: :download_attachment
+    :as => :download_attachment
   get "/attachment/:id/show(/:name)" => "attachments#show",
-      as: :show_attachment
+    :as => :show_attachment
 
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
 
-  namespace :api, defaults: { format: "json" } do
+  namespace :api, defaults: {format: "json"} do
     resources :ingredients, only: [:index]
 
     resources :elements, only: [:index, :show]
 
     resources :pages, only: [:index] do
-      get "elements" => "elements#index", as: "elements"
-      get "elements/:named" => "elements#index", as: "named_elements"
+      get "elements" => "elements#index", :as => "elements"
+      get "elements/:named" => "elements#index", :as => "named_elements"
       collection do
         get :nested
       end
@@ -129,8 +130,8 @@ Alchemy::Engine.routes.draw do
       end
     end
 
-    get "/pages/*urlname(.:format)" => "pages#show", as: "page"
-    get "/admin/pages/:id(.:format)" => "pages#show", as: "preview_page"
+    get "/pages/*urlname(.:format)" => "pages#show", :as => "page"
+    get "/admin/pages/:id(.:format)" => "pages#show", :as => "preview_page"
 
     resources :nodes, only: [:index] do
       member do
@@ -141,13 +142,13 @@ Alchemy::Engine.routes.draw do
   end
 
   get "/:locale" => "pages#index",
-    constraints: { locale: Alchemy::RoutingConstraints::LOCALE_REGEXP },
-    as: :show_language_root
+    :constraints => {locale: Alchemy::RoutingConstraints::LOCALE_REGEXP},
+    :as => :show_language_root
 
   # The page show action has to be last route
   constraints(locale: Alchemy::RoutingConstraints::LOCALE_REGEXP) do
     get "(/:locale)/*urlname(.:format)" => "pages#show",
-      constraints: Alchemy::RoutingConstraints.new,
-      as: :show_page
+      :constraints => Alchemy::RoutingConstraints.new,
+      :as => :show_page
   end
 end

data/config/spring.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 Spring.application_root = "./spec/dummy"
 Spring.watch "lib/**/*"

data/db/migrate/20230121212637_alchemy_six_point_one.rb

@@ -64,7 +64,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
         t.integer "updater_id"
         t.boolean "default", default: false, null: false
         t.string "country_code", default: "", null: false
-        t.references "site", null: false, foreign_key: { to_table: :alchemy_sites }
+        t.references "site", null: false, foreign_key: {to_table: :alchemy_sites}
         t.string "locale"
         t.index ["creator_id"], name: "index_alchemy_languages_on_creator_id"
         t.index ["language_code", "country_code"], name: "index_alchemy_languages_on_language_code_and_country_code"
@@ -108,7 +108,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
         t.datetime "updated_at", null: false
         t.integer "creator_id"
         t.integer "updater_id"
-        t.references "language", null: false, foreign_key: { to_table: :alchemy_languages }
+        t.references "language", null: false, foreign_key: {to_table: :alchemy_languages}
         t.datetime "published_at", precision: nil
         t.datetime "locked_at", precision: nil
         t.index ["creator_id"], name: "index_alchemy_pages_on_creator_id"
@@ -122,7 +122,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
 
     unless table_exists?("alchemy_page_versions")
       create_table "alchemy_page_versions" do |t|
-        t.references "page", null: false, foreign_key: { to_table: :alchemy_pages, on_delete: :cascade }
+        t.references "page", null: false, foreign_key: {to_table: :alchemy_pages, on_delete: :cascade}
         t.datetime "public_on", precision: nil
         t.datetime "public_until", precision: nil
         t.datetime "created_at", null: false
@@ -144,7 +144,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
         t.integer "updater_id"
         t.integer "parent_element_id"
         t.boolean "fixed", default: false, null: false
-        t.references "page_version", null: false, foreign_key: { to_table: :alchemy_page_versions, on_delete: :cascade }
+        t.references "page_version", null: false, foreign_key: {to_table: :alchemy_page_versions, on_delete: :cascade}
         t.index ["creator_id"], name: "index_alchemy_elements_on_creator_id"
         t.index ["fixed"], name: "index_alchemy_elements_on_fixed"
         t.index ["page_version_id", "parent_element_id"], name: "idx_alchemy_elements_on_page_version_id_and_parent_element_id"
@@ -155,7 +155,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
 
     unless table_exists?("alchemy_ingredients")
       create_table "alchemy_ingredients" do |t|
-        t.references "element", null: false, foreign_key: { to_table: :alchemy_elements, on_delete: :cascade }
+        t.references "element", null: false, foreign_key: {to_table: :alchemy_elements, on_delete: :cascade}
         t.string "type", null: false
         t.string "role", null: false
         t.text "value"
@@ -186,8 +186,8 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
         t.integer "lft", null: false
         t.integer "rgt", null: false
         t.integer "depth", default: 0, null: false
-        t.references "page", foreign_key: { to_table: :alchemy_pages, on_delete: :restrict }
-        t.references "language", null: false, foreign_key: { to_table: :alchemy_languages }
+        t.references "page", foreign_key: {to_table: :alchemy_pages, on_delete: :restrict}
+        t.references "language", null: false, foreign_key: {to_table: :alchemy_languages}
         t.integer "creator_id"
         t.integer "updater_id"
         t.datetime "created_at", null: false
@@ -222,7 +222,7 @@ class AlchemySixPointOne < ActiveRecord::Migration[ActiveRecord::Migration.curre
 
     unless table_exists?("alchemy_picture_thumbs")
       create_table "alchemy_picture_thumbs" do |t|
-        t.references "picture", null: false, foreign_key: { to_table: :alchemy_pictures }
+        t.references "picture", null: false, foreign_key: {to_table: :alchemy_pictures}
         t.string "signature", null: false
         t.text "uid", null: false
         t.index ["signature"], name: "index_alchemy_picture_thumbs_on_signature", unique: true

data/db/migrate/20230505132743_add_indexes_to_alchemy_pictures.rb

@@ -0,0 +1,6 @@
+class AddIndexesToAlchemyPictures < ActiveRecord::Migration[6.1]
+  def change
+    add_index :alchemy_pictures, :name, if_not_exists: true
+    add_index :alchemy_pictures, :image_file_name, if_not_exists: true
+  end
+end

data/lib/alchemy/admin/locale.rb

@@ -18,10 +18,10 @@ module Alchemy
       # It respects the default translation from your +config/application.rb+ +default_locale+ config option.
       #
       def set_translation
-        if locale_change_needed?
-          locale = available_locale || ::I18n.default_locale
+        locale = if locale_change_needed?
+          available_locale || ::I18n.default_locale
         else
-          locale = session[:alchemy_locale]
+          session[:alchemy_locale]
         end
         ::I18n.locale = session[:alchemy_locale] = locale
       end

data/lib/alchemy/admin/preview_url.rb

@@ -48,7 +48,7 @@ module Alchemy
             port: uri.port,
             path: page.url_path,
             userinfo: userinfo,
-            query: { alchemy_preview_mode: true }.to_param,
+            query: {alchemy_preview_mode: true}.to_param
           ).to_s
         else
           routes.admin_page_path(page)
@@ -73,7 +73,7 @@ module Alchemy
       end
 
       def uri_class
-        if uri.class == URI::Generic
+        if uri.instance_of?(URI::Generic)
           raise MissingProtocolError, "Please provide the protocol with preview['host']"
         else
           uri.class

data/lib/alchemy/auth_accessors.rb

@@ -90,7 +90,7 @@ module Alchemy
     @@user_class ||= begin
       @@user_class_name.constantize
     rescue NameError => e
-      if e.message =~ /#{Regexp.escape(@@user_class_name)}/
+      if /#{Regexp.escape(@@user_class_name)}/.match?(e.message)
         Rails.logger.warn <<~MSG
           #{e.message}
           #{e.backtrace.join("\n")}

data/lib/alchemy/config.rb

@@ -58,7 +58,7 @@ module Alchemy
         YAML.safe_load(
           ERB.new(File.read(file)).result,
           permitted_classes: YAML_PERMITTED_CLASSES,
-          aliases: true,
+          aliases: true
         ) || {}
       rescue Errno::ENOENT
         {}

data/lib/alchemy/controller_actions.rb

@@ -20,7 +20,7 @@ module Alchemy
 
     # Returns a host string with the domain the app is running on.
     def current_server
-     "#{request.protocol}#{request.host_with_port}"
+      "#{request.protocol}#{request.host_with_port}"
     end
 
     # The current authorized user.
@@ -62,11 +62,11 @@ module Alchemy
     # Try to find and stores current language for Alchemy.
     #
     def set_alchemy_language(lang = nil)
-      if lang
-        @language = lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
+      @language = if lang
+        lang.is_a?(Language) ? lang : load_alchemy_language_from_id_or_code(lang)
       else
         # find the best language and remember it for later
-        @language = load_alchemy_language_from_params ||
+        load_alchemy_language_from_params ||
           load_alchemy_language_from_session ||
           Language.default
       end

data/lib/alchemy/deprecation.rb

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

data/lib/alchemy/dragonfly/processors/thumbnail.rb

@@ -19,7 +19,7 @@ module Alchemy
           # resize all frames in a GIF
           # @link https://imagemagick.org/script/command-line-options.php#coalesce
           # @link https://imagemagick.org/script/command-line-options.php#deconstruct
-          @content&.mime_type == "image/gif" ? "-coalesce #{super} -deconstruct" : super
+          (@content&.mime_type == "image/gif") ? "-coalesce #{super} -deconstruct" : super
         end
       end
     end

data/lib/alchemy/element_definition.rb

@@ -51,11 +51,11 @@ module Alchemy
           YAML.safe_load(
             ERB.new(File.read(definitions_file_path)).result,
             permitted_classes: YAML_PERMITTED_CLASSES,
-            aliases: true,
+            aliases: true
           ) || []
         else
           raise LoadError,
-                "Could not find elements.yml file! Please run `rails generate alchemy:install`"
+            "Could not find elements.yml file! Please run `rails generate alchemy:install`"
         end
       end
 

data/lib/alchemy/engine.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Alchemy
   class Engine < Rails::Engine
     isolate_namespace Alchemy
@@ -19,6 +20,20 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
+    initializer "alchemy.importmap" do |app|
+      Alchemy.importmap.draw(Engine.root.join("config", "importmap.rb"))
+
+      package_path = Engine.root.join("app/javascript")
+      app.config.assets.paths << package_path
+
+      if app.config.importmap.sweep_cache
+        Alchemy.importmap.cache_sweeper(watches: package_path)
+        ActiveSupport.on_load(:action_controller_base) do
+          before_action { Alchemy.importmap.cache_sweeper.execute_if_updated }
+        end
+      end
+    end
+
     # Gutentag downcases all tags before save
     # and Gutentag validations are not case sensitive.
     # But we support having tags with uppercase characters.
@@ -32,7 +47,7 @@ module Alchemy
       Ransack.configure do |config|
         config.custom_arrows = {
           up_arrow: '<i class="fa fas fa-xs fa-arrow-up"></i>',
-          down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>',
+          down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>'
         }
       end
     end

data/lib/alchemy/filetypes.rb

@@ -8,7 +8,7 @@ module Alchemy
       "audio/mpeg",
       "audio/mp4",
       "audio/wav",
-      "audio/x-wav",
+      "audio/x-wav"
     ]
 
     IMAGE_FILE_TYPES = [
@@ -17,7 +17,7 @@ module Alchemy
       "image/png",
       "image/svg+xml",
       "image/tiff",
-      "image/x-psd",
+      "image/x-psd"
     ]
 
     VCARD_FILE_TYPES = ["text/x-vcard", "application/vcard"]
@@ -29,31 +29,31 @@ module Alchemy
       "video/mpeg",
       "video/quicktime",
       "video/x-msvideo",
-      "video/x-ms-wmv",
+      "video/x-ms-wmv"
     ]
 
     TEXT_FILE_TYPES = [
       "application/rtf",
-      "text/plain",
+      "text/plain"
     ]
 
     EXCEL_FILE_TYPES = [
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
       "application/vnd.ms-excel",
       "application/msexcel",
-      "text/csv",
+      "text/csv"
     ]
 
     WORD_FILE_TYPES = [
       "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
       "application/vnd.ms-word",
-      "application/msword",
+      "application/msword"
     ]
 
     POWERPOINT_FILE_TYPES = [
       "application/vnd.openxmlformats-officedocument.presentationml.presentation",
       "application/vnd.ms-powerpoint",
-      "application/mspowerpoint",
+      "application/mspowerpoint"
     ]
   end
 end

data/lib/alchemy/forms/builder.rb

@@ -11,7 +11,7 @@ module Alchemy
         if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
           options[:disabled] = true
           options[:input_html] = options.fetch(:input_html, {}).merge(
-            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name),
+            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name)
           )
         end
 
@@ -31,8 +31,8 @@ module Alchemy
         input_options = {
           type: :text,
           class: type,
-          data: { datepicker_type: type },
-          value: date&.iso8601,
+          data: {datepicker_type: type},
+          value: date&.iso8601
         }.merge(options[:input_html] || {})
 
         input attribute_name, as: :string, input_html: input_options
@@ -42,7 +42,7 @@ module Alchemy
       #
       def submit(label, options = {})
         options = {
-          wrapper_html: { class: "submit" },
+          wrapper_html: {class: "submit"}
         }.update(options)
         template.content_tag("div", options.delete(:wrapper_html)) do
           template.content_tag("button", label, options.delete(:input_html))

data/lib/alchemy/i18n.rb

@@ -54,10 +54,12 @@ module Alchemy
       end
 
       def available_locales
-        @@available_locales ||= nil
-        @@available_locales || translation_files.collect { |f|
-          f.match(LOCALE_FILE_PATTERN)[1].to_sym
-        }.uniq.sort
+        Rails.application.config.i18n.available_locales || begin
+          @@available_locales ||= nil
+          @@available_locales || translation_files.collect { |f|
+            f.match(LOCALE_FILE_PATTERN)[1].to_sym
+          }.uniq.sort
+        end
       end
 
       def available_locales=(locales)

data/lib/alchemy/install/tasks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "thor"
 
 module Alchemy
@@ -15,7 +16,7 @@ module Alchemy
             mountpoint = ask("- At which path do you want to mount Alchemy CMS at?", default: mountpoint)
           end
           sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
-          inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
+          inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", {after: sentinel, verbose: true}
         end
 
         def set_primary_language(code: "en", name: "English", auto_accept: false)

data/lib/alchemy/name_conversions.rb

@@ -13,7 +13,7 @@ module Alchemy
         .gsub(/[äÄ]/, "ae")
         .gsub(/[üÜ]/, "ue")
         .gsub(/[öÖ]/, "oe")
-        .gsub(/[ß]/, "ss")
+        .gsub(/ß/, "ss")
         .parameterize
     end
 

data/lib/alchemy/page_layout.rb

@@ -51,7 +51,7 @@ module Alchemy
             YAML.safe_load(
               ERB.new(File.read(layouts_file_path)).result,
               permitted_classes: YAML_PERMITTED_CLASSES,
-              aliases: true,
+              aliases: true
             ) || []
           )
         else

data/lib/alchemy/permissions.rb

@@ -89,7 +89,7 @@ module Alchemy
           :alchemy_admin_pages,
           :alchemy_admin_pictures,
           :alchemy_admin_tags,
-          :alchemy_admin_users,
+          :alchemy_admin_users
         ]
 
         # Controller actions
@@ -127,7 +127,7 @@ module Alchemy
         # Navigation
         can :index, [
           :alchemy_admin_languages,
-          :alchemy_admin_users,
+          :alchemy_admin_users
         ]
 
         # Resources
@@ -136,7 +136,7 @@ module Alchemy
           :copy_language_tree,
           :flush,
           :order,
-          :switch_language,
+          :switch_language
         ], Alchemy::Page
 
         # Resources which may be locked via template permissions
@@ -149,7 +149,7 @@ module Alchemy
         #
         can([
           :create,
-          :destroy,
+          :destroy
         ], Alchemy::Page) { |p| p.editable_by?(@user) }
 
         can(:publish, Alchemy::Page) do |page|
@@ -160,6 +160,7 @@ module Alchemy
         can :manage, Alchemy::Attachment
         can :manage, Alchemy::Tag
         can :index, Alchemy::Language
+        can :switch, Alchemy::Language
       end
     end
 

data/lib/alchemy/resource.rb

@@ -101,8 +101,8 @@ module Alchemy
     attr_accessor :resource_relations, :model_associations
     attr_reader :model
 
-    DEFAULT_SKIPPED_ATTRIBUTES = %w(id created_at creator_id)
-    DEFAULT_SKIPPED_ASSOCIATIONS = %w(creator)
+    DEFAULT_SKIPPED_ATTRIBUTES = %w[id created_at creator_id]
+    DEFAULT_SKIPPED_ASSOCIATIONS = %w[creator]
     SEARCHABLE_COLUMN_TYPES = [:string, :text]
 
     def initialize(controller_path, module_definition = nil, custom_model = nil)
@@ -169,7 +169,7 @@ module Alchemy
           name: col.name,
           type: resource_column_type(col),
           relation: resource_relation(col.name),
-          enum: enum_values_collection_for_select(col.name),
+          enum: enum_values_collection_for_select(col.name)
         }.delete_if { |_k, v| v.blank? }
       end.compact
     end
@@ -183,16 +183,16 @@ module Alchemy
           ::I18n.t(key, scope: [
             :activerecord, :attributes, model.model_name.i18n_key, "#{column_name}_values"
           ], default: key.humanize),
-          key,
+          key
         ]
       end
     end
 
     def sorted_attributes
-      @_sorted_attributes ||= attributes.
-        sort_by  { |attr| attr[:name] == "name" ? 0 : 1 }.
-        sort_by! { |attr| attr[:type] == :boolean ? 1 : 0 }.
-        sort_by! { |attr| attr[:name] == "updated_at" ? 1 : 0 }
+      @_sorted_attributes ||= attributes
+        .sort_by { |attr| (attr[:name] == "name") ? 0 : 1 }
+        .sort_by! { |attr| (attr[:type] == :boolean) ? 1 : 0 }
+        .sort_by! { |attr| (attr[:name] == "updated_at") ? 1 : 0 }
     end
 
     def editable_attributes
@@ -281,7 +281,7 @@ module Alchemy
     def searchable_relation_attribute(attribute)
       {
         name: "#{attribute[:relation][:model_association].name}_#{attribute[:relation][:attr_method]}",
-        type: attribute[:relation][:attr_type],
+        type: attribute[:relation][:attr_type]
       }
     end
 
@@ -325,7 +325,7 @@ module Alchemy
         resource_relations[foreign_key] = options.merge(
           model_association: association,
           name: relation_name,
-          collection: collection,
+          collection: collection
         )
       end
     end

data/lib/alchemy/resources_helper.rb

@@ -23,7 +23,7 @@ module Alchemy
 
     def resource_url_proxy
       if resource_handler.in_engine?
-        eval(resource_handler.engine_name)
+        eval(resource_handler.engine_name) # rubocop:disable Security/Eval
       else
         main_app
       end
@@ -80,11 +80,11 @@ module Alchemy
         value = record.present? ? record.send(attribute[:relation][:attr_method]) : Alchemy.t(:not_found)
       elsif attribute_value && attribute[:type].to_s =~ /(date|time)/
         localization_format = if attribute[:type] == :datetime
-          options[:datetime_format] || :'alchemy.default'
+          options[:datetime_format] || :"alchemy.default"
         elsif attribute[:type] == :date
-          options[:date_format] || :'alchemy.default'
+          options[:date_format] || :"alchemy.default"
         else
-          options[:time_format] || :'alchemy.time'
+          options[:time_format] || :"alchemy.time"
         end
         value = l(attribute_value, format: localization_format)
       else
@@ -110,8 +110,8 @@ module Alchemy
         options.merge(
           as: "string",
           input_html: {
-            data: { datepicker_type: input_type },
-          },
+            data: {datepicker_type: input_type}
+          }
         )
       when "text"
         options.merge(as: "text", input_html: {rows: 4})
@@ -135,7 +135,7 @@ module Alchemy
     # If the attribute contains a resource_relation, then the table and column for related model will be returned.
     #
     def sortable_resource_header_column(attribute)
-      if relation = attribute[:relation]
+      if (relation = attribute[:relation])
         "#{relation[:model_association].name}_#{relation[:attr_method]}"
       else
         attribute[:name]

data/lib/alchemy/routing_constraints.rb

@@ -32,9 +32,9 @@ module Alchemy
 
     # We don't want to handle the Rails info routes.
     def no_rails_route?
-      return true if !%w(development test).include?(Rails.env)
+      return true if !%w[development test].include?(Rails.env)
 
-      (@params["urlname"] =~ /\Arails\//).nil?
+      !@params["urlname"].start_with?("rails/")
     end
   end
 end