Merge pull request #156 from coord-e/html-pipeline-3.0

Upgrade html-pipeline to v3 and drop support for Ruby <= 3.0

.github/workflows/ci.yml

@@ -11,8 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.7'
-          - '3.0'
           - '3.1'
           - '3.2'
     name: Run test with Ruby ${{ matrix.ruby }}
@@ -49,8 +47,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - '2.7'
-          - '3.0'
           - '3.1'
           - '3.2'
     name: Run assets:precompile with Ruby ${{ matrix.ruby }}

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## lastest(master branch)
+- Dependencies
+    - Upgrade html-pipeline to v3
+    - Drop support for Ruby <= 3.0
+
 ## v0.8.0
 - Upgrade Rails to v7.0
 - Support Ruby 3.2

app/helpers/kuroko2/job_definitions_helper.rb

@@ -5,7 +5,7 @@ def first_line(text)
     end
 
     def markdown_format(text)
-      pipeline = HTML::Pipeline.new([HTML::Pipeline::MarkdownFilter])
+      pipeline = HTMLPipeline.new(convert_filter: HTMLPipeline::ConvertFilter::MarkdownFilter.new)
       raw(pipeline.call(text)[:output].to_s)
     end
 

kuroko2.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'omniauth-google-oauth2', '>= 1.0.0'
   s.add_dependency 'omniauth-rails_csrf_protection'
 
-  s.add_dependency 'html-pipeline'
+  s.add_dependency 'html-pipeline', '>= 3'
   s.add_dependency 'commonmarker', '>= 0.17.8'
   s.add_dependency 'font-awesome-rails'
   s.add_dependency 'rinku'

lib/kuroko2.rb

@@ -3,7 +3,8 @@
 require 'aws-sdk-cloudwatchlogs'
 require 'retryable'
 require 'faraday'
-require 'html/pipeline'
+require 'html_pipeline'
+require 'html_pipeline/convert_filter/markdown_filter'
 require 'hipchat'
 require 'omniauth-google-oauth2'
 require 'omniauth/rails_csrf_protection'

spec/helpers/job_definition_helper_spec.rb

@@ -37,7 +37,8 @@
       EOF
     end
 
-    it { is_expected.to match %r(<h1>Title</h1>) }
+    # commonmarker >= 1 includes an anchor in headings
+    it { is_expected.to match %r(<h1>(<a href="#title" aria-hidden="true" id="title"></a>)?Title</h1>) }
     it { is_expected.to match %r(LGTM) }
   end