html-pipeline 3.2.2 → 3.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e66a69a9e35bc5703f036d091740bdc654f98cfaf38870761797699ed28199b
-  data.tar.gz: 7624bb08357fa9f358cb4947dbf5742916a3e620fa7db2d5296e9aba414e40f5
+  metadata.gz: fd951d54c89f057036db67e4d74dbca0de8e5ca07f27a89979d3b7814ec67a38
+  data.tar.gz: ef06eacc4b6eab0f53d207d873eb02fb0b61c4f746a621f0ad1c4800b5292bce
 SHA512:
-  metadata.gz: 19083c1093cf8908028e8ea5233c97005a25072b5d77e9c28368570d477ff09cba5f6ae78e93e3633b766b9dcaeccc7bd746aacecbfdf480cd467306b230c1af
-  data.tar.gz: 74e3afc29616225353448945af5a3ee516a8cea67924e865edf89a65b92cf77d56196b2be50ccd6fce6d5d343ed4cc7181b3b6b7d2a146dbb281a1165ba66ef3
+  metadata.gz: 4dc2bf7b6c312ee045c31df9fb48d76303563fffbc863c3cb70a3c0caf96e8040ae6fb3ff99c9c1e7c7aa8dddeae7cafeb7cc287c54d1b920cea44731fe39878
+  data.tar.gz: 8d0f26c1474af8a306b35659d4f4a3633922484fcd4ce6e97c3d4804684b195b67fe58bf42cb2c1ff95e6486c13932633365d3326db6bc071f6cf2d55b45660b

data/.github/workflows/automerge.yml

@@ -1,6 +1,7 @@
 name: PR auto-{approve,merge}
 
 on:
+  workflow_dispatch:
   pull_request_target:
 
 permissions:
@@ -8,6 +9,8 @@ permissions:
   contents: write
 
 jobs:
-  dependabot:
-    uses: yettoapp/actions/.github/workflows/automerge_dependabot.yml@main
-    secrets: inherit
+  bot-check:
+    uses: gjtorikian/actions/.github/workflows/automerge.yml@main
+    secrets:
+      gh_token: ${{ secrets.GITHUB_TOKEN }}
+

data/.github/workflows/ci.yml

@@ -4,19 +4,11 @@ on:
   pull_request:
 
 permissions:
-  contents: read
+  contents: write
+  pull-requests: write
 
 jobs:
   test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Ruby
-        uses: yettoapp/actions/setup-languages@main
-        with:
-          ruby: true
-
-      - name: Run tests
-        run: bundle exec rake test
+    uses: gjtorikian/actions/.github/workflows/ruby_test_suite.yml@main
+    secrets:
+      gh_token: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/lint.yml

@@ -1,4 +1,4 @@
-name: Linting
+name: Lint
 
 on:
   pull_request:
@@ -6,18 +6,11 @@ on:
       - "**/*.rb"
 
 permissions:
-  contents: read
+  contents: write
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
+  lint:
+    uses: gjtorikian/actions/.github/workflows/ruby_lint.yml@main
+    secrets:
+      gh_token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Set up Ruby
-        uses: yettoapp/actions/setup-languages@main
-        with:
-          ruby: true
-
-      - name: Rubocop
-        run: bundle exec rake rubocop

data/.github/workflows/publish.yml

@@ -11,14 +11,20 @@ on:
     types:
       - closed
 
+permissions:
+  pull-requests: write
+  contents: write
+  id-token: write
+  actions: write
+
 jobs:
   ruby:
-    uses: yettoapp/actions/.github/workflows/ruby_gem_release.yml@main
+    uses: gjtorikian/actions/.github/workflows/ruby_gem_release.yml@main
     secrets:
-      rubygems_api_key: ${{ secrets.RUBYGEMS_API_BOT_KEY }}
       gh_token: ${{ secrets.GITHUB_TOKEN }}
     with:
       gem_name: html-pipeline
       version_filepath: lib/html_pipeline/version.rb
       prepare: ${{ github.event_name == 'push' }}
       release: ${{ github.event_name == 'workflow_dispatch' || ((github.event.pull_request.merged == true) && (contains(github.event.pull_request.labels.*.name, 'release'))) }}
+      oidc_role_to_assume: rg_oidc_akr_h9dt72ax2bswgewowdv7

data/.gitignore

@@ -17,4 +17,6 @@ test/tmp
 test/version_tmp
 tmp
 exec/*
+
 vendor/cache/
+vendor/bundle/

data/.rubocop.yml

@@ -15,3 +15,6 @@ AllCops:
     - "vendor/**/*"
     - "tmp/**/*"
     - "test/progit/**/*"
+
+ThreadSafety/ClassAndModuleAttributes:
+  Enabled: false

data/.vscode/settings.json

@@ -4,5 +4,8 @@
     },
     "[ruby]": {
         "editor.defaultFormatter": "Shopify.ruby-lsp"
+    },
+    "[github-actions-workflow]": {
+        "editor.defaultFormatter": "redhat.vscode-yaml"
     }
 }

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+# [v3.2.4] - 06-01-2026
+## What's Changed
+* [skip test] Release v3.2.3 by @github-actions[bot] in https://github.com/gjtorikian/html-pipeline/pull/419
+* Bump actions/checkout from 4 to 5 in the github-actions group by @dependabot[bot] in https://github.com/gjtorikian/html-pipeline/pull/424
+* Bump actions/checkout from 5 to 6 in the github-actions group by @dependabot[bot] in https://github.com/gjtorikian/html-pipeline/pull/426
+* Support Ruby 4.0 by @gjtorikian in https://github.com/gjtorikian/html-pipeline/pull/427
+* Allow for completely nil sanitization by @gjtorikian in https://github.com/gjtorikian/html-pipeline/pull/428
+
+
+**Full Changelog**: https://github.com/gjtorikian/html-pipeline/compare/v3.2.3...v3.2.4
+# [v3.2.3] - 24-04-2025
+## What's Changed
+* Allow for just text pipelines by @gjtorikian in https://github.com/gjtorikian/html-pipeline/pull/418
+
+
+**Full Changelog**: https://github.com/gjtorikian/html-pipeline/compare/v3.2.2...v3.2.3
 # [v3.2.2] - 09-08-2024
 ## What's Changed
 * Add support for @ prefix on MentionFilter base_url by @jeremysmithco in https://github.com/gjtorikian/html-pipeline/pull/411

data/Gemfile

@@ -25,12 +25,12 @@ group :development do
 end
 
 group :test do
-  gem "commonmarker", "~> 2.0.1", require: false
+  gem "commonmarker", "~> 2.6", require: false
   gem "gemoji", "~> 4.1", require: false
   gem "gemojione", "~> 4.3", require: false
 
-  gem "minitest"
-
+  gem "minitest", "~> 6.0"
+  gem "minitest-mock", "~> 5.27"
   gem "minitest-bisect", "~> 1.6"
 
   gem "nokogiri", "~> 1.13"

data/html-pipeline.gemspec

@@ -16,7 +16,8 @@ Gem::Specification.new do |gem|
   gem.files         = %x(git ls-files -z).split("\x0").reject { |f| f =~ %r{^(test|gemfiles|script)/} }
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = "~> 3.1"
+  gem.required_ruby_version = ">= 3.2"
+
   # https://github.com/rubygems/rubygems/pull/5852#issuecomment-1231118509
   gem.required_rubygems_version = ">= 3.3.22"
 

data/lib/html_pipeline/node_filter/emoji_filter.rb

@@ -73,10 +73,10 @@ class HTMLPipeline
           default_img_attrs(name).transform_keys(&:to_sym)
             .merge!(context[:img_attrs] || {}).transform_keys(&:to_sym)
             .each_with_object([]) do |(attr, value), arr|
-            next if value.nil?
+              next if value.nil?
 
-            value = value.respond_to?(:call) && value.call(name) || value
-            arr << %(#{attr}="#{value}")
+              value = value.respond_to?(:call) && value.call(name) || value
+              arr << %(#{attr}="#{value}")
           end.compact.join(" ")
 
         "<img #{html_attrs}>"

data/lib/html_pipeline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class HTMLPipeline
-  VERSION = "3.2.2"
+  VERSION = "3.2.4"
 end

data/lib/html_pipeline.rb

@@ -122,7 +122,7 @@ class HTMLPipeline
 
     @convert_filter = convert_filter
 
-    if @convert_filter.nil? && (!@text_filters.empty? && !@node_filters.empty?)
+    if @convert_filter.nil? && !@text_filters.empty? && !@node_filters.empty?
       raise InvalidFilterError, "Must provide `convert_filter` if `text_filters` and `node_filters` are also provided"
     elsif !@convert_filter.nil?
       validate_filter(@convert_filter, HTMLPipeline::ConvertFilter)
@@ -154,13 +154,13 @@ class HTMLPipeline
     if @text_filters.any?
       payload = default_payload({
         text_filters: @text_filters.map { |f| f.class.name },
-        context: context,
-        result: result,
+        context:,
+        result:,
       })
       instrument("call_text_filters.html_pipeline", payload) do
         result[:output] =
           @text_filters.inject(text) do |doc, filter|
-            perform_filter(filter, doc, context: (filter.context || {}).merge(context), result: result)
+            perform_filter(filter, doc, context: (filter.context || {}).merge(context), result:)
           end
       end
     end
@@ -181,20 +181,22 @@ class HTMLPipeline
       },
     }
 
-    if @node_filters.empty?
+    if @node_filters.empty? && !@sanitization_config.nil?
       instrument("sanitization.html_pipeline", payload) do
         result[:output] = Selma::Rewriter.new(sanitizer: @sanitization_config, options: rewriter_options).rewrite(html)
       end
-    else
+    elsif @node_filters.any?
       instrument("call_node_filters.html_pipeline", payload) do
         @node_filters.each { |filter| filter.context = (filter.context || {}).merge(context) }
         result[:output] = Selma::Rewriter.new(sanitizer: @sanitization_config, handlers: @node_filters, options: rewriter_options).rewrite(html)
         payload = default_payload({
           node_filters: @node_filters.map { |f| f.class.name },
-          context: context,
-          result: result,
+          context:,
+          result:,
         })
       end
+    else
+      result[:output] = html
     end
 
     result = result.merge(@node_filters.collect(&:result).reduce({}, :merge))
@@ -211,18 +213,18 @@ class HTMLPipeline
   def perform_filter(filter, doc, context: {}, result: {})
     payload = default_payload({
       filter: filter.class.name,
-      context: context,
-      result: result,
+      context:,
+      result:,
     })
 
     instrument("call_filter.html_pipeline", payload) do
-      filter.call(doc, context: context, result: result)
+      filter.call(doc, context:, result:)
     end
   end
 
   # Like call but guarantee the value returned is a string of HTML markup.
   def to_html(input, context: {}, result: {})
-    result = call(input, context: context, result: result)
+    result = call(input, context:, result:)
     output = result[:output]
     if output.respond_to?(:to_html)
       output.to_html
@@ -272,7 +274,7 @@ class HTMLPipeline
     invalid_filters = filters.reject { |f| correctly_ancestored?(f, klass) }
 
     unless invalid_filters.empty?
-      verb = invalid_filters.count == 1 ? "does" : "do"
+      verb = invalid_filters.one? ? "does" : "do"
       raise InvalidFilterError, "All filters must inherit from `#{klass}`; #{invalid_filters.join(", ")} #{verb} not"
     end
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: html-pipeline
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.4
 platform: ruby
 authors:
 - Garen J. Torikian
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selma
@@ -24,7 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
-  force_ruby_platform: false
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +37,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
-  force_ruby_platform: false
 description: HTML processing filters and utilities
 email:
 - gjtorikian@gmail.com
@@ -102,17 +99,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.3.22
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Helpers for processing content through a chain of filters
 test_files: []