alchemy_cms 4.0.6 → 4.1.0.beta

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

@@ -15,6 +15,11 @@ FactoryBot.define do
       name 'slider'
     end
 
+    trait :nested do
+      association :parent_element, factory: :alchemy_element, name: 'slider'
+      name 'slide'
+    end
+
     trait :with_contents do
       create_contents_after_create true
     end

data/lib/alchemy/test_support/shared_contexts.rb

@@ -1,7 +1,7 @@
 RSpec.shared_context 'with invalid file' do
   let(:invalid_file) do
     fixture_file_upload(
-      File.expand_path('../../../../spec/fixtures/users.yml', __FILE__),
+      File.expand_path('../../../spec/fixtures/users.yml', __dir__),
       'text/x-yaml'
     )
   end

data/lib/alchemy/tinymce.rb

@@ -5,7 +5,6 @@ module Alchemy
     mattr_accessor :languages, :plugins
 
     @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link paste tabfocus table)
-    @@languages = ['en', 'de']
     @@init = {
       skin: 'alchemy',
       width: '100%',
@@ -22,7 +21,8 @@ module Alchemy
       convert_urls: false,
       entity_encoding: 'raw',
       paste_as_text: true,
-      element_format: 'html'
+      element_format: 'html',
+      branding: false
     }
 
     class << self

data/lib/alchemy/upgrader/four_point_one.rb

@@ -0,0 +1,42 @@
+require_relative 'tasks/harden_acts_as_taggable_on_migrations'
+
+module Alchemy
+  class Upgrader::FourPointOne < Upgrader
+    class << self
+      def harden_acts_as_taggable_on_migrations
+        desc 'Harden `acts_as_taggable_on_migrations`'
+        `bundle exec rake railties:install:migrations FROM=acts_as_taggable_on_engine`
+        Alchemy::Upgrader::Tasks::HardenActsAsTaggableOnMigrations.new.patch_migrations
+        `bundle exec rake db:migrate`
+      end
+
+      def alchemy_4_1_todos
+        notice = <<-NOTE
+
+        Changed tagging provider to Gutentag
+        ------------------------------------
+
+        The automatic updater that just ran updated all existing `acts_as_taggable_on_migrations`,
+        so that they don't blow up if the `acts_as_taggable_on` gem is no longer available.
+
+        All your existing tags have been migrated to `Gutentag::Tag`s.
+
+        Removed Rails and non-English translations
+        ------------------------------------------
+
+        Removed the Rails translations from our translation files and moved all non-english translation
+        files into the newly introduced `alchemy_i18n` gem.
+
+        If you need more translations than the default English one you can either put `alchemy_i18n`
+        in to your apps `Gemfile` or - recommended - copy only the translation files you need into your
+        apps `config/locales` folder.
+
+        For the Rails translations either put the rails-i18n gem into your apps Gemfile or - recommended -
+        copy only the translation files you need into your apps config/locales folder.
+
+        NOTE
+        todo notice, 'Alchemy v4.1 changes'
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'thor'
+
+module Alchemy::Upgrader::Tasks
+  class HardenActsAsTaggableOnMigrations < Thor
+    include Thor::Actions
+
+    no_tasks do
+      def patch_migrations
+        sentinel = /add_column.*/
+        aato_file = Dir.glob('db/migrate/*_add_taggings_counter_cache_to_tags.*.rb').first
+        if aato_file
+          inject_into_file aato_file,
+            "\n\n    # inserted by Alchemy CMS upgrader\n    return unless defined?(ActsAsTaggableOn)",
+            { after: sentinel, verbose: true }
+        end
+
+        sentinel = /def up/
+        aato_file = Dir.glob('db/migrate/*_change_collation_for_tag_names.*.rb').first
+        if aato_file
+          inject_into_file aato_file,
+            "\n    # inserted by Alchemy CMS upgrader\n    return unless defined?(ActsAsTaggableOn)\n",
+            { after: sentinel, verbose: true }
+        end
+      end
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.0.6"
+  VERSION = "4.1.0.beta"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -5,13 +5,12 @@ end
 
 # Require globally used external libraries
 require 'acts_as_list'
-require 'acts-as-taggable-on'
 require 'action_view/dependency_tracker'
 require 'active_model_serializers'
 require 'awesome_nested_set'
-require 'bourbon'
 require 'cancan'
 require 'dragonfly'
+require 'gutentag'
 require 'handlebars_assets'
 require 'jquery-rails'
 require 'jquery-ui-rails'
@@ -53,7 +52,7 @@ require_relative 'alchemy/sass_support'
 require_relative 'alchemy/ssl_protection'
 require_relative 'alchemy/resource'
 require_relative 'alchemy/tinymce'
-require_relative 'alchemy/touching'
+require_relative 'alchemy/taggable'
 
 # Require hacks
 require_relative 'kaminari/scoped_pagination_url_helper'

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -1,10 +1,10 @@
-require File.join(__FILE__, '../../base')
+require_relative '../base'
 
 module Alchemy
   module Generators
     class ElementsGenerator < Base
       desc "This generator generates your elements view partials."
-      source_root File.expand_path('templates', File.dirname(__FILE__))
+      source_root File.expand_path('templates', __dir__)
 
       def create_partials
         @elements = load_alchemy_yaml('elements.yml')

data/lib/rails/generators/alchemy/essence/essence_generator.rb

@@ -5,7 +5,7 @@ module Alchemy
     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', File.dirname(__FILE__))
+      source_root File.expand_path('templates', __dir__)
 
       def init
         @essence_name = essence_name.underscore

data/lib/rails/generators/alchemy/install/install_generator.rb

@@ -10,7 +10,7 @@ module Alchemy
         default: false,
         desc: "Skip creation of demo element, page and application layout."
 
-      source_root File.expand_path('files', File.dirname(__FILE__))
+      source_root File.expand_path('files', __dir__)
 
       def copy_config
         copy_file "#{config_path}/config.yml", "config/alchemy/config.yml"
@@ -18,7 +18,7 @@ module Alchemy
 
       def copy_yml_files
         %w(elements page_layouts).each do |file|
-          template "#{current_path}/templates/#{file}.yml.tt", "config/alchemy/#{file}.yml"
+          template "#{__dir__}/templates/#{file}.yml.tt", "config/alchemy/#{file}.yml"
         end
       end
 
@@ -56,17 +56,13 @@ module Alchemy
       end
 
       def copy_dragonfly_config
-        template "#{current_path}/templates/dragonfly.rb.tt", "config/initializers/dragonfly.rb"
+        template "#{__dir__}/templates/dragonfly.rb.tt", "config/initializers/dragonfly.rb"
       end
 
       private
 
       def config_path
-        @_config_path ||= File.expand_path('../../../../../config/alchemy', current_path)
-      end
-
-      def current_path
-        @_current_path ||= File.dirname(__FILE__)
+        @_config_path ||= File.expand_path('../../../../../config/alchemy', __dir__)
       end
     end
   end

data/lib/rails/generators/alchemy/module/module_generator.rb

@@ -5,7 +5,7 @@ module Alchemy
     class ModuleGenerator < ::Rails::Generators::Base
       desc "This generator generates an Alchemy module for you."
       argument :module_name, banner: "your_module_name"
-      source_root File.expand_path('templates', File.dirname(__FILE__))
+      source_root File.expand_path('templates', __dir__)
 
       def init
         @module_name = module_name.downcase

data/lib/rails/generators/alchemy/page_layouts/page_layouts_generator.rb

@@ -1,10 +1,10 @@
-require File.join(__FILE__, '../../base')
+require_relative '../base'
 
 module Alchemy
   module Generators
     class PageLayoutsGenerator < Base
       desc "This generator generates your page_layouts view partials."
-      source_root File.expand_path('templates', File.dirname(__FILE__))
+      source_root File.expand_path('templates', __dir__)
 
       def create_partials
         @page_layouts = load_alchemy_yaml('page_layouts.yml')

data/lib/rails/generators/alchemy/site_layouts/site_layouts_generator.rb

@@ -1,10 +1,10 @@
-require File.join(__FILE__, '../../base')
+require_relative '../base'
 
 module Alchemy
   module Generators
     class SiteLayoutsGenerator < Base
       desc "This generator generates your site layouts view partials."
-      source_root File.expand_path('templates', File.dirname(__FILE__))
+      source_root File.expand_path('templates', __dir__)
 
       def create_partials
         @sites = Alchemy::Site.all

data/lib/rails/generators/alchemy/views/views_generator.rb

@@ -17,7 +17,7 @@ module Alchemy
         default: nil,
         desc: "List of views not to copy. Available views are #{ALCHEMY_VIEWS.to_sentence}."
 
-      source_root File.expand_path("../../../../../app/views/alchemy", File.dirname(__FILE__))
+      source_root File.expand_path("../../../../../app/views/alchemy", __dir__)
 
       def copy_alchemy_views
         views_to_copy.each do |dir|

data/lib/tasks/alchemy/db.rake

@@ -1,10 +1,11 @@
 require 'shellwords'
 require 'alchemy/seeder'
 require 'alchemy/tasks/helpers'
-include Alchemy::Tasks::Helpers
 
 namespace :alchemy do
   namespace :db do
+    include Alchemy::Tasks::Helpers
+
     desc "Seeds the database with Alchemy defaults"
     task seed: [:environment] do
       Alchemy::Seeder.seed!

data/lib/tasks/alchemy/tidy.rake

@@ -8,7 +8,6 @@ namespace :alchemy do
       Rake::Task['alchemy:tidy:element_positions'].invoke
       Rake::Task['alchemy:tidy:content_positions'].invoke
       Rake::Task['alchemy:tidy:remove_orphaned_records'].invoke
-      Rake::Task['alchemy:tidy:remove_duplicate_folded_pages'].invoke
     end
 
     desc "Creates missing cells for pages."
@@ -57,10 +56,5 @@ namespace :alchemy do
     task remove_orphaned_contents: [:environment] do
       Alchemy::Tidy.remove_orphaned_contents
     end
-
-    desc "Remove duplicate folded pages."
-    task remove_duplicate_folded_pages: [:environment] do
-      Alchemy::Tidy.remove_duplicate_folded_pages
-    end
   end
 end

data/lib/tasks/alchemy/upgrade.rake

@@ -5,12 +5,7 @@ namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     'alchemy:upgrade:prepare',
-    'alchemy:upgrade:3.0:run', 'alchemy:upgrade:3.0:todo',
-    'alchemy:upgrade:3.1:todo',
-    'alchemy:upgrade:3.2:run', 'alchemy:upgrade:3.2:todo',
-    'alchemy:upgrade:3.3:run', 'alchemy:upgrade:3.3:todo',
-    'alchemy:upgrade:3.4:run', 'alchemy:upgrade:3.4:todo',
-    'alchemy:upgrade:3.5:run', 'alchemy:upgrade:3.5:todo'
+    'alchemy:upgrade:4.1:run', 'alchemy:upgrade:4.1:todo'
   ] do
     Alchemy::Upgrader.display_todos
   end
@@ -40,153 +35,25 @@ namespace :alchemy do
       end
     end
 
-    desc 'Upgrade Alchemy to v3.0'
-    task '3.0' => [
+    desc 'Upgrade Alchemy to v4.1'
+    task '4.1' => [
       'alchemy:upgrade:prepare',
-      'alchemy:upgrade:3.0:run',
-      'alchemy:upgrade:3.0:todo'
+      'alchemy:upgrade:4.1:run',
+      'alchemy:upgrade:4.1:todo'
     ] do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace '3.0' do
-      task run: [
-        'alchemy:upgrade:3.0:rename_registered_role_ro_member',
-        'alchemy:upgrade:3.0:publish_unpublished_public_pages'
-      ]
+    namespace '4.1' do
+      task run: ['alchemy:upgrade:4.1:harden_acts_as_taggable_on_migrations']
 
-      desc 'Rename the `registered` user role to `member`'
-      task rename_registered_role_ro_member: [:environment] do
-        Alchemy::Upgrader::ThreePointZero.rename_registered_role_ro_member
-      end
-
-      desc 'Sets `published_at` of public pages without a `published_at` date set to their `updated_at` value'
-      task publish_unpublished_public_pages: [:environment] do
-        Alchemy::Upgrader::ThreePointZero.publish_unpublished_public_pages
-      end
-
-      task :todo do
-        Alchemy::Upgrader::ThreePointZero.alchemy_3_0_todos
-      end
-    end
-
-    desc 'Upgrade Alchemy to v3.1'
-    task '3.1' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:3.1:todo'
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
-    namespace '3.1' do
-      task :todo do
-        Alchemy::Upgrader::ThreePointOne.alchemy_3_1_todos
-      end
-    end
-
-    desc 'Upgrade Alchemy to v3.2'
-    task '3.2' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:3.2:run',
-      'alchemy:upgrade:3.2:todo'
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
-    namespace '3.2' do
-      task run: [
-        'alchemy:upgrade:3.2:upgrade_acts_as_taggable_on_migrations',
-        'alchemy:upgrade:3.2:inject_seeder'
-      ]
-
-      desc 'Install and patch acts_as_taggable_on migrations.'
-      task upgrade_acts_as_taggable_on_migrations: [:environment] do
-        Alchemy::Upgrader::ThreePointTwo.upgrade_acts_as_taggable_on_migrations
-      end
-
-      desc 'Add Alchemy seeder to `db/seeds.rb` file.'
-      task inject_seeder: [:environment] do
-        Alchemy::Upgrader::ThreePointTwo.inject_seeder
-      end
-
-      task :todo do
-        Alchemy::Upgrader::ThreePointTwo.alchemy_3_2_todos
-      end
-    end
-
-    desc 'Upgrade Alchemy to v3.3'
-    task '3.3' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:3.3:run',
-      'alchemy:upgrade:3.3:todo'
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
-    namespace '3.3' do
-      task run: [
-        'alchemy:upgrade:3.3:convert_available_contents',
-        'alchemy:upgrade:3.3:migrate_existing_elements'
-      ]
-
-      desc 'Convert `available_contents` config to `nestable_elements`.'
-      task convert_available_contents: [:environment] do
-        Alchemy::Upgrader::ThreePointThree.convert_available_contents
-      end
-
-      desc 'Migrate existing elements to `nestable_elements`.'
-      task migrate_existing_elements: [:environment] do
-        Alchemy::Upgrader::ThreePointThree.migrate_existing_elements
-      end
-
-      task :todo do
-        Alchemy::Upgrader::ThreePointThree.alchemy_3_3_todos
-      end
-    end
-
-    desc 'Upgrade Alchemy to v3.4'
-    task '3.4' => ['alchemy:upgrade:prepare', 'alchemy:upgrade:3.4:run']
-
-    namespace '3.4' do
-      task run: [
-        'alchemy:upgrade:3.4:install_asset_manifests',
-        'alchemy:upgrade:3.4:store_image_file_format'
-      ]
-
-      desc 'Install asset manifests into `vendor/assets`'
-      task install_asset_manifests: [:environment] do
-        Alchemy::Upgrader::ThreePointFour.install_asset_manifests
-      end
-
-      desc 'Store image file format on Alchemy pictures.'
-      task store_image_file_format: [:environment] do
-        Alchemy::Upgrader::ThreePointFour.store_image_file_format
-      end
-
-      task :todo do
-        Alchemy::Upgrader::ThreePointFour.alchemy_3_4_todos
-      end
-    end
-
-    desc 'Upgrade Alchemy to v3.5'
-    task '3.5' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:3.5:run',
-      'alchemy:upgrade:3.5:todo'
-    ] do
-      Alchemy::Upgrader.display_todos
-    end
-
-    namespace '3.5' do
-      task run: ['alchemy:upgrade:3.5:install_dragonfly_config']
-
-      desc 'Install dragonfly config into `config/initializers`'
-      task install_dragonfly_config: [:environment] do
-        Alchemy::Upgrader::ThreePointFive.install_dragonfly_config
+      desc 'Harden acts_as_taggable_on migrations'
+      task harden_acts_as_taggable_on_migrations: [:environment] do
+        Alchemy::Upgrader::FourPointOne.harden_acts_as_taggable_on_migrations
       end
 
       task :todo do
-        Alchemy::Upgrader::ThreePointFive.alchemy_3_5_todos
+        Alchemy::Upgrader::FourPointOne.alchemy_4_1_todos
       end
     end
   end