alchemy_cms 4.5.0 → 5.0.0.rc1

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/attachment_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/attachment_factory"
 
 FactoryBot.define do
-  factory :alchemy_essence_file, class: 'Alchemy::EssenceFile' do
+  factory :alchemy_essence_file, class: "Alchemy::EssenceFile" do
     attachment factory: :alchemy_attachment
   end
 end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/page_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/page_factory"
 
 FactoryBot.define do
-  factory :alchemy_essence_page, class: 'Alchemy::EssencePage' do
+  factory :alchemy_essence_page, class: "Alchemy::EssencePage" do
     page factory: :alchemy_page
   end
 end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/content_factory'
-require 'alchemy/test_support/factories/picture_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/content_factory"
+require "alchemy/test_support/factories/picture_factory"
 
 FactoryBot.define do
-  factory :alchemy_essence_picture, class: 'Alchemy::EssencePicture' do
+  factory :alchemy_essence_picture, class: "Alchemy::EssencePicture" do
     picture factory: :alchemy_picture
 
     trait :with_content do

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require "factory_bot"
 
 FactoryBot.define do
-  factory :alchemy_essence_text, class: 'Alchemy::EssenceText' do
-    body { 'This is a headline' }
+  factory :alchemy_essence_text, class: "Alchemy::EssenceText" do
+    body { "This is a headline" }
   end
 end

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

@@ -1,29 +1,36 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/site_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/site_factory"
 
 FactoryBot.define do
-  factory :alchemy_language, class: 'Alchemy::Language' do
-    name { 'Deutsch' }
-    code { 'de' }
+  factory :alchemy_language, class: "Alchemy::Language" do
+    name { "Your Language" }
+    code { ::I18n.available_locales.first.to_s }
     default { true }
-    frontpage_name { 'Intro' }
-    page_layout { Alchemy::Config.get(:default_language)['page_layout'] }
+    frontpage_name { "Intro" }
+    page_layout { Alchemy::Config.get(:default_language)["page_layout"] }
+
     public { true }
-    site { Alchemy::Site.default }
+
+    site { Alchemy::Site.default || create(:alchemy_site, :default) }
 
     trait :klingon do
-      name { 'Klingon' }
-      code { 'kl' }
-      frontpage_name { 'Tuq' }
+      name { "Klingon" }
+      code { "kl" }
+      frontpage_name { "Tuq" }
       default { false }
     end
 
     trait :english do
-      name { 'English' }
-      code { 'en' }
-      frontpage_name { 'Intro' }
+      name { "English" }
+      code { "en" }
+      default { false }
+    end
+
+    trait :german do
+      name { "Deutsch" }
+      code { "de" }
       default { false }
     end
   end

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/language_factory'
-require 'alchemy/test_support/factories/page_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/language_factory"
+require "alchemy/test_support/factories/page_factory"
 
 FactoryBot.define do
-  factory :alchemy_node, class: 'Alchemy::Node' do
-    site { Alchemy::Site.default }
-    language { Alchemy::Language.default }
-    name { 'A Node' }
+  factory :alchemy_node, class: "Alchemy::Node" do
+    language { Alchemy::Language.default || create(:alchemy_language) }
+    name { "A Node" }
+    menu_type { Alchemy::Node.available_menu_names.first }
 
     trait :with_page do
       association :page, factory: :alchemy_page
@@ -16,7 +16,7 @@ FactoryBot.define do
     end
 
     trait :with_url do
-      url { 'https://example.com' }
+      url { "https://example.com" }
     end
   end
 end

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

@@ -1,36 +1,33 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/language_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/language_factory"
 
 FactoryBot.define do
-  factory :alchemy_page, class: 'Alchemy::Page' do
-    language { Alchemy::Language.default || FactoryBot.create(:alchemy_language) }
+  factory :alchemy_page, class: "Alchemy::Page" do
+    language do
+      @cached_attributes[:parent]&.language ||
+        Alchemy::Language.default ||
+        FactoryBot.create(:alchemy_language)
+    end
     sequence(:name) { |n| "A Page #{n}" }
     page_layout { "standard" }
 
-    parent_id do
-      (Alchemy::Page.find_by(language_root: true) ||
-        FactoryBot.create(:alchemy_page, :language_root)).id
+    parent do
+      Alchemy::Page.find_by(language_root: true, language: language) ||
+        FactoryBot.create(:alchemy_page, :language_root, language: language)
     end
 
     # This speeds up creating of pages dramatically.
     # Pass autogenerate_elements: true to generate elements
     autogenerate_elements { false }
 
-    trait :root do
-      name { 'Root' }
-      language { nil }
-      parent_id { nil }
-      page_layout { nil }
-    end
-
     trait :language_root do
-      name { 'Startseite' }
-      page_layout { language.page_layout }
+      name { language&.frontpage_name || "Intro" }
+      page_layout { language&.page_layout || "index" }
       language_root { true }
       public_on { Time.current }
-      parent_id { Alchemy::Page.root.id }
+      parent { nil }
     end
 
     trait :public do
@@ -38,17 +35,8 @@ FactoryBot.define do
       public_on { Time.current }
     end
 
-    trait :system do
-      name { "Systempage" }
-      parent_id { Alchemy::Page.root.id }
-      language_root { false }
-      page_layout { nil }
-      language { nil }
-    end
-
     trait :layoutpage do
-      name { "Footer" }
-      parent_id { Alchemy::Page.find_or_create_layout_root_for(Alchemy::Language.current.id).id }
+      parent { nil }
       layoutpage { true }
       page_layout { "footer" }
     end

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

@@ -1,14 +1,14 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require "factory_bot"
 
 FactoryBot.define do
-  factory :alchemy_picture, class: 'Alchemy::Picture' do
+  factory :alchemy_picture, class: "Alchemy::Picture" do
     image_file do
-      File.new(Alchemy::Engine.root.join('lib', 'alchemy', 'test_support', 'fixtures', 'image.png'))
+      File.new(Alchemy::Engine.root.join("lib", "alchemy", "test_support", "fixtures", "image.png"))
     end
-    name { 'image' }
-    image_file_name { 'image.png' }
+    name { "image" }
+    image_file_name { "image.png" }
     upload_hash { Time.current.hash }
   end
 end

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

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require "factory_bot"
 
 FactoryBot.define do
-  factory :alchemy_site, class: 'Alchemy::Site' do
-    name { 'A Site' }
-    host { 'domain.com' }
+  factory :alchemy_site, class: "Alchemy::Site" do
+    name { "A Site" }
+    host { "domain.com" }
 
     trait :default do
       public { true }
-      name { Alchemy::Config.get(:default_site)['name'] }
-      host { Alchemy::Config.get(:default_site)['host'] }
+
+      name { Alchemy::Config.get(:default_site)["name"] }
+      host { Alchemy::Config.get(:default_site)["host"] }
     end
 
     trait :public do

data/lib/alchemy/test_support/integration_helpers.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Alchemy
   module TestSupport
     # Helpers for integration specs

data/lib/alchemy/test_support/shared_contexts.rb

@@ -1,14 +1,15 @@
-RSpec.shared_context 'with invalid file' do
+# frozen_string_literal: true
+RSpec.shared_context "with invalid file" do
   let(:invalid_file) do
     fixture_file_upload(
-      File.expand_path('../../../spec/fixtures/users.yml', __dir__),
-      'text/x-yaml'
+      File.expand_path("../../../spec/fixtures/users.yml", __dir__),
+      "text/x-yaml",
     )
   end
 
   before do
     allow(Alchemy::Attachment).to receive(:allowed_filetypes) do
-      ['png']
+      ["png"]
     end
   end
 end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 RSpec.shared_examples_for "having a json uploader error message" do
   it "renders json response with error message" do
     subject
-    expect(response.media_type).to eq('application/json')
+    expect(response.media_type).to eq("application/json")
     expect(response.status).to eq(422)
     json = JSON.parse(response.body)
-    expect(json).to have_key('growl_message')
-    expect(json).to have_key('files')
+    expect(json).to have_key("growl_message")
+    expect(json).to have_key("files")
   end
 end

data/lib/alchemy/tinymce.rb

@@ -6,23 +6,23 @@ module Alchemy
 
     @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table)
     @@init = {
-      skin: 'alchemy',
-      width: 'auto',
+      skin: "alchemy",
+      width: "auto",
       resize: true,
-      autoresize_min_height: '105',
-      autoresize_max_height: '480',
+      autoresize_min_height: "105",
+      autoresize_max_height: "480",
       menubar: false,
       statusbar: true,
       toolbar: [
-        'bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen',
-        'pastetext charmap hr | undo redo | alchemy_link unlink anchor | code'
+        "bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen",
+        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code",
       ],
       fix_list_elements: true,
       convert_urls: false,
-      entity_encoding: 'raw',
+      entity_encoding: "raw",
       paste_as_text: true,
-      element_format: 'html',
-      branding: false
+      element_format: "html",
+      branding: false,
     }
 
     class << self
@@ -42,12 +42,14 @@ module Alchemy
 
       def content_definitions_from_elements(definitions)
         definitions.collect do |el|
-          next if el['contents'].blank?
-          contents = el['contents'].select do |c|
-            c['settings'] && c['settings']['tinymce'].is_a?(Hash)
+          next if el["contents"].blank?
+
+          contents = el["contents"].select do |c|
+            c["settings"] && c["settings"]["tinymce"].is_a?(Hash)
           end
           next if contents.blank?
-          contents.map { |c| c.merge('element' => el['name']) }
+
+          contents.map { |c| c.merge("element" => el["name"]) }
         end.flatten.compact
       end
     end

data/lib/alchemy/upgrader.rb

@@ -1,26 +1,27 @@
-require 'alchemy/shell'
+# frozen_string_literal: true
+require "alchemy/shell"
 
 module Alchemy
   class Upgrader
     extend Alchemy::Shell
 
-    Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].each { |f| require f }
+    Dir["#{File.dirname(__FILE__)}/upgrader/*.rb"].sort.each { |f| require f }
 
     class << self
       def copy_new_config_file
         desc "Copy configuration file."
-        config_file = Rails.root.join('config/alchemy/config.yml')
-        default_config = File.join(File.dirname(__FILE__), '../../config/alchemy/config.yml')
+        config_file = Rails.root.join("config/alchemy/config.yml")
+        default_config = File.join(File.dirname(__FILE__), "../../config/alchemy/config.yml")
         if !File.exist? config_file
           log "No configuration file found. Creating it."
-          FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml')
+          FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml")
         elsif FileUtils.identical? default_config, config_file
           log "Configuration file already present.", :skip
         else
           log "Custom configuration file found."
-          FileUtils.cp default_config, Rails.root.join('config/alchemy/config.yml.defaults')
+          FileUtils.cp default_config, Rails.root.join("config/alchemy/config.yml.defaults")
           log "Copied new default configuration file."
-          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", 'Configuration has changed'
+          todo "Check the default configuration file (./config/alchemy/config.yml.defaults) for new configuration options and insert them into your config file.", "Configuration has changed"
         end
       end
     end

data/lib/alchemy/upgrader/five_point_zero.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require_relative "tasks/harden_gutentag_migrations"
+
+module Alchemy
+  class Upgrader::FivePointZero < Upgrader
+    class << self
+      def install_gutentag_migrations
+        desc "Install Gutentag migrations"
+        Rake::Task["gutentag:install:migrations"].invoke
+        Alchemy::Upgrader::Tasks::HardenGutentagMigrations.new.patch_migrations
+        Rake::Task["db:migrate"].invoke
+      end
+
+      def remove_layout_roots
+        desc "Remove layout root pages"
+        layout_roots = Alchemy::Page.where(layoutpage: true).where("name LIKE 'Layoutroot for%'")
+        if layout_roots.size.positive?
+          log "Removing #{layout_roots.size} layout root pages."
+          layout_roots.delete_all
+          Alchemy::Page.where(layoutpage: true).update_all(parent_id: nil)
+          log "Done.", :success
+        else
+          log "No layout root pages found.", :skip
+        end
+      end
+
+      def remove_root_page
+        desc "Remove root page"
+        root_page = Alchemy::Page.find_by(parent_id: nil, name: "Root")
+        if root_page
+          Alchemy::Page.where(parent_id: root_page.id).update_all(parent_id: nil)
+          root_page.delete
+          log "Done.", :success
+        else
+          log "Root page not found.", :skip
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/tasks/element_views_updater.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'alchemy/upgrader'
+require "alchemy/upgrader"
 
 module Alchemy::Upgrader::Tasks
   class ElementViewsUpdater < Thor
@@ -11,14 +11,14 @@ module Alchemy::Upgrader::Tasks
         puts "-- Removing '_view' suffix from element views"
 
         Dir.glob("#{elements_view_folder}/*_view.*").each do |file|
-          FileUtils.mv(file, file.to_s.sub(/_view/, ''))
+          FileUtils.mv(file, file.to_s.sub(/_view/, ""))
         end
       end
 
       def update_local_variable
         puts "-- Updating element views local variable to element name"
 
-        Alchemy::Element.definitions.map { |e| e['name'] }.each do |name|
+        Alchemy::Element.definitions.map { |e| e["name"] }.each do |name|
           view = Dir.glob("#{elements_view_folder}/_#{name}.*").last
           gsub_file(view, /\b#{name}_view\b/, name)
         end
@@ -28,7 +28,7 @@ module Alchemy::Upgrader::Tasks
     private
 
     def elements_view_folder
-      Rails.root.join('app', 'views', 'alchemy', 'elements')
+      Rails.root.join("app", "views", "alchemy", "elements")
     end
   end
 end