trusty-cms 8.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77d3850c23f30e1a9654c68e84bf5f34c3c7ebd3f0deaf5baadd91a34423eb3f
-  data.tar.gz: d21af2702b713670e01cd1f33ae95e8d2ea9803e1134921a8d76f90e2d75ec0d
+  metadata.gz: a19f132543bcd95bbd5225dc356b1ad17a5e85da6e4778af11151b5474641536
+  data.tar.gz: 19bd2adb46698e225aed2c5272238c533a093ccd48e9ae5979665d3f721e9433
 SHA512:
-  metadata.gz: 4847f7ef1367b73749feead54eae6d0c7ffa76d953b6ac6dd0c29af23cdfe11b0b4c9a26e8a9018b0d0200ae30818f65cb6aba4be1bc3e41a5e4c4089ac0cd0f
-  data.tar.gz: bdd09ed13ebc928624962d5d44b0eb82d63694a55a9fbcd5b50584a206ae998c81f5f68353c97738cb0a1e6c84f2fe158cb222bd37f22c3798f932f6346fbc07
+  metadata.gz: a03e160394522490d737f7d5d729b4e96d73226a284fdfdc6971d40c10e720ec788b174196509c30e80a43be8d116fd2a49f2321e1bc6eae16564dac97de5be2
+  data.tar.gz: a4c06fd38e690bc65e7d83e3e3f964c2919ede43c81a1f56e2d7b5975c1f3e00481452fd0ec53267fb760192ffb3034c16c92fb2347b188042c34d1076acc39c

data/Gemfile

@@ -14,16 +14,16 @@ gemspec
 group :development, :test do
   gem 'activestorage-validator'
   gem 'acts_as_list'
+  gem 'capybara'
   gem 'database_cleaner'
   gem 'devise-two-factor'
   gem 'factory_bot_rails', '6.5.1'
   gem 'file_validators'
   gem 'jsbundling-rails', '~> 1.3'
-  gem 'launchy', '~> 3.0.1'
+  gem 'launchy', '~> 3.1.1'
   gem 'mysql2'
-  gem 'paper_trail', '~> 16.0.0'
+  gem 'paper_trail', '~> 17.0.0'
   gem 'paper_trail-association_tracking', '~> 2.3.0'
-  gem 'poltergeist', '~> 1.18.1'
   gem 'pry-byebug'
   gem 'psych', '5.4.0'
   gem 'rails-observers'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (8.0)
+    trusty-cms (8.2.0)
       RedCloth (= 4.3.4)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -15,8 +15,8 @@ PATH
       diffy
       drb
       execjs (~> 2.7)
-      haml (~> 6.3.0)
-      haml-rails (~> 2.1)
+      haml (>= 6.3, < 7.4)
+      haml-rails (>= 2.1, < 4.0)
       highline (>= 1.7.8, < 3.2.0)
       image_processing
       kraken-io
@@ -24,13 +24,14 @@ PATH
       mini_racer
       mutex_m
       mysql2
-      paper_trail (~> 16.0.0)
+      ostruct
+      paper_trail (~> 17.0.0)
       paper_trail-association_tracking (>= 2.2.1, < 2.4.0)
       psych (= 5.4.0)
       rack (>= 2.0.1, < 3.2.0)
       rack-cache (~> 1.7)
       radius (~> 0.8)
-      rails (~> 8.0.0)
+      rails (~> 8.1.0)
       rake (< 14.0)
       ransack (~> 4.2.1)
       rdoc (>= 5.1, < 9.0)
@@ -47,29 +48,31 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.4)
-    actioncable (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    action_text-trix (2.1.19)
+      railties
+    actioncable (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      activejob (= 8.0.5.1)
-      activerecord (= 8.0.5.1)
-      activestorage (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    actionmailbox (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
-    actionmailer (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      actionview (= 8.0.5.1)
-      activejob (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    actionmailer (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.5.1)
-      actionview (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    actionpack (8.1.3.1)
+      actionview (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -77,44 +80,45 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      activerecord (= 8.0.5.1)
-      activestorage (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    actiontext (8.1.3.1)
+      action_text-trix (~> 2.1.15)
+      actionpack (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.5.1)
-      activesupport (= 8.0.5.1)
+    actionview (8.1.3.1)
+      activesupport (= 8.1.3.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (8.0.5.1)
-      activesupport (= 8.0.5.1)
+    activejob (8.1.3.1)
+      activesupport (= 8.1.3.1)
       globalid (>= 0.3.6)
-    activemodel (8.0.5.1)
-      activesupport (= 8.0.5.1)
-    activerecord (8.0.5.1)
-      activemodel (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    activemodel (8.1.3.1)
+      activesupport (= 8.1.3.1)
+    activerecord (8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       timeout (>= 0.4.0)
-    activestorage (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      activejob (= 8.0.5.1)
-      activerecord (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    activestorage (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       marcel (~> 1.0)
     activestorage-validator (0.8.0)
       rails (>= 7.2.0)
-    activesupport (8.0.5.1)
+    activesupport (8.1.3.1)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -129,7 +133,6 @@ GEM
       public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
     bcrypt (3.1.22)
-    benchmark (0.5.0)
     bigdecimal (4.1.2)
     builder (3.3.0)
     byebug (13.0.0)
@@ -146,7 +149,6 @@ GEM
     childprocess (5.1.0)
       logger (~> 1.5)
     chunky_png (1.4.0)
-    cliver (0.3.2)
     coderay (1.1.3)
     concurrent-ruby (1.3.8)
     connection_pool (3.0.2)
@@ -180,7 +182,7 @@ GEM
     diff-lcs (1.6.2)
     diffy (3.4.4)
     drb (2.2.3)
-    erb (6.0.6)
+    erb (6.0.7)
     erubi (1.13.1)
     execjs (2.10.1)
     factory_bot (6.6.0)
@@ -203,11 +205,12 @@ GEM
       mime-types (>= 1.0)
     globalid (1.4.0)
       activesupport (>= 6.1)
-    haml (6.3.1)
+    haml (7.3.0)
+      prism (>= 1.1.0)
       temple (>= 0.8.2)
       thor
       tilt
-    haml-rails (2.1.0)
+    haml-rails (3.1.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
@@ -221,7 +224,7 @@ GEM
     i18n (1.15.2)
       concurrent-ruby (~> 1.0)
     image_processing (2.0.2)
-    io-console (0.8.2)
+    io-console (0.9.2)
     irb (1.18.0)
       pp (>= 0.6.0)
       prism (>= 1.3.0)
@@ -235,9 +238,10 @@ GEM
       httparty
       json
       multipart-post
-    launchy (3.0.1)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     libv8-node (24.12.0.1)
     libv8-node (24.12.0.1-aarch64-linux)
     libv8-node (24.12.0.1-aarch64-linux-musl)
@@ -307,15 +311,12 @@ GEM
     nokogiri (1.19.4-x86_64-linux-musl)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    paper_trail (16.0.0)
-      activerecord (>= 6.1)
+    ostruct (0.6.3)
+    paper_trail (17.0.0)
+      activerecord (>= 7.1)
       request_store (~> 1.4)
     paper_trail-association_tracking (2.3.0)
       paper_trail (>= 12.0)
-    poltergeist (1.18.1)
-      capybara (>= 2.1, < 4)
-      cliver (~> 0.3.1)
-      websocket-driver (>= 0.2.0)
     pp (0.6.4)
       prettyprint
     prettyprint (0.2.0)
@@ -343,20 +344,20 @@ GEM
     rackup (2.3.1)
       rack (>= 3)
     radius (0.8.0)
-    rails (8.0.5.1)
-      actioncable (= 8.0.5.1)
-      actionmailbox (= 8.0.5.1)
-      actionmailer (= 8.0.5.1)
-      actionpack (= 8.0.5.1)
-      actiontext (= 8.0.5.1)
-      actionview (= 8.0.5.1)
-      activejob (= 8.0.5.1)
-      activemodel (= 8.0.5.1)
-      activerecord (= 8.0.5.1)
-      activestorage (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    rails (8.1.3.1)
+      actioncable (= 8.1.3.1)
+      actionmailbox (= 8.1.3.1)
+      actionmailer (= 8.1.3.1)
+      actionpack (= 8.1.3.1)
+      actiontext (= 8.1.3.1)
+      actionview (= 8.1.3.1)
+      activejob (= 8.1.3.1)
+      activemodel (= 8.1.3.1)
+      activerecord (= 8.1.3.1)
+      activestorage (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       bundler (>= 1.15.0)
-      railties (= 8.0.5.1)
+      railties (= 8.1.3.1)
     rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
@@ -366,9 +367,9 @@ GEM
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (8.0.5.1)
-      actionpack (= 8.0.5.1)
-      activesupport (= 8.0.5.1)
+    railties (8.1.3.1)
+      actionpack (= 8.1.3.1)
+      activesupport (= 8.1.3.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -380,7 +381,7 @@ GEM
       activerecord (>= 6.1.5)
       activesupport (>= 6.1.5)
       i18n
-    rbs (4.1.2)
+    rbs (4.1.3)
       logger
       prism (>= 1.6.0)
       tsort
@@ -389,8 +390,8 @@ GEM
       prism (>= 1.6.0)
       rbs (>= 4.0.0)
       tsort
-    regexp_parser (2.12.0)
-    reline (0.6.3)
+    regexp_parser (2.13.1)
+    reline (0.7.0)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -451,7 +452,7 @@ GEM
     ssrf_filter (1.5.0)
     stringex (2.8.6)
     stringio (3.2.0)
-    temple (0.10.4)
+    temple (0.10.6)
     thor (1.5.0)
     tilt (2.8.0)
     timeout (0.6.1)
@@ -490,16 +491,16 @@ PLATFORMS
 DEPENDENCIES
   activestorage-validator
   acts_as_list
+  capybara
   database_cleaner
   devise-two-factor
   factory_bot_rails (= 6.5.1)
   file_validators
   jsbundling-rails (~> 1.3)
-  launchy (~> 3.0.1)
+  launchy (~> 3.1.1)
   mysql2
-  paper_trail (~> 16.0.0)
+  paper_trail (~> 17.0.0)
   paper_trail-association_tracking (~> 2.3.0)
-  poltergeist (~> 1.18.1)
   pry-byebug
   psych (= 5.4.0)
   rails-observers
@@ -512,4 +513,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.5.21
+  4.0.22

data/INSTALL.md

@@ -2,7 +2,7 @@
 
 From within the directory containing your TrustyCMS instance:
 
-1. Create a new Rails 7.0+ application (i.e. `rails new [project_name]`)
+1. Create a new Rails 8.0+ application (i.e. `rails new [project_name]`)
 
 2. Add the following gems to your Gemfile:
 

data/README.md

@@ -53,11 +53,10 @@ See the INSTALL.md file for more instructions.
 Prerequisites:
 
 * A Github account and Git ([Github has some really good instructions](https://help.github.com/articles/set-up-git))
-* Ruby 3.1 or higher
-* A Rails application (currently supports version 7.0)
+* Ruby 3.3 or higher
+* A Rails application (currently supports version 8.1)
 * Bundler
 * MySQL
-* [PhantomJS >= 1.8.1](https://github.com/teampoltergeist/poltergeist/tree/v1.5.0#installing-phantomjs)
 
 Steps:
 

data/app/helpers/admin/pages_helper.rb

@@ -19,11 +19,22 @@ module Admin::PagesHelper
   end
 
   def parent_page_options(current_site, page)
-    parent_pages = []
-    parent_pages.concat(Page.parent_pages(current_site.homepage_id))
-    parent_pages << page.parent if page.parent
-    selected_page_id = page.parent_id
-    options_for_select(parent_pages.map { |p| [p.title, p.id] }, selected_page_id)
+    parent_pages = Page.parent_pages(current_site.homepage_id).to_a
+    parent_pages << page.parent if page.parent && parent_pages.exclude?(page.parent)
+    # A page can never be its own parent. For a site's root page this would
+    # otherwise set parent_id to itself and create an infinite loop in the tree.
+    parent_pages.reject! { |p| p.id == page.id }
+    # The root (top) page of a site must have no parent, so give it a blank
+    # option. Without one the browser submits the first option on save, which
+    # gives the root page a parent and breaks the whole site.
+    return options_for_select([[t('select.none'), '']], '') if root_page?(current_site, page)
+
+    options = parent_pages.map { |p| [p.title, p.id] }
+    options_for_select(options, page.parent.id)
+  end
+
+  def root_page?(current_site, page)
+    page.id.present? && page.id == current_site.homepage_id
   end
 
   def revert_confirmation_message(version)

data/config/application.rb

@@ -19,10 +19,6 @@ module TrustyCms
     include TrustyCms::Initializer
     config.load_defaults 8.0
 
-    # Rails 8.1 will make `to_time` always preserve the receiver's timezone.
-    # Opt in now to silence the deprecation and get the new behavior.
-    config.active_support.to_time_preserves_timezone = :zone
-
     Rails.autoloaders.log!
     # Enable the asset pipeline
     config.assets.enabled = true

data/config/initializers/zeitwerk.rb

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

data/lib/trusty_cms/available_locales.rb

@@ -5,7 +5,7 @@ module TrustyCms::AvailableLocales
     available_locales = {}
     TrustyCms.configuration.i18n.load_path.each do |path|
       if File.exist?(path) && path !~ /_available_tags/
-        locale_yaml = YAML.load_file(path)
+        locale_yaml = YAML.load_file(path, aliases: true)
         stem = File.basename(path, '.yml')
         if locale_yaml[stem] && lang = locale_yaml[stem]['this_file_language']
           available_locales[lang] = stem

data/lib/trusty_cms/resource_responses.rb

@@ -53,13 +53,6 @@ module TrustyCms
         super
         @table = Hash.new { |h, k| h[k] = Response.new }
       end
-
-      def initialize_copy(orig)
-        super
-        @table.keys.each do |key|
-          @table[key] = orig.send(key).dup
-        end
-      end
     end
 
     class Response

data/lib/trusty_cms/setup.rb

@@ -145,7 +145,7 @@ module TrustyCms
     end
 
     def load_template_file(filename)
-      YAML.load_file(filename)
+      YAML.load_file(filename, aliases: true)
     end
 
     def create_records(template)

data/lib/trusty_cms/task_support.rb

@@ -3,7 +3,7 @@ module TrustyCms
     class << self
       def establish_connection
         unless ActiveRecord::Base.connected?
-          connection_hash = YAML.load_file("#{Rails.root}/config/database.yml").to_hash
+          connection_hash = YAML.load_file("#{Rails.root}/config/database.yml", aliases: true).to_hash
           env_connection = connection_hash[Rails.env]
           ActiveRecord::Base.establish_connection(env_connection)
         end
@@ -23,7 +23,7 @@ module TrustyCms
           begin
             TrustyCms::Config.transaction do
               TrustyCms::Config.delete_all if clear
-              configs = YAML.load(YAML.load_file(path))
+              configs = YAML.load(YAML.load_file(path), aliases: true)
               configs.each do |key, value|
                 c = TrustyCms::Config.find_or_initialize_by_key(key)
                 c.value = value

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '8.0'.freeze
+  VERSION = '8.2.0'.freeze
 end

data/spec/controllers/admin/pages_controller_spec.rb

@@ -116,18 +116,27 @@ RSpec.describe Admin::PagesController, type: :controller do
   end
 
   describe 'GET #search' do
-    it 'returns matching pages when a query is present' do
-      create(:page, title: 'Findable', slug: 'findable', parent: home)
+    # The suite-wide stub returns nil, which the real Page.current_site can't do:
+    # the multi-site extension defines it as `@current_site ||= Site.default`, and
+    # Site.default ends in a catchall it creates. #search is the one action that
+    # reads it, so stub it faithfully here and let the fallback actually run.
+    let(:site) { create(:site) }
 
-      get :search, params: { site_id: nil, search: { query: 'Findable' } }
+    before { allow(Page).to receive(:current_site).and_return(site) }
+
+    it 'falls back to the current site when no site_id is given' do
+      create(:page, title: 'Findable', slug: 'findable', parent: home, site_id: site.id)
+
+      get :search, params: { search: { query: 'Findable' } }
 
       expect(response).to have_http_status(:ok)
+      expect(controller.instance_variable_get(:@site_id)).to eq(site.id)
       titles = controller.instance_variable_get(:@pages).map(&:title)
       expect(titles).to include('Findable')
     end
 
     it 'does not run a query when none is given' do
-      get :search, params: { site_id: '' }
+      get :search
       expect(controller.instance_variable_get(:@pages)).to be_nil
     end
   end
@@ -142,21 +151,17 @@ RSpec.describe Admin::PagesController, type: :controller do
   end
 
   describe 'PUT #restore' do
-    # NOTE: latent bug / Rails 8 upgrade blocker — restore_page_version calls
-    # PaperTrail's `reify`, which YAML-loads the stored version. Under Psych 4+
-    # (psych 5.4 is pinned) safe-loading rejects ActiveSupport::TimeWithZone
-    # because no permitted classes are configured, so restoring any page that has
-    # a timestamp in its versioned state raises Psych::DisallowedClass. Page
-    # restore is effectively broken until paper_trail's serializer is configured
-    # with permitted classes (e.g. via ActiveRecord::Base.yaml_column_permitted_classes
-    # or a custom serializer). Characterizing current behavior.
-    it 'currently fails to reify a versioned page (Psych safe-load blocker)' do
+    # reify YAML-loads the stored version under Psych 4+ safe-load, which needs
+    # ActiveSupport::TimeWithZone (and friends) in
+    # ActiveRecord.yaml_column_permitted_classes — configured in the dummy app.
+    it 'reifies the prior version and redirects to edit' do
       page = create(:page, title: 'V1', parent: home)
       PaperTrail.request(whodunnit: admin.id.to_s) { page.update!(title: 'V2') }
 
-      expect {
-        put :restore, params: { id: page.id, version_index: 1 }
-      }.to raise_error(Psych::DisallowedClass, /TimeWithZone/)
+      put :restore, params: { id: page.id, version_index: 1 }
+
+      expect(response).to redirect_to(edit_admin_page_path(page))
+      expect(page.reload.title).to eq('V1')
     end
   end
 end

data/spec/dummy/config/application.rb

@@ -41,8 +41,7 @@ module TrustyCms
 
     config.encoding = 'utf-8'
     config.time_zone = 'UTC'
-    # Rails 8.1 will make `to_time` always preserve the receiver's timezone.
-    config.active_support.to_time_preserves_timezone = :zone
+
     # Skip frameworks you're not going to use (only works if using vendor/rails).
     # To use Rails without a database, you must remove the Active Record framework
     # config.frameworks -= [ :action_mailer ]
@@ -121,6 +120,11 @@ module TrustyCms
       end
     end
 
+    config.active_record.yaml_column_permitted_classes = [
+      Symbol, Date, Time, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone,
+      ActiveSupport::HashWithIndifferentAccess, BigDecimal
+    ]
+
     config.to_prepare do
       extension_loader.deactivate_extensions
       extension_loader.load_extensions

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

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

data/spec/helpers/admin/pages_helper_spec.rb

@@ -72,6 +72,36 @@ describe Admin::PagesHelper, type: :helper do
       expect(html).to include('Home')
       expect(html).to include("value=\"#{home.id}\"")
     end
+
+    it 'offers a blank parent option for the site root page' do
+      home = FactoryBot.create(:home, title: 'Home')
+      current_site = double('Site', homepage_id: home.id)
+      allow(Page).to receive(:parent_pages).with(home.id).and_return([home])
+
+      html = helper.parent_page_options(current_site, home)
+      expect(html).to include('<option selected="selected" value="">&lt;none&gt;</option>')
+    end
+
+    it 'never lists the root page as a candidate for its own parent' do
+      home = FactoryBot.create(:home, title: 'Home')
+      current_site = double('Site', homepage_id: home.id)
+      allow(Page).to receive(:parent_pages).with(home.id).and_return([home])
+
+      html = helper.parent_page_options(current_site, home)
+
+      expect(html).not_to include("value=\"#{home.id}\"")
+    end
+
+    it 'does not offer a blank parent option for non-root pages' do
+      home = FactoryBot.create(:home, title: 'Home')
+      child = FactoryBot.create(:page, title: 'Child', slug: 'child', parent: home)
+      current_site = double('Site', homepage_id: home.id)
+      allow(Page).to receive(:parent_pages).with(home.id).and_return([home])
+
+      html = helper.parent_page_options(current_site, child)
+
+      expect(html).not_to include('<option value="">')
+    end
   end
 
   describe '#revert_confirmation_message' do

data/spec/lib/ostruct_spec.rb

@@ -1,14 +1,7 @@
 require 'spec_helper'
 require 'ostruct'
 
-# lib/ostruct.rb reopens OpenStruct (originally patched for a Ruby upgrade) and
-# shadows the stdlib version via the load path. This is exactly the kind of
-# patch a Ruby/Rails upgrade can break, so pin the behaviour we rely on.
-describe 'OpenStruct patch' do
-it 'is the project patch, not the stdlib implementation' do
-  expect(OpenStruct.instance_method(:initialize).source_location.first)
-    .to eq(File.expand_path('../../lib/ostruct.rb', __dir__))
-end
+describe 'OpenStruct' do
 
   it 'builds accessors from a hash, symbolizing string keys' do
     os = OpenStruct.new('a' => 1, :b => 2)

data/spec/spec_helper.rb

@@ -13,9 +13,9 @@ SimpleCov::Formatter::LcovFormatter.config do |config|
 end
 
 SimpleCov.configure do
-  add_filter %r{^/lib/generators/}
-  add_filter 'lib/trusty_cms/setup.rb'
-  add_filter %r{/templates/}   # generated-app boilerplate
+  skip %r{^/lib/generators/}
+  skip 'lib/trusty_cms/setup.rb'
+  skip %r{/templates/}   # generated-app boilerplate
 end
 
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([

data/trusty_cms.gemspec

@@ -21,7 +21,6 @@ a general purpose content management system--not merely a blogging engine.'
   s.rdoc_options = ['--title', 'TrustyCms -- Content Management You Can Trust', '--line-numbers', '--main', 'README', '--exclude', 'app', '--exclude', 'bin', '--exclude',
                     'config', '--exclude', 'db', '--exclude', 'features', '--exclude', 'lib', '--exclude', 'log', '--exclude', 'pkg', '--exclude', 'public', '--exclude', 'script', '--exclude', 'spec', '--exclude', 'test', '--exclude', 'tmp', '--exclude', 'vendor']
   s.require_paths = ['lib']
-  s.rubygems_version = '1.3.7'
   s.summary = 'A no-fluff content management system designed for small teams.'
   s.license = 'MIT'
   s.test_files = Dir['spec/**/*']
@@ -37,8 +36,8 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'diffy'
   s.add_dependency 'drb'
   s.add_dependency 'execjs', '~> 2.7'
-  s.add_dependency 'haml', '~> 6.3.0'
-  s.add_dependency 'haml-rails', '~> 2.1'
+  s.add_dependency 'haml', '>= 6.3', '< 7.4'
+  s.add_dependency 'haml-rails', '>= 2.1', '< 4.0'
   s.add_dependency 'highline', '>= 1.7.8', '< 3.2.0'
   s.add_dependency 'image_processing'
   s.add_dependency 'kraken-io'
@@ -46,13 +45,14 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'mini_racer'
   s.add_dependency 'mutex_m'
   s.add_dependency 'mysql2'
-  s.add_dependency 'paper_trail', '~> 16.0.0'
+  s.add_dependency 'ostruct'
+  s.add_dependency 'paper_trail', '~> 17.0.0'
   s.add_dependency 'paper_trail-association_tracking', '>= 2.2.1', '< 2.4.0'
   s.add_dependency 'psych', '5.4.0'
   s.add_dependency 'rack', '>= 2.0.1', '< 3.2.0'
   s.add_dependency 'rack-cache', '~> 1.7'
   s.add_dependency 'radius', '~> 0.8'
-  s.add_dependency 'rails', '~> 8.0.0'
+  s.add_dependency 'rails', '~> 8.1.0'
   s.add_dependency 'rake', '< 14.0'
   s.add_dependency 'ransack', '~> 4.2.1'
   s.add_dependency 'rdoc', '>= 5.1', '< 9.0'

data/yarn.lock

@@ -1671,9 +1671,9 @@ fast-glob@^3.2.5, fast-glob@^3.2.9:
     micromatch "^4.0.8"
 
 fast-uri@^3.0.1:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.4.tgz#3b3daf9ce68f41f956df0b505132c0cfce9ec7af"
-  integrity sha512-8JnbkQ4juDyvYs4mgFGQqg4yCYtFDtUtmp2QIQq11ZZe5CFQ5wcqm1rqDgAh/QdMySuBnPzMUiJUNZG5N/AiQw==
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.5.tgz#610f37419a030270430cecd68d74e3d4d96725d0"
+  integrity sha512-gHwA1O9LDIcKunMKhObS/HimwtehO1nPUECKAu5TpKgaO19fcWEl4bliWe1jWxVFvIXztJjjQ4L8XQ1EU9f7Jw==
 
 fastest-levenshtein@^1.0.12:
   version "1.0.16"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: '8.0'
+  version: 8.2.0
 platform: ruby
 authors:
 - TrustyCms CMS dev team
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-07 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -194,30 +193,42 @@ dependencies:
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: '6.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 6.3.0
+        version: '7.4'
 - !ruby/object:Gem::Dependency
   name: haml-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -322,20 +333,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 17.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 17.0.0
 - !ruby/object:Gem::Dependency
   name: paper_trail-association_tracking
   requirement: !ruby/object:Gem::Requirement
@@ -424,14 +449,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -639,9 +664,9 @@ executables:
 - trusty_cms
 extensions: []
 extra_rdoc_files:
-- README.md
 - INSTALL.md
 - LICENSE.md
+- README.md
 files:
 - ".gitignore"
 - CODE_OF_CONDUCT.md
@@ -1137,7 +1162,6 @@ files:
 - lib/inheritable_class_attributes.rb
 - lib/login_system.rb
 - lib/method_observer.rb
-- lib/ostruct.rb
 - lib/simpleton.rb
 - lib/string_extensions/string_extensions.rb
 - lib/symbol_extensions/symbol_extensions.rb
@@ -1351,7 +1375,6 @@ homepage: https://github.com/pgharts/trusty-cms
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--title"
 - TrustyCms -- Content Management You Can Trust
@@ -1399,8 +1422,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
@@ -1427,6 +1449,7 @@ test_files:
 - spec/dummy/bin/rails
 - spec/dummy/bin/rake
 - spec/dummy/bin/setup
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/cable.yml
@@ -1453,7 +1476,6 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config/storage.yml
-- spec/dummy/config.ru
 - spec/dummy/db/migrate/20260729201444_add_service_name_to_active_storage_blobs.active_storage.rb
 - spec/dummy/db/migrate/20260729201445_create_active_storage_variant_records.active_storage.rb
 - spec/dummy/db/migrate/20260729201446_remove_not_null_on_active_storage_blobs_checksum.active_storage.rb

data/lib/ostruct.rb

@@ -1,51 +0,0 @@
-# patching OpenStruct due to Ruby 2.3.1 upgrade
-# See more here: http://stackoverflow.com/questions/39278864/openstruct-issue-with-ruby-2-3-1/39280374#39280374
-
-class OpenStruct
-  def initialize(hash = nil)
-    @table = {}
-    hash&.each_pair do |k, v|
-      k = k.to_sym
-      @table[k] = v
-      new_ostruct_member(k)
-    end
-  end
-
-  def modifiable
-    begin
-      @modifiable = true
-    rescue StandardError
-      raise RuntimeError, "can't modify frozen #{self.class}", caller(3)
-    end
-    @table
-  end
-  protected :modifiable
-
-  def new_ostruct_member(name)
-    name = name.to_sym
-    unless respond_to?(name)
-      define_singleton_method(name) { @table[name] }
-      define_singleton_method("#{name}=") { |x| modifiable[name] = x }
-    end
-    name
-  end
-  protected :new_ostruct_member
-
-  def method_missing(mid, *args) # :nodoc:
-    mname = mid.id2name
-    len = args.length
-    if mname.chomp!('=')
-      if len != 1
-        raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
-      end
-
-      modifiable[new_ostruct_member(mname)] = args[0]
-    elsif len == 0
-      @table[mid]
-    else
-      err = NoMethodError.new "undefined method `#{mid}' for #{self}", mid, args
-      err.set_backtrace caller(1)
-      raise err
-    end
-  end
-end