comfortable_media_surfer 3.1.6 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5be068cf905c6ec8cb3e1e509554abff7e77d8f2c75a21116f5ee3e80c65f9
-  data.tar.gz: 723125a4edbd90114426132bf375fe6fd6cc9f501d638e8c48e4caf9a70ad1e7
+  metadata.gz: 9f97502706b77eb2d52d4e8bf2ee3bde3bbe30d73523fa969526752610749738
+  data.tar.gz: bc9b28a3c19372688e334f6b259325b9d6054913f52d42d255b2d9f8afa0172b
 SHA512:
-  metadata.gz: a515bc875c3f765bff181e36b6eb9b7fd9fd2a6f1ce20b2f31390c5d93c81cab36036fea15fc98948220e8ea754f87021c0a96800833712647815f8058650e89
-  data.tar.gz: 50b001c7926e4de6a6a00bbdddf11964bd976d3735e83f604836826fb5c5c1250683260db1864954493421cee08ed9af1765b664dc11050f2f522c0c7fecf00b
+  metadata.gz: 5711fa8354ad641f8667f70554aae551740325a650e86a61216bb68776e90b23cf741ba2760c6727c81da0d34ca5db04725ed7e7aa0add8141f429bd3b1a1559
+  data.tar.gz: 81087fabb487b7c0fd1455415051bc2be6fa053ebe50ada16936be258081d4841814e0fadaa744d4f6fbd670dda928db03213e9ea822a273ace8ad07d3be10af

data/.github/workflows/claude-code-review.yml

@@ -22,6 +22,8 @@ jobs:
       - name: Run Claude Code Review
         id: claude-review
         uses: anthropics/claude-code-action@v1
+        env:
+          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
         with:
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           prompt: |

data/.github/workflows/claude.yml

@@ -11,19 +11,112 @@ on:
     types: [submitted]
 
 jobs:
-  claude:
+  authorize_claude_actor:
     if: |
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
       (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      authorized: ${{ steps.permission-gate.outputs.authorized }}
+    steps:
+      - name: Verify actor can run Claude
+        id: permission-gate
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const permissionByLogin = new Map();
+
+            function claudeRequester() {
+              if (
+                context.eventName === 'issue_comment' ||
+                context.eventName === 'pull_request_review_comment'
+              ) {
+                return context.payload.comment?.user?.login;
+              }
+
+              if (context.eventName === 'pull_request_review') {
+                return context.payload.review?.user?.login;
+              }
+
+              if (context.eventName === 'issues') {
+                return context.payload.issue?.user?.login;
+              }
+
+              return null;
+            }
+
+            async function hasWriteAccessFor(username) {
+              if (!username) {
+                return false;
+              }
+
+              if (permissionByLogin.has(username)) {
+                return permissionByLogin.get(username);
+              }
+
+              let hasWriteAccess = false;
+              try {
+                const { data: permission } = await github.rest.repos.getCollaboratorPermissionLevel({
+                  owner,
+                  repo,
+                  username
+                });
+                hasWriteAccess = ['admin', 'write'].includes(permission.permission);
+              } catch (error) {
+                core.warning(
+                  `Unable to verify ${username} write permission for Claude; ` +
+                    `treating the Claude request as untrusted: ${error.message || error}`
+                );
+              }
+
+              permissionByLogin.set(username, hasWriteAccess);
+              return hasWriteAccess;
+            }
+
+            const actor = context.actor;
+            const requester = claudeRequester();
+
+            if (!requester) {
+              core.setOutput('authorized', 'false');
+              core.setFailed('Unable to run Claude because the requester could not be determined.');
+              return;
+            }
+
+            if (!(await hasWriteAccessFor(actor))) {
+              core.setOutput('authorized', 'false');
+              core.setFailed(`Unable to run Claude because ${actor} does not have write/admin repository permission.`);
+              return;
+            }
+
+            if (!(await hasWriteAccessFor(requester))) {
+              core.setOutput('authorized', 'false');
+              core.setFailed(
+                `Unable to run Claude because requester ${requester} does not have write/admin repository permission.`
+              );
+              return;
+            }
+
+            core.setOutput('authorized', 'true');
+            core.info(`Authorized ${actor} and Claude requester ${requester} to run Claude.`);
+
+  claude:
+    needs: authorize_claude_actor
+    if: needs.authorize_claude_actor.outputs.authorized == 'true'
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read
       issues: read
       id-token: write
       actions: read # Required for Claude to read CI results on PRs
+      checks: read
+      statuses: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -33,12 +126,17 @@ jobs:
       - name: Run Claude Code
         id: claude
         uses: anthropics/claude-code-action@v1
+        env:
+          CLAUDE_CODE_OAUTH_TOKEN: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
         with:
+          github_token: ${{ github.token }}
           claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
 
           # This is an optional setting that allows Claude to read CI results on PRs
           additional_permissions: |
             actions: read
+            checks: read
+            statuses: read
 
           # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
           # prompt: 'Update the pull request description to include a summary of changes.'

data/.github/workflows/coveralls.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
 
 jobs:
@@ -10,9 +11,9 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "3.3"
+          - "3.4"
         rails-version:
-          - "7.1"
+          - "8.1"
         continue-on-error: [true]
     name: ${{ format('Coverage (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest
@@ -49,4 +50,4 @@ jobs:
           bin/bundle exec rails db:drop
           bin/bundle exec rails db:create
           bin/bundle exec rails db:migrate
-          bin/bundle exec rails test:db
+          bin/bundle exec rake test:serial

data/.github/workflows/rubyonrails.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - master
   pull_request:
 
 jobs:
@@ -10,19 +11,15 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-          - "3.2"
           - "3.3"
           - "3.4"
           - "4.0"
         rails-version:
-          - "7.1"
           - "7.2"
           - "8.0"
           - "8.1"
-        continue-on-error: [true]
     name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.continue-on-error }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.rails-version }}.gemfile
       RAILS_ENV: test
@@ -54,7 +51,7 @@ jobs:
           bin/bundle exec rails db:drop
           bin/bundle exec rails db:create
           bin/bundle exec rails db:migrate
-          bin/bundle exec rails test:db
+          bin/bundle exec rake test
 
       - name: Lint the code
         run: bin/bundle exec rubocop --parallel
@@ -63,3 +60,35 @@ jobs:
         run: |
           bin/bundle exec brakeman -q -w3
           bin/bundle exec bundler-audit --update --gemfile-lock gemfiles/${{ matrix.rails-version }}.gemfile.lock
+
+  system_tests:
+    name: System tests (Ruby 4.0, Rails 8.1)
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/8.1.gemfile
+      RAILS_ENV: test
+      SKIP_COV: true
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v4
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: npm
+      - run: npm ci
+
+      - name: Install Ruby 4.0
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "4.0"
+          bundler-cache: true
+
+      - name: Compile assets
+        run: npm run build && npm run build:css
+
+      - name: Prepare database
+        run: bin/bundle exec rails db:prepare
+
+      - name: Run system tests
+        run: bin/bundle exec rake test:system

data/CHANGELOG.md

@@ -12,17 +12,37 @@ For all changes prior to the inception of this project, see the [Release History
 
 ## [Unreleased]
 
+## [v3.1.7] - 2026-02-20
+
+### Fixed
+
+- Fix wrong number of arguments for `to_s` in date tags from [PR 58](https://github.com/shakacode/comfortable-media-surfer/pull/58)
+
+### Changed
+
+- Update rubocop requirement from ~> 1.81.1 to ~> 1.84.0
+
+## [v3.1.6] - 2026-02-19
+
+### Added
+
+- Claude code workflow
+
+### Fixed
+
+- problem creating root/home page from [P5 45](https://github.com/shakacode/comfortable-media-surfer/pull/45)
+
 ## [v3.1.5] - 2026-01-08
 
-## Added
+### Added
 
 - Rails 8.1 compatibility
 
-## Fixed
+### Fixed
 
-- Strip possible spaces around exclude page slugs, from [PR](https://github.com/shakacode/comfortable-media-surfer/pull/42)
+- Strip possible spaces around exclude page slugs, from [PR 42](https://github.com/shakacode/comfortable-media-surfer/pull/42)
 
-## Changed
+### Changed
 
 - gem updates for propshaft, brakeman, rubocop, haml-rails
 
@@ -115,7 +135,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.5...master
+[Unreleased]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.7...master
+[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
 [v3.1.4]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.3...v3.1.4
 [v3.1.3]: https://github.com/shakacode/comfortable-media-surfer/compare/v3.1.2...v3.1.3

data/CONTRIBUTING.md

@@ -13,7 +13,11 @@ Fork the project. Optionally, create a branch you want to work on.
   created for you. Just run `bundle exec rake db:migrate`
 - Prepare the environment by running `rails comfy:compile_assets`, and
   `rake db:test:prepare`
-- Make sure that existing tests are passing by running `bundle exec rake test`
+- Make sure that existing tests are passing by running `bundle exec rake test`.
+  This uses six isolated workers by default, merges their coverage, and records
+  per-file runtimes in `tmp/parallel_runtime_test.log` for future balancing.
+  Set `PARALLEL_WORKERS` to tune the worker count, or run
+  `bundle exec rake test:serial` for a serial coverage run.
 - There are system tests that can be run with `bundle exec rake test:system`.
   You need to have `chromedriver` installed for that.
 - You should be able to start the app via `bin/rails s` and navigate to http://localhost:3000/admin

data/Gemfile

@@ -9,9 +9,9 @@ gem 'rails', '~> 8.1.0'
 
 group :development, :test do
   gem 'autoprefixer-rails', '~> 10.4.21.0'
-  gem 'byebug',             '~> 12.0.0', platforms: %i[mri mingw x64_mingw]
+  gem 'byebug',             '~> 13.0.0', platforms: %i[mri mingw x64_mingw]
   gem 'gem-release'
-  gem 'image_processing',   '>= 1.12.0'
+  gem 'image_processing',   '>= 1.12.2'
   gem 'propshaft',          '~> 1.3.1'
   gem 'sqlite3',            '>= 2.1'
   # gem 'mysql2',             '~> 0.5'
@@ -19,12 +19,12 @@ group :development, :test do
 end
 
 group :development do
-  gem 'listen',       '~> 3.9.0'
+  gem 'listen',       '~> 3.10.0'
   gem 'web-console',  '~> 4.2'
 end
 
 group :test do
-  gem 'brakeman',                 '~> 7.1.0'
+  gem 'brakeman'
   gem 'bundler-audit',            '~> 0.9.1'
   gem 'coveralls_reborn',         '~> 0.29.0', require: false
   gem 'cuprite',                  '>= 0.15'
@@ -34,9 +34,10 @@ group :test do
   gem 'minitest-reporters',       '>= 1.6.1'
   gem 'mocha',                    '>= 2.3.0', require: false
   gem 'ostruct'
+  gem 'parallel_tests', '~> 5.7', require: false
   gem 'puma'
   gem 'rails-controller-testing', '~> 1.0.5'
-  gem 'rubocop',                  '~> 1.81.1', require: false
+  gem 'rubocop',                  require: false
   gem 'rubocop-minitest'
   gem 'rubocop-rails'
   gem 'simplecov', '~> 0.22.0', require: false

data/README.md

@@ -1,16 +1,16 @@
 [![Rails CI](https://github.com/shakacode/comfortable-media-surfer/actions/workflows/rubyonrails.yml/badge.svg)](https://github.com/shakacode/comfortable-media-surfer/actions/workflows/rubyonrails.yml)
-[![Coverage Status](https://coveralls.io/repos/github/shakacode/comfortable-media-surfer/badge.svg?branch=HEAD)](https://coveralls.io/github/shakacode/comfortable-media-surfer?branch=HEAD)
+[![Coverage Status](https://coveralls.io/repos/github/shakacode/comfortable-media-surfer/badge.svg?branch=master)](https://coveralls.io/github/shakacode/comfortable-media-surfer?branch=master)
 [![Gem Version](https://img.shields.io/gem/v/comfortable_media_surfer.svg?style=flat)](http://rubygems.org/gems/comfortable_media_surfer)
 [![Gem Downloads](https://img.shields.io/gem/dt/comfortable_media_surfer.svg?style=flat)](http://rubygems.org/gems/comfortable_media_surfer)
 [![GitHub Release Date - Published_At](https://img.shields.io/github/release-date/shakacode/comfortable-media-surfer?label=last%20release&color=seagreen)](https://github.com/shakacode/comfortable-media-surfer/releases)
 
 # ComfortableMediaSurfer
 
-ComfortableMediaSurfer is a powerful Ruby 7.0+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off.
+ComfortableMediaSurfer is a powerful Ruby 7.2+ CMS (Content Management System) Engine, picking up where [ComfortableMexicanSofa](https://github.com/comfy/comfortable-mexican-sofa) left off.
 
 ## Features
 
-- Simple drop-in integration with Rails 7.0+ apps with minimal configuration
+- 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
@@ -27,7 +27,7 @@ ComfortableMediaSurfer is a powerful Ruby 7.0+ CMS (Content Management System) E
 
 ## Compatibility
 
-On Ruby 3.x, Rails 7.x +
+On Ruby 3.2+, 4.x, Rails 7.2+, 8.x
 
 ## Installation
 

data/Rakefile

@@ -1,5 +1,206 @@
 # frozen_string_literal: true
 
 require_relative 'config/application'
+require 'open3'
+require 'parallel_tests/tasks'
+require 'rake/testtask'
+require 'stringio'
 
 Rails.application.load_tasks
+
+module ComfortableMediaSurferTestOutput
+  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
+
+  class Progress
+    def initialize(io)
+      @io = io
+      @line = +''
+      @pending = +''
+      @awaiting_blank = false
+      @expecting_progress = false
+      @printing_progress = false
+    end
+
+    def feed(chunk)
+      chunk.each_char { |character| consume(character) }
+      flush
+    end
+
+    def finish
+      flush
+      @io.puts if @printing_progress
+    end
+
+  private
+
+    def consume(character)
+      return if character == "\r"
+      return finish_line if character == "\n"
+
+      if @expecting_progress && character.match?(%r{[.EFS]})
+        @printing_progress = true
+        @pending << character
+      elsif @printing_progress
+        flush
+        @io.puts
+        @printing_progress = false
+        @expecting_progress = false
+        @line = +character
+      else
+        @expecting_progress = false if @expecting_progress
+        @line << character
+      end
+    end
+
+    def finish_line
+      flush
+      if @printing_progress
+        @io.puts
+        @expecting_progress = false
+      elsif @line.start_with?('# Running tests')
+        @awaiting_blank = true
+      elsif @awaiting_blank && @line.empty?
+        @expecting_progress = true
+        @awaiting_blank = false
+      end
+      @line.clear
+      @printing_progress = false
+    end
+
+    def flush
+      return if @pending.empty?
+
+      @io.print ComfortableMediaSurferTestOutput.progress_color(@pending)
+      @io.flush
+      @pending.clear
+    end
+  end
+
+module_function
+
+  def capture(env, command)
+    output = +''
+    errors = +''
+    status = nil
+    started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    progress = Progress.new($stdout)
+
+    Open3.popen3(env, *command) do |stdin, stdout, stderr, wait_thread|
+      stdin.close
+      error_reader = Thread.new { stderr.read }
+      loop do
+        chunk = stdout.readpartial(4096)
+        output << chunk
+        progress.feed(chunk)
+      end
+    rescue EOFError
+      errors = error_reader.value
+      status = wait_thread.value
+    ensure
+      progress.finish
+    end
+
+    elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at
+    [output, errors, status, elapsed]
+  end
+
+  def color(text, name)
+    return text unless $stdout.tty? && !ENV.key?('NO_COLOR')
+
+    "\e[#{COLORS.fetch(name)}m#{text}\e[0m"
+  end
+
+  def progress_color(text)
+    return text unless $stdout.tty? && !ENV.key?('NO_COLOR')
+
+    highlighted = text.gsub('S', "\e[33mS\e[32m")
+      .gsub(%r{[EF]}) { |character| "\e[31m#{character}\e[32m" }
+    "\e[32m#{highlighted}\e[0m"
+  end
+
+  def summary(output)
+    counts = output.match(SUMMARY)
+    raise 'Could not read the parallel test summary' unless counts
+
+    "#{counts[:tests]} tests, #{counts[:assertions]} assertions, " \
+      "#{counts[:failures]} failures, #{counts[:errors]} errors, " \
+      "#{counts[:skips]} #{counts[:skips] == '1' ? 'skip' : 'skips'}"
+  end
+
+  def run_parallel
+    workers = ENV.fetch('PARALLEL_WORKERS', '6')
+    skip_coverage = ENV.fetch('SKIP_COV', nil)
+    FileUtils.rm_rf('coverage')
+    FileUtils.mkdir_p('tmp')
+    Rake::Task['parallel:prepare'].invoke(workers)
+
+    env = {
+      'PARALLEL_COVERAGE' => skip_coverage ? nil : 'true',
+      'RECORD_RUNTIME' => 'true',
+      'SKIP_COV' => skip_coverage,
+      'NO_COLOR' => '1',
+      'TMPDIR' => ENV.fetch('COMFY_TEST_TMPDIR', '/tmp')
+    }
+    command = [
+      'bundle', 'exec', 'parallel_test', 'test',
+      '--type', 'test',
+      '--exclude-pattern', 'test/system/',
+      '-n', workers
+    ]
+
+    puts color("Running tests (#{workers} workers)…", :cyan)
+    stdout, stderr, status, elapsed = capture(env, command)
+    unless status.success?
+      $stdout.write(stdout)
+      $stderr.write(stderr)
+      raise "Parallel tests failed with status #{status.exitstatus}"
+    end
+    $stderr.write(stderr) unless stderr.empty?
+    puts color(summary(stdout), :green)
+    puts color(format('Completed in %.1f seconds', elapsed), :cyan)
+
+    report_coverage unless skip_coverage
+  end
+
+  def report_coverage
+    require 'simplecov'
+    SimpleCov.coverage_dir File.expand_path('coverage', __dir__)
+    result = SimpleCov::ResultMerger.merged_result
+    quietly { SimpleCov::Formatter::HTMLFormatter.new.format(result) }
+    coverage = format('Coverage: %<percent>.2f%% (%<covered>d/%<total>d) — coverage/index.html',
+                      percent: result.covered_percent, covered: result.covered_lines, total: result.total_lines)
+    puts color(coverage, :green)
+  end
+
+  def quietly
+    previous = $stdout
+    $stdout = StringIO.new
+    yield
+  ensure
+    $stdout = previous
+  end
+end
+
+namespace :test do
+  task :prepare_serial do
+    FileUtils.rm_rf('coverage')
+    ENV['TMPDIR'] = ENV.fetch('COMFY_TEST_TMPDIR', '/tmp')
+  end
+
+  desc 'Run tests serially with coverage'
+  Rake::TestTask.new(:serial) do |task|
+    task.libs << 'test' << 'lib'
+    task.test_files = Rake::FileList['test/**/*_test.rb'].exclude('test/system/**/*_test.rb')
+    task.warning = false
+  end
+  Rake::Task['test:serial'].enhance(['test:prepare_serial'])
+
+  desc 'Run tests in isolated processes'
+  task(:parallel) { ComfortableMediaSurferTestOutput.run_parallel }
+end
+
+Rake::Task[:test].clear
+
+desc 'Run tests in parallel (default: 6 workers)'
+task test: 'test:parallel'

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

@@ -1,4 +1,7 @@
+import jQuery from "jquery";
 import ujs from "@rails/ujs";
+
+window.jQuery = window.$ = jQuery;
 ujs.start();
 
 import "bootstrap/js/src/tab";

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

@@ -37,6 +37,7 @@
     CMS.codemirror.dispose();
     CMS.wysiwyg.dispose();
     CMS.files.dispose();
+    CMS.fileLinks.dispose();
     CMS.fileUpload.dispose();
     CMS.sortableList.dispose();
     CMS.timepicker.dispose();