alchemy_cms 4.6.2 → 5.0.0.beta1

data/lib/alchemy/test_support/factories.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-Dir["#{File.dirname(__FILE__)}/factories/*.rb"].each do |file|
+Dir["#{File.dirname(__FILE__)}/factories/*.rb"].sort.each do |file|
   require file
 end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require "factory_bot"
 
 FactoryBot.define do
-  factory :alchemy_attachment, class: 'Alchemy::Attachment' do
+  factory :alchemy_attachment, class: "Alchemy::Attachment" do
     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' }
-    file_name { 'image.png' }
+    name { "image" }
+    file_name { "image.png" }
   end
 end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
-require 'alchemy/test_support/factories/element_factory'
-require 'alchemy/test_support/factories/essence_file_factory'
-require 'alchemy/test_support/factories/essence_picture_factory'
-require 'alchemy/test_support/factories/essence_text_factory'
+require "factory_bot"
+require "alchemy/test_support/factories/element_factory"
+require "alchemy/test_support/factories/essence_file_factory"
+require "alchemy/test_support/factories/essence_picture_factory"
+require "alchemy/test_support/factories/essence_text_factory"
 
 FactoryBot.define do
-  factory :alchemy_content, class: 'Alchemy::Content' do
+  factory :alchemy_content, class: "Alchemy::Content" do
     name { "text" }
     essence_type { "Alchemy::EssenceText" }
     association :essence, factory: :alchemy_essence_text

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

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require 'factory_bot'
+require "factory_bot"
 
 FactoryBot.define do
-  factory :alchemy_dummy_user, class: 'DummyUser' do
+  factory :alchemy_dummy_user, class: "DummyUser" do
     sequence(:email) { |n| "john.#{n}@doe.com" }
-    password { 's3cr3t' }
-    alchemy_roles { ['member'] }
+    password { "s3cr3t" }
+    alchemy_roles { ["member"] }
 
     trait :as_admin do
-      alchemy_roles { ['admin'] }
+      alchemy_roles { ["admin"] }
     end
 
     trait :as_author do
-      alchemy_roles { ['author'] }
+      alchemy_roles { ["author"] }
     end
 
     trait :as_editor do
-      alchemy_roles { ['editor'] }
+      alchemy_roles { ["editor"] }
     end
   end
 end

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

@@ -1,22 +1,22 @@
 # 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_element, class: 'Alchemy::Element' do
-    name { 'article' }
+  factory :alchemy_element, class: "Alchemy::Element" do
+    name { "article" }
     autogenerate_contents { false }
     association :page, factory: :alchemy_page
 
     trait :fixed do
       fixed { true }
-      name { 'right_column' }
+      name { "right_column" }
     end
 
     trait :unique do
       unique { true }
-      name { 'header' }
+      name { "header" }
     end
 
     trait :trashed do
@@ -26,12 +26,12 @@ FactoryBot.define do
     end
 
     trait :with_nestable_elements do
-      name { 'slider' }
+      name { "slider" }
     end
 
     trait :nested do
-      association :parent_element, factory: :alchemy_element, name: 'slider'
-      name { 'slide' }
+      association :parent_element, factory: :alchemy_element, name: "slider"
+      name { "slide" }
     end
 
     trait :with_contents do

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,31 @@
 # 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 { "Deutsch" }
+    code { "de" }
     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" }
+      frontpage_name { "Intro" }
       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