govuk_markdown 2.0.3 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3752fe30f06aa219d8980f67f509d424bf2151237a26a3ead62cca2357fa5b28
-  data.tar.gz: 60c9c9ae54297729fb5f7392cdfef6e39e8842524b32b08fa81fcc546787dcfa
+  metadata.gz: afc74637316dbd7ed8e352f32d34673c604ec6873cf5218278fdae1f12d3f1a6
+  data.tar.gz: 87c0a97cdb053edef4fd4d98fba76f6601835e151fb47c3f01620d073f90df27
 SHA512:
-  metadata.gz: 5c598babbcffaf1dd479ccc45f1df91a793af4915f07f17dfbd59b3d7e3716d026cd63dfb84e2a4064915eeae9d152f48e68da0b716e6264f66475f77d93ad7e
-  data.tar.gz: 8515582240378e430d5c81281aabf84a278fe646df72da79707c636608ead74693193525f0373640f63fb20b583c123d58ae4f7affcb4f8befd1a0e2831d7462
+  metadata.gz: 6dc9fb3c8286a1e5f3f64edf8bf7999df87981987a4147d03eda93a399901efc8c7a6333aa0189d3197b52d396fbacc4c77c39da5e58344f4eeac00ec9d2c5d0
+  data.tar.gz: f11e1ac3d408e24eb23839d6bed7cb0be021b62764ee6821560a131cf0a63e27ec646737d5676425249055455bcc5c6e147e2f1407f98234072fee691a64d036

data/.github/workflows/publish_gem.yml

@@ -17,7 +17,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: '3.1.4'
+        ruby-version: .ruby-version
 
     - name: Install dependencies
       run: |

data/.github/workflows/tests.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1.4', '3.2.3', '3.3.0']
+        ruby: ['4.0.9']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2

data/.ruby-version

@@ -1 +1 @@
-3.1.4
+4.0.9

data/Gemfile.lock

@@ -1,106 +1,116 @@
 PATH
   remote: .
   specs:
-    govuk_markdown (2.0.2)
+    govuk_markdown (2.0.4)
       activesupport
       redcarpet
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3.2)
+    activesupport (7.2.4)
       base64
+      benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5, < 3)
       drb
       i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    ast (2.4.2)
-    base64 (0.2.0)
-    bigdecimal (3.1.7)
+      logger (>= 1.4.2)
+      minitest (>= 5.1, < 6)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    diff-lcs (1.5.1)
-    drb (2.2.1)
-    i18n (1.14.4)
+    concurrent-ruby (1.3.8)
+    connection_pool (2.5.5)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    i18n (1.15.2)
       concurrent-ruby (~> 1.0)
-    json (2.7.2)
-    language_server-protocol (3.17.0.3)
+    io-console (0.9.4)
+    json (2.21.2)
+    language_server-protocol (3.17.0.6)
+    lint_roller (1.1.0)
+    logger (1.7.0)
     method_source (1.1.0)
-    minitest (5.22.3)
-    mutex_m (0.2.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    minitest (5.27.0)
+    parallel (1.28.0)
+    parser (3.3.13.0)
       ast (~> 2.4.1)
       racc
-    pry (0.14.2)
+    prism (1.9.0)
+    pry (0.16.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.7.3)
-    rack (3.0.10)
+      reline (>= 0.6.0)
+    racc (1.8.1)
+    rack (3.2.7)
     rainbow (3.1.1)
-    rake (13.2.1)
-    redcarpet (3.6.0)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rspec (3.13.0)
+    rake (13.4.2)
+    redcarpet (3.6.1)
+    regexp_parser (2.13.1)
+    reline (0.7.0)
+      io-console (~> 0.5)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.0)
+    rspec-core (3.13.6)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rspec-support (3.13.7)
+    rubocop (1.86.0)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
-      rubocop (~> 1.41)
-    rubocop-govuk (4.16.1)
-      rubocop (= 1.62.1)
-      rubocop-ast (= 1.31.2)
-      rubocop-rails (= 2.24.1)
-      rubocop-rake (= 0.6.0)
-      rubocop-rspec (= 2.28.0)
-    rubocop-rails (2.24.1)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-govuk (5.2.1)
+      rubocop (= 1.86.0)
+      rubocop-ast (= 1.49.1)
+      rubocop-capybara (= 2.22.1)
+      rubocop-rails (= 2.34.3)
+      rubocop-rake (= 0.7.1)
+      rubocop-rspec (= 3.9.0)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
-    rubocop-rspec (2.28.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
     ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (3.3.0)
+      unicode-emoji (~> 4.3)
+    unicode-emoji (4.3.0)
 
 PLATFORMS
   ruby
@@ -113,4 +123,4 @@ DEPENDENCIES
   rubocop-govuk
 
 BUNDLED WITH
-   2.1.4
+   4.0.10

data/govuk_markdown.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "Convert Markdown into GOV.UK styled HTML"
   spec.description   = "Convert Markdown into GOV.UK styled HTML"
   spec.homepage      = "https://github.com/DFE-Digital/govuk_markdown"
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.4")
+  spec.required_ruby_version = Gem::Requirement.new(">= 4.0.9")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage

data/lib/govuk_markdown/renderer/mixin.rb

@@ -0,0 +1,97 @@
+module GovukMarkdown
+  # Renderer::Mixin overrides methods in Redcarpet::Render::HTML.
+  # See `GovukMarkdown::Renderer` for an example of how to include it.
+  module Renderer::Mixin
+    def table(header, body)
+      <<~HTML
+        <table class='govuk-table'>
+          <thead class='govuk-table__head'>
+            #{header}
+          </thead>
+          <tbody class='govuk-table__body'>
+            #{body}
+          </tbody>
+        </table>
+      HTML
+    end
+
+    def table_row(content)
+      <<~HTML
+        <tr class='govuk-table__row'>
+          #{content}
+        </tr>
+      HTML
+    end
+
+    def table_cell(content, _alignment, header)
+      if header
+        <<~HTML
+          <th class='govuk-table__header'>
+            #{content}
+          </th>
+        HTML
+      else
+        <<~HTML
+          <td class='govuk-table__cell'>
+            #{content}
+          </td>
+        HTML
+      end
+    end
+
+    def header(text, header_level)
+      valid_header_sizes = %w[xl l m s].freeze
+
+      start_size = valid_header_sizes.include?(@headings_start_with) ? @headings_start_with : "xl"
+
+      start_size_index = valid_header_sizes.find_index(start_size)
+
+      header_size = valid_header_sizes[start_size_index + header_level - 1] || "s"
+
+      id_attribute = @options[:with_toc_data] ? " id=\"#{text.parameterize}\"" : ""
+      <<~HTML
+        <h#{header_level}#{id_attribute} class="govuk-heading-#{header_size}">#{text}</h#{header_level}>
+      HTML
+    end
+
+    def paragraph(text)
+      <<~HTML
+        <p class="govuk-body-m">#{text}</p>
+      HTML
+    end
+
+    def list(contents, list_type)
+      case list_type
+      when :unordered
+        <<~HTML
+          <ul class="govuk-list govuk-list--bullet">
+            #{contents}
+          </ul>
+        HTML
+      when :ordered
+        <<~HTML
+          <ol class="govuk-list govuk-list--number">
+            #{contents}
+          </ol>
+        HTML
+      else
+        raise "Unexpected type #{list_type.inspect}"
+      end
+    end
+
+    def hrule
+      <<~HTML
+        <hr class="govuk-section-break govuk-section-break--xl govuk-section-break--visible">
+      HTML
+    end
+
+    def preprocess(document)
+      Preprocessor
+        .new(document)
+        .inject_inset_text
+        .inject_details
+        .strip_front_matter(@strip_front_matter)
+        .output
+    end
+  end
+end

data/lib/govuk_markdown/renderer.rb

@@ -1,6 +1,9 @@
 module GovukMarkdown
   class Renderer < ::Redcarpet::Render::HTML
-    include Redcarpet::Render::SmartyPants
+    autoload :Mixin, "govuk_markdown/renderer/mixin"
+
+    include ::Redcarpet::Render::SmartyPants
+    include Mixin
 
     def initialize(govuk_options, options = {})
       @headings_start_with = govuk_options[:headings_start_with]
@@ -8,97 +11,5 @@ module GovukMarkdown
 
       super options
     end
-
-    def table(header, body)
-      <<~HTML
-        <table class='govuk-table'>
-          <thead class='govuk-table__head'>
-            #{header}
-          </thead>
-          <tbody class='govuk-table__body'>
-            #{body}
-          </tbody>
-        </table>
-      HTML
-    end
-
-    def table_row(content)
-      <<~HTML
-        <tr class='govuk-table__row'>
-          #{content}
-        </tr>
-      HTML
-    end
-
-    def table_cell(content, _alignment, header)
-      if header
-        <<~HTML
-          <th class='govuk-table__header'>
-            #{content}
-          </th>
-        HTML
-      else
-        <<~HTML
-          <td class='govuk-table__cell'>
-            #{content}
-          </td>
-        HTML
-      end
-    end
-
-    def header(text, header_level)
-      valid_header_sizes = %w[xl l m s].freeze
-
-      start_size = valid_header_sizes.include?(@headings_start_with) ? @headings_start_with : "xl"
-
-      start_size_index = valid_header_sizes.find_index(start_size)
-
-      header_size = valid_header_sizes[start_size_index + header_level - 1] || "s"
-
-      id_attribute = @options[:with_toc_data] ? " id=\"#{text.parameterize}\"" : ""
-      <<~HTML
-        <h#{header_level}#{id_attribute} class="govuk-heading-#{header_size}">#{text}</h#{header_level}>
-      HTML
-    end
-
-    def paragraph(text)
-      <<~HTML
-        <p class="govuk-body-m">#{text}</p>
-      HTML
-    end
-
-    def list(contents, list_type)
-      case list_type
-      when :unordered
-        <<~HTML
-          <ul class="govuk-list govuk-list--bullet">
-            #{contents}
-          </ul>
-        HTML
-      when :ordered
-        <<~HTML
-          <ol class="govuk-list govuk-list--number">
-            #{contents}
-          </ol>
-        HTML
-      else
-        raise "Unexpected type #{list_type.inspect}"
-      end
-    end
-
-    def hrule
-      <<~HTML
-        <hr class="govuk-section-break govuk-section-break--xl govuk-section-break--visible">
-      HTML
-    end
-
-    def preprocess(document)
-      Preprocessor
-        .new(document)
-        .inject_inset_text
-        .inject_details
-        .strip_front_matter(@strip_front_matter)
-        .output
-    end
   end
 end

data/lib/govuk_markdown/version.rb

@@ -1,3 +1,3 @@
 module GovukMarkdown
-  VERSION = "2.0.3".freeze
+  VERSION = "2.0.5".freeze
 end

data/lib/govuk_markdown.rb

@@ -4,10 +4,11 @@ require "redcarpet"
 require_relative "./govuk_markdown/version"
 require_relative "./govuk_markdown/preprocessor"
 require_relative "./govuk_markdown/renderer"
+require_relative "./govuk_markdown/renderer/mixin"
 
 module GovukMarkdown
-  def self.render(markdown, govuk_options = {})
+  def self.render(markdown, govuk_options = {}, redcarpet_options = {})
     renderer = GovukMarkdown::Renderer.new(govuk_options, { with_toc_data: true, strip_front_matter: true, link_attributes: { class: "govuk-link" } })
-    Redcarpet::Markdown.new(renderer, tables: true, no_intra_emphasis: true).render(markdown).strip
+    Redcarpet::Markdown.new(renderer, tables: true, no_intra_emphasis: true, **redcarpet_options).render(markdown).strip
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk_markdown
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.5
 platform: ruby
 authors:
 - Tijmen Brommet
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +122,7 @@ files:
 - lib/govuk_markdown.rb
 - lib/govuk_markdown/preprocessor.rb
 - lib/govuk_markdown/renderer.rb
+- lib/govuk_markdown/renderer/mixin.rb
 - lib/govuk_markdown/version.rb
 homepage: https://github.com/DFE-Digital/govuk_markdown
 licenses: []
@@ -130,7 +130,6 @@ metadata:
   homepage_uri: https://github.com/DFE-Digital/govuk_markdown
   source_code_uri: https://github.com/DFE-Digital/govuk_markdown
   changelog_uri: https://github.com/DFE-Digital/govuk_markdown
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +137,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.4
+      version: 4.0.9
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Convert Markdown into GOV.UK styled HTML
 test_files: []