trusty-cms 5.6.0 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f8b0bd8937e1904cbd99f07ebd6cb049c116427158203f3690049ac4dcc7808
-  data.tar.gz: 0460de350d9c1a6f9a13ed21e0c8e729804912b96dd970675787c075cb17f69e
+  metadata.gz: 8335ccbe0b9f13c382765aea13eab9c77b06a6a6284610a0353753bd3ad04cf8
+  data.tar.gz: ac210d21758eb07bb95ceddd8bf693cde011a37516e55a1e4953009559b84d5a
 SHA512:
-  metadata.gz: afe7f5c07904b684ffbc6c1865ace738b25c8fcd3c7aa7a7337b79541bb4fdb0108d6c5d81792afbe07c17c66811215f496235965cdb89884ee6d6721e5c6c44
-  data.tar.gz: b64ae5a35689107f12b7fe785660183d049e3aac4d34f6a7b66ee19fec49294a03ff3689e1ac7f37a21b4d3dced22f0ada6bf5866b600199826af295f04a1099
+  metadata.gz: 4aa825126e6e9eff94a59d842a7c13d9b7a74cdc3995b390a9f18ad8bf28c664eb3cd206c696c608d9baaa3036caa5eb5f648f620d956cfee41f423d11b94afd
+  data.tar.gz: 3db3a0a1dfbfc251d40ff2f094c4877f5e70d5f610bfe0d6fa2a26be4d22108a60e9b84fe843b6f88ada69ddee977e7fd13a3c85758ca31f947e939562927b3d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.6.0)
+    trusty-cms (5.6.1)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)
@@ -35,67 +35,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actioncable (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionmailbox (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8)
+      actionpack (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activesupport (= 7.0.8)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.6)
-      actionview (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8)
+      actionview (= 7.0.8)
+      activesupport (= 7.0.8)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actiontext (7.0.8)
+      actionpack (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    actionview (7.0.8)
+      activesupport (= 7.0.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activejob (7.0.8)
+      activesupport (= 7.0.8)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activerecord (6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
-    activestorage (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    activemodel (7.0.8)
+      activesupport (= 7.0.8)
+    activerecord (7.0.8)
+      activemodel (= 7.0.8)
+      activesupport (= 7.0.8)
+    activestorage (7.0.8)
+      actionpack (= 7.0.8)
+      activejob (= 7.0.8)
+      activerecord (= 7.0.8)
+      activesupport (= 7.0.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.3.0)
       rails (>= 6.1.0)
-    activesupport (6.1.7.6)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     acts_as_list (1.1.0)
       activerecord (>= 4.2)
     acts_as_tree (2.9.1)
@@ -141,7 +147,7 @@ GEM
     diff-lcs (1.5.0)
     docile (1.4.0)
     erubi (1.12.0)
-    execjs (2.8.1)
+    execjs (2.9.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
@@ -180,7 +186,7 @@ GEM
       addressable (~> 2.8)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -201,14 +207,14 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.5)
-    net-imap (0.3.7)
+    net-imap (0.4.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.1)
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.4.0)
       net-protocol
     nio4r (2.5.9)
     nokogiri (1.15.4-x86_64-darwin)
@@ -236,21 +242,20 @@ GEM
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (6.1.7.6)
-      actioncable (= 6.1.7.6)
-      actionmailbox (= 6.1.7.6)
-      actionmailer (= 6.1.7.6)
-      actionpack (= 6.1.7.6)
-      actiontext (= 6.1.7.6)
-      actionview (= 6.1.7.6)
-      activejob (= 6.1.7.6)
-      activemodel (= 6.1.7.6)
-      activerecord (= 6.1.7.6)
-      activestorage (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    rails (7.0.8)
+      actioncable (= 7.0.8)
+      actionmailbox (= 7.0.8)
+      actionmailer (= 7.0.8)
+      actionpack (= 7.0.8)
+      actiontext (= 7.0.8)
+      actionview (= 7.0.8)
+      activejob (= 7.0.8)
+      activemodel (= 7.0.8)
+      activerecord (= 7.0.8)
+      activestorage (= 7.0.8)
+      activesupport (= 7.0.8)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.6)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -260,12 +265,13 @@ GEM
       nokogiri (~> 1.14)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.7.6)
-      actionpack (= 6.1.7.6)
-      activesupport (= 6.1.7.6)
+    railties (7.0.8)
+      actionpack (= 7.0.8)
+      activesupport (= 7.0.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
     rdoc (6.5.0)
       psych (>= 4.0.0)
@@ -344,7 +350,7 @@ GEM
     will_paginate (4.0.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.11)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-darwin-18
@@ -371,4 +377,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.4.20
+   2.4.13

data/app/controllers/application_controller.rb

@@ -1,4 +1,3 @@
-# require_dependency 'trusty_cms'
 require 'login_system'
 
 class ApplicationController < ActionController::Base

data/app/controllers/site_controller.rb

@@ -1,4 +1,6 @@
 require 'trusty_cms/pagination/controller'
+require 'will_paginate/array'
+
 class SiteController < ApplicationController
   include TrustyCms::Pagination::Controller
 
@@ -42,16 +44,19 @@ class SiteController < ApplicationController
   def cacheable_request?
     (request.head? || request.get?) && live?
   end
+
   # hide_action :cacheable_request?
 
   def set_expiry(time, options = {})
     expires_in time, options
   end
+
   # hide_action :set_expiry
 
   def set_etag(val)
     headers['ETag'] = val
   end
+
   # hide_action :set_expiry
 
   private

data/app/models/site.rb

@@ -1,5 +1,6 @@
 # The site class includes - in find_for_host - some key retrieval and creation logic that is called from ApplicationController to set the current site context.
 # Otherwise it's just another Trusty data model.
+require 'acts_as_list'
 
 class Site < ActiveRecord::Base
   acts_as_list

data/app/models/trusty_cms/config.rb

@@ -81,7 +81,8 @@ module TrustyCms
               TrustyCms::Config.initialize_cache
             end
             TrustyCms::Config.initialize_cache if TrustyCms::Config.stale_cache?
-            Rails.cache.read('TrustyCms::Config')[key]
+            # Rails.cache.read('TrustyCms::Config')[key]
+            # TODO: Do we need this line?
           end
         end
       end

data/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('boot', __dir__)
+require_relative 'boot'
 
 require 'rails/all'
 require 'acts_as_tree'
@@ -18,8 +18,6 @@ module TrustyCms
   class Application < Rails::Application
     include TrustyCms::Initializer
     config.active_record.whitelist_attributes = true
-    config.autoload_paths += %W(#{config.root}/lib)
-    config.eager_load_paths << Rails.root.join('lib')
 
     # Enable the asset pipeline
     config.assets.enabled = true
@@ -80,7 +78,7 @@ module TrustyCms
     end
     config.after_initialize do
       extension_loader.load_extensions
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
 
       extension_loader.activate_extensions # also calls initialize_views
       # config.add_controller_paths(extension_loader.paths(:controller))

data/config/initializers/trusty_cms_config.rb

@@ -1,5 +1,3 @@
-require 'multi_site/engine'
-require 'clipped/engine'
 Rails.application.reloader.to_prepare do
   TrustyCms.config do |config|
     config.define 'admin.title', default: 'TrustyCms CMS'
@@ -22,18 +20,18 @@ Rails.application.reloader.to_prepare do
 
   TrustyCms.config do |config|
     config.namespace 'paperclip' do |pc|
-      pc.define 'url',                      default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
-      pc.define 'path',                     default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+      pc.define 'url', default: '/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
+      pc.define 'path', default: ':rails_root/public/system/:attachment/:id/:style/:basename:no_original_style.:extension', allow_change: true
       pc.define 'skip_filetype_validation', default: true, type: :boolean
       pc.define 'storage', default: 'filesystem',
-                           select_from: {
-                             'File System' => 'filesystem',
-                             'Amazon S3' => 'fog',
-                             'Google Storage' => 'fog',
-                             'Rackspace Cloud Files' => 'fog',
-                           },
-                           allow_blank: false,
-                           allow_display: false
+                select_from: {
+                  'File System' => 'filesystem',
+                  'Amazon S3' => 'fog',
+                  'Google Storage' => 'fog',
+                  'Rackspace Cloud Files' => 'fog',
+                },
+                allow_blank: false,
+                allow_display: false
 
       pc.namespace 'fog' do |fog|
         fog.define 'provider', select_from: {
@@ -74,7 +72,8 @@ Rails.application.reloader.to_prepare do
       assets.define 'create_video_thumbnails?', default: 'true'
       assets.define 'create_pdf_thumbnails?', default: 'true'
 
-      assets.namespace 'thumbnails' do |thumbs| # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
+      assets.namespace 'thumbnails' do |thumbs|
+        # NB :icon and :thumbnail are already defined as fixed formats for use in the admin interface and can't be changed
         thumbs.define 'image', default: 'normal:size=640x640>|small:size=320x320>'
         thumbs.define 'video', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'
         thumbs.define 'pdf', default: 'normal:size=640x640>,format=jpg|small:size=320x320>,format=jpg'

data/lib/configuration_extensions/configuration_extensions.rb

@@ -14,7 +14,7 @@ module TrustyCms
     #     config['other.thing'] = 'nothing'
     #   end
     #
-    def config  # method must be defined before any initializers run
+    def config # method must be defined before any initializers run
       yield TrustyCms::Config if block_given?
       TrustyCms::Config
     end
@@ -33,6 +33,7 @@ module TrustyCms
     def root
       Pathname.new(TRUSTY_CMS_ROOT) if defined?(TRUSTY_CMS_ROOT)
     end
+
     def boot!
       unless booted?
         preinitialize
@@ -46,12 +47,12 @@ module TrustyCms
 
     def pick_boot
       case
-        when app?
-          AppBoot.new
-        when vendor?
-          VendorBoot.new
-        else
-          GemBoot.new
+      when app?
+        AppBoot.new
+      when vendor?
+        VendorBoot.new
+      else
+        GemBoot.new
       end
     end
 
@@ -77,7 +78,6 @@ module TrustyCms
   end
 end
 
-
 class Rails::Application::Configuration
 
   # The TrustyCms::Configuration class extends Rails::Configuration with three purposes:
@@ -132,7 +132,8 @@ class Rails::Application::Configuration
     @extension_list ||= extensions ? expand_and_check(extensions) : available_extensions
   end
 
-  def expand_and_check(extension_list) #:nodoc
+  def expand_and_check(extension_list)
+    #:nodoc
     missing_extensions = extension_list - [:all] - available_extensions
     raise LoadError, "These configured extensions have not been found: #{missing_extensions.to_sentence}" if missing_extensions.any?
     if m = extension_list.index(:all)

data/lib/generators/extension/templates/extension.rb

@@ -1,5 +1,4 @@
 # Uncomment this if you reference any of your controllers in activate
-# require_dependency "application_controller"
 require "radiant-<%= file_name %>-extension"
 
 class <%= class_name %> < TrustyCms::Extension

data/lib/generators/language_extension/templates/extension.rb

@@ -1,5 +1,4 @@
 # Uncomment this if you reference any of your controllers in activate
-# require_dependency "application_controller"
 require "radiant-<%= file_name %>_language_pack-extension"
 
 class <%= class_name %> < TrustyCms::Extension

data/lib/generators/trusty_cms/templates/application.rb.erb

@@ -30,7 +30,7 @@ module TrustyCms
 
     # Initialize extension paths
     config.initialize_extension_paths
-    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
     extension_loader.paths(:load).reverse_each do |path, value|
       config.autoload_paths.unshift path
       $LOAD_PATH.unshift path
@@ -51,7 +51,7 @@ module TrustyCms
     # An example of how to add extensions:
     # config.extensions = [ :snippets, :clipped, :layouts, :reorder, :multi_site, :rad_social]
 
-    config.extensions = [ ]
+    config.extensions = []
 
     # By default, only English translations are loaded. Remove any of these from
     # the list below if you'd like to provide any of the additional options
@@ -85,7 +85,6 @@ module TrustyCms
     #    Sets the meta store type and storage location.  We recommend you use
     #    radiant: since this will enable manual expiration and acceleration headers.
 
-
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
                           :entitystore => "radiant:tmp/cache/entity",
@@ -97,8 +96,6 @@ module TrustyCms
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
 
-
-
     config.filter_parameters += [:password, :password_confirmation]
 
     # Use the database for sessions instead of the cookie-based default,
@@ -128,13 +125,13 @@ module TrustyCms
 
     config.after_initialize do
       extension_loader.load_extensions
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
 
       #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
       #  load(initializer)
       #end
 
-      extension_loader.activate_extensions  # also calls initialize_views
+      extension_loader.activate_extensions # also calls initialize_views
       #config.add_controller_paths(extension_loader.paths(:controller))
       #config.add_eager_load_paths(extension_loader.paths(:eager_load))
 

data/lib/trusty_cms/extension_loader.rb

@@ -13,15 +13,18 @@ module TrustyCms
 
       attr_accessor :config
 
-      def initialize(rails_config) #:nodoc
+      def initialize(rails_config)
+        #:nodoc
         @config = rails_config
       end
 
-      def before_clear(*_args) #:nodoc
+      def before_clear(*_args)
+        #:nodoc
         ExtensionLoader.deactivate_extensions
       end
 
-      def after_clear(*_args) #:nodoc
+      def after_clear(*_args)
+        #:nodoc
         ExtensionLoader.load_extensions
         ExtensionLoader.activate_extensions
       end
@@ -73,7 +76,6 @@ module TrustyCms
       begin
         constant = "#{name}_extension".camelize
         extension = constant.constantize
-        extension.unloadable
         extension.path = extension_path
         extension
       rescue LoadError, NameError => e
@@ -88,6 +90,10 @@ module TrustyCms
       extensions.each(&:load_initializers)
     end
 
+    def load_extension_initializers
+      load_extension_initalizers
+    end
+
     # Deactivates all enabled extensions.
     #
     def deactivate_extensions
@@ -138,5 +144,7 @@ module TrustyCms
         end
       end
     end
+
+    alias_method :load_extension_initializers, :load_extension_initalizers
   end
 end

data/lib/trusty_cms/initializer.rb

@@ -97,7 +97,7 @@ module TrustyCms
     def load_application_initializers
       load_trusty_initializers unless deployed_as_app?
       super
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
     end
 
     # Loads initializers found in TRUSTY_CMS_ROOT/config/initializers.

data/lib/trusty_cms.rb

@@ -2,6 +2,7 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '5.6.0'.freeze
+    VERSION = '5.6.1'.freeze
   end
 end
+

data/spec/dummy/config/application.rb

@@ -31,7 +31,7 @@ module TrustyCms
 
     # Initialize extension paths
     config.initialize_extension_paths
-    extension_loader = ExtensionLoader.instance {|l| l.initializer = self }
+    extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
     extension_loader.paths(:load).reverse_each do |path, value|
       config.autoload_paths.unshift path
       $LOAD_PATH.unshift path
@@ -101,7 +101,7 @@ module TrustyCms
     # config.action_controller.session_store = :cookie_store DEPRECATED
 
     # Activate observers that should always be running
-    #config.active_record.observers = :user_action_observer
+    # config.active_record.observers = :user_action_observer
 
     # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
     # All files from config/locales/*.rb,yml are added automatically.
@@ -122,15 +122,15 @@ module TrustyCms
 
     config.after_initialize do
       extension_loader.load_extensions
-      extension_loader.load_extension_initalizers
+      extension_loader.load_extension_initializers
 
-      #Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
+      # Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
       #  load(initializer)
-      #end
+      # end
 
-      extension_loader.activate_extensions  # also calls initialize_views
-      #config.add_controller_paths(extension_loader.paths(:controller))
-      #config.add_eager_load_paths(extension_loader.paths(:eager_load))
+      extension_loader.activate_extensions # also calls initialize_views
+      # config.add_controller_paths(extension_loader.paths(:controller))
+      # config.add_eager_load_paths(extension_loader.paths(:eager_load))
 
       # Add new inflection rules using the following format:
       ActiveSupport::Inflector.inflections do |inflect|

data/spec/dummy/config/initializers/trusty_cms_config.rb

@@ -1,20 +1,23 @@
-TrustyCms.config do |config|
-  config.define 'admin.title', :default => "TrustyCms CMS"
-  config.define 'dev.host'
-  config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
-  config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
-  config.define 'defaults.page.parts', :default => "Body,Extended"
-  config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
-  config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
-  config.define 'defaults.page.fields'
-  config.define 'pagination.param_name', :default => 'page'
-  config.define 'pagination.per_page_param_name', :default => 'per_page'
-  config.define 'admin.pagination.per_page', :type => :integer, :default => 50
-  config.define 'site.title', :default => "Your site title", :allow_blank => false
-  config.define 'site.host', :default => "www.example.com", :allow_blank => false
-  config.define 'user.allow_password_reset?', :default => true
-end
+Rails.application.reloader.to_prepare do
+  TrustyCms.config do |config|
+    config.define 'admin.title', :default => "TrustyCms CMS"
+    config.define 'dev.host'
+    config.define 'local.timezone', :allow_change => true, :select_from => lambda { ActiveSupport::TimeZone::MAPPING.keys.sort }
+    config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
+    config.define 'defaults.page.parts', :default => "Body,Extended"
+    config.define 'defaults.page.status', :select_from => lambda { Status.selectable_values }, :allow_blank => false, :default => "Draft"
+    config.define 'defaults.page.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
+    config.define 'defaults.page.fields'
+    config.define 'pagination.param_name', :default => 'page'
+    config.define 'pagination.per_page_param_name', :default => 'per_page'
+    config.define 'admin.pagination.per_page', :type => :integer, :default => 50
+    config.define 'site.title', :default => "Your site title", :allow_blank => false
+    config.define 'site.host', :default => "www.example.com", :allow_blank => false
+    config.define 'user.allow_password_reset?', :default => true
+  end
+
+  TrustyCms::Application.config do |config|
 
-TrustyCms::Application.config do |config|
+  end
 
 end

data/spec/dummy/db/schema.rb

@@ -2,34 +2,61 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2016_10_27_141250) do
+ActiveRecord::Schema[7.0].define(version: 2023_10_19_192097) do
+  create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.string "name", null: false
+    t.string "record_type", null: false
+    t.bigint "record_id", null: false
+    t.bigint "blob_id", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
+    t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
+  end
+
+  create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.string "key", null: false
+    t.string "filename", null: false
+    t.string "content_type"
+    t.text "metadata"
+    t.string "service_name", null: false
+    t.bigint "byte_size", null: false
+    t.string "checksum", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
+  end
+
+  create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+    t.bigint "blob_id", null: false
+    t.string "variation_digest", null: false
+    t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
+  end
 
-  create_table "admins", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "admins", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "reset_password_token"
-    t.datetime "reset_password_sent_at"
-    t.datetime "remember_created_at"
+    t.datetime "reset_password_sent_at", precision: nil
+    t.datetime "remember_created_at", precision: nil
     t.integer "sign_in_count", default: 0, null: false
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
+    t.datetime "current_sign_in_at", precision: nil
+    t.datetime "last_sign_in_at", precision: nil
     t.string "current_sign_in_ip"
     t.string "last_sign_in_ip"
     t.string "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
+    t.datetime "confirmed_at", precision: nil
+    t.datetime "confirmation_sent_at", precision: nil
     t.string "unconfirmed_email"
     t.integer "failed_attempts", default: 0, null: false
     t.string "unlock_token"
-    t.datetime "locked_at"
+    t.datetime "locked_at", precision: nil
     t.string "first_name"
     t.string "last_name"
     t.boolean "admin"
@@ -38,11 +65,11 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
     t.integer "updated_by_id"
     t.text "notes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: nil, null: false
+    t.datetime "updated_at", precision: nil, null: false
   end
 
-  create_table "assets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "caption"
     t.string "title"
     t.string "asset_file_name"
@@ -50,31 +77,31 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "asset_file_size"
     t.integer "created_by_id"
     t.integer "updated_by_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.string "uuid"
     t.integer "original_width"
     t.integer "original_height"
     t.string "original_extension"
   end
 
-  create_table "config", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "config", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "key", limit: 40, default: "", null: false
     t.string "value", default: ""
     t.index ["key"], name: "key", unique: true
   end
 
-  create_table "extension_meta", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "extension_meta", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.integer "schema_version", default: 0
     t.boolean "enabled", default: true
   end
 
-  create_table "layouts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "layouts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.text "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.string "content_type", limit: 40
@@ -82,28 +109,28 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
   end
 
-  create_table "page_attachments", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "asset_id"
     t.integer "page_id"
     t.integer "position"
   end
 
-  create_table "page_fields", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_fields", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.integer "page_id"
     t.string "name"
     t.string "content"
     t.index ["page_id", "name", "content"], name: "index_page_fields_on_page_id_and_name_and_content"
   end
 
-  create_table "page_parts", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "page_parts", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "filter_id", limit: 25
-    t.text "content", limit: 16777215
+    t.text "content", size: :medium
     t.integer "page_id"
     t.index ["page_id", "name"], name: "parts_by_page"
   end
 
-  create_table "pages", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "pages", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "title"
     t.string "slug", limit: 100
     t.string "breadcrumb", limit: 160
@@ -111,9 +138,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "status_id", default: 1, null: false
     t.integer "parent_id"
     t.integer "layout_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "published_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
+    t.datetime "published_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.boolean "virtual", default: false, null: false
@@ -128,34 +155,34 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.index ["virtual", "status_id"], name: "pages_published"
   end
 
-  create_table "sessions", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "sessions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "session_id"
     t.text "data"
-    t.datetime "updated_at"
+    t.datetime "updated_at", precision: nil
     t.index ["session_id"], name: "index_sessions_on_session_id"
     t.index ["updated_at"], name: "index_sessions_on_updated_at"
   end
 
-  create_table "sites", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "sites", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name"
     t.string "domain"
     t.integer "homepage_id"
     t.integer "position", default: 0
     t.integer "created_by_id"
-    t.datetime "created_at"
+    t.datetime "created_at", precision: nil
     t.integer "updated_by_id"
-    t.datetime "updated_at"
+    t.datetime "updated_at", precision: nil
     t.string "subtitle"
     t.string "abbreviation"
     t.string "base_domain"
   end
 
-  create_table "snippets", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "snippets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100, default: "", null: false
     t.string "filter_id", limit: 25
     t.text "content"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.integer "lock_version", default: 0
@@ -163,15 +190,15 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.index ["name", "site_id"], name: "name_site_id", unique: true
   end
 
-  create_table "users", options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+  create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
     t.string "name", limit: 100
     t.string "email"
     t.string "login", limit: 40, default: "", null: false
     t.string "password", limit: 40
     t.boolean "admin", default: false, null: false
     t.boolean "designer", default: false, null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", precision: nil
+    t.datetime "updated_at", precision: nil
     t.integer "created_by_id"
     t.integer "updated_by_id"
     t.string "salt"
@@ -181,7 +208,9 @@ ActiveRecord::Schema.define(version: 2016_10_27_141250) do
     t.integer "site_id"
     t.string "locale"
     t.string "password_reset_token"
-    t.datetime "password_reset_sent_at"
+    t.datetime "password_reset_sent_at", precision: nil
   end
 
+  add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
+  add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
 end

data/trusty_cms.gemspec

@@ -25,31 +25,31 @@ a general purpose content management system--not merely a blogging engine.'
   s.license = 'MIT'
   s.test_files = Dir['spec/**/*']
   s.add_dependency 'activestorage-validator'
-  s.add_dependency 'acts_as_list',    '>= 0.9.5', '< 1.2.0'
-  s.add_dependency 'acts_as_tree',    '~> 2.9.1'
-  s.add_dependency 'ckeditor',        '>= 4.2.2', '< 4.4.0'
-  s.add_dependency 'delocalize',      '>= 0.2', '< 2.0'
+  s.add_dependency 'acts_as_list', '>= 0.9.5', '< 1.2.0'
+  s.add_dependency 'acts_as_tree', '~> 2.9.1'
+  s.add_dependency 'ckeditor', '>= 4.2.2', '< 4.4.0'
+  s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
   s.add_dependency 'devise'
-  s.add_dependency 'execjs',          '~> 2.7'
-  s.add_dependency 'haml',            '>= 5.0', '< 6.0'
+  s.add_dependency 'execjs', '~> 2.7'
+  s.add_dependency 'haml', '>= 5.0', '< 6.0'
   s.add_dependency 'haml-rails'
-  s.add_dependency 'highline',        '>= 1.7.8', '< 2.2.0'
+  s.add_dependency 'highline', '>= 1.7.8', '< 2.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mini_racer'
   s.add_dependency 'mysql2'
-  s.add_dependency 'rack',            '>= 2.0.1', '< 3.1.0'
-  s.add_dependency 'rack-cache',      '~> 1.7'
-  s.add_dependency 'radius',          '~> 0.7'
+  s.add_dependency 'rack', '>= 2.0.1', '< 3.1.0'
+  s.add_dependency 'rack-cache', '~> 1.7'
+  s.add_dependency 'radius', '~> 0.7'
   s.add_dependency 'rails'
-  s.add_dependency 'rake',            '< 14.0'
-  s.add_dependency 'rdoc',            '>= 5.1', '< 7.0'
-  s.add_dependency 'RedCloth',        '4.3.2'
+  s.add_dependency 'rake', '< 14.0'
+  s.add_dependency 'rdoc', '>= 5.1', '< 7.0'
+  s.add_dependency 'RedCloth', '4.3.2'
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sass-rails'
-  s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
-  s.add_dependency 'tzinfo',          '>= 1.2.3', '< 2.1.0'
-  s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'
+  s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
+  s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
+  s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
   s.add_dependency 'uuidtools', '>= 2.1.5', '< 2.3.0'
   s.add_dependency 'will_paginate', '>= 3', '< 5'
 end

data/vendor/extensions/multi-site-extension/multi_site_extension.rb

@@ -1,5 +1,3 @@
-require_dependency 'application_controller'
-
 class MultiSiteExtension < TrustyCms::Extension
   version "3.0.2"
   description %{ Enables virtual sites to be created with associated domain names.
@@ -7,7 +5,6 @@ class MultiSiteExtension < TrustyCms::Extension
                  individual site) and allows model classes to be scoped by site. }
   url "http://trustarts.org/"
 
-
   def activate
 
     # Model extensions
@@ -19,7 +16,7 @@ class MultiSiteExtension < TrustyCms::Extension
     Admin::ResourceController.send :include, MultiSite::ApplicationControllerExtensions
     ApplicationController.send :include, MultiSite::ApplicationControllerFilterExtensions
 
-    #ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
+    # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
     SiteController.send :include, MultiSite::SiteControllerExtensions
     Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
     Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
@@ -39,7 +36,6 @@ class MultiSiteExtension < TrustyCms::Extension
       admin.snippets.edit.add :form, "choose_site", :before => "edit_filter" unless admin.snippets.edit.form.include?("choose_site")
     end
 
-
     unless defined? admin.site
       TrustyCms::AdminUI.send :include, MultiSite::AdminUI
       admin.site = TrustyCms::AdminUI.load_default_site_regions

data/yarn.lock

@@ -54,6 +54,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.0.tgz#df5c386e2218be505b34837acbcb874d7a983420"
+  integrity sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==
+  dependencies:
+    "@babel/types" "^7.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-compilation-targets@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz#0698fc44551a26cf29f18d4662d5bf545a6cfc52"
@@ -65,18 +75,23 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
   integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
 
-"@babel/helper-function-name@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
-  integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/template" "^7.22.5"
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-hoist-variables@^7.22.5":
   version "7.22.5"
@@ -127,6 +142,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz#601fa28e4cc06786c18912dca138cec73b882044"
   integrity sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz#694c30dfa1d09a6534cdfcafbe56789d36aba040"
@@ -155,7 +175,12 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.16.tgz#180aead7f247305cce6551bea2720934e2fa2c95"
   integrity sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5":
+"@babel/parser@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.0.tgz#da950e622420bf96ca0d0f2909cdddac3acd8719"
+  integrity sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==
+
+"@babel/template@^7.22.15":
   version "7.22.15"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
   integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
@@ -165,18 +190,18 @@
     "@babel/types" "^7.22.15"
 
 "@babel/traverse@^7.22.15", "@babel/traverse@^7.22.17":
-  version "7.22.17"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.17.tgz#b23c203ab3707e3be816043081b4a994fcacec44"
-  integrity sha512-xK4Uwm0JnAMvxYZxOVecss85WxTEIbTa7bnGyf/+EgCL5Zt3U7htUpEOWv9detPlamGKuRzCqw74xVglDWpPdg==
+  version "7.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
     "@babel/code-frame" "^7.22.13"
-    "@babel/generator" "^7.22.15"
-    "@babel/helper-environment-visitor" "^7.22.5"
-    "@babel/helper-function-name" "^7.22.5"
+    "@babel/generator" "^7.23.0"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
     "@babel/helper-hoist-variables" "^7.22.5"
     "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.22.16"
-    "@babel/types" "^7.22.17"
+    "@babel/parser" "^7.23.0"
+    "@babel/types" "^7.23.0"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -189,6 +214,15 @@
     "@babel/helper-validator-identifier" "^7.22.15"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.0.tgz#8c1f020c9df0e737e4e247c0619f58c68458aaeb"
+  integrity sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@fortawesome/fontawesome-free@^5.15.4":
   version "5.15.4"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
@@ -1585,6 +1619,18 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
   integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
+semver@^6.3.1:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.3.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 shoestring@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/shoestring/-/shoestring-2.0.1.tgz#7dd35a600b7e5826788124452c4a8acf64648b06"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 5.6.1
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -1063,7 +1063,7 @@ files:
 - vendor/extensions/clipped-extension/lib/paperclip/geometry_transformation.rb
 - vendor/extensions/clipped-extension/lib/tasks/clipped_extension_tasks.rake
 - vendor/extensions/clipped-extension/lib/tasks/paperclip_tasks.rake
-- vendor/extensions/clipped-extension/lib/trusty-clipped-extension.rb
+- vendor/extensions/clipped-extension/lib/trusty_cms_clipped_extension.rb
 - vendor/extensions/clipped-extension/lib/trusty_cms_clipped_extension/cloud.rb
 - vendor/extensions/layouts-extension/layouts_extension.rb
 - vendor/extensions/layouts-extension/lib/haml_layouts/models/layout.rb
@@ -1073,7 +1073,7 @@ files:
 - vendor/extensions/layouts-extension/lib/share_layouts/controllers/action_controller.rb
 - vendor/extensions/layouts-extension/lib/share_layouts/helpers/action_view.rb
 - vendor/extensions/layouts-extension/lib/tasks/layouts_extension_tasks.rake
-- vendor/extensions/layouts-extension/lib/trusty-layouts-extension.rb
+- vendor/extensions/layouts-extension/lib/trusty_cms_layouts_extension.rb
 - vendor/extensions/multi-site-extension/lib/multi_site/admin_ui.rb
 - vendor/extensions/multi-site-extension/lib/multi_site/application_controller_extensions.rb
 - vendor/extensions/multi-site-extension/lib/multi_site/application_controller_filter_extensions.rb
@@ -1089,9 +1089,9 @@ files:
 - vendor/extensions/multi-site-extension/lib/multi_site/site_controller_extensions.rb
 - vendor/extensions/multi-site-extension/lib/tasks/multi_site_extension_tasks.rake
 - vendor/extensions/multi-site-extension/lib/tasks/scoped_admin_extension_tasks.rake
-- vendor/extensions/multi-site-extension/lib/trusty-multi-site-extension.rb
+- vendor/extensions/multi-site-extension/lib/trusty_cms_multi_site_extension.rb
 - vendor/extensions/multi-site-extension/multi_site_extension.rb
-- vendor/extensions/snippets-extension/lib/trusty-snippets-extension.rb
+- vendor/extensions/snippets-extension/lib/trusty_cms_snippets_extension.rb
 - vendor/extensions/snippets-extension/snippets_extension.rb
 - yarn.lock
 homepage: https://github.com/pgharts/trusty-cms
@@ -1151,52 +1151,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/fixtures/users.yml
-- spec/factories/page.rb
-- spec/factories/user.rb
-- spec/factories/page_part.rb
-- spec/factories/layout.rb
-- spec/models/layout_spec.rb
-- spec/support/custom_actions.rb
-- spec/ci/database.mysql.yml
-- spec/features/pages_spec.rb
-- spec/features/config_spec.rb
-- spec/features/layouts_spec.rb
 - spec/controllers/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/Rakefile
-- spec/dummy/README.rdoc
-- spec/dummy/public/favicon.ico
+- spec/fixtures/users.yml
+- spec/ci/database.mysql.yml
 - spec/dummy/public/404.html
 - spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
 - spec/dummy/public/422.html
-- spec/dummy/package.json
+- spec/dummy/bin/rails
+- spec/dummy/bin/setup
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/boot.rb
 - spec/dummy/config/routes.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
 - spec/dummy/config/application.rb
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/database.yml
-- spec/dummy/yarn.lock
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/boot.rb
+- spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
+- spec/dummy/package.json
+- spec/dummy/yarn.lock
+- spec/dummy/README.rdoc
 - spec/dummy/db/schema.rb
 - spec/dummy/config.ru
 - spec/spec_helper.rb
 - spec/rails_helper.rb
+- spec/models/layout_spec.rb
+- spec/factories/page.rb
+- spec/factories/page_part.rb
+- spec/factories/user.rb
+- spec/factories/layout.rb
+- spec/support/custom_actions.rb
+- spec/features/config_spec.rb
+- spec/features/layouts_spec.rb
+- spec/features/pages_spec.rb