comfy_middle_seat 4.2.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25bec879fab0f69cf22d27320c22441fd04a2dd10d489223b5f4dfe42d4647e4
-  data.tar.gz: 0ca964528011c2f24c8d804c965f08fb46e1dea98d7b9286557bf9f6cc0da27a
+  metadata.gz: 654bed46bea3e8580f57ce3b9ba688ceb7b592d83f76c6762b771ee21c11266c
+  data.tar.gz: 6164127c75dd90045b376a401887ab95976a6722f9b084bc3e7b937056d7570e
 SHA512:
-  metadata.gz: ddc4be334bbdd4dcde5f7a703b2f22c8dd6645b79c36ea3ed1e13e77d4d6a077d0e8193c5de10b29520893d7f8463d019921a12553cd3dd5827b9d1d91741ba0
-  data.tar.gz: 4ea20039aeef0f0c580252eee42f09bf1804c7376f2944f5c5dba4927e86126bff5d7c681eda6f4de3e1e79ee33f23d16fa01345a06f90b4f6f178ab9aeea80b
+  metadata.gz: 1c2c3126c49194876cb5794df8d986f524ed93fc159337d08651f54dcd88fbcd9a2f9ccfb3ee80ea8eb6046217a0a82b94f73dcf442aa4c33877c196b61bad01
+  data.tar.gz: 235b0a6ecc612706f168d2daf513f1935addbd9083afea5a2f80726dffb65e80fc74021dae0cd3de1284d26f4df19ab084f336907489b409324f071c0e49171b

data/.github/workflows/coveralls.yml

@@ -39,6 +39,9 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
+      - name: Install image processors
+        run: sudo apt-get update && sudo apt-get install -y imagemagick libvips-dev
+
       - name: Update CMS gem
         run: bundle update comfy_middle_seat
 

data/.github/workflows/rubyonrails.yml

@@ -40,6 +40,9 @@ jobs:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
 
+      - name: Install image processors
+        run: sudo apt-get update && sudo apt-get install -y imagemagick libvips-dev
+
       - name: Update CMS gem
         run: bundle update comfy_middle_seat
 

data/CHANGELOG.md

@@ -12,16 +12,39 @@ This changelog follows the project's lineage: **Comfortable Mexican Sofa → Com
 
 ## [Unreleased]
 
+### Added
+
+- Resize, crop, and pad images with ImageMagick or Vips.
+- Validate image dimensions with a configurable size limit.
+
+### Fixed
+
+- Restore supported legacy image resizing and modernize admin thumbnails.
+- Keep original file links for images that cannot be resized.
+
+## [v4.3.0] - 2026-10-17
+
+### Added
+
+- Hide content with CMS comment blocks and add short inline notes.
+- Insert CMS tags with editor shortcuts and selected parameter placeholders.
+- Find shortcuts with `;;` + Tab or Ctrl+Space and fuzzy search.
+
+## [v4.2.0] - 2026-10-13
+
 ### Changed
 
 - Keep Page editing actions together in a sticky top toolbar.
 - Save edits and publish or unpublish a page with one button.
-- Shorten publication notices and show save hints as button tooltips.
-- Auto-dismiss success and informational notices; keep warnings and errors visible.
+- Show unpublished status below the heading and save hints as button tooltips.
+- Simplify the save confirmation to “Page updated.”
+- Fade success and informational notices after five seconds; pause on hover or focus.
+- Keep warnings and errors visible and respect reduced-motion preferences.
 
 ### Fixed
 
 - Keep editing buttons aligned with the page heading above publication status.
+- Keep editing controls usable after Preview.
 - Restore dismissal of admin flash notices.
 - Keep Add Child Layout on one line when space allows.
 
@@ -251,7 +274,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/avonderluft/comfy-middle-seat/compare/v4.1.0...master
+[Unreleased]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.3.0...master
+[v4.3.0]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.2.0...v4.3.0
+[v4.2.0]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.1.0...v4.2.0
 [v4.1.0]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.4...v4.1.0
 [v4.0.4]: https://github.com/avonderluft/comfy-middle-seat/compare/ea2bb99c0398e1f4d6e850a25e0c13afc577c3ad...v4.0.4
 [v4.0.3]: https://github.com/avonderluft/comfy-middle-seat/compare/v4.0.2...ea2bb99c0398e1f4d6e850a25e0c13afc577c3ad

data/README.md

@@ -114,6 +114,126 @@ A Site defines a hostname, path, and language. Layouts define page structure and
 
 When an editor creates a Page using this Layout, the admin automatically presents fields for `title` and `content`. Content tags can also provide Markdown, files, images, dates, numbers, checkboxes, snippets, partials, helpers, navigation, and other reusable content.
 
+### Editor shortcuts
+
+In HTML and Markdown code editors, type a shortcut and press **Tab** to insert a CMS tag. The parameter placeholder is selected so you can replace it immediately. For example, `;md` inserts `{{ cms:markdown content }}` with `content` selected.
+
+Type **`;;` then Tab**, or press **Ctrl+Space**, for a searchable shortcut list. Search by shortcut or tag name: `c` prioritizes comment, children, and other `c` shortcuts; `p fl` finds `page_file_link`. Exact and prefix matches appear before fuzzy matches.
+
+Use the arrow keys and **Enter** or **Tab** to choose. The tag replaces the entire trigger and search text. **Escape** closes the list without changing your text. Full names such as `;markdown` also work for direct expansion. One **Undo** reverses the expansion without removing what you typed.
+
+| Shortcut | Inserts | Selected placeholder |
+| --- | --- | --- |
+| `;md` | `markdown` | `content` |
+| `;tx` | `text` | `field` |
+| `;ta` | `textarea` | `content` |
+| `;wys` | `wysiwyg` | `content` |
+| `;da` | `date` | `field` |
+| `;dt` | `datetime` | `field` |
+| `;num` | `number` | `field` |
+| `;cb` | `checkbox` | `field` |
+| `;fi` | `file`, as a link | `attachment` |
+| `;fs` | `files`, as links | `attachments` |
+| `;im` | `image` | `image label` |
+| `;au` | `audio` | `path/to/audio` |
+| `;fl` | `file_link`, as a link | `file_id` |
+| `;pfl` | `page_file_link`, as a link | `attachment` |
+| `;sn` | `snippet` | `identifier` |
+| `;as`, `;css` | CSS `asset` tag | `layout_identifier` |
+| `;js` | JavaScript `asset` tag | `layout_identifier` |
+| `;hlp` | `helper` | `method_name` |
+| `;par` | `partial` | `path/to/partial` |
+| `;tpl` | `template` | `path/to/template` |
+| `;cr` | `breadcrumbs` | — |
+| `;ch` | `children` | — |
+| `;si` | `siblings` | — |
+| `;com` | Complete multiline comment block | `Comment here` |
+| `;nt` | `comment "Note"` (also `;note`) | `Note` |
+| `;ec` | `endcomment` | — |
+| `;end` | `end` | — |
+
+Placeholders are examples: replace them with your field names, identifiers, paths, or IDs. `;asset` inserts the CSS version; `;comment` inserts a full comment block.
+
+Shortcuts work at the start of a line, after whitespace, or after `>`, outside an existing CMS tag. Unrecognized shortcuts retain normal Tab behavior. CSS, JavaScript, ordinary text fields, and visual editors are unchanged. Saved content uses the standard `{{ cms:... }}` syntax.
+
+### CMS comments
+
+Use a quoted note for a short comment:
+
+```html
+{{cms:comment "Replace this banner in December"}}
+```
+
+Use a block to hide a section, including any CMS tags inside it:
+
+```html
+{{cms:comment}}
+Internal note: this section is not ready.
+{{cms:markdown old_content}}
+{{cms:snippet seasonal_banner}}
+{{cms:endcomment}}
+```
+
+Comments produce no rendered output and do not create editor fields. Unlike HTML comments, enclosed CMS tags are not processed. Source text and existing field values remain stored; removing a comment restores normal processing.
+
+Blocks may be nested and must end with `{{cms:endcomment}}`, not `{{cms:end}}`. Short notes accept single or double quotes, with backslash-escaped quotes. Unclosed blocks and malformed comment tags raise a clear syntax error. Comments work in layouts, snippets, and rendered fragment content, including Markdown. They are not a place for secrets: original source remains available to editors and may be exposed by APIs that include raw content.
+
+### Image resizing
+
+Resize images from the media library or page attachments without changing the originals:
+
+```liquid
+{{ cms:image "Homepage banner", resize_to_limit: "1600x600" }}
+{{ cms:file card_photo, as: image, resize_to_fill: "600x400" }}
+{{ cms:image "Product photo", resize_and_pad: "500x500" }}
+```
+
+The same options work with `file`, `files`, `image`, `file_link`, and `page_file_link`:
+
+| Option | Result |
+| --- | --- |
+| `resize_to_limit` | Fit within the dimensions; never enlarge. |
+| `resize_to_fit` | Fit within the dimensions; allow enlargement. |
+| `resize_to_fill` | Fill the exact dimensions with a centered crop. |
+| `resize_and_pad` | Fit the whole image into the exact dimensions with padding. |
+
+Specify one operation and positive dimensions as `"WIDTHxHEIGHT"`. Invalid values, conflicting operations, and dimensions above the configured limit raise an error. Padding uses the processor's defaults; its color/transparency can differ between processors and image formats. Sizing options are ignored for missing attachments and files that Active Storage cannot transform, such as PDFs and SVGs under its default configuration. Missing attachments render nothing; non-transformable files retain their original URLs.
+
+The default maximum requested width or height is 4096 pixels. Change it in `config/initializers/comfy_middle_seat.rb`:
+
+```ruby
+ComfyMiddleSeat.configure do |config|
+  config.max_image_dimension = 6000
+end
+```
+
+This limits requested tag dimensions, not upload sizes or all intermediate processing memory. Admin thumbnails use fixed sizes.
+
+The CMS respects your application's Active Storage processor. Use ImageMagick with `:mini_magick`, or install libvips and add `ruby-vips` to your application's Gemfile, then configure:
+
+```ruby
+# config/application.rb, inside your application class
+config.active_storage.variant_processor = :vips
+```
+
+Restart after changing processors. No processor switch is required to use the new options; the gem retains its existing MiniMagick dependency for compatibility.
+
+#### Existing image tags
+
+- `resize: "400x300"` translates to `resize_to_fit`; `resize: "400x300>"` translates to `resize_to_limit`. Both work with either processor.
+- Supported legacy combinations of `resize`, `gravity`, and `crop` retain their operation order under MiniMagick. Resize accepts `WxH` with an optional `>`, `<`, `!`, or `^` suffix; crop requires `WxH+X+Y` (signed offsets). Offset-free crops are rejected because ImageMagick treats them as tiling, not a single crop. Gravity accepts the standard compass positions and `center`.
+- Other legacy geometry, including percentages and one-dimensional sizes, raises an actionable error. Replace it with an explicit two-dimensional operation. The size limit applies to legacy dimensions too.
+- Complex legacy expressions are not silently approximated on Vips. Convert them before switching processors; do not mix legacy and modern options in a tag.
+
+After upgrading, clear rendered page and translation caches once so image links use the new transformations:
+
+```ruby
+Comfy::Cms::Page.update_all(content_cache: nil)
+Comfy::Cms::Translation.update_all(content_cache: nil)
+```
+
+No database migration or re-upload is needed. New variants are generated on demand and may increase storage use temporarily; originals and old variants are not deleted. Purge any external page/CDN HTML caches separately. Clear rendered caches again after changing the sizing policy. Active Storage's variant keys do not include the processor: switching processors reuses existing variants with the same options, even after clearing page caches. To regenerate those images with the new processor, invalidate the affected derived variants separately, preserving the original uploads, and clear any cached derivative files on your CDN.
+
 ### Publishing pages
 
 A page is publicly visible only when it and all its ancestors are published. Unpublishing a parent hides its branch without changing descendants’ individual publication settings. Republishing the parent restores only descendants whose full ancestor chain is published; drafts stay unpublished. Translations must also satisfy their own publication settings.
@@ -130,7 +250,7 @@ Development mode continues to show unpublished pages for preview. Check public v
 | Rails | CI tests 7.2, 8.0, and 8.1 |
 | Node.js | 18 or newer for asset compilation |
 | File storage | Active Storage |
-| Image processing | ImageMagick |
+| Image processing | ImageMagick or libvips (via Active Storage) |
 
 Pagination is provided by [Kaminari](https://github.com/amatsuda/kaminari). The admin uses Bootstrap, CodeMirror, and Redactor.
 

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

@@ -0,0 +1,177 @@
+import CodeMirror from "codemirror";
+import "codemirror/addon/hint/show-hint";
+
+const tag = (shortcut, name, params = "", placeholder = null, aliases = []) => ({
+  shortcut,
+  name,
+  aliases: [shortcut, name, ...aliases],
+  text: `{{ cms:${name}${params ? ` ${params}` : ""} }}`,
+  placeholder,
+});
+
+const completions = [
+  tag("md", "markdown", "content", "content"),
+  tag("tx", "text", "field", "field"),
+  tag("ta", "textarea", "content", "content"),
+  tag("wys", "wysiwyg", "content", "content"),
+  tag("da", "date", "field", "field"),
+  tag("dt", "datetime", "field", "field"),
+  tag("num", "number", "field", "field"),
+  tag("cb", "checkbox", "field", "field"),
+  tag("fi", "file", "attachment, as: link", "attachment"),
+  tag("fs", "files", "attachments, as: link", "attachments"),
+  tag("im", "image", '"image label"', "image label"),
+  tag("au", "audio", '"path/to/audio"', "path/to/audio"),
+  tag("fl", "file_link", "file_id, as: link", "file_id"),
+  tag("pfl", "page_file_link", "attachment, as: link", "attachment"),
+  tag("sn", "snippet", "identifier", "identifier"),
+  tag("as", "asset", "layout_identifier, type: css, as: tag", "layout_identifier"),
+  tag("css", "asset", "layout_identifier, type: css, as: tag", "layout_identifier"),
+  tag("js", "asset", "layout_identifier, type: js, as: tag", "layout_identifier"),
+  tag("hlp", "helper", "method_name", "method_name"),
+  tag("par", "partial", '"path/to/partial"', "path/to/partial"),
+  tag("tpl", "template", '"path/to/template"', "path/to/template"),
+  tag("cr", "breadcrumbs"),
+  tag("ch", "children"),
+  tag("si", "siblings"),
+  {
+    ...tag("com", "comment", "", "Comment here"),
+    text: "{{ cms:comment }}\nComment here\n{{ cms:endcomment }}",
+  },
+  tag("nt", "comment", '"Note"', "Note", ["note"]),
+  tag("ec", "endcomment"),
+  tag("end", "end"),
+];
+
+const byAlias = new Map();
+for (const completion of completions) {
+  for (const alias of completion.aliases) {
+    // Shared full names use the primary entry: asset => ;as, comment => ;com.
+    if (!byAlias.has(alias)) byAlias.set(alias, completion);
+  }
+}
+
+const completionContext = (editor, requireSemicolon = false, start = null) => {
+  if (editor.getOption("readOnly") || editor.somethingSelected() ||
+      editor.listSelections().length !== 1) return null;
+
+  const to = editor.getCursor();
+  const line = editor.getLine(to.line);
+  if (/\w/.test(line.charAt(to.ch))) return null;
+
+  if (start && (start.line !== to.line || start.ch > to.ch)) return null;
+  // Keep the menu's original start so spaces in a fuzzy query are not lost.
+  const match = start
+    ? /^(;{0,2}[\w ]*)$/.exec(line.slice(start.ch, to.ch))
+    : /(?:^|[\s>])(;;[\w ]*|;?\w*)$/.exec(line.slice(0, to.ch));
+  if (!match || (requireSemicolon && !match[1].startsWith(";"))) return null;
+
+  const from = start || CodeMirror.Pos(to.line, to.ch - match[1].length);
+  const before = editor.getRange(CodeMirror.Pos(0, 0), from);
+  if (before.lastIndexOf("{{") > before.lastIndexOf("}}")) return null;
+
+  return {
+    from,
+    to,
+    selector: match[1].startsWith(";;"),
+    query: match[1].replace(/^;{1,2}/, "").toLowerCase().replace(/ /g, ""),
+  };
+};
+
+const insertCompletion = (editor, completion, from, to) => {
+  const indent = editor.getLine(from.line).match(/^\s*/)[0];
+  const text = completion.text.replace(/\n/g, `\n${indent}`);
+  const start = editor.indexFromPos(from);
+
+  editor.operation(() => {
+    // A distinct history origin keeps the expansion separate from preceding typing.
+    editor.replaceRange(text, from, to, "cms-completion");
+    if (completion.placeholder) {
+      const offset = text.indexOf(completion.placeholder);
+      editor.setSelection(
+        editor.posFromIndex(start + offset),
+        editor.posFromIndex(start + offset + completion.placeholder.length)
+      );
+    } else {
+      editor.setCursor(editor.posFromIndex(start + text.length));
+    }
+  });
+};
+
+const matchRank = (alias, query) => {
+  if (alias === query) return 0;
+  if (alias.startsWith(query)) return 1;
+  if (alias.includes(query)) return 2;
+
+  let position = 0;
+  for (const character of query) {
+    position = alias.indexOf(character, position);
+    if (position === -1) return Infinity;
+    position += 1;
+  }
+  return 3;
+};
+
+const displayNames = {
+  as: "asset (CSS)",
+  css: "asset (CSS)",
+  js: "asset (JavaScript)",
+  com: "comment (block)",
+  nt: "comment (note)",
+};
+
+const hints = (editor, start) => {
+  const context = completionContext(editor, false, start);
+  if (!context) return null;
+
+  return {
+    from: context.from,
+    to: context.to,
+    list: completions
+      .map((completion) => ({
+        completion,
+        rank: Math.min(...completion.aliases.map((alias) => matchRank(alias, context.query))),
+      }))
+      .filter(({ rank }) => Number.isFinite(rank))
+      .sort((a, b) => a.rank - b.rank)
+      .map(({ completion }) => ({
+        text: completion.text,
+        displayText: `;${completion.shortcut} ${displayNames[completion.shortcut] || completion.name}`,
+        hint(cm, data) {
+          insertCompletion(cm, completion, data.from, data.to);
+        },
+      })),
+  };
+};
+
+const showCompletions = (editor, context) => {
+  editor.showHint({
+    hint: (cm) => hints(cm, context.from),
+    completeSingle: false,
+    closeCharacters: /[\t\r\n()[\]{}:>,]/,
+  });
+};
+
+export const cmsTagCompletionKeys = (mode) => {
+  if (!["text/html", "htmlmixed", "text/x-markdown", "markdown"].includes(mode)) return {};
+
+  return {
+    Tab(editor) {
+      const context = completionContext(editor, true);
+      if (context?.selector) {
+        showCompletions(editor, context);
+        return;
+      }
+      const completion = context && byAlias.get(context.query);
+      if (!completion) return CodeMirror.Pass;
+
+      insertCompletion(editor, completion, context.from, context.to);
+    },
+    "Ctrl-Space"(editor) {
+      const context = completionContext(editor);
+      if (!context) return CodeMirror.Pass;
+
+      showCompletions(editor, context);
+    },
+  };
+};

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

@@ -1,5 +1,6 @@
 import jQuery from "jquery";
 import CodeMirror from "codemirror";
+import { cmsTagCompletionKeys } from "./cms_tag_completions";
 import "codemirror/mode/markdown/markdown";
 import "codemirror/mode/htmlmixed/htmlmixed";
 
@@ -12,6 +13,7 @@ import "codemirror/mode/htmlmixed/htmlmixed";
       )) {
         const codemirror = CodeMirror.fromTextArea(textarea, {
           mode: textarea.dataset.cmsCmMode,
+          extraKeys: cmsTagCompletionKeys(textarea.dataset.cmsCmMode),
           tabSize: 2,
           lineWrapping: true,
           autoCloseTags: true,
@@ -52,6 +54,7 @@ import "codemirror/mode/htmlmixed/htmlmixed";
     },
     dispose() {
       for (const codemirror of codeMirrorInstances) {
+        codemirror.closeHint();
         codemirror.toTextArea();
       }
       codeMirrorInstances.length = 0;

data/app/assets/stylesheets/comfy/admin/cms/application.sass

@@ -2,6 +2,7 @@
 @import "comfy/vendor/bootstrap/bootstrap"
 
 @import "codemirror/lib/codemirror"
+@import "codemirror/addon/hint/show-hint"
 @import "comfy/vendor/fontawesome"
 @import "comfy/vendor/redactor"
 @import "flatpickr/dist/flatpickr.min"

data/app/assets/stylesheets/comfy/admin/cms/codemirror_overrides.sass

@@ -12,6 +12,17 @@ body#comfy
     .CodeMirror-scroll
       min-height: 160px
 
+  .CodeMirror-hints
+    z-index: 1060
+    max-width: calc(100vw - 1rem)
+    border-color: $gray-400
+    background-color: $white
+    .CodeMirror-hint
+      color: $body-color
+    .CodeMirror-hint-active
+      background-color: $primary
+      color: $white
+
   .CodeMirror-focused
     border-color: rgba(82, 168, 236, 0.8)
     outline: 0

data/app/controllers/comfy/admin/cms/files_controller.rb

@@ -23,7 +23,13 @@ class Comfy::Admin::Cms::FilesController < Comfy::Admin::Cms::BaseController
         case params[:type]
         when 'image'
           file_scope.with_images.collect do |file|
-            { thumb: url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+            attachment = file.attachment
+            thumbnail = if attachment.variable?
+                          attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])
+                        else
+                          attachment
+                        end
+            { thumb: url_for(thumbnail),
               image: url_for(file.attachment),
               title: file.label }
           end

data/app/models/comfy/cms/file.rb

@@ -6,9 +6,9 @@ class Comfy::Cms::File < ActiveRecord::Base
   include Comfy::Cms::WithCategories
 
   VARIANT_SIZE = {
-    redactor: { resize: '100x75^', gravity: 'center', crop: '100x75+0+0' },
-    thumb: { resize: '200x150^', gravity: 'center', crop: '200x150+0+0' },
-    icon: { resize: '28x28^', gravity: 'center', crop: '28x28+0+0' }
+    redactor: { resize_to_fill: [100, 75] },
+    thumb: { resize_to_fill: [200, 150] },
+    icon: { resize_to_fill: [28, 28] }
   }.freeze
 
   # temporary place to store attachment

data/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml

@@ -2,7 +2,7 @@
   - attachments.each do |attachment|
     :ruby
       thumb_url = if attachment.variable?
-        url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+        url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb]))
       end
       filename = attachment.filename.to_s
       truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")

data/config/initializers/comfy_middle_seat.rb

@@ -46,6 +46,10 @@ ComfyMiddleSeat.configure do |config|
   # object you want to keep. Set it to 0 if you wish to turn this feature off.
   #   config.revisions_limit = 25
 
+  # Maximum requested width or height for image resizing in CMS tags.
+  # Values above this limit raise an error rather than being silently reduced.
+  #   config.max_image_dimension = 4096
+
   # Locale definitions. If you want to define your own locale merge
   # {:locale => 'Locale Title'} with this.
   #   config.locales = {:en => 'English', :es => 'Español'}

data/lib/comfy_middle_seat/configuration.rb

@@ -84,6 +84,9 @@ class ComfyMiddleSeat::Configuration
   # For example: include fragments into json data with `config.page_to_json_options = { include: [:fragments] }`
   attr_accessor :page_to_json_options
 
+  # Maximum requested width or height for image transformations in CMS tags.
+  attr_accessor :max_image_dimension
+
   # Configuration defaults
   def initialize
     @cms_title              = 'ComfyMiddleSeat CMS Engine'
@@ -99,6 +102,7 @@ class ComfyMiddleSeat::Configuration
     @enable_seeds           = false
     @seeds_path             = File.expand_path('db/cms_seeds', Rails.root)
     @revisions_limit        = 25
+    @max_image_dimension    = 4096
     @locales                = {
       'ar' => 'عربي',
       'ca' => 'Català',

data/lib/comfy_middle_seat/content/image_transformations.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+# Restrict CMS-authored transformations to bounded image operations. Never pass
+# arbitrary tag options through to an image processor.
+class ComfyMiddleSeat::Content::ImageTransformations
+  OPERATIONS = %w[resize_to_limit resize_to_fit resize_to_fill resize_and_pad].freeze
+  LEGACY_OPTIONS = %w[resize gravity crop].freeze
+  OPTIONS = (OPERATIONS + LEGACY_OPTIONS).freeze
+  GRAVITIES = %w[northwest north northeast west center east southwest south southeast].freeze
+
+  def self.normalize(options, processor: ActiveStorage.variant_processor)
+    new(options, processor).normalize
+  end
+
+  def initialize(options, processor)
+    @options = options.stringify_keys
+    @processor = processor
+  end
+
+  def normalize
+    return {} if @options.empty?
+
+    unknown = @options.keys - OPTIONS
+    error!("Unknown image options: #{unknown.join(', ')}") if unknown.any?
+    modern = @options.keys & OPERATIONS
+    if modern.size > 1 || (modern.any? && @options.keys.intersect?(LEGACY_OPTIONS))
+      error!('Use one resize operation; do not mix modern and legacy image options')
+    end
+
+    if modern.any?
+      operation = modern.first
+      { operation.to_sym => dimensions(@options[operation], operation) }
+    else
+      legacy_transformations
+    end
+  end
+
+private
+
+  def dimensions(value, operation)
+    match = value.is_a?(String) && %r{\A\s*(\d+)\s*x\s*(\d+)\s*\z}.match(value)
+    error!("#{operation} must be dimensions such as \"400x300\"") unless match
+    validate_dimensions(match[1].to_i, match[2].to_i)
+  end
+
+  def validate_dimensions(width, height)
+    limit = ComfyMiddleSeat.config.max_image_dimension
+    unless limit.is_a?(Integer) && limit.positive?
+      error!('max_image_dimension must be a positive integer')
+    end
+    unless width.positive? && height.positive? && width <= limit && height <= limit
+      error!("Image dimensions must be between 1 and #{limit} pixels; adjust max_image_dimension if needed")
+    end
+    [width, height]
+  end
+
+  def legacy_transformations
+    if @options.key?('resize')
+      size, modifier = legacy_resize
+      if @options.keys == ['resize'] && ['', '>'].include?(modifier)
+        operation = modifier == '>' ? :resize_to_limit : :resize_to_fit
+        return { operation => size }
+      end
+    end
+
+    validate_legacy_crop if @options.key?('crop')
+
+    if @options.key?('gravity') && !GRAVITIES.include?(@options['gravity'])
+      error!("Unsupported gravity; choose #{GRAVITIES.join(', ')}")
+    end
+    unless @options.key?('resize') || @options.key?('crop')
+      error!('Legacy gravity requires resize or crop')
+    end
+    unless @processor == :mini_magick
+      error!('Legacy crop, gravity, and resize modifiers require MiniMagick; use a modern resize option with Vips')
+    end
+
+    # image_processing combines these operations itself. The order matters for
+    # existing resize/gravity/crop expressions; combine_options is unsupported.
+    @options.slice(*LEGACY_OPTIONS).symbolize_keys
+  end
+
+  def legacy_resize
+    value = @options['resize']
+    match = value.is_a?(String) && %r{\A(\d+)x(\d+)([!<>^]?)\z}.match(value)
+    error!('Legacy resize must be WxH with an optional >, <, !, or ^ suffix; use a modern resize option') unless match
+    [validate_dimensions(match[1].to_i, match[2].to_i), match[3]]
+  end
+
+  def validate_legacy_crop
+    value = @options['crop']
+    match = value.is_a?(String) && %r{\A(\d+)x(\d+)[+-]\d+[+-]\d+\z}.match(value)
+    error!('Legacy crop requires explicit offsets: WxH+X+Y; use resize_to_fill for a centered crop') unless match
+    validate_dimensions(match[1].to_i, match[2].to_i)
+  end
+
+  def error!(message)
+    raise ComfyMiddleSeat::Content::Tag::Error, message
+  end
+end

data/lib/comfy_middle_seat/content/renderer.rb

@@ -22,6 +22,9 @@ class ComfyMiddleSeat::Content::Renderer
 
   # tags are in this format: {{ cms:tag_class params }}
   TAG_REGEX = %r{\{\{\s*?cms:(?<class>\w+)(?<params>.*?)\}\}}
+  COMMENT_START_REGEX = %r{\{\{\s*cms:(?<comment>comment|endcomment)(?=\s|\}\}|\z)}
+  TOKEN_REGEX = %r{#{COMMENT_START_REGEX}|#{TAG_REGEX}}
+  COMMENT_NOTE_REGEX = %r{(?:"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|“(?:\\.|[^”\\])*”|‘(?:\\.|[^’\\])*’)\s*\}\}}m
 
   class << self
     # @return [Hash<String, Class<ComfyMiddleSeat::Content::Tag>>]
@@ -73,23 +76,35 @@ class ComfyMiddleSeat::Content::Renderer
 
   # Splitting text with tags into tokens we can process down the line
   # @return [Array<String, {Symbol => String}>]
-  def tokenize(string)
+  def tokenize(string, preserve_whitespace: false)
     tokens = []
     ss = StringScanner.new(string.to_s)
-    while (string = ss.scan_until(TAG_REGEX))
+    while (string = ss.scan_until(TOKEN_REGEX))
       text = string.sub(ss[0], '')
       tokens << text unless text.empty?
-      tokens << {
-        tag_class: ss[:class],
-        tag_params: ss[:params].strip,
-        source: ss[0]
-      }
+      case ss[:comment]
+      when 'comment'
+        skip_comment(ss)
+      when 'endcomment'
+        raise SyntaxError, 'Unexpected {{cms:endcomment}} without {{cms:comment}}'
+      else
+        tokens << {
+          tag_class: ss[:class],
+          tag_params: ss[:params].strip,
+          source: ss[0]
+        }
+      end
     end
     text = ss.rest
-    tokens << text if text.present?
+    tokens << text if text.present? || (preserve_whitespace && !text.empty?)
     tokens
   end
 
+  # Remove comments before formatters such as Markdown can transform their contents.
+  def strip_comments(string)
+    tokenize(string, preserve_whitespace: true).map { |token| token.is_a?(Hash) ? token[:source] : token }.join
+  end
+
   # Constructing node tree for content. It's a list of strings and tags with
   # their own `nodes` method that has array of strings and tags with their own
   # `nodes` method that... you get the idea.
@@ -143,4 +158,34 @@ class ComfyMiddleSeat::Content::Renderer
 
     nodes.flatten
   end
+
+private
+
+  # Comments are lexical: their contents must never become tag instances or form fields.
+  def skip_comment(scanner)
+    return unless comment_block?(scanner)
+
+    depth = 1
+    while scanner.scan_until(COMMENT_START_REGEX)
+      if scanner[:comment] == 'comment'
+        depth += 1 if comment_block?(scanner)
+      else
+        unless scanner.skip(%r{\s*\}\}})
+          raise SyntaxError, 'Invalid CMS comment closing tag: use {{cms:endcomment}} without parameters'
+        end
+
+        depth -= 1
+        return if depth.zero?
+      end
+    end
+    raise SyntaxError, 'Unclosed CMS comment: expected {{cms:endcomment}}'
+  end
+
+  def comment_block?(scanner)
+    scanner.skip(%r{\s*})
+    return true if scanner.skip(%r{\}\}})
+    return false if scanner.skip(COMMENT_NOTE_REGEX)
+
+    raise SyntaxError, 'Invalid CMS comment: use {{cms:comment "note"}} or {{cms:comment}}...{{cms:endcomment}}'
+  end
 end

data/lib/comfy_middle_seat/content/tags/file.rb

@@ -8,9 +8,8 @@ require_relative 'mixins/file_content'
 #
 # `as`      - url (default) | link | image - render out link or image tag
 # `label`   - attach label attribute to link or image tag
-# `resize`  - imagemagic option. For example: "100x50>"
-# `gravity` - imagemagic option. For example: "center"
-# `crop`    - imagemagic option. For example: "100x50+0+0"
+# Image sizing: resize_to_limit, resize_to_fit, resize_to_fill, resize_and_pad ("100x50").
+# Legacy resize/gravity/crop expressions remain supported for MiniMagick.
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
 class ComfyMiddleSeat::Content::Tags::File < ComfyMiddleSeat::Content::Tags::Fragment
@@ -28,7 +27,7 @@ class ComfyMiddleSeat::Content::Tags::File < ComfyMiddleSeat::Content::Tags::Fra
     @as             = options['as'] || 'url'
     @label          = options['label']
     @class          = options['class']
-    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
+    @variant_attrs  = options.slice(*ComfyMiddleSeat::Content::ImageTransformations::OPTIONS)
   end
 
   def form_field(object_name, view, index)

data/lib/comfy_middle_seat/content/tags/file_link.rb

@@ -9,12 +9,8 @@ require_relative 'mixins/file_content'
 # `as`      - url (default) | link | image - how file gets rendered out
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
-# - variant_attrs are not functional, perhaps due to some change in ImageMagick
-# - Simply use a class in your CSS / SASS to style your image display
-# `label`   - attach label attribute to link or image tag
-# `resize`  - imagemagick option. For example: "100x50>"
-# `gravity` - imagemagick option. For example: "center"
-# `crop`    - imagemagick option. For example: "100x50+0+0"
+# Image sizing: resize_to_limit, resize_to_fit, resize_to_fill, resize_and_pad ("100x50").
+# Legacy resize/gravity/crop expressions remain supported for MiniMagick.
 #
 class ComfyMiddleSeat::Content::Tags::FileLink < ComfyMiddleSeat::Content::Tag
   include ComfyMiddleSeat::Content::Tags::Mixins::FileContent
@@ -28,7 +24,7 @@ class ComfyMiddleSeat::Content::Tags::FileLink < ComfyMiddleSeat::Content::Tag
     @identifier     = params[0]
     @as             = options['as'] || 'url'
     @class          = options['class']
-    @variant_attrs  = options.slice('resize', 'gravity', 'crop') # broken for ImageMagick
+    @variant_attrs  = options.slice(*ComfyMiddleSeat::Content::ImageTransformations::OPTIONS)
 
     return if @identifier.present?
 

data/lib/comfy_middle_seat/content/tags/image.rb

@@ -7,12 +7,8 @@ require_relative 'mixins/file_content'
 #
 # `class`   - any html classes that you want on the image tag. For example "class1 class2"
 #
-# - variant_attrs are not functional, perhaps due to some change in ImageMagick
-# - Simply use a class in your CSS / SASS to style your image display
-# `label`   - attach label attribute to link or image tag
-# `resize`  - imagemagick option. For example: "100x50>"
-# `gravity` - imagemagick option. For example: "center"
-# `crop`    - imagemagick option. For example: "100x50+0+0"
+# Image sizing: resize_to_limit, resize_to_fit, resize_to_fill, resize_and_pad ("100x50").
+# Legacy resize/gravity/crop expressions remain supported for MiniMagick.
 
 class ComfyMiddleSeat::Content::Tags::Image < ComfyMiddleSeat::Content::Tag
   include ComfyMiddleSeat::Content::Tags::Mixins::FileContent
@@ -26,7 +22,7 @@ class ComfyMiddleSeat::Content::Tags::Image < ComfyMiddleSeat::Content::Tag
     @identifier     = params[0]
     @as             = 'image'
     @class          = options['class']
-    @variant_attrs  = options.slice('resize', 'gravity', 'crop') # broken for ImageMagick
+    @variant_attrs  = options.slice(*ComfyMiddleSeat::Content::ImageTransformations::OPTIONS)
 
     return if @identifier.present?
 

data/lib/comfy_middle_seat/content/tags/markdown.rb

@@ -5,7 +5,10 @@
 #
 class ComfyMiddleSeat::Content::Tags::Markdown < ComfyMiddleSeat::Content::Tags::Fragment
   def render
-    renderable ? Kramdown::Document.new(content.to_s).to_html : ''
+    return '' unless renderable
+
+    source = ComfyMiddleSeat::Content::Renderer.new(context).strip_comments(content)
+    Kramdown::Document.new(source).to_html
   end
 
   def form_field(object_name, view, index)

data/lib/comfy_middle_seat/content/tags/mixins/file_content.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
+require_relative '../../image_transformations'
+
 # A mixin for tags that returns the file as their content.
 module ComfyMiddleSeat::Content::Tags::Mixins
   module FileContent
     # @param [ActiveStorage::Blob] file
     # @param ["link", "image", "url"] as
-    # @param [{String => String}] variant_attrs ImageMagick variant attributes
+    # @param [{String => String}] variant_attrs Modern or legacy image options
     # @param [String] label alt text for `as: "image"`, link text for `as: "link"`
     # @return [String]
     def content(file: self.file, as: self.as, variant_attrs: self.variant_attrs, label: self.label)
@@ -14,8 +16,9 @@ module ComfyMiddleSeat::Content::Tags::Mixins
       url_helpers = Rails.application.routes.url_helpers
 
       attachment_url =
-        if variant_attrs.present? && file.image?
-          variant = file.variant(combine_options: variant_attrs)
+        if variant_attrs.present? && file.variable?
+          transformations = ComfyMiddleSeat::Content::ImageTransformations.normalize(variant_attrs)
+          variant = file.variant(transformations)
           url_helpers.rails_representation_path(variant, only_path: true)
         else
           url_helpers.rails_blob_path(file, only_path: true)

data/lib/comfy_middle_seat/content/tags/page_file_link.rb

@@ -18,12 +18,8 @@ require_relative 'mixins/file_content'
 # `as`      - url (default) | link | image - how file gets rendered out
 # `class`   - any html classes that you want on the result link or image tag. For example "class1 class2"
 #
-# - the following params are deprecated / not functional, perhaps due to some change in ImageMagick
-# - Simply use a class in your CSS / SASS to style your image display
-# `label`   - attach label attribute to link or image tag
-# `resize`  - imagemagick option. For example: "100x50>"
-# `gravity` - imagemagick option. For example: "center"
-# `crop`    - imagemagick option. For example: "100x50+0+0"
+# Image sizing: resize_to_limit, resize_to_fit, resize_to_fill, resize_and_pad ("100x50").
+# Legacy resize/gravity/crop expressions remain supported for MiniMagick.
 #
 class ComfyMiddleSeat::Content::Tags::PageFileLink < ComfyMiddleSeat::Content::Tag
   include ComfyMiddleSeat::Content::Tags::Mixins::FileContent
@@ -48,7 +44,7 @@ class ComfyMiddleSeat::Content::Tags::PageFileLink < ComfyMiddleSeat::Content::T
     @identifier     = params[0]
     @as             = options['as'] || 'url'
     @class          = options['class']
-    @variant_attrs  = options.slice('resize', 'gravity', 'crop')
+    @variant_attrs  = options.slice(*ComfyMiddleSeat::Content::ImageTransformations::OPTIONS)
     @filename       = options['filename']
 
     return if @identifier.present?

data/lib/comfy_middle_seat/content/tags/snippet.rb

@@ -18,7 +18,8 @@ class ComfyMiddleSeat::Content::Tags::Snippet < ComfyMiddleSeat::Content::Tag
 
   def content
     if snippet.markdown
-      Kramdown::Document.new(snippet.content.to_s).to_html
+      source = ComfyMiddleSeat::Content::Renderer.new(context).strip_comments(snippet.content)
+      Kramdown::Document.new(source).to_html
     else
       snippet.content
     end

data/lib/comfy_middle_seat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ComfyMiddleSeat
-  VERSION = '4.2.0'
+  VERSION = '4.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_middle_seat
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -230,6 +230,7 @@ files:
 - app/assets/javascripts/comfy/admin/cms/application.js
 - app/assets/javascripts/comfy/admin/cms/base.js
 - app/assets/javascripts/comfy/admin/cms/categories.js
+- app/assets/javascripts/comfy/admin/cms/cms_tag_completions.js
 - app/assets/javascripts/comfy/admin/cms/codemirror.js
 - app/assets/javascripts/comfy/admin/cms/custom.js
 - app/assets/javascripts/comfy/admin/cms/diff.js
@@ -573,6 +574,7 @@ files:
 - lib/comfy_middle_seat/configuration.rb
 - lib/comfy_middle_seat/content.rb
 - lib/comfy_middle_seat/content/block.rb
+- lib/comfy_middle_seat/content/image_transformations.rb
 - lib/comfy_middle_seat/content/params_parser.rb
 - lib/comfy_middle_seat/content/renderer.rb
 - lib/comfy_middle_seat/content/tag.rb