trusty-cms 6.1.2 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 317a11bc953c6892d860b8c0e13b7d71ca9feffd3e9c6251c52606928fc1ada3
-  data.tar.gz: aef8f45d869c2b2ec31df22d23002ba14c4b1399e1bf82b06a4a6bc5ca8d707e
+  metadata.gz: 2697be62c66372fd8436f662bee38a5792c95936b8111035ce844d670cea2dd8
+  data.tar.gz: ae60a31bc2fd2b1c8a245160bb545e68b9a3f44487ef7158ff231953c4f6b8ed
 SHA512:
-  metadata.gz: 7c6011cc75d010d0a669e5105820b8ab4d498c081220a5584e654dd8e9c8002fa748175b06cce6145c8011b3f1ab0823052c231bd2107946b725afcfcc94b5ea
-  data.tar.gz: 9b9460d709ae5504c298d03a3a5b170db440fc9db7b7998531ac856f7635dfee5f99dfe3d66d25bf4ce54494c4a687523355b84ff73d8f887f81bfef38fc5f25
+  metadata.gz: e35fdb83d9aed2a32ccb54da1bd94db1bc9838358a9b2d2aca92acf0256a94905e195365c0694bd91155598aa7330d502f2d8a950feaf7d8336efd7197b6cf32
+  data.tar.gz: '0925e0cd632719177be0ceb2deb5e17e7fb2c7cc502189d9fe11acb2bca3d05ea3f6d0d76dd135da39c068158c507b46038681f81da3199ecd3d8f0086d2c2ab'

data/Gemfile.lock

@@ -35,67 +35,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.3)
-    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)
@@ -129,7 +135,7 @@ GEM
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.3.3)
+    date (3.3.4)
     delocalize (1.2.0)
       rails (>= 2)
     devise (4.9.3)
@@ -197,23 +203,23 @@ GEM
     mini_mime (1.1.5)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
-    minitest (5.15.0)
+    minitest (5.20.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.5)
-    net-imap (0.4.1)
+    net-imap (0.4.9.1)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.12.5-x86_64-darwin)
+    nio4r (2.7.0)
+    nokogiri (1.16.0-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -236,35 +242,36 @@ 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
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.5.0)
-      loofah (~> 2.19, >= 2.19.1)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      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.1.0)
     ransack (4.1.1)
       activerecord (>= 6.1.5)
@@ -329,9 +336,9 @@ GEM
     temple (0.10.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.2.2)
+    thor (1.3.0)
     tilt (2.1.0)
-    timeout (0.4.0)
+    timeout (0.4.1)
     trustygems (0.2.1)
       rake
     tzinfo (2.0.6)

data/app/models/page.rb

@@ -1,6 +1,10 @@
+require 'trusty_cms/taggable'
+
 class Page < ActiveRecord::Base
   class MissingRootPageError < StandardError
-    def initialize(message = 'Database missing root page'); super end
+    def initialize(message = 'Database missing root page')
+      ; super
+    end
   end
 
   # Callbacks
@@ -65,6 +69,7 @@ class Page < ActiveRecord::Base
   def child_path(child)
     clean_path(path + '/' + child.slug)
   end
+
   alias_method :child_url, :child_path
 
   def part(name)
@@ -118,6 +123,7 @@ class Page < ActiveRecord::Base
       clean_path(slug)
     end
   end
+
   alias_method :url, :path
 
   def process(request, response)
@@ -157,6 +163,7 @@ class Page < ActiveRecord::Base
       end
     end
   end
+
   private :set_content_type
 
   def response_code
@@ -256,11 +263,11 @@ class Page < ActiveRecord::Base
         @display_name = string
       else
         @display_name ||= begin
-          n = name.to_s
-          n.sub(/^(.+?)Page$/, '\1')
-          n.gsub(/([A-Z])/, ' \1')
-          n.strip
-        end
+                            n = name.to_s
+                            n.sub(/^(.+?)Page$/, '\1')
+                            n.gsub(/([A-Z])/, ' \1')
+                            n.strip
+                          end
       end
       @display_name = @display_name + ' - not installed' if missing? && @display_name !~ /not installed/
       @display_name
@@ -355,6 +362,7 @@ class Page < ActiveRecord::Base
   def clean_path(path)
     "/#{path.to_s.strip}".gsub(%r{//+}, '/')
   end
+
   alias_method :clean_url, :clean_path
 
   def parent?

data/config/application.rb

@@ -17,8 +17,7 @@ end
 module TrustyCms
   class Application < Rails::Application
     include TrustyCms::Initializer
-    config.active_record.whitelist_attributes = true
-
+    Rails.autoloaders.log!
     # Enable the asset pipeline
     config.assets.enabled = true
 
@@ -26,6 +25,7 @@ module TrustyCms
     config.assets.version = '1.0'
 
     # Initialize extension paths
+    config.eager_load_paths << Rails.root.join('vendor', 'extensions')
     config.initialize_extension_paths
     extension_loader = ExtensionLoader.instance { |l| l.initializer = self }
     extension_loader.paths(:load).reverse_each do |path|
@@ -77,16 +77,18 @@ module TrustyCms
       end
     end
     config.after_initialize do
-      extension_loader.load_extensions
-      extension_loader.load_extension_initializers
+      # 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))
       # config.add_eager_load_paths(extension_loader.paths(:eager_load))
 
       # Add new inflection rules using the following format:
-      ActiveSupport::Inflector.inflections do |inflect|
-        inflect.uncountable 'config'
+      Rails.autoloaders.each do |autoloader|
+        autoloader.inflector.inflect(
+          'config' => 'Configuration'
+        )
       end
     end
   end

data/lib/trusty_cms/admin_ui.rb

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

data/lib/trusty_cms/engine.rb

@@ -1,5 +1,6 @@
 module TrustyCms
   class Engine < Rails::Engine
+    isolate_namespace TrustyCms
     paths['app/helpers'] = []
     initializer 'trusty_cms.assets.precompile' do |app|
       app.config.assets.paths << Rails.root.join('../trusty-cms/node_modules')

data/lib/trusty_cms/resource_responses.rb

@@ -1,4 +1,4 @@
-require 'ostruct'
+require 'open_struct'
 module TrustyCms
   module ResourceResponses
     def self.extended(base)
@@ -64,6 +64,7 @@ module TrustyCms
 
     class Response
       attr_reader :publish_formats, :publish_block, :blocks, :block_order
+
       def initialize
         @publish_formats = []
         @blocks = {}

data/lib/trusty_cms/version.rb

@@ -0,0 +1,3 @@
+module TrustyCms
+  VERSION = '6.2.0'.freeze
+end

data/lib/trusty_cms.rb

@@ -1,8 +1,7 @@
-TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT
+require 'trusty_cms/version'
+require 'trusty_cms/engine'
 
-unless defined? TrustyCms::VERSION
-  module TrustyCms
-    VERSION = '6.1.2'.freeze
-  end
+module TrustyCms
 end
 
+TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT

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

@@ -0,0 +1,8 @@
+Rails.autoloaders.each do |autoloader|
+  autoloader.inflector.inflect(
+    'clipped_admin_ui' => 'ClippedAdminUI',
+    'admin_ui' => 'AdminUI',
+    'ostruct' => 'OpenStruct',
+  # Add more inflections as needed
+  )
+end

data/trusty_cms.gemspec

@@ -1,8 +1,10 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-require File.expand_path(__FILE__ + '/../lib/trusty_cms.rb')
+$:.push File.expand_path('lib', __dir__)
+require_relative 'lib/trusty_cms/version'
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>=2.5.3'
+  s.required_ruby_version = '>= 3.0.5'
   s.name = 'trusty-cms'
   s.version = TrustyCms::VERSION
   s.platform = Gem::Platform::RUBY

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

@@ -19,6 +19,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.1.2
+  version: 6.2.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -954,7 +954,7 @@ files:
 - lib/inheritable_class_attributes.rb
 - lib/login_system.rb
 - lib/method_observer.rb
-- lib/ostruct.rb
+- lib/open_struct.rb
 - lib/simpleton.rb
 - lib/string_extensions/string_extensions.rb
 - lib/symbol_extensions/symbol_extensions.rb
@@ -985,6 +985,7 @@ files:
 - lib/trusty_cms/setup.rb
 - lib/trusty_cms/taggable.rb
 - lib/trusty_cms/task_support.rb
+- lib/trusty_cms/version.rb
 - log/.keep
 - package.json
 - public/.htaccess
@@ -1025,6 +1026,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/zeitwerk.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
@@ -1135,7 +1137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.3
+      version: 3.0.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -1164,6 +1166,7 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/environments/production.rb
+- spec/dummy/config/initializers/zeitwerk.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/session_store.rb