alchemy_cms 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4eb5a0535db07358911a52c75a9d3f0552119d547f6f6b7ff0d4b64ac51e1e96
-  data.tar.gz: 6d9009861880e870ca5cf9617a5bdaad8bc467a87ff842ff2722a10a1b08767a
+  metadata.gz: c585dd53e50006dabd57cbac098ba15c8acc5dc0ea9dd18a432df5feeca4dc89
+  data.tar.gz: 19518e22d715dfc11dbc46dfbd72245bd8a88156360bb8702e345bdc5d52ff7f
 SHA512:
-  metadata.gz: 64045d0762ec1a803b87992b154a9cde5f202603e415d5086f61d74ccb16db4f9de10d80b313b37883f104f8c0877bffa83b631ad705cde329229a7a873a4dff
-  data.tar.gz: 5da92fe5ed83c535ffdd683fcc00d5781e5be7e2563c6767d7d972176ac995346922b70a2b20541a3a6bf51688664bc2ba5e449630d57b862f65972a75b1fe1e
+  metadata.gz: d721b898bf3a4c76daf7ec9a925d76d9782252751355b797922fc5c0d2a3a95e97e1e05a5f9fe6b01f670d2453c7b63bcdc54d64f0c845c0145817fc517fd577
+  data.tar.gz: 4867e081525cc3ff481dcadb7d5625a3ddaade4e030ed46522ddd0d8d71c65c55a403d9599a7b4adbef3027e06947bcbfd6386aee4470669bc1e13650d671d74

data/.github/workflows/test.yml

@@ -11,6 +11,7 @@ jobs:
         rails:
           - "6.1"
           - "7.0"
+          - "7.1"
         ruby:
           - "3.0"
           - "3.1"

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 7.0.6 (2023-11-15)
+
+- [7.0-stable] Merge pull request #2612 from sascha-karnatz/harden-page-publisher [#2613](https://github.com/AlchemyCMS/alchemy_cms/pull/2613) ([alchemycms-bot](https://github.com/alchemycms-bot))
+- [7.0] Allow Rails 7.1 [#2603](https://github.com/AlchemyCMS/alchemy_cms/pull/2603) ([tvdeyen](https://github.com/tvdeyen))
+- [7.0-stable] Merge pull request #2601 from tvdeyen/remove-jquery-ui-rails [#2602](https://github.com/AlchemyCMS/alchemy_cms/pull/2602) ([alchemycms-bot](https://github.com/alchemycms-bot))
+
 ## 7.0.5 (2023-10-06)
 
 - [7.0-stable] Merge pull request #2593 from tvdeyen/fix-turbo-redirect [#2594](https://github.com/AlchemyCMS/alchemy_cms/pull/2594) ([alchemycms-bot](https://github.com/alchemycms-bot))

data/Gemfile

@@ -4,7 +4,7 @@ source "https://rubygems.org"
 
 gemspec
 
-rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
+rails_version = ENV.fetch("RAILS_VERSION", "7.1")
 gem "rails", "~> #{rails_version}.0"
 
 if ENV["DB"].nil? || ENV["DB"] == "sqlite"
@@ -27,6 +27,11 @@ group :development, :test do
     # Necessary because GH Actions gem cache does not have this "Bundled with Ruby" gem installed
     gem "rexml", "~> 3.2.4"
     gem "sassc", "~> 2.4.0" # https://github.com/sass/sassc-ruby/issues/146
+
+    # https://github.com/hotwired/turbo-rails/issues/512
+    if rails_version == "7.1"
+      gem "actioncable", "~> #{rails_version}.0"
+    end
   else
     gem "launchy"
     gem "annotate"

data/alchemy_cms.gemspec

@@ -29,10 +29,10 @@ Gem::Specification.new do |gem|
     activesupport
     railties
   ].each do |rails_gem|
-    gem.add_runtime_dependency rails_gem, [">= 6.1", "< 7.1"]
+    gem.add_runtime_dependency rails_gem, [">= 6.1", "< 7.2"]
   end
 
-  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
+  gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.14"]
   gem.add_runtime_dependency "acts_as_list", [">= 0.3", "< 2"]
   gem.add_runtime_dependency "awesome_nested_set", ["~> 3.1"]
   gem.add_runtime_dependency "cancancan", [">= 2.1", "< 4.0"]
@@ -43,7 +43,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "handlebars_assets", ["~> 0.23"]
   gem.add_runtime_dependency "importmap-rails", ["~> 1.2", ">= 1.2.1"]
   gem.add_runtime_dependency "jquery-rails", ["~> 4.0", ">= 4.0.4"]
-  gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
   gem.add_runtime_dependency "ransack", [">= 1.8", "< 5.0"]

data/app/assets/javascripts/alchemy/admin.js

@@ -2,7 +2,6 @@
 // ------------------------------
 //= require jquery2
 //= require jquery_ujs
-//= require jquery-ui/effects/effect-fade
 //= require jquery-ui/widgets/draggable
 //= require jquery-ui/widgets/sortable
 //= require jquery-ui/widgets/tabs

data/app/assets/javascripts/alchemy/alchemy.dialog.js.coffee

@@ -90,7 +90,7 @@ class window.Alchemy.Dialog
     ))
     if @options.ready?
       @options.ready(@dialog_body)
-    @dialog_body.show('fade', 200)
+    @dialog_body.show()
     true
 
   # Adds a spinner into Dialog body

data/app/controllers/alchemy/admin/ingredients_controller.rb

@@ -19,7 +19,8 @@ module Alchemy
       private
 
       def ingredient_params
-        params[:ingredient]&.permit(@ingredient.class.stored_attributes[:data]) || {}
+        params[:ingredient]&.permit(@ingredient.class.stored_attributes[:data]) ||
+          ActionController::Parameters.new
       end
 
       def load_croppable_resource

data/app/models/alchemy/page/publisher.rb

@@ -20,21 +20,23 @@ module Alchemy
       #
       def publish!(public_on:)
         Page.transaction do
-          version = public_version(public_on)
-          DeleteElements.new(version.elements).call
-
-          repository = page.draft_version.element_repository
-          ActiveRecord::Base.no_touching do
-            Element.acts_as_list_no_update do
-              repository.visible.not_nested.each.with_index(1) do |element, position|
-                Alchemy::DuplicateElement.new(element, repository: repository).call(
-                  page_version_id: version.id,
-                  position: position
-                )
+          PageMutex.with_lock!(@page) do
+            version = public_version(public_on)
+            DeleteElements.new(version.elements).call
+
+            repository = page.draft_version.element_repository
+            ActiveRecord::Base.no_touching do
+              Element.acts_as_list_no_update do
+                repository.visible.not_nested.each.with_index(1) do |element, position|
+                  Alchemy::DuplicateElement.new(element, repository: repository).call(
+                    page_version_id: version.id,
+                    position: position
+                  )
+                end
               end
             end
+            page.update(published_at: public_on)
           end
-          page.update(published_at: public_on)
         end
 
         Alchemy.publish_targets.each { |p| p.perform_later(page) }

data/app/models/alchemy/page_mutex.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PageMutex < BaseRecord
+    class LockFailed < StandardError; end
+
+    MAX_AGE = 300 # seconds
+
+    belongs_to :page, class_name: "Alchemy::Page", optional: true
+
+    scope :expired, -> { where(arel_table[:created_at].lteq(MAX_AGE.seconds.ago)) }
+
+    def self.with_lock!(page)
+      raise ArgumentError, "A page is necessary to lock it" if page.nil?
+
+      # remove old expired page if it wasn't deleted before
+      expired.where(page: page).delete_all
+
+      begin
+        page_mutex = create!(page: page)
+      rescue ActiveRecord::RecordNotUnique
+        error = LockFailed.new("Can't lock page #{page.id} twice!")
+        logger.error error.inspect
+        raise error
+      end
+      yield
+    ensure
+      page_mutex&.destroy
+    end
+  end
+end

data/app/models/alchemy/picture/url.rb

@@ -35,7 +35,7 @@ module Alchemy
           thumb.uid
         else
           uid = PictureThumb::Uid.call(signature, variant)
-          ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
+          ActiveRecord::Base.connected_to(role: db_writing_role) do
             PictureThumb::Create.call(variant, signature, uid)
           end
           uid
@@ -49,6 +49,14 @@ module Alchemy
           variant.picture.thumbs.find_by(signature: signature)
         end
       end
+
+      def db_writing_role
+        if ActiveRecord::Base.respond_to?(:writing_role)
+          ActiveRecord::Base.writing_role
+        else
+          ActiveRecord.writing_role
+        end
+      end
     end
   end
 end

data/db/migrate/20231113104432_create_page_mutexes.rb

@@ -0,0 +1,8 @@
+class CreatePageMutexes < ActiveRecord::Migration[6.1]
+  def change
+    create_table :alchemy_page_mutexes do |t|
+      t.references :page, null: false, index: {unique: true}, foreign_key: {to_table: :alchemy_pages}
+      t.datetime :created_at
+    end
+  end
+end

data/lib/alchemy/version.rb

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

data/lib/alchemy_cms.rb

@@ -14,7 +14,6 @@ require "gutentag"
 require "handlebars_assets"
 require "importmap-rails"
 require "jquery-rails"
-require "jquery-ui-rails"
 require "kaminari"
 require "non_stupid_digest_assets"
 require "ransack"

data/vendor/assets/javascripts/jquery-ui/data.js

@@ -0,0 +1,45 @@
+//= require jquery-ui/version
+
+/*!
+ * jQuery UI :data 1.13.0
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: :data Selector
+//>>group: Core
+//>>description: Selects elements which have data stored under the specified key.
+//>>docs: http://api.jqueryui.com/data-selector/
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.extend( $.expr.pseudos, {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo( function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
+			};
+		} ) :
+
+		// Support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		}
+} );
+} );

data/vendor/assets/javascripts/jquery-ui/ie.js

@@ -0,0 +1,20 @@
+//= require jquery-ui/version
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+// This file is deprecated
+return $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+} );

data/vendor/assets/javascripts/jquery-ui/keycode.js

@@ -0,0 +1,51 @@
+//= require jquery-ui/version
+
+/*!
+ * jQuery UI Keycode 1.13.0
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Keycode
+//>>group: Core
+//>>description: Provide keycodes as keynames
+//>>docs: http://api.jqueryui.com/jQuery.ui.keyCode/
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.ui.keyCode = {
+	BACKSPACE: 8,
+	COMMA: 188,
+	DELETE: 46,
+	DOWN: 40,
+	END: 35,
+	ENTER: 13,
+	ESCAPE: 27,
+	HOME: 36,
+	LEFT: 37,
+	PAGE_DOWN: 34,
+	PAGE_UP: 33,
+	PERIOD: 190,
+	RIGHT: 39,
+	SPACE: 32,
+	TAB: 9,
+	UP: 38
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/plugin.js

@@ -0,0 +1,49 @@
+//= require jquery-ui/version
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+// $.ui.plugin is deprecated. Use $.widget() extensions instead.
+return $.ui.plugin = {
+	add: function( module, option, set ) {
+		var i,
+			proto = $.ui[ module ].prototype;
+		for ( i in set ) {
+			proto.plugins[ i ] = proto.plugins[ i ] || [];
+			proto.plugins[ i ].push( [ option, set[ i ] ] );
+		}
+	},
+	call: function( instance, name, args, allowDisconnected ) {
+		var i,
+			set = instance.plugins[ name ];
+
+		if ( !set ) {
+			return;
+		}
+
+		if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode ||
+				instance.element[ 0 ].parentNode.nodeType === 11 ) ) {
+			return;
+		}
+
+		for ( i = 0; i < set.length; i++ ) {
+			if ( instance.options[ set[ i ][ 0 ] ] ) {
+				set[ i ][ 1 ].apply( instance.element, args );
+			}
+		}
+	}
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/safe-active-element.js

@@ -0,0 +1,46 @@
+//= require jquery-ui/version
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.ui.safeActiveElement = function( document ) {
+	var activeElement;
+
+	// Support: IE 9 only
+	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+	try {
+		activeElement = document.activeElement;
+	} catch ( error ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE may return null instead of an element
+	// Interestingly, this only seems to occur when NOT in an iframe
+	if ( !activeElement ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 11 only
+	// IE11 returns a seemingly empty object in some cases when accessing
+	// document.activeElement from an <iframe>
+	if ( !activeElement.nodeName ) {
+		activeElement = document.body;
+	}
+
+	return activeElement;
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/safe-blur.js

@@ -0,0 +1,27 @@
+//= require jquery-ui/version
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.ui.safeBlur = function( element ) {
+
+	// Support: IE9 - 10 only
+	// If the <body> is blurred, IE will switch windows, see #9420
+	if ( element && element.nodeName.toLowerCase() !== "body" ) {
+		$( element ).trigger( "blur" );
+	}
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/scroll-parent.js

@@ -0,0 +1,50 @@
+//= require jquery-ui/version
+
+/*!
+ * jQuery UI Scroll Parent 1.13.0
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: scrollParent
+//>>group: Core
+//>>description: Get the closest ancestor element that is scrollable.
+//>>docs: http://api.jqueryui.com/scrollParent/
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.fn.scrollParent = function( includeHidden ) {
+	var position = this.css( "position" ),
+		excludeStaticParent = position === "absolute",
+		overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/,
+		scrollParent = this.parents().filter( function() {
+			var parent = $( this );
+			if ( excludeStaticParent && parent.css( "position" ) === "static" ) {
+				return false;
+			}
+			return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) +
+				parent.css( "overflow-x" ) );
+		} ).eq( 0 );
+
+	return position === "fixed" || !scrollParent.length ?
+		$( this[ 0 ].ownerDocument || document ) :
+		scrollParent;
+};
+
+} );

data/vendor/assets/javascripts/jquery-ui/unique-id.js

@@ -0,0 +1,54 @@
+//= require jquery-ui/version
+
+/*!
+ * jQuery UI Unique ID 1.13.0
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: uniqueId
+//>>group: Core
+//>>description: Functions to generate and remove uniqueId's
+//>>docs: http://api.jqueryui.com/uniqueId/
+
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+return $.fn.extend( {
+	uniqueId: ( function() {
+		var uuid = 0;
+
+		return function() {
+			return this.each( function() {
+				if ( !this.id ) {
+					this.id = "ui-id-" + ( ++uuid );
+				}
+			} );
+		};
+	} )(),
+
+	removeUniqueId: function() {
+		return this.each( function() {
+			if ( /^ui-id-\d+$/.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		} );
+	}
+} );
+
+} );

data/vendor/assets/javascripts/jquery-ui/version.js

@@ -0,0 +1,20 @@
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+"use strict";
+
+$.ui = $.ui || {};
+
+return $.ui.version = "1.13.0";
+
+} );