alchemy_cms 4.5.1 → 4.6.0

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.5.1"
+  VERSION = "4.6.0"
 
   def self.version
     VERSION

data/lib/tasks/alchemy/convert.rake

@@ -3,6 +3,7 @@ namespace :alchemy do
     namespace :urlnames do
       desc "Converts the urlname of all pages to nested url paths."
       task to_nested: [:environment] do
+        Alchemy::Deprecation.warn('alchemy:convert:urlnames:to_nested task is deprecated and will be removed from Alchemy 5.0')
         unless Alchemy::Config.get(:url_nesting)
           raise "\nURL nesting is disabled! Please enable url_nesting in `config/alchemy/config.yml` first.\n\n"
         end
@@ -18,6 +19,7 @@ namespace :alchemy do
 
       desc "Converts the urlname of all pages to contain the slug only."
       task to_slug: [:environment] do
+        Alchemy::Deprecation.warn('alchemy:convert:urlnames:to_slug task is deprecated and will be removed from Alchemy 5.0')
         if Alchemy::Config.get(:url_nesting)
           raise "\nURL nesting is enabled! Please disable url_nesting in `config/alchemy/config.yml` first.\n\n"
         end

data/lib/tasks/alchemy/upgrade.rake

@@ -1,29 +1,32 @@
-require 'alchemy/upgrader'
-require 'alchemy/version'
+# frozen_string_literal: true
+
+require "alchemy/upgrader"
+require "alchemy/version"
 
 namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
-    'alchemy:upgrade:prepare',
-    'alchemy:upgrade:4.1:run', 'alchemy:upgrade:4.1:todo',
-    'alchemy:upgrade:4.2:run', 'alchemy:upgrade:4.2:todo',
-    'alchemy:upgrade:4.4:run', 'alchemy:upgrade:4.4:todo'
+    "alchemy:upgrade:prepare",
+    "alchemy:upgrade:4.1:run", "alchemy:upgrade:4.1:todo",
+    "alchemy:upgrade:4.2:run", "alchemy:upgrade:4.2:todo",
+    "alchemy:upgrade:4.4:run", "alchemy:upgrade:4.4:todo",
+    "alchemy:upgrade:4.6:run", "alchemy:upgrade:4.6:todo",
   ] do
     Alchemy::Upgrader.display_todos
   end
 
   namespace :upgrade do
-    desc 'Alchemy Upgrader: Prepares the database and updates Alchemys configuration file.'
+    desc "Alchemy Upgrader: Prepares the database and updates Alchemys configuration file."
     task prepare: [
-      'alchemy:upgrade:database',
-      'alchemy:upgrade:config'
+      "alchemy:upgrade:database",
+      "alchemy:upgrade:config",
     ]
 
     desc "Alchemy Upgrader: Prepares the database."
     task database: [
-      'alchemy:install:migrations',
-      'db:migrate',
-      'alchemy:db:seed'
+      "alchemy:install:migrations",
+      "db:migrate",
+      "alchemy:db:seed",
     ]
 
     desc "Alchemy Upgrader: Copy configuration file."
@@ -37,19 +40,19 @@ namespace :alchemy do
       end
     end
 
-    desc 'Upgrade Alchemy to v4.1'
-    task '4.1' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:4.1:run',
-      'alchemy:upgrade:4.1:todo'
+    desc "Upgrade Alchemy to v4.1"
+    task "4.1" => [
+      "alchemy:upgrade:prepare",
+      "alchemy:upgrade:4.1:run",
+      "alchemy:upgrade:4.1:todo",
     ] do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace '4.1' do
-      task run: ['alchemy:upgrade:4.1:harden_acts_as_taggable_on_migrations']
+    namespace "4.1" do
+      task run: ["alchemy:upgrade:4.1:harden_acts_as_taggable_on_migrations"]
 
-      desc 'Harden acts_as_taggable_on migrations'
+      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
@@ -59,45 +62,45 @@ namespace :alchemy do
       end
     end
 
-    desc 'Upgrade Alchemy to v4.2'
-    task '4.2' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:4.2:run',
-      'alchemy:upgrade:4.2:todo'
+    desc "Upgrade Alchemy to v4.2"
+    task "4.2" => [
+      "alchemy:upgrade:prepare",
+      "alchemy:upgrade:4.2:run",
+      "alchemy:upgrade:4.2:todo",
     ] do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace '4.2' do
+    namespace "4.2" do
       task run: [
-        'alchemy:upgrade:4.2:convert_picture_galleries',
-        'alchemy:upgrade:4.2:migrate_picture_galleries',
-        'alchemy:upgrade:4.2:convert_cells',
-        'alchemy:upgrade:4.2:migrate_cells',
-        'alchemy:upgrade:4.2:update_element_partial_name_variable'
+        "alchemy:upgrade:4.2:convert_picture_galleries",
+        "alchemy:upgrade:4.2:migrate_picture_galleries",
+        "alchemy:upgrade:4.2:convert_cells",
+        "alchemy:upgrade:4.2:migrate_cells",
+        "alchemy:upgrade:4.2:update_element_partial_name_variable",
       ]
 
-      desc 'Convert `picture_gallery` element definitions to `nestable_elements`.'
+      desc "Convert `picture_gallery` element definitions to `nestable_elements`."
       task convert_picture_galleries: [:environment] do
         Alchemy::Upgrader::FourPointTwo.convert_picture_galleries
       end
 
-      desc 'Migrate `picture_gallery` elements to `nestable_elements`.'
+      desc "Migrate `picture_gallery` elements to `nestable_elements`."
       task migrate_picture_galleries: [:environment] do
         Alchemy::Upgrader::FourPointTwo.migrate_picture_galleries
       end
 
-      desc 'Convert cells config to fixed nestable elements.'
+      desc "Convert cells config to fixed nestable elements."
       task convert_cells: [:environment] do
         Alchemy::Upgrader::FourPointTwo.convert_cells
       end
 
-      desc 'Migrate existing cells to fixed nestable elements.'
-      task migrate_cells: ['alchemy:install:migrations', 'db:migrate'] do
+      desc "Migrate existing cells to fixed nestable elements."
+      task migrate_cells: ["alchemy:install:migrations", "db:migrate"] do
         Alchemy::Upgrader::FourPointTwo.migrate_cells
       end
 
-      desc 'Update element views to use element partial name variable.'
+      desc "Update element views to use element partial name variable."
       task :update_element_partial_name_variable do
         Alchemy::Upgrader::FourPointTwo.update_element_views_variable_name
       end
@@ -107,19 +110,19 @@ namespace :alchemy do
       end
     end
 
-    desc 'Upgrade Alchemy to v4.4'
-    task '4.4' => [
-      'alchemy:upgrade:prepare',
-      'alchemy:upgrade:4.4:run',
-      'alchemy:upgrade:4.4:todo'
+    desc "Upgrade Alchemy to v4.4"
+    task "4.4" => [
+      "alchemy:upgrade:prepare",
+      "alchemy:upgrade:4.4:run",
+      "alchemy:upgrade:4.4:todo",
     ] do
       Alchemy::Upgrader.display_todos
     end
 
-    namespace '4.4' do
+    namespace "4.4" do
       task run: [
-        'alchemy:upgrade:4.4:rename_element_views',
-        'alchemy:upgrade:4.4:update_local_variable'
+        "alchemy:upgrade:4.4:rename_element_views",
+        "alchemy:upgrade:4.4:update_local_variable",
       ]
 
       desc "Remove '_view' suffix from element views."
@@ -127,7 +130,7 @@ namespace :alchemy do
         Alchemy::Upgrader::FourPointFour.rename_element_views
       end
 
-      desc 'Update element views local variable to element name.'
+      desc "Update element views local variable to element name."
       task update_local_variable: [:environment] do
         Alchemy::Upgrader::FourPointFour.update_local_variable
       end
@@ -136,5 +139,23 @@ namespace :alchemy do
         Alchemy::Upgrader::FourPointFour.alchemy_4_4_todos
       end
     end
+
+    desc "Upgrade Alchemy to v4.6"
+    task "4.6" => [
+      "alchemy:upgrade:prepare",
+    ]
+
+    namespace "4.6" do
+      task run: []
+
+      desc "Move child pages of invisible pages to visible parent."
+      task restructure_page_tree: [:environment] do
+        Alchemy::Upgrader::FourPointSix.restructure_page_tree
+      end
+
+      task :todo do
+        Alchemy::Upgrader::FourPointSix.todos
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -10,10 +10,10 @@ authors:
 - Hendrik Mans
 - Carsten Fregin
 - Martin Meyerhoff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-17 00:00:00.000000000 Z
+date: 2020-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -739,6 +739,7 @@ files:
 - app/controllers/concerns/alchemy/locale_redirects.rb
 - app/controllers/concerns/alchemy/page_redirects.rb
 - app/controllers/concerns/alchemy/site_redirects.rb
+- app/decorators/alchemy/content_editor.rb
 - app/helpers/alchemy/admin/attachments_helper.rb
 - app/helpers/alchemy/admin/base_helper.rb
 - app/helpers/alchemy/admin/contents_helper.rb
@@ -790,6 +791,7 @@ files:
 - app/models/alchemy/page/page_naming.rb
 - app/models/alchemy/page/page_natures.rb
 - app/models/alchemy/page/page_scopes.rb
+- app/models/alchemy/page/url_path.rb
 - app/models/alchemy/picture.rb
 - app/models/alchemy/picture/transformations.rb
 - app/models/alchemy/picture/url.rb
@@ -1102,12 +1104,12 @@ files:
 - lib/alchemy/upgrader.rb
 - lib/alchemy/upgrader/four_point_four.rb
 - lib/alchemy/upgrader/four_point_one.rb
+- lib/alchemy/upgrader/four_point_six.rb
 - lib/alchemy/upgrader/four_point_two.rb
 - lib/alchemy/upgrader/tasks/cells_migration.rb
 - lib/alchemy/upgrader/tasks/cells_upgrader.rb
 - lib/alchemy/upgrader/tasks/element_partial_name_variable_updater.rb
 - lib/alchemy/upgrader/tasks/element_views_updater.rb
-- lib/alchemy/upgrader/tasks/fixed_element_name_finder.rb
 - lib/alchemy/upgrader/tasks/harden_acts_as_taggable_on_migrations.rb
 - lib/alchemy/upgrader/tasks/picture_gallery_migration.rb
 - lib/alchemy/upgrader/tasks/picture_gallery_upgrader.rb
@@ -1242,8 +1244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5
 test_files: []

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

@@ -1,31 +0,0 @@
-module Alchemy::Upgrader::Tasks
-  class FixedElementNameFinder
-
-    def call(cell_name)
-      return cell_name if fixed_elements.include?(cell_name)
-      return "#{cell_name}_elements" if unfixed_elements.include?(cell_name)
-      cell_name
-    end
-
-    private
-
-    def fixed_elements
-      @_fixed_element_names ||= begin
-        definitions.select { |element| element['fixed'] }.map { |element| element['name'] }
-      end
-    end
-
-    def unfixed_elements
-      @_unfixed_elements ||= begin
-        definitions.reject { |element| element['fixed'] }.map { |element| element['name'] }
-      end
-    end
-
-    def definitions
-      @_definitions ||= begin
-        elements_file_path = Rails.root.join('config', 'alchemy', 'elements.yml')
-        YAML.load_file(elements_file_path)
-      end
-    end
-  end
-end