comfy_middle_seat 3.2.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 385ae2594717984eee4d7a568cb9bde9443f709965748fe601812be607f13dea
-  data.tar.gz: 879f3f1d267b529b30ad012d57c61bfbd64e4cb877b062b44e022eac015502de
+  metadata.gz: e2261f0af74a7d60998b21a9f85feacdb454614e8f8bec638eb9f7a1aa3b2850
+  data.tar.gz: 06244651d11d7868006fdb42cea0b0ac9119304af97b42cd563401cd4ee9fd52
 SHA512:
-  metadata.gz: 430cebb413df49b32fb311c6a7bc1462ea52cf5c7056f7c35c6c24ad4ff9740f3344f35a860eb2eb0d3d94671c5385d82be0d916e6ac7309df974e2897d74aa6
-  data.tar.gz: 7ea323b71050068057948cde56b61fc0ae986d3235a9ef990fd0e01feae6390f7f73ea29bf8533bfe806e88999773faa310cd354d1582eb5e949f82df55f1f37
+  metadata.gz: 4f52d95a635172aa91cff2536dc87167656c815e23c743cd648a1d2fccf1cccd875e1a1866081ebaa2837b6b3b17690f1e6b59f321a4aaaa915bdc81464374da
+  data.tar.gz: 054772f74cc2c0a373bd7939b9a4f47da4f7bfbf71aab88db624da8c6df72614da456c0377d3fd327c9a5a9903f3afc6c823ef5ce0f62c2a642b5b40dc638d17

data/.github/workflows/coveralls.yml

@@ -45,6 +45,10 @@ jobs:
       - name: Compile assets
         run: bin/bundle exec rails comfy:compile_assets
 
+      - name: Verify Coveralls token is configured
+        run: |
+          ruby -e 'abort "COVERALLS_REPO_TOKEN is missing" if ENV.fetch("COVERALLS_REPO_TOKEN", "").strip.empty?'
+
       - name: Run tests, report coverage
         run: |
           bin/bundle exec rails db:drop

data/CHANGELOG.md

@@ -6,12 +6,63 @@ All notable changes to this project's source code will be documented in this fil
 
 Please follow the recommendations outlined at [keepachangelog.com](https://keepachangelog.com). Please use the existing headings and styling as a guide, and add a link for the version diff at the bottom of the file. Also, please update the `Unreleased` link to compare it to the latest release version.
 
-For all changes prior to the inception of this project, see the [Release History](https://github.com/comfy/comfortable-mexican-sofa/releases) of ComfortableMexicanSofa.
+This changelog follows the project's lineage: **Comfortable Mexican Sofa → Comfortable Media Surfer → Comfy Middle Seat**. Version **3.2.0** is the first release published as `comfy_middle_seat`. The entries for **3.0.0–3.1.7** below are inherited from `comfortable_media_surfer` and retain their upstream links. For earlier history, see the [Comfortable Mexican Sofa releases](https://github.com/comfy/comfortable-mexican-sofa/releases).
 
-## Versions
+## Comfy Middle Seat
 
 ## [Unreleased]
 
+### Changed
+
+- Complete the implementation namespace and internal-path decoupling from Comfortable Media Surfer: current Ruby APIs now use `ComfyMiddleSeat`, library files live under `comfy_middle_seat`, and generated configuration belongs at `config/initializers/comfy_middle_seat.rb`.
+- Require applications upgrading from `comfortable_media_surfer` to rename the initializer and replace Ruby configuration or integration references from `ComfortableMediaSurfer` to `ComfyMiddleSeat`. The existing `comfy_cms_*` database tables, schema, and stored data remain unchanged, so no database migration is required.
+- Add the standalone `comfy-middle-seat-upgrade` executable to safely preview and convert a legacy initializer without booting Rails, preserving the original as a backup and refusing ambiguous or destructive changes.
+- Preserve Comfortable Media Surfer names and URLs where they describe project history, acknowledgements, inherited release notes, or upstream resources rather than the current API.
+
+## [v3.2.1] - 2026-09-17
+
+### Fixed
+
+- Fix CI eager loading after the gem rename by excluding the explicitly required `comfy_middle_seat` entrypoint and version directory from Zeitwerk autoloading. Add a regression test that also checks eager loading outside CI.
+
+### Changed
+
+- At the time of this release, update the admin footer branding and repository link to Comfy Middle Seat while retaining the then-current `ComfortableMediaSurfer::VERSION` compatibility constant.
+- Check that `COVERALLS_REPO_TOKEN` is configured before running the coverage job, with a clear error when it is missing.
+- Document asset compilation and explicit test database setup, along with commands for running the main and browser/system test suites.
+- Update README badges and release documentation, preserving the distinction between Seat releases and inherited Surfer history.
+
+## [v3.2.0] - 2026-09-17
+
+**First Comfy Middle Seat release.** Forked from [Comfortable Media Surfer](https://github.com/shakacode/comfortable-media-surfer), itself a revival of [Comfortable Mexican Sofa](https://github.com/comfy/comfortable-mexican-sofa). The new name keeps the C.M.S. initials and pays homage to the original.
+
+### Changed
+
+- Publish the gem as `comfy_middle_seat` and rename the gemspec to `comfy_middle_seat.gemspec`.
+- At the time of v3.2.0, preserve the `ComfortableMediaSurfer` Ruby namespace and configuration while retaining the existing routes and database tables. The Unreleased namespace decoupling supersedes the Ruby compatibility behavior; the database compatibility remains unchanged.
+- Move the version definition to `lib/comfy_middle_seat/version.rb` for release tooling, retaining a compatibility loader at the old path.
+- Run the main test suite in six isolated processes by default, with merged coverage and a separate `test:serial` task for Coveralls.
+- Update CI coverage to Rails 7.2, 8.0, and 8.1, with a separate browser/system test job.
+
+### Added
+
+- Add `lib/comfy_middle_seat.rb` so Bundler loads the existing implementation automatically under the new gem name.
+- Add controls to publish and unpublish child pages from the admin interface.
+
+### Fixed
+
+- Strengthen site isolation for admin parameters, cross-site associations, asset lookup, reordering, categories, and fragment ownership.
+- Fix file modal cleanup and reinitialization, and expose jQuery for Bootstrap integration.
+- Remove the unsupported `:escape` option before JSON parsing while preserving other parser options.
+
+### Historical v3.2.0 upgrade behavior
+
+For v3.2.0, users replaced `comfortable_media_surfer` with `comfy_middle_seat` in the Gemfile while keeping the former Ruby namespace and initializer name. That release-specific compatibility guidance is preserved for history but is superseded by the Unreleased change: current upgrades must rename the initializer to `config/initializers/comfy_middle_seat.rb` and replace `ComfortableMediaSurfer` Ruby references with `ComfyMiddleSeat`. Neither stage changes the database schema.
+
+## Comfortable Media Surfer — inherited releases
+
+The releases below belong to `comfortable_media_surfer`, not `comfy_middle_seat`. Their original notes and upstream comparison links are preserved.
+
 ## [v3.1.7] - 2026-02-20
 
 ### Fixed
@@ -135,7 +186,9 @@ First release of `comfortable_media_surfer`. This new gem is a revival of [Comfo
 
 - Rebranded **ComfortableMexicanSofa** as **ComfortableMediaSurfer** in order to publish new gem (database table names and schema have not changed).
 
-[Unreleased]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.7...master
+[Unreleased]: https://github.com/avonderluft/comfy-middle-seat/compare/v3.2.1...master
+[v3.2.1]: https://github.com/avonderluft/comfy-middle-seat/compare/v3.2.0...v3.2.1
+[v3.2.0]: https://github.com/avonderluft/comfy-middle-seat/compare/eeb5d590f47b5d6bb70191fb81c781540753fa97...v3.2.0
 [v3.1.7]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.6...v3.1.7
 [v3.1.6]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.5...v3.1.6
 [v3.1.5]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.4...v3.1.5

data/CONTRIBUTING.md

@@ -1,10 +1,10 @@
 # Contributing
 
-Contribute your code to ComfortableMediaSurfer in 5 easy steps:
+Contribute to [Comfy Middle Seat](https://github.com/avonderluft/comfy-middle-seat) in five steps:
 
 ### 1. Fork it
 
-Fork the project. Optionally, create a branch you want to work on.
+Fork the [current repository](https://github.com/avonderluft/comfy-middle-seat). Optionally, create a branch for your work.
 
 ### 2. Get it running locally
 
@@ -25,9 +25,12 @@ Fork the project. Optionally, create a branch you want to work on.
 
 ### 3. Hack away
 
-- Create a few small pull requests instead of a humoungous one. I can merge small stuff faster.
-- When adding new code just make sure it follows the same style as the existing code.
-- Avoid adding 3rd party dependencies if you can.
+- Use the current `ComfyMiddleSeat` Ruby namespace and `comfy_middle_seat` internal paths. New configuration examples and generated initializers belong in `config/initializers/comfy_middle_seat.rb`; do not reintroduce `ComfortableMediaSurfer` as a current API.
+- Keep the existing `comfy_cms_*` database tables and schema stable. The namespace and internal-path decoupling does not require a database migration.
+- Historical release notes, acknowledgements, and upstream links may intentionally retain the Comfortable Media Surfer name.
+- Create a few small pull requests instead of one huge pull request. Smaller changes can be reviewed and merged faster.
+- When adding new code, make sure it follows the same style as the existing code.
+- Avoid adding third-party dependencies if you can.
 - Tests please, but nothing complicated. UnitTest / Fixtures all the way. Make sure all tests pass.
 - Run `bundle exec rubocop` and fix any issues raised.
 

data/Gemfile

@@ -26,7 +26,7 @@ end
 group :test do
   gem 'brakeman'
   gem 'bundler-audit',            '~> 0.9.1'
-  gem 'coveralls_reborn',         '~> 0.29.0', require: false
+  gem 'coveralls_reborn',         require: false
   gem 'cuprite',                  '>= 0.15'
   gem 'diffy'
   gem 'equivalent-xml',           '~> 0.6.0'

data/README.md

@@ -1,19 +1,19 @@
-[![Rails CI](https://github.com/avonderluft/comfy-middle-seat/actions/workflows/rubyonrails.yml/badge.svg)](https://github.com/avonderluft/comfy-middle-seat/actions/workflows/rubyonrails.yml)
-[![Gem Version](https://img.shields.io/gem/v/comfy_middle_seat.svg?style=flat)](https://rubygems.org/gems/comfy_middle_seat)
-[![Gem Downloads](https://img.shields.io/gem/dt/comfy_middle_seat.svg?style=flat)](https://rubygems.org/gems/comfy_middle_seat)
-[![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/comfy-middle-seat?label=last%20release&color=seagreen)](https://github.com/avonderluft/comfy-middle-seat/releases)
+[![Rails CI](https://github.com/avonderluft/comfy-middle-seat/actions/workflows/rubyonrails.yml/badge.svg)](https://github.com/avonderluft/comfy-middle-seat/actions/workflows/rubyonrails.yml) [![Test Coverage](https://img.shields.io/coverallsCoverage/github/avonderluft/comfy-middle-seat?branch=master&cacheSeconds=300)](https://coveralls.io/github/avonderluft/comfy-middle-seat?branch=master) [![Gem Version](https://img.shields.io/gem/v/comfy_middle_seat.svg?style=flat)](https://rubygems.org/gems/comfy_middle_seat) [![Gem Downloads](https://img.shields.io/gem/dt/comfy_middle_seat.svg?style=flat)](https://rubygems.org/gems/comfy_middle_seat) [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/avonderluft/comfy-middle-seat?label=last%20release&color=seagreen)](https://github.com/avonderluft/comfy-middle-seat/releases)
 
 # Comfy Middle Seat
 
-Comfy Middle Seat is a Rails CMS (Content Management System) engine, published as `comfy_middle_seat`. It keeps the Comfortable Media Surfer implementation and pays homage to the original Comfortable Mexican Sofa—with the same C.M.S. initials and a new place to sit.
+It all depends on who is sitting on your left and on your right.
 
-The `ComfortableMediaSurfer` Ruby namespace, configuration, and internal paths remain unchanged. Only the gem's public name changes; there is no need to rename existing Surfer initializers or database tables.
+Comfy Middle Seat is a Rails CMS (Content Management System) engine, published as the `comfy_middle_seat` gem. It is descended from Comfortable Media Surfer and pays homage to the original Comfortable Mexican Sofa—with the same C.M.S. initials with a new place to sit.
+
+The current implementation uses the `ComfyMiddleSeat` Ruby namespace, `comfy_middle_seat` internal paths, and the initializer `config/initializers/comfy_middle_seat.rb`. Database storage remains compatible: the existing `comfy_cms_*` tables and schema are unchanged, so this namespace change requires no database migration.
 
 ## Project History
 
-- **[Comfortable Mexican Sofa](https://github.com/comfy/comfortable-mexican-sofa)**, created by Oleg Khabarov, is the original Rails CMS on which this project is built.
-- **[Comfortable Media Surfer](https://github.com/shakacode/comfortable-media-surfer)** revived Sofa under ShakaCode, continuing its development for modern Rails applications.
-- **Comfy Middle Seat** is a fork of Comfortable Media Surfer, published under a new gem name while retaining its implementation and API.
+- **[Comfortable Mexican Sofa](https://github.com/comfy/comfortable-mexican-sofa)**, created by Oleg Khabarov, is the original Rails CMS on which this project is built.  Oleg deserves the lion's share of kudos.
+- **[oCcaMS](https://github.com/avonderluft/occams)** was an attempted revival of Sofa. Andrew vonderLuft was a contributor to [RadiantCMS](https://github.com/radiant/radiant) back in the day, but that project became inactive. He found Sofa and liked it even better than Radiant, but sadly it too became inactive. Hence Occams.
+- **[Comfortable Media Surfer](https://github.com/shakacode/comfortable-media-surfer)** revived Sofa under the sponsorship of ShakaCode, continuing its development for modern Rails applications.
+- **[Comfy Middle Seat](https://github.com/avonderluft/comfy-middle-seat)** began as a fork of Comfortable Media Surfer and is now implemented under its own `ComfyMiddleSeat` namespace and `comfy_middle_seat` paths.
 
 See the [CHANGELOG](CHANGELOG.md) for the inherited development history, and the original [Sofa releases](https://github.com/comfy/comfortable-mexican-sofa/releases) and [Surfer releases](https://github.com/shakacode/comfortable-media-surfer/releases) for earlier releases.
 
@@ -22,10 +22,10 @@ See the [CHANGELOG](CHANGELOG.md) for the inherited development history, and the
 - Simple drop-in integration with Rails 7.2+ apps with minimal configuration
 * The CMS keeps clear from the rest of your application
 * Powerful page templating capability using [Content Tags](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Content-Tags)
-* [Multiple Sites](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Sites) from a single installation
+* [Multiple Sites](https://github.com/shakacode/comfortable-media-surfer/wiki/Sites) from a single installation
 * Multi-Language Support (i18n) (ca, cs, da, de, en, es, fi, fr, gr, hr, it, ja, nb, nl, pl, pt-BR, ru, sv, tr, uk, zh-CN, zh-TW) and page localization.
-* [CMS Seeds](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-CMS-Seeds) for initial content population
-* [Revision History](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Revisions) to revert changes
+* [CMS Seeds](https://github.com/shakacode/comfortable-media-surfer/wiki/CMS-Seeds) for initial content population
+* [Revision History](https://github.com/shakacode/comfortable-media-surfer/wiki/Revisions) to revert changes
 * [Extendable Admin Area](https://github.com/shakacode/comfortable-media-surfer/wiki/HowTo:-Reusing-Admin-Area) built with [Bootstrap 4](http://getbootstrap.com) (responsive design). Using [CodeMirror](http://codemirror.net) for HTML and Markdown highlighing and [Redactor](http://imperavi.com/redactor) as the WYSIWYG editor.
 
 ## Dependencies
@@ -43,18 +43,20 @@ On Ruby 3.2+, 4.x, Rails 7.2+, 8.x
 Add gem definition to your Gemfile:
 
 ```ruby
-gem "comfy_middle_seat", "~> 3.1.0"
+gem "comfy_middle_seat", "~> 3.2.0"
 ```
 
-Then from the Rails project's root run:
+Then, for a new installation, run these commands from the Rails project's root:
 
-```
-    bundle install
-    rails generate comfy:cms
-    rails db:migrate
-    rails comfy:compile_assets
+```sh
+bundle install
+rails generate comfy:cms
+rails db:migrate
+rails comfy:compile_assets
 ```
 
+`rails db:migrate` is part of a new installation. Applications upgrading from Comfortable Media Surfer already have the same tables and schema and do not need a database migration for the gem, namespace, or internal-path rename.
+
 Now take a look inside your `config/routes.rb` file. You'll see where routes attach for the admin area and content serving. Make sure that content serving route appears as a very last item or it will make all other routes to be inaccessible.
 
 ```ruby
@@ -62,24 +64,60 @@ comfy_route :cms_admin, path: "/admin"
 comfy_route :cms, path: "/"
 ```
 
+The generator creates `config/initializers/comfy_middle_seat.rb`. Use `ComfyMiddleSeat` for configuration and other library API references:
+
+```ruby
+ComfyMiddleSeat.configure do |config|
+  config.cms_title = "My CMS"
+  config.admin_base_controller = "ApplicationController"
+end
+
+ComfyMiddleSeat::AccessControl::AdminAuthentication.username = "user"
+ComfyMiddleSeat::AccessControl::AdminAuthentication.password = "change-me"
+```
+
 ## Converting from Comfortable Media Surfer, Comfortable Mexican Sofa, or Occams
 
 ### From Surfer to Middle Seat
 
-Replace `comfortable_media_surfer` in your Gemfile with `comfy_middle_seat` and run `bundle install`. Do not include both gems. Existing `ComfortableMediaSurfer` configuration and database tables remain unchanged.
+1. Replace `comfortable_media_surfer` in your Gemfile with `comfy_middle_seat` and run `bundle install`. Do not include both gems.
+2. From the Rails application root, preview and run the standalone initializer upgrader. It does not boot Rails:
+
+   ```sh
+   bundle exec comfy-middle-seat-upgrade --dry-run
+   bundle exec comfy-middle-seat-upgrade
+   ```
+
+   It renames `config/initializers/comfortable_media_surfer.rb` to `config/initializers/comfy_middle_seat.rb`, updates the project namespace references inside it, and preserves the original as `config/initializers/comfortable_media_surfer.rb.bak`. It refuses to overwrite an existing initializer or backup.
+3. In any other application integrations, replace Ruby references to `ComfortableMediaSurfer` with `ComfyMiddleSeat`.
+
+For example:
+
+```ruby
+# Before
+ComfortableMediaSurfer.configure do |config|
+  config.cms_title = "My CMS"
+end
+
+# After
+ComfyMiddleSeat.configure do |config|
+  config.cms_title = "My CMS"
+end
+```
+
+Review the converted initializer and remove its `.bak` file when satisfied. The database tables, schema, and stored records remain unchanged; existing `comfy_cms_*` tables are used as-is, and **no database migration is required** for this upgrade.
 
 ### From Sofa to Middle Seat
 
-The database structure is the same.  Your Sofa project will also need to be upgraded to >= Rails 7.x  
-Then you should simply be able to update your Gemfile thus, and run bundle
+The database structure is the same, so no database migration is required for the CMS tables. Your Sofa project must first be upgraded to Rails 7.2 or newer. Then update the Gemfile, run `bundle install`, use `config/initializers/comfy_middle_seat.rb`, and update CMS library references in application code to `ComfyMiddleSeat`:
 
 ```ruby
-gem 'comfy_middle_seat', '~> 3.1.0'
+gem "comfy_middle_seat", "~> 3.2.0"
 ```
 
 ### From Occams to Middle Seat
 
-Again the project must be >= Rails 7.x.  Since the schema is different, executing this SQL should get you set for Middle Seat
+The project must be on Rails 7.2 or newer. Unlike Surfer and Sofa, Occams used different table names, so converting an Occams database requires the following SQL. This is an Occams data conversion, not a migration caused by the current `ComfyMiddleSeat` namespace or internal-path change.
 
 ```sql
 ALTER TABLE occams_cms_categories RENAME TO comfy_cms_categories;
@@ -107,7 +145,7 @@ UPDATE active_storage_attachments SET record_type = 'Comfy::Cms::File' WHERE rec
 
 After finishing installation you should be able to navigate to http://localhost:3000/admin
 
-Default username and password is 'user' and 'pass'. You probably want to change it right away. Admin credentials (among other things) can be found and changed in your app's CMS initializer: `config/initializers/comfortable_media_surfer.rb`. The initializer retains its Surfer name for compatibility.
+The default username and password are `user` and `pass`. Change them before exposing the application. Admin credentials and other CMS settings are configured in `config/initializers/comfy_middle_seat.rb` through the `ComfyMiddleSeat` namespace.
 
 Before creating pages and populating them with content we need to create a Site. Site defines a hostname, content path and its language.
 
@@ -126,7 +164,7 @@ Once you have a layout, you may start creating pages and populating content. It'
 
 ## Documentation
 
-The [Comfortable Media Surfer Wiki](https://github.com/shakacode/comfortable-media-surfer/wiki) remains the upstream reference for the inherited CMS features, including [Content Tags](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Content-Tags). The feature links above also point to that wiki. When following its installation instructions, use the `comfy_middle_seat` gem; Ruby examples using `ComfortableMediaSurfer` retain that namespace.
+The [Comfortable Media Surfer Wiki](https://github.com/shakacode/comfortable-media-surfer/wiki) remains an upstream reference for inherited CMS features, including [Content Tags](https://github.com/shakacode/comfortable-media-surfer/wiki/Docs:-Content-Tags). These historical upstream links are intentionally preserved. When adapting its examples, use the `comfy_middle_seat` gem, `config/initializers/comfy_middle_seat.rb`, and the `ComfyMiddleSeat` Ruby namespace; upstream examples that use `ComfortableMediaSurfer` show the former API and must be updated.
 
 ## Add-ons
 
@@ -138,7 +176,7 @@ If you want to add a Blog functionality to your app take a look at
 
 #### Contributing
 
-Comfy Middle Seat can run like any Rails application in development. It's as easy to work on as any other Rails app. For more detail see [CONTRIBUTING](CONTRIBUTING.md). The inherited development instructions may still refer to Comfortable Media Surfer.
+Comfy Middle Seat can run like any Rails application in development. It's as easy to work on as any other Rails app. For more detail, see [CONTRIBUTING](CONTRIBUTING.md).
 
 #### Testing
 
@@ -154,5 +192,4 @@ Comfy Middle Seat can run like any Rails application in development. It's as eas
 
 ---
 
-Copyright 2010-2019 Oleg Khabarov, 2024-2026 ShakaCode LLC, 2026 Andrew vonderLuft
-Released under the [MIT license](LICENSE)
+Copyright 2010-2019 Oleg Khabarov, 2024-2026 ShakaCode LLC, 2026 Andrew vonderLuft.<br/>Released under the [MIT license](LICENSE)

data/Rakefile

@@ -8,7 +8,7 @@ require 'stringio'
 
 Rails.application.load_tasks
 
-module ComfortableMediaSurferTestOutput
+module ComfyMiddleSeatTestOutput
   SUMMARY = %r{(?<assertions>\d+) assertions, (?<errors>\d+) errors, (?<failures>\d+) failures, (?<skips>\d+) skips?, (?<tests>\d+) tests}
   COLORS = { green: 32, yellow: 33, red: 31, cyan: 36 }.freeze
 
@@ -71,7 +71,7 @@ module ComfortableMediaSurferTestOutput
     def flush
       return if @pending.empty?
 
-      @io.print ComfortableMediaSurferTestOutput.progress_color(@pending)
+      @io.print ComfyMiddleSeatTestOutput.progress_color(@pending)
       @io.flush
       @pending.clear
     end
@@ -197,7 +197,7 @@ namespace :test do
   Rake::Task['test:serial'].enhance(['test:prepare_serial'])
 
   desc 'Run tests in isolated processes'
-  task(:parallel) { ComfortableMediaSurferTestOutput.run_parallel }
+  task(:parallel) { ComfyMiddleSeatTestOutput.run_parallel }
 end
 
 Rake::Task[:test].clear

data/app/assets/javascripts/comfy/admin/cms/application.js

@@ -15,6 +15,8 @@ import "./base";
 import "./categories";
 import "./codemirror";
 import "./diff";
+import "./dirty_forms";
+import "./draft_forms";
 import "./file_link";
 import "./file_upload";
 import "./files_modal";

data/app/assets/javascripts/comfy/admin/cms/base.js

@@ -25,15 +25,20 @@
     CMS.wysiwyg.init();
     CMS.sortableList.init();
     CMS.timepicker.init();
-    CMS.pageFragments();
+    CMS.pageFragments.init();
     CMS.categories();
     CMS.files.init();
     CMS.fileLinks();
     CMS.fileUpload.init();
     CMS.diff();
+    CMS.draftForms.init();
+    CMS.dirtyForms.init();
   };
 
   CMS.dispose = () => {
+    CMS.pageFragments.dispose();
+    CMS.draftForms.dispose();
+    CMS.dirtyForms.dispose();
     CMS.codemirror.dispose();
     CMS.wysiwyg.dispose();
     CMS.files.dispose();

data/app/assets/javascripts/comfy/admin/cms/codemirror.js

@@ -18,6 +18,9 @@ import "codemirror/mode/htmlmixed/htmlmixed";
           lineNumbers: true,
           viewportMargin: Infinity,
         });
+        codemirror.on("change", () => {
+          textarea.dispatchEvent(new Event("input", { bubbles: true }));
+        });
         codeMirrorInstances.push(codemirror);
       }
 
@@ -33,6 +36,20 @@ import "codemirror/mode/htmlmixed/htmlmixed";
           }
         });
     },
+    sync(root = document) {
+      for (const codemirror of codeMirrorInstances) {
+        if (root.contains(codemirror.getTextArea())) codemirror.save();
+      }
+    },
+    restore(root = document) {
+      for (const codemirror of codeMirrorInstances) {
+        const textarea = codemirror.getTextArea();
+        if (!root.contains(textarea)) continue;
+
+        codemirror.setValue(textarea.value);
+        codemirror.refresh();
+      }
+    },
     dispose() {
       for (const codemirror of codeMirrorInstances) {
         codemirror.toTextArea();

data/app/assets/javascripts/comfy/admin/cms/dirty_forms.js

@@ -0,0 +1,201 @@
+(() => {
+  const defaultMessage =
+    "You have unsaved changes. Are you sure you want to leave this page?";
+
+  let forms = [];
+  let baselines = new WeakMap();
+  let submittingForms = new WeakSet();
+  let navigationAllowed = false;
+
+  const controlState = (control) => {
+    if (!control.name) return null;
+
+    const type = (control.type || "").toLowerCase();
+    if (["button", "image", "reset", "submit"].includes(type)) return null;
+
+    if (type === "checkbox" || type === "radio") {
+      return [control.name, type, control.value, control.checked];
+    }
+
+    if (type === "file") {
+      return [
+        control.name,
+        type,
+        Array.from(control.files).map((file) => [
+          file.name,
+          file.size,
+          file.lastModified,
+        ]),
+      ];
+    }
+
+    if (control instanceof HTMLSelectElement && control.multiple) {
+      return [
+        control.name,
+        type,
+        Array.from(control.selectedOptions).map((option) => option.value),
+      ];
+    }
+
+    return [control.name, type, control.value];
+  };
+
+  const formState = (form) =>
+    JSON.stringify(Array.from(form.elements).map(controlState).filter(Boolean));
+
+  const syncEditors = () => {
+    if (CMS.codemirror && CMS.codemirror.sync) CMS.codemirror.sync();
+    if (CMS.wysiwyg && CMS.wysiwyg.sync) CMS.wysiwyg.sync();
+  };
+
+  const dirtyForms = () => {
+    syncEditors();
+    return forms.filter(
+      (form) =>
+        form.isConnected &&
+        baselines.has(form) &&
+        baselines.get(form) !== formState(form)
+    );
+  };
+
+  const formsRequiringWarning = () =>
+    dirtyForms().filter((form) => !submittingForms.has(form));
+
+  const warningMessage = (dirtyForm) =>
+    dirtyForm.dataset.cmsUnsavedMessage || defaultMessage;
+
+  const beforeUnload = (event) => {
+    if (navigationAllowed || formsRequiringWarning().length === 0) return;
+
+    event.preventDefault();
+    event.returnValue = "";
+  };
+
+  const navigationTarget = (event) => {
+    if (
+      event.defaultPrevented ||
+      event.button !== 0 ||
+      event.metaKey ||
+      event.ctrlKey ||
+      event.shiftKey ||
+      event.altKey
+    ) {
+      return null;
+    }
+
+    const link = event.target.closest("a[href]");
+    if (!link || link.hasAttribute("download")) return null;
+
+    const target = link.getAttribute("target");
+    if (target && !["_self", "_top", "_parent", window.name].includes(target)) {
+      return null;
+    }
+
+    const url = new URL(link.href, document.location.href);
+    if (
+      url.origin === document.location.origin &&
+      url.pathname === document.location.pathname &&
+      url.search === document.location.search &&
+      url.hash
+    ) {
+      return null;
+    }
+
+    return link;
+  };
+
+  const allowCurrentNavigation = () => {
+    navigationAllowed = true;
+    window.setTimeout(() => {
+      navigationAllowed = false;
+    }, 0);
+  };
+
+  const confirmLinkNavigation = (event) => {
+    if (navigationAllowed || !navigationTarget(event)) return;
+
+    const dirtyForm = formsRequiringWarning()[0];
+    if (!dirtyForm) return;
+
+    if (!window.confirm(warningMessage(dirtyForm))) {
+      event.preventDefault();
+      event.stopImmediatePropagation();
+      return;
+    }
+
+    allowCurrentNavigation();
+  };
+
+  const confirmTurbolinksNavigation = (event) => {
+    if (navigationAllowed) return;
+
+    const dirtyForm = formsRequiringWarning()[0];
+    if (!dirtyForm) return;
+
+    if (!window.confirm(warningMessage(dirtyForm))) {
+      event.preventDefault();
+      return;
+    }
+
+    allowCurrentNavigation();
+  };
+
+  const markSubmitting = (event) => {
+    const form = event.target;
+    const submitterTarget = event.submitter && event.submitter.formTarget;
+    const target = submitterTarget || form.target;
+
+    if (
+      target &&
+      !["_self", "_top", "_parent", window.name].includes(target)
+    ) {
+      return;
+    }
+
+    submittingForms.add(form);
+  };
+
+  window.CMS.dirtyForms = {
+    init() {
+      forms = Array.from(
+        document.querySelectorAll("form[data-cms-unsaved-message]")
+      );
+      baselines = new WeakMap();
+      submittingForms = new WeakSet();
+      navigationAllowed = false;
+
+      for (const form of forms) {
+        const baseline =
+          form.dataset.cmsSaveFailed === "true" ? null : formState(form);
+        baselines.set(form, baseline);
+      }
+
+      window.addEventListener("beforeunload", beforeUnload);
+      document.addEventListener("click", confirmLinkNavigation, true);
+      document.addEventListener("submit", markSubmitting, true);
+      document.addEventListener(
+        "turbolinks:before-visit",
+        confirmTurbolinksNavigation
+      );
+    },
+
+    dispose() {
+      window.removeEventListener("beforeunload", beforeUnload);
+      document.removeEventListener("click", confirmLinkNavigation, true);
+      document.removeEventListener("submit", markSubmitting, true);
+      document.removeEventListener(
+        "turbolinks:before-visit",
+        confirmTurbolinksNavigation
+      );
+
+      forms = [];
+      baselines = new WeakMap();
+      submittingForms = new WeakSet();
+      navigationAllowed = false;
+    },
+
+    isDirty() {
+      return dirtyForms().length > 0;
+    },
+  };
+})();