trusty-cms 6.2.2.1 → 6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71383e72f45672a6cf5bf9fb68301f9c0239a2ad40d7782a2e269724150b1e8a
-  data.tar.gz: bebc54966f5f3a0a431a1ac6585e4646c80fe0d319b33a8666e65a4781ede6a2
+  metadata.gz: 5c4f73e3a3abf514d52886a6eb71386cbb3786ad3a3b0848f9e34ccd931f2425
+  data.tar.gz: 4d9e6b0b2b561ed0f95f7efc887647d7fc28562ece114e0acc2efb920d361346
 SHA512:
-  metadata.gz: a616c07e4091859c3b62c7a3253862dcf4963bb48bb38552b0259e88e1cd2ae2e13256c6fbecee909c60989a194abfd0b6b2d4e3f715ead86f0764b37adf6e34
-  data.tar.gz: 33b03b3d3ce65928e841e4033e65bf521596b8b311f0336733b5bd8b0f4d1dad92fce0fd82e79225a3e0ba80cf373a6e5e56291793ea829138244ba1938d13db
+  metadata.gz: b482105054e3aa23a9fad042d75a1449d0a27ae91d3109e34ad1b279befb8197e56e4dba3a8d8144b2049652678190b4ad015b9ac1ed78165c3c284075b4ced3
+  data.tar.gz: 880494f40cb2ae15cc08b31122e372007aec9f23a81dc0fc2eb950beb05571741e53870a8d8d977b943d0b9701de4d3d44428295676e921d14ca13295a02af6e

data/Gemfile

@@ -17,7 +17,7 @@ group :development, :test do
   gem 'database_cleaner'
   gem 'factory_bot_rails', '6.4.2'
   gem 'file_validators'
-  gem 'launchy', '~> 2.5.0'
+  gem 'launchy', '~> 3.0.1'
   gem 'mysql2'
   gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.2.2)
+    trusty-cms (6.3)
       RedCloth (= 4.3.3)
       activestorage-validator
-      acts_as_list (>= 0.9.5, < 1.2.0)
+      acts_as_list (>= 0.9.5, < 1.3.0)
       acts_as_tree (~> 2.9.1)
       ckeditor (>= 4.2.2, < 4.4.0)
       delocalize (>= 0.2, < 2.0)
@@ -12,7 +12,7 @@ PATH
       execjs (~> 2.7)
       haml (>= 5.0, < 6.0)
       haml-rails
-      highline (>= 1.7.8, < 3.1.0)
+      highline (>= 1.7.8, < 3.2.0)
       image_processing
       kraken-io
       mini_racer
@@ -20,7 +20,7 @@ PATH
       rack (>= 2.0.1, < 3.1.0)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails
+      rails (~> 6.1.7)
       rake (< 14.0)
       ransack
       rdoc (>= 5.1, < 7.0)
@@ -35,125 +35,125 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.3)
-    actioncable (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actioncable (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actionmailbox (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actionmailer (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.8.1)
-      actionview (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-      rack (~> 2.0, >= 2.2.4)
+    actionpack (6.1.7.8)
+      actionview (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-      globalid (>= 0.6.0)
+    actiontext (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       nokogiri (>= 1.8.5)
-    actionview (7.0.8.1)
-      activesupport (= 7.0.8.1)
+    actionview (6.1.7.8)
+      activesupport (= 6.1.7.8)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.8.1)
-      activesupport (= 7.0.8.1)
+    activejob (6.1.7.8)
+      activesupport (= 6.1.7.8)
       globalid (>= 0.3.6)
-    activemodel (7.0.8.1)
-      activesupport (= 7.0.8.1)
-    activerecord (7.0.8.1)
-      activemodel (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
-    activestorage (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    activemodel (6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activerecord (6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
+    activestorage (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
     activestorage-validator (0.4.0)
       rails (>= 6.1.0)
-    activesupport (7.0.8.1)
+    activesupport (6.1.7.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    acts_as_list (1.1.0)
-      activerecord (>= 4.2)
+      zeitwerk (~> 2.3)
+    acts_as_list (1.2.2)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
-    bcrypt (3.1.19)
-    builder (3.2.4)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    bcrypt (3.1.20)
+    builder (3.3.0)
     byebug (11.1.3)
-    capybara (3.35.3)
+    capybara (3.40.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
+      nokogiri (~> 1.11)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     ckeditor (4.3.0)
       orm_adapter (~> 0.5.0)
       terrapin
-    climate_control (0.2.0)
+    climate_control (1.2.0)
     cliver (0.3.2)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.4)
     crass (1.0.6)
-    css_parser (1.16.0)
+    css_parser (1.19.0)
       addressable
+    csv (3.3.0)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
-    database_cleaner-active_record (2.1.0)
+    database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     date (3.3.4)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.1)
-    docile (1.4.0)
-    erubi (1.12.0)
+    docile (1.4.1)
+    erubi (1.13.0)
     execjs (2.9.1)
-    factory_bot (6.4.2)
+    factory_bot (6.5.0)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.2)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    ffi (1.15.5)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux-gnu)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
@@ -167,25 +167,30 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    highline (3.0.1)
-    httparty (0.21.0)
+    highline (3.1.1)
+      reline
+    httparty (0.22.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    image_processing (1.12.2)
+    image_processing (1.13.0)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    json (2.6.3)
+    io-console (0.7.2)
+    json (2.7.2)
     kraken-io (0.1.3)
       activesupport
       httparty
       json
       multipart-post
-    launchy (2.5.2)
+    launchy (3.0.1)
       addressable (~> 2.8)
-    libv8-node (18.16.0.0-x86_64-darwin)
-    libv8-node (18.16.0.0-x86_64-linux)
+      childprocess (~> 5.0)
+    libv8-node (18.19.0.0-x86_64-darwin)
+    libv8-node (18.19.0.0-x86_64-linux)
+    logger (1.6.1)
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -195,31 +200,32 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    method_source (1.0.0)
-    mime-types (3.4.1)
+    matrix (0.4.2)
+    method_source (1.1.0)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    mini_magick (4.12.0)
+    mime-types-data (3.2024.0903)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    mini_racer (0.8.0)
-      libv8-node (~> 18.16.0.0)
-    minitest (5.22.2)
+    mini_racer (0.16.0)
+      libv8-node (~> 18.19.0.0)
+    minitest (5.25.1)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.4.1)
     mysql2 (0.5.6)
-    net-imap (0.4.10)
+    net-imap (0.4.16)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.2-x86_64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.7-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -234,28 +240,29 @@ GEM
       pry (>= 0.13, < 0.15)
     psych (5.1.1.1)
       stringio
-    public_suffix (5.0.4)
-    racc (1.7.3)
-    rack (2.2.8.1)
-    rack-cache (1.14.0)
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-cache (1.17.0)
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (7.0.8.1)
-      actioncable (= 7.0.8.1)
-      actionmailbox (= 7.0.8.1)
-      actionmailer (= 7.0.8.1)
-      actionpack (= 7.0.8.1)
-      actiontext (= 7.0.8.1)
-      actionview (= 7.0.8.1)
-      activejob (= 7.0.8.1)
-      activemodel (= 7.0.8.1)
-      activerecord (= 7.0.8.1)
-      activestorage (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    rails (6.1.7.8)
+      actioncable (= 6.1.7.8)
+      actionmailbox (= 6.1.7.8)
+      actionmailer (= 6.1.7.8)
+      actionpack (= 6.1.7.8)
+      actiontext (= 6.1.7.8)
+      actionview (= 6.1.7.8)
+      activejob (= 6.1.7.8)
+      activemodel (= 6.1.7.8)
+      activerecord (= 6.1.7.8)
+      activestorage (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       bundler (>= 1.15.0)
-      railties (= 7.0.8.1)
+      railties (= 6.1.7.8)
+      sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -265,49 +272,51 @@ GEM
       nokogiri (~> 1.14)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (7.0.8.1)
-      actionpack (= 7.0.8.1)
-      activesupport (= 7.0.8.1)
+    railties (6.1.7.8)
+      actionpack (= 6.1.7.8)
+      activesupport (= 6.1.7.8)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-      zeitwerk (~> 2.5)
-    rake (13.1.0)
-    ransack (4.1.1)
+    rake (13.2.1)
+    ransack (4.2.1)
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rdoc (6.6.2)
+    rdoc (6.7.0)
       psych (>= 4.0.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.9.2)
+    reline (0.5.10)
+      io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     roadie (5.2.1)
       css_parser (~> 1.4)
       nokogiri (~> 1.15)
-    roadie-rails (3.1.0)
+    roadie-rails (3.2.0)
       railties (>= 5.1, < 8.0)
       roadie (~> 5.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.1)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.1)
+    rspec-rails (6.1.5)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.12)
-      rspec-expectations (~> 3.12)
-      rspec-mocks (~> 3.12)
-      rspec-support (~> 3.12)
+      rspec-core (~> 3.13)
+      rspec-expectations (~> 3.13)
+      rspec-mocks (~> 3.13)
+      rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.2)
       ffi (~> 1.12)
+      logger
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -322,22 +331,22 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.2)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     stringex (2.8.6)
-    stringio (3.1.0)
-    temple (0.10.0)
-    terrapin (0.6.0)
-      climate_control (>= 0.0.3, < 1.0)
-    thor (1.3.1)
-    tilt (2.1.0)
+    stringio (3.1.1)
+    temple (0.10.3)
+    terrapin (1.0.1)
+      climate_control
+    thor (1.3.2)
+    tilt (2.4.0)
     timeout (0.4.1)
     trustygems (0.2.1)
       rake
@@ -350,16 +359,14 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.18)
 
 PLATFORMS
-  x86_64-darwin-18
-  x86_64-darwin-20
   x86_64-darwin-21
-  x86_64-darwin-22
+  x86_64-darwin-23
   x86_64-linux
 
 DEPENDENCIES
@@ -368,7 +375,7 @@ DEPENDENCIES
   database_cleaner
   factory_bot_rails (= 6.4.2)
   file_validators
-  launchy (~> 2.5.0)
+  launchy (~> 3.0.1)
   mysql2
   poltergeist (~> 1.18.1)
   pry-byebug

data/app/assets/javascripts/ckeditor/config.js

@@ -1,6 +1,7 @@
 CKEDITOR.editorConfig = function (config) {
     config.allowedContent = true;
     config.removeFormatTags = "";
+    config.fillEmptyBlocks = false;
     config.protectedSource.push(/<r:([\S]+).*<\/r:\1>/g);
     config.protectedSource.push(/<r:[^>/]*\/>/g);
     //let paste from word be available

data/app/assets/stylesheets/admin/assets.scss

@@ -45,6 +45,14 @@
   #assets_table.assets {
     overflow: auto;
   }
+
+  .toolbar {
+    .asset_search {
+      #filesearchforminput {
+        width: 55%;
+      }
+    }
+  }
 }
 
 #upload_holders {

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -40,8 +40,8 @@ input[type="submit"], input[type="button"] {
 input[type="text"], input[type="search"], input[type="password"], input[type="email"] {
   border: 0.5px solid $gray;
   margin: 0.5em;
-  max-width: 75%;
   padding: 0.25em;
+  width: 75%;
 }
 
 select {

data/app/helpers/admin/regions_helper.rb

@@ -15,7 +15,8 @@ module Admin::RegionsHelper
         raise e
       end
     end.join.html_safe
-    Rails.logger.error(output)
+    # comment out all the html logging
+    # Rails.logger.error(output)
     block_given? ? concat(output) : output
   end
 

data/config/application.rb

@@ -76,9 +76,10 @@ module TrustyCms
         html
       end
     end
-    config.after_initialize do
-      # extension_loader.load_extensions
-      # extension_loader.load_extension_initializers
+    config.to_prepare do
+      extension_loader.deactivate_extensions
+      extension_loader.load_extensions
+      extension_loader.load_extension_initializers
 
       extension_loader.activate_extensions # also calls initialize_views
       # config.add_controller_paths(extension_loader.paths(:controller))

data/lib/active_record_extensions/active_record_extensions.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 class ActiveRecord::Base
   def self.validates_path(*args)
     configuration = args.extract_options!

data/lib/trusty_cms/admin_ui.rb

@@ -1,5 +1,5 @@
 require 'simpleton'
-require 'open_struct'
+require 'ostruct'
 
 module TrustyCms
   class AdminUI

data/lib/trusty_cms/extension_loader.rb

@@ -65,7 +65,7 @@ module TrustyCms
     #
     def load_extensions
       configuration = TrustyCms::Application.config
-      @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
+      # @observer ||= DependenciesObserver.new(configuration).observe(::ActiveSupport::Dependencies)
       self.extensions = configuration.enabled_extensions.map { |ext| load_extension(ext) }.compact
     end
 

data/lib/trusty_cms/initializer.rb

@@ -9,15 +9,6 @@ require 'trusty_cms/extension_loader'
 require 'string_extensions/string_extensions'
 require 'trusty_cms/engine'
 
-# This is a wild and probably terrible hack built to initialize extension engines.
-# I have no idea what the repercussions will be. Revisit later.
-Gem.loaded_specs.each_with_object([]) do |(gemname, gemspec), _found|
-  if gemname =~ /trusty-.*-extension$/
-    ep = TrustyCms::ExtensionLoader.record_path(gemspec.full_gem_path, gemname)
-    require "#{ep.name}/engine"
-  end
-end
-
 module TrustyCms
   module Initializer
     # Rails::Initializer is essentially a list of startup steps and we extend it here by:

data/lib/trusty_cms/resource_responses.rb

@@ -1,4 +1,4 @@
-require 'open_struct'
+require 'ostruct'
 module TrustyCms
   module ResourceResponses
     def self.extended(base)

data/lib/trusty_cms/version.rb

@@ -1,3 +1,4 @@
 module TrustyCms
-  VERSION = '6.2.2.1'.freeze
+  VERSION = '6.3'.freeze
 end
+

data/lib/trusty_cms.rb

@@ -5,3 +5,4 @@ module TrustyCms
 end
 
 TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
+

data/spec/dummy/config/application.rb

@@ -139,4 +139,4 @@ module TrustyCms
 
     end
   end
-end
+end

data/trusty_cms.gemspec

@@ -1,8 +1,7 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
-$:.push File.expand_path('lib', __dir__)
-require_relative 'lib/trusty_cms/version'
+require File.expand_path(__FILE__ + '/../lib/trusty_cms/version.rb')
 Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3.0.5'
   s.name = 'trusty-cms'
@@ -27,7 +26,7 @@ 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_list', '>= 0.9.5', '< 1.3.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'
@@ -35,7 +34,7 @@ a general purpose content management system--not merely a blogging engine.'
   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', '< 3.1.0'
+  s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
   s.add_dependency 'mini_racer'
@@ -43,7 +42,7 @@ a general purpose content management system--not merely a blogging engine.'
   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 'rails', '~> 6.1.7'
   s.add_dependency 'rake', '< 14.0'
   s.add_dependency 'ransack'
   s.add_dependency 'rdoc', '>= 5.1', '< 7.0'

data/vendor/extensions/layouts-extension/layouts_extension.rb

@@ -8,11 +8,11 @@ class LayoutsExtension < TrustyCms::Extension
     ActionView::Base.send :include, ShareLayouts::Helpers::ActionView
 
     # Nested Layouts
-    Page.send   :include, NestedLayouts::Tags::Core
+    Page.send :include, NestedLayouts::Tags::Core
 
     # HAML Layouts
-    Layout.send  :include, HamlLayouts::Models::Layout
-    Page.send    :include, HamlLayouts::Models::Page
+    Layout.send :include, HamlLayouts::Models::Layout
+    Page.send :include, HamlLayouts::Models::Page
     HamlFilter
   end
 

data/vendor/extensions/multi-site-extension/lib/multi_site/scoped_validation.rb

@@ -1,43 +1,33 @@
 module MultiSite::ScopedValidation
+  # scoping validations to the site should be very simple
+  # all you would normally need is something like this:
+  #
+  #   validates_uniqueness_of :email, :scope => :site_id
+  #
+  # but if you want to scope core trusty classes, you have a problem:
+  # their uniqueness validations have already been declared
+  # The only answer is to reach right back and change the validates_uniqueness_of method
+  # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
+  # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
 
-  def self.included(base)
-
-    base.class_eval do
-      # scoping validations to the site should be very simple
-      # all you would normally need is something like this:
-      #
-      #   validates_uniqueness_of :email, :scope => :site_id
-      #
-      # but if you want to scope core trusty classes, you have a problem:
-      # their uniqueness validations have already been declared
-      # The only answer is to reach right back and change the validates_uniqueness_of method
-      # and to make it more awkward, that has to happen so early that we can't reflect on the site association.
-      # Hence the check for a site_id column. It's a hack, but a fairly harmless one.
-
-      def validates_uniqueness_of_with_site(*attr)
-        if database_exists?
-          if table_exists? && column_names.include?('site_id')
-            configuration = attr.extract_options!
-            configuration[:scope] ||= :site_id
-            attr.push(configuration)
-          end
-          validates_uniqueness_of_without_site(*attr)
-        end
-      end
-
-      alias_method :validates_uniqueness_of_without_site, :validates_uniqueness_of
-      alias_method :validates_uniqueness_of, :validates_uniqueness_of_with_site
-
-      def database_exists?
-        ActiveRecord::Base.connection
-      rescue ActiveRecord::NoDatabaseError
-        false
-      else
-        true
+  def validates_uniqueness_of(*attr)
+    if database_exists?
+      if table_exists? && column_names.include?('site_id')
+        configuration = attr.extract_options!
+        configuration[:scope] ||= :site_id
+        attr.push(configuration)
       end
+      super(*attr)
     end
+  end
 
+  def database_exists?
+    ActiveRecord::Base.connection
+  rescue ActiveRecord::NoDatabaseError
+    false
+  else
+    true
   end
 end
 
-ActiveRecord::Validations::ClassMethods.send :include, MultiSite::ScopedValidation
+ActiveRecord::Validations::ClassMethods.prepend MultiSite::ScopedValidation

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

@@ -6,7 +6,6 @@ class MultiSiteExtension < TrustyCms::Extension
   url "http://trustarts.org/"
 
   def activate
-
     # Model extensions
     ActiveRecord::Base.send :include, MultiSite::ScopedModel
     Page.send :include, MultiSite::PageExtensions
@@ -19,7 +18,6 @@ class MultiSiteExtension < TrustyCms::Extension
     # ActionController::Base.send :include, MultiSite::ApplicationControllerExtensions
     SiteController.send :include, MultiSite::SiteControllerExtensions
     Admin::ResourceController.send :include, MultiSite::ResourceControllerExtensions
-    Admin::PagesController.send :include, MultiSite::ResourceControllerExtensions
     Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
     Admin::ResourceController.send :helper, MultiSite::SiteChooserHelper
     Admin::PagesController.send :helper, MultiSite::SiteChooserHelper

data/vendor/extensions/snippets-extension/snippets_extension.rb

@@ -34,7 +34,7 @@ class SnippetsExtension < TrustyCms::Extension
       end
     end
 
-    admin.snippet       ||= TrustyCms::AdminUI.load_default_snippet_regions
+    admin.snippet ||= TrustyCms::AdminUI.load_default_snippet_regions
 
     tab 'Design' do
       add_item "Snippets", "/admin/snippets"

data/yarn.lock

@@ -427,12 +427,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.12.0, browserslist@^4.21.9:
   version "4.21.10"
@@ -701,10 +701,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -1225,11 +1225,11 @@ micromark@~2.11.0:
     parse-entities "^2.0.0"
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 min-indent@^1.0.0:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.2.2.1
+  version: '6.3'
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-07 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -33,7 +33,7 @@ dependencies:
         version: 0.9.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: 0.9.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
         version: 1.7.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -288,16 +288,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -954,7 +954,7 @@ files:
 - lib/inheritable_class_attributes.rb
 - lib/login_system.rb
 - lib/method_observer.rb
-- lib/open_struct.rb
+- lib/ostruct.rb
 - lib/simpleton.rb
 - lib/string_extensions/string_extensions.rb
 - lib/symbol_extensions/symbol_extensions.rb
@@ -1030,6 +1030,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/storage.yml
 - spec/dummy/db/schema.rb
 - spec/dummy/package.json
 - spec/dummy/public/404.html
@@ -1179,6 +1180,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/storage.yml
 - spec/dummy/config.ru
 - spec/dummy/db/schema.rb
 - spec/dummy/package.json