alchemy_cms 6.0.0.pre.rc4 → 6.0.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8076b5e01533899e6c3003841940160335389c6e8a961bedec1b08839f61ba
-  data.tar.gz: dfcd49629458243d86cb4bb49615da876b3e5bfb1b69de121f90fe6e98bb964c
+  metadata.gz: 380b59193f2297abbf578f48a662afd797a678edd9948b5967a5df870df20b5f
+  data.tar.gz: e36993e934138b801ce941d7a3b272790b41dde673f1cbded7e874cba637dd8d
 SHA512:
-  metadata.gz: a25f6e26595f7b7e218200a0a7dbc1e69ac175c1daa3736b443501f80c8f1012215c69ab2f17addeb61b397cb3288b018b87f8e175d1ec9c1399e38101018d7f
-  data.tar.gz: 1c8cee2a1c08c70581945e25dc0745ba9bf2dea83e44220e00a096fce531df941bea97405836dcc4cf650ede4e12162e7ab6b9dc18a8e297f4ac6f71a18643d6
+  metadata.gz: '01489e9bf191e8ba5f42d19dfc93336d318744c41ccf6764625ebf787b8f2f030d219829be4b3b5830db93699e681883217909d8239ca023323469c95b7aab28'
+  data.tar.gz: 33599581bdff5315660e260562179f7e9b12ef9269dd50aeba7e5e52cdcb8bf5db5188bb86cb8cc60b53a0346d6c0bf8fe336c5eef234aec54a6110f7d5386b8

data/.github/workflows/ci.yml

@@ -72,13 +72,6 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
-      - name: Install bundler
-        run: |
-          gem install bundler
-      - name: Install bundle
-        timeout-minutes: 10
-        run: |
-          bundle install --jobs 4 --retry 3
       - name: Restore node modules cache
         id: yarn-cache
         uses: actions/cache@v2.1.3

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 6.0.0-rc5 (2022-02-24)
+
+### Changes
+
+- Change database version to 6.0 [#2239](https://github.com/AlchemyCMS/alchemy_cms/pull/2239) ([tvdeyen](https://github.com/tvdeyen))
+- Remove unused route [#2238](https://github.com/AlchemyCMS/alchemy_cms/pull/2238) ([phantomwhale](https://github.com/phantomwhale))
+- Add custom gutentag tag validations class [#2232](https://github.com/AlchemyCMS/alchemy_cms/pull/2232) ([tvdeyen](https://github.com/tvdeyen))
+- Touch nodes and all ancestors on page update [#2226](https://github.com/AlchemyCMS/alchemy_cms/pull/2226) ([tvdeyen](https://github.com/tvdeyen))
+- Extract Airbrake error handler into extension [#2221](https://github.com/AlchemyCMS/alchemy_cms/pull/2221) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.0-rc4 (2022-01-16)
 
 ### Changes

data/app/models/alchemy/page.rb

@@ -144,7 +144,7 @@ module Alchemy
     after_update :create_legacy_url,
       if: :saved_change_to_urlname?
 
-    after_update -> { nodes.update_all(updated_at: Time.current) }
+    after_update :touch_nodes
 
     # Concerns
     include PageScopes
@@ -603,5 +603,10 @@ module Alchemy
     def create_legacy_url
       legacy_urls.find_or_create_by(urlname: urlname_before_last_save)
     end
+
+    def touch_nodes
+      ids = node_ids + nodes.flat_map { |n| n.ancestors.pluck(:id) }
+      Node.where(id: ids).touch_all
+    end
   end
 end

data/app/services/alchemy/tag_validations.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class TagValidations
+    def self.call(klass)
+      new(klass).call
+    end
+
+    def initialize(klass)
+      @klass = klass
+    end
+
+    def call
+      klass.validates :name, presence: true, uniqueness: { case_sensitive: true }
+    end
+
+    private
+
+    attr_reader :klass
+  end
+end

data/config/routes.rb

@@ -124,7 +124,6 @@ Alchemy::Engine.routes.draw do
 
   resources :messages, only: [:index, :new, :create]
   resources :elements, only: :show
-  resources :contents, only: :show
 
   namespace :api, defaults: { format: "json" } do
     resources :contents, only: [:index, :show]

data/db/migrate/20200226213334_alchemy_four_point_four.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
+class AlchemyFourPointFour < ActiveRecord::Migration[6.0]
   def up
     unless table_exists?("alchemy_attachments")
-      create_table "alchemy_attachments", force: :cascade do |t|
+      create_table "alchemy_attachments" do |t|
         t.string "name"
         t.string "file_name"
         t.string "file_mime_type"
         t.integer "file_size"
         t.references "creator"
         t.references "updater"
-        t.timestamps null: false
+        t.timestamps
         t.string "file_uid"
         t.index ["file_uid"], name: "index_alchemy_attachments_on_file_uid"
       end
     end
 
     unless table_exists?("alchemy_contents")
-      create_table "alchemy_contents", force: :cascade do |t|
+      create_table "alchemy_contents" do |t|
         t.string "name"
         t.references "essence", null: false, polymorphic: true, index: { unique: true }
         t.references "element", null: false
@@ -25,14 +25,14 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_elements")
-      create_table "alchemy_elements", force: :cascade do |t|
+      create_table "alchemy_elements" do |t|
         t.string "name"
         t.integer "position"
         t.references "page", null: false, index: false
         t.boolean "public", default: true
         t.boolean "folded", default: false
         t.boolean "unique", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.references "parent_element", index: false
@@ -44,27 +44,27 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_elements_alchemy_pages")
-      create_table "alchemy_elements_alchemy_pages", id: false, force: :cascade do |t|
+      create_table "alchemy_elements_alchemy_pages", id: false do |t|
         t.references "element"
         t.references "page"
       end
     end
 
     unless table_exists?("alchemy_essence_booleans")
-      create_table "alchemy_essence_booleans", force: :cascade do |t|
+      create_table "alchemy_essence_booleans" do |t|
         t.boolean "value"
         t.index ["value"], name: "index_alchemy_essence_booleans_on_value"
       end
     end
 
     unless table_exists?("alchemy_essence_dates")
-      create_table "alchemy_essence_dates", force: :cascade do |t|
+      create_table "alchemy_essence_dates" do |t|
         t.datetime "date"
       end
     end
 
     unless table_exists?("alchemy_essence_files")
-      create_table "alchemy_essence_files", force: :cascade do |t|
+      create_table "alchemy_essence_files" do |t|
         t.references "attachment"
         t.string "title"
         t.string "css_class"
@@ -73,13 +73,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_htmls")
-      create_table "alchemy_essence_htmls", force: :cascade do |t|
+      create_table "alchemy_essence_htmls" do |t|
         t.text "source"
       end
     end
 
     unless table_exists?("alchemy_essence_links")
-      create_table "alchemy_essence_links", force: :cascade do |t|
+      create_table "alchemy_essence_links" do |t|
         t.string "link"
         t.string "link_title"
         t.string "link_target"
@@ -88,13 +88,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_pages")
-      create_table "alchemy_essence_pages", force: :cascade do |t|
+      create_table "alchemy_essence_pages" do |t|
         t.references "page"
       end
     end
 
     unless table_exists?("alchemy_essence_pictures")
-      create_table "alchemy_essence_pictures", force: :cascade do |t|
+      create_table "alchemy_essence_pictures" do |t|
         t.references "picture"
         t.string "caption"
         t.string "title"
@@ -111,7 +111,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_richtexts")
-      create_table "alchemy_essence_richtexts", force: :cascade do |t|
+      create_table "alchemy_essence_richtexts" do |t|
         t.text "body"
         t.text "stripped_body"
         t.boolean "public"
@@ -119,14 +119,14 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_essence_selects")
-      create_table "alchemy_essence_selects", force: :cascade do |t|
+      create_table "alchemy_essence_selects" do |t|
         t.string "value"
         t.index ["value"], name: "index_alchemy_essence_selects_on_value"
       end
     end
 
     unless table_exists?("alchemy_essence_texts")
-      create_table "alchemy_essence_texts", force: :cascade do |t|
+      create_table "alchemy_essence_texts" do |t|
         t.text "body"
         t.string "link"
         t.string "link_title"
@@ -137,7 +137,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_folded_pages")
-      create_table "alchemy_folded_pages", force: :cascade do |t|
+      create_table "alchemy_folded_pages" do |t|
         t.references "page", null: false, index: false
         t.references "user", null: false, index: false
         t.boolean "folded", default: false
@@ -146,13 +146,13 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_languages")
-      create_table "alchemy_languages", force: :cascade do |t|
+      create_table "alchemy_languages" do |t|
         t.string "name"
         t.string "language_code"
         t.string "frontpage_name"
         t.string "page_layout", default: "intro"
         t.boolean "public", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.boolean "default", default: false
@@ -165,16 +165,16 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_legacy_page_urls")
-      create_table "alchemy_legacy_page_urls", force: :cascade do |t|
+      create_table "alchemy_legacy_page_urls" do |t|
         t.string "urlname", null: false
         t.references "page", null: false
-        t.timestamps null: false
+        t.timestamps
         t.index ["urlname"], name: "index_alchemy_legacy_page_urls_on_urlname"
       end
     end
 
     unless table_exists?("alchemy_nodes")
-      create_table "alchemy_nodes", force: :cascade do |t|
+      create_table "alchemy_nodes" do |t|
         t.string "name"
         t.string "title"
         t.string "url"
@@ -189,7 +189,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
         t.references "language", null: false
         t.references "creator"
         t.references "updater"
-        t.timestamps null: false
+        t.timestamps
         t.references "site", null: false
         t.index ["lft"], name: "index_alchemy_nodes_on_lft"
         t.index ["rgt"], name: "index_alchemy_nodes_on_rgt"
@@ -197,7 +197,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_pages")
-      create_table "alchemy_pages", force: :cascade do |t|
+      create_table "alchemy_pages" do |t|
         t.string "name"
         t.string "urlname"
         t.string "title"
@@ -217,7 +217,7 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
         t.boolean "robot_follow", default: true
         t.boolean "sitemap", default: true
         t.boolean "layoutpage", default: false
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.references "language"
@@ -234,12 +234,12 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_pictures")
-      create_table "alchemy_pictures", force: :cascade do |t|
+      create_table "alchemy_pictures" do |t|
         t.string "name"
         t.string "image_file_name"
         t.integer "image_file_width"
         t.integer "image_file_height"
-        t.timestamps null: false
+        t.timestamps
         t.references "creator"
         t.references "updater"
         t.string "upload_hash"
@@ -250,10 +250,10 @@ class AlchemyFourPointFour < ActiveRecord::Migration[5.2]
     end
 
     unless table_exists?("alchemy_sites")
-      create_table "alchemy_sites", force: :cascade do |t|
+      create_table "alchemy_sites" do |t|
         t.string "host"
         t.string "name"
-        t.timestamps null: false
+        t.timestamps
         t.boolean "public", default: false
         t.text "aliases"
         t.boolean "redirect_to_primary_host"

data/db/migrate/20200423073425_create_alchemy_essence_nodes.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateAlchemyEssenceNodes < ActiveRecord::Migration[5.2]
+class CreateAlchemyEssenceNodes < ActiveRecord::Migration[6.0]
   def change
     create_table :alchemy_essence_nodes do |t|
       t.references "node"

data/db/migrate/20200504210159_remove_site_id_from_nodes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class RemoveSiteIdFromNodes < ActiveRecord::Migration[5.2]
+class RemoveSiteIdFromNodes < ActiveRecord::Migration[6.0]
   def up
     remove_foreign_key :alchemy_nodes, :alchemy_sites
     remove_index :alchemy_nodes, :site_id

data/db/migrate/20200505215518_add_language_id_foreign_key_to_alchemy_pages.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[5.2]
+class AddLanguageIdForeignKeyToAlchemyPages < ActiveRecord::Migration[6.0]
   def change
     add_foreign_key :alchemy_pages, :alchemy_languages, column: :language_id
     change_column_null :alchemy_pages, :language_id, false, Alchemy::Language.default&.id

data/db/migrate/20200511113603_add_menu_type_to_alchemy_nodes.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[5.2]
+class AddMenuTypeToAlchemyNodes < ActiveRecord::Migration[6.0]
   class LocalNode < ActiveRecord::Base
     self.table_name = :alchemy_nodes
     acts_as_nested_set scope: :language_id

data/db/migrate/20200514091507_make_page_layoutpage_null_false.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class MakePageLayoutpageNullFalse < ActiveRecord::Migration[5.2]
+class MakePageLayoutpageNullFalse < ActiveRecord::Migration[6.0]
   def change
     change_column_null :alchemy_pages, :layoutpage, false, false
   end

data/db/migrate/20200519073500_remove_visible_from_alchemy_pages.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[5.2]
+class RemoveVisibleFromAlchemyPages < ActiveRecord::Migration[6.0]
   class LocalPage < ActiveRecord::Base
     self.table_name = "alchemy_pages"
 

data/db/migrate/20200617110713_create_alchemy_picture_thumbs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateAlchemyPictureThumbs < ActiveRecord::Migration[5.2]
+class CreateAlchemyPictureThumbs < ActiveRecord::Migration[6.0]
   def up
     return if table_exists?(:alchemy_picture_thumbs)
 

data/db/migrate/20200907111332_remove_tri_state_booleans.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class RemoveTriStateBooleans < ActiveRecord::Migration[5.2]
+class RemoveTriStateBooleans < ActiveRecord::Migration[6.0]
   def change
     change_column_null :alchemy_elements, :public, false, false
     change_column_default :alchemy_elements, :public, true

data/db/migrate/20201207131309_create_page_versions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreatePageVersions < ActiveRecord::Migration[5.2]
+class CreatePageVersions < ActiveRecord::Migration[6.0]
   def change
     create_table :alchemy_page_versions do |t|
       t.references :page,

data/db/migrate/20201207135820_add_page_version_id_to_alchemy_elements.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class AddPageVersionIdToAlchemyElements < ActiveRecord::Migration[5.2]
+class AddPageVersionIdToAlchemyElements < ActiveRecord::Migration[6.0]
   class LocalPage < ActiveRecord::Base
     self.table_name = :alchemy_pages
     has_many :elements, class_name: "LocalElement", inverse_of: :page

data/lib/alchemy/engine.rb

@@ -19,11 +19,12 @@ module Alchemy
       NonStupidDigestAssets.whitelist += [/^tinymce\//]
     end
 
-    # Gutentag downcases all tgas before save.
-    # We support having tags with uppercase characters.
-    # The Gutentag search is case insensitive.
-    initializer "alchemy.gutentag_normalizer" do
+    # Gutentag downcases all tags before save
+    # and Gutentag validations are not case sensitive.
+    # But we support having tags with uppercase characters.
+    config.to_prepare do
       Gutentag.normaliser = ->(value) { value.to_s }
+      Gutentag.tag_validations = Alchemy::TagValidations
     end
 
     # Custom Ransack sort arrows
@@ -44,12 +45,5 @@ module Alchemy
         end
       end
     end
-
-    initializer "alchemy.error_tracking" do
-      if defined?(Airbrake)
-        require_relative "error_tracking/airbrake_handler"
-        Alchemy::ErrorTracking.notification_handler = Alchemy::ErrorTracking::AirbrakeHandler
-      end
-    end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.0-rc4"
+  VERSION = "6.0.0-rc5"
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.rc4
+  version: 6.0.0.pre.rc5
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-16 00:00:00.000000000 Z
+date: 2022-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1007,6 +1007,7 @@ files:
 - app/serializers/alchemy/picture_serializer.rb
 - app/services/alchemy/delete_elements.rb
 - app/services/alchemy/duplicate_element.rb
+- app/services/alchemy/tag_validations.rb
 - app/views/alchemy/_edit_mode.html.erb
 - app/views/alchemy/_menubar.html.erb
 - app/views/alchemy/_preview_mode_code.html.erb
@@ -1308,7 +1309,6 @@ files:
 - lib/alchemy/elements_finder.rb
 - lib/alchemy/engine.rb
 - lib/alchemy/error_tracking.rb
-- lib/alchemy/error_tracking/airbrake_handler.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/filetypes.rb

data/lib/alchemy/error_tracking/airbrake_handler.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Alchemy
-  module ErrorTracking
-    class AirbrakeHandler < BaseHandler
-      def self.call(exception)
-        return if ["development", "test"].include?(Rails.env)
-
-        notify_airbrake(exception)
-      end
-    end
-  end
-end