alchemy_cms 4.6.6 → 5.0.0.beta1

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/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/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/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

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module Alchemy::Upgrader::Tasks
+  class HardenGutentagMigrations < Thor
+    include Thor::Actions
+
+    no_tasks do
+      def patch_migrations
+        sentinel = /def up/
+
+        migration_file = Dir.glob("db/migrate/*_gutentag_tables.gutentag.rb").first
+        if migration_file
+          inject_into_file migration_file,
+            "\n    # inserted by Alchemy CMS upgrader\n    return if table_exists?(:gutentag_taggings)\n",
+            { after: sentinel, verbose: true }
+        end
+
+        migration_file = Dir.glob("db/migrate/*_gutentag_cache_counter.gutentag.rb").first
+        if migration_file
+          inject_into_file migration_file,
+            "\n    # inserted by Alchemy CMS upgrader\n    return if column_exists?(:gutentag_tags, :taggings_count)\n",
+            { after: sentinel, verbose: true }
+        end
+      end
+    end
+  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/userstamp.rb

@@ -7,6 +7,6 @@
 if Alchemy.user_class < ActiveRecord::Base
   Alchemy.user_class.class_eval do
     model_stamper
-    stampable stamper_class_name: Alchemy.user_class.name
+    stampable stamper_class_name: Alchemy.user_class_name
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.6.6"
+  VERSION = "5.0.0.beta1"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -1,61 +1,63 @@
+# frozen_string_literal: true
 # Instantiate the global Alchemy namespace
 module Alchemy
-  Alchemy::YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
+  YAML_WHITELIST_CLASSES = %w(Symbol Date Regexp)
 end
 
 # Require globally used external libraries
-require 'acts_as_list'
-require 'action_view/dependency_tracker'
-require 'active_model_serializers'
-require 'awesome_nested_set'
-require 'cancan'
-require 'dragonfly'
-require 'gutentag'
-require 'handlebars_assets'
-require 'jquery-rails'
-require 'jquery-ui-rails'
-require 'kaminari'
-require 'non-stupid-digest-assets'
-require 'ransack'
-require 'request_store'
-require 'responders'
-require 'sassc-rails'
-require 'simple_form'
-require 'select2-rails'
-require 'turbolinks'
-require 'userstamp'
+require "acts_as_list"
+require "action_view/dependency_tracker"
+require "active_model_serializers"
+require "awesome_nested_set"
+require "cancan"
+require "dragonfly"
+require "gutentag"
+require "handlebars_assets"
+require "jquery-rails"
+require "jquery-ui-rails"
+require "kaminari"
+require "non-stupid-digest-assets"
+require "ransack"
+require "request_store"
+require "responders"
+require "sassc-rails"
+require "simple_form"
+require "select2-rails"
+require "turbolinks"
+require "userstamp"
+require "webpacker"
 
 # Require globally used Alchemy mixins
-require_relative 'alchemy/ability_helper'
-require_relative 'alchemy/admin/locale'
-require_relative 'alchemy/auth_accessors'
-require_relative 'alchemy/cache_digests/template_tracker'
-require_relative 'alchemy/config'
-require_relative 'alchemy/configuration_methods'
-require_relative 'alchemy/controller_actions'
-require_relative 'alchemy/deprecation'
-require_relative 'alchemy/elements_finder'
-require_relative 'alchemy/errors'
-require_relative 'alchemy/essence'
-require_relative 'alchemy/filetypes'
-require_relative 'alchemy/forms/builder'
-require_relative 'alchemy/hints'
-require_relative 'alchemy/i18n'
-require_relative 'alchemy/logger'
-require_relative 'alchemy/modules'
-require_relative 'alchemy/name_conversions'
-require_relative 'alchemy/on_page_layout'
-require_relative 'alchemy/on_page_layout/callbacks_runner'
-require_relative 'alchemy/page_layout'
-require_relative 'alchemy/paths'
-require_relative 'alchemy/permissions'
-require_relative 'alchemy/ssl_protection'
-require_relative 'alchemy/resource'
-require_relative 'alchemy/tinymce'
-require_relative 'alchemy/taggable'
+require_relative "alchemy/ability_helper"
+require_relative "alchemy/admin/locale"
+require_relative "alchemy/admin/preview_url"
+require_relative "alchemy/auth_accessors"
+require_relative "alchemy/cache_digests/template_tracker"
+require_relative "alchemy/config"
+require_relative "alchemy/configuration_methods"
+require_relative "alchemy/controller_actions"
+require_relative "alchemy/deprecation"
+require_relative "alchemy/elements_finder"
+require_relative "alchemy/errors"
+require_relative "alchemy/essence"
+require_relative "alchemy/filetypes"
+require_relative "alchemy/forms/builder"
+require_relative "alchemy/hints"
+require_relative "alchemy/i18n"
+require_relative "alchemy/logger"
+require_relative "alchemy/modules"
+require_relative "alchemy/name_conversions"
+require_relative "alchemy/on_page_layout"
+require_relative "alchemy/on_page_layout/callbacks_runner"
+require_relative "alchemy/page_layout"
+require_relative "alchemy/paths"
+require_relative "alchemy/permissions"
+require_relative "alchemy/resource"
+require_relative "alchemy/tinymce"
+require_relative "alchemy/taggable"
 
 # Require hacks
-require_relative 'kaminari/scoped_pagination_url_helper'
+require_relative "kaminari/scoped_pagination_url_helper"
 
 # Finally require Alchemy itself
-require_relative 'alchemy/engine'
+require_relative "alchemy/engine"

data/lib/{rails/generators → generators}/alchemy/base.rb

@@ -1,14 +1,15 @@
-require 'rails'
+# frozen_string_literal: true
+require "rails"
 
 module Alchemy
   module Generators
     class Base < ::Rails::Generators::Base
-      class_option :template_engine, type: :string, aliases: '-e', desc: 'Template engine for the views. Available options are "erb", "haml", and "slim".'
+      class_option :template_engine, type: :string, aliases: "-e", desc: 'Template engine for the views. Available options are "erb", "haml", and "slim".'
 
       private
 
       def conditional_template(source, destination)
-        files = Dir.glob(destination.gsub(/\.([a-z]+)$/, '*'))
+        files = Dir.glob(destination.gsub(/\.([a-z]+)$/, "*"))
         if files.any?
           ext = File.extname(files.first)[1..-1]
 
@@ -28,7 +29,7 @@ module Alchemy
         # Rails is clever enough to default this to whatever template
         # engine is configured through its generator configuration,
         # but we'll default it to erb anyway, just in case.
-        options[:template_engine] || 'erb'
+        options[:template_engine] || "erb"
       end
 
       def load_alchemy_yaml(name)

data/lib/{rails/generators → generators}/alchemy/elements/elements_generator.rb

@@ -1,24 +1,20 @@
-require_relative '../base'
+# frozen_string_literal: true
+require_relative "../base"
 
 module Alchemy
   module Generators
     class ElementsGenerator < Base
       desc "This generator generates your elements view partials."
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def create_partials
-        @elements = load_alchemy_yaml('elements.yml')
+        @elements = load_alchemy_yaml("elements.yml")
         return unless @elements
 
         @elements.each do |element|
           @element = element
           @contents = element["contents"] || []
-          if element["name"] =~ /\A[a-z0-9_-]+\z/
-            @element_name = element["name"].underscore
-          else
-            raise "Element name '#{element['name']}' has wrong format. Only lowercase and non whitespace characters allowed."
-          end
-
+          @element_name = element_name(element)
           conditional_template "view.html.#{template_engine}", "#{elements_dir}/_#{@element_name}.html.#{template_engine}"
         end
       end
@@ -28,6 +24,14 @@ module Alchemy
       def elements_dir
         @_elements_dir ||= "app/views/alchemy/elements"
       end
+
+      def element_name(element)
+        if element["name"] =~ Alchemy::Element::NAME_REGEXP
+          element["name"].underscore
+        else
+          raise "Element name '#{element["name"]}' has wrong format. Only lowercase and non whitespace characters allowed."
+        end
+      end
     end
   end
 end

data/lib/{rails/generators → generators}/alchemy/essence/essence_generator.rb

@@ -1,15 +1,16 @@
-require 'rails'
+# frozen_string_literal: true
+require "rails"
 
 module Alchemy
   module Generators
     class EssenceGenerator < ::Rails::Generators::Base
       desc "This generator generates an Alchemy essence for you."
       argument :essence_name, banner: "YourEssenceName"
-      source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path("templates", __dir__)
 
       def init
         @essence_name = essence_name.underscore
-        @essence_view_path = 'app/views/alchemy/essences'
+        @essence_view_path = "app/views/alchemy/essences"
       end
 
       def create_model
@@ -19,20 +20,21 @@ module Alchemy
       def act_as_essence
         essence_class_file = "app/models/#{@essence_name}.rb"
         essence_class = @essence_name.classify
-        inject_into_class essence_class_file, essence_class, <<-CLASSMETHOD
-  acts_as_essence(
-    # Your options:
-    #
-    # ingredient_column:   [String or Symbol] - Specifies the column name you use for storing the content in the database. (Default :body)
-    # validate_column:     [String or Symbol] - Which column should be validated. (Default: ingredient_column)
-    # preview_text_column: [String or Symbol] - Specifies the column for the preview_text method. (Default: ingredient_column)
-    # preview_text_method: [String or Symbol] - A method called on ingredient to get the preview text. (Default: ingredient_column)
-  )
-CLASSMETHOD
+        inject_into_class essence_class_file, essence_class, <<~CLASSMETHOD
+          acts_as_essence(
+            # Your options:
+            #
+            # ingredient_column:   [String or Symbol] - Specifies the column name you use for storing the content in the database. (Default :body)
+            # validate_column:     [String or Symbol] - Which column should be validated. (Default: ingredient_column)
+            # preview_text_column: [String or Symbol] - Specifies the column for the preview_text method. (Default: ingredient_column)
+            # preview_text_method: [String or Symbol] - A method called on ingredient to get the preview text. (Default: ingredient_column)
+          )
+        CLASSMETHOD
       end
 
       def copy_templates
         essence_name = @essence_name.classify.demodulize.underscore
+        @essence_editor_local = "#{essence_name}_editor"
         template "view.html.erb", "#{@essence_view_path}/_#{essence_name}_view.html.erb"
         template "editor.html.erb", "#{@essence_view_path}/_#{essence_name}_editor.html.erb"
       end

data/lib/generators/alchemy/essence/templates/editor.html.erb

@@ -0,0 +1,17 @@
+<%%#
+  Available locals:
+  * <%= @essence_editor_local %> - A Alchemy::ContentEditor instance
+
+  Please consult Alchemy::Content.rb docs for further methods on the content object
+%>
+<%%= content_tag :div,
+  id: <%= @essence_editor_local %>.dom_id,
+  class: <%= @essence_editor_local %>.css_classes,
+  data: <%= @essence_editor_local %>.data_attributes do %>
+  <%%= content_label(<%= @essence_editor_local %>) %>
+  <%%= text_field_tag(
+    <%= @essence_editor_local %>.form_field_name,
+    <%= @essence_editor_local %>.ingredient,
+    id: <%= @essence_editor_local %>.form_field_id
+  ) %>
+<%% end %>