govspeak 9.0.0 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95a5244e69195ca6b70429063a23918bf1c11cf0c2269b9f90c46fa0f874b0d2
-  data.tar.gz: 12e5c4cfbd40a4a9d144bfdca2f0ca6c4fc10abe9d8de3f6e5868d98af8d7959
+  metadata.gz: 4b920cf6948fc17a6bc0046c71bc4a92cde77dd1f1fab57b58be2d8a4d077ea9
+  data.tar.gz: d60959650aae08193cfedc1ad48cf1a6e3eb65c584b825d60701c2bbdf0dae31
 SHA512:
-  metadata.gz: e1222f5628b71f08eeb0453dae99891c8a42c8a446d6ad44b0087fa51991e48e93c22ed1bce50e2421c888f7d447af1e411171b607affb2e7dd17b855851c0dd
-  data.tar.gz: 2add7fce1c12861cdf6f0d78626f81bdafcedde870821f2adefd5a468125ce423e629c397b9747d944d3b853ca659d6f769a3b71a57da09fce99b5c1b63e7dbd
+  metadata.gz: bc7e37cc770324bad3ad12fadba04eeb24fcf894411b052312029753a5532e647006f417e77f3080ea88c8ff43b67ad7c1f9834a9bc14ffa9e983cc1e59f2360
+  data.tar.gz: 9c93d9f23dfc2387b64f3280a431b28f110737b784811c31aa58a5045cb18797a0eac13fb18c3579393aa5c07054e6739ed9f9035e57b95353ee75d00acb16f8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 10.0.0
+
+* Drop support for Ruby <3.2
+* Drop support for govuk_publishing_components <43.0.0
+
 ## 9.0.0
 
 * Remove Advisory component ([#357](https://github.com/alphagov/govspeak/pull/357))

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "9.0.0".freeze
+  VERSION = "10.0.0".freeze
 end

data/test/govspeak_attachment_test.rb

@@ -17,7 +17,7 @@ class GovspeakAttachmentTest < Minitest::Test
     }
 
     rendered = render_govspeak("[Attachment:attachment.pdf]", [attachment])
-    assert_match(/<section class="gem-c-attachment/, rendered)
+    assert html_has_selector?(rendered, "section.gem-c-attachment")
     assert_match(/Attachment Title/, rendered)
   end
 
@@ -29,7 +29,7 @@ class GovspeakAttachmentTest < Minitest::Test
     }
 
     rendered = render_govspeak("[Attachment: This is the name of my &%$@€? attachment]", [attachment])
-    assert_match(/<section class="gem-c-attachment/, rendered)
+    assert html_has_selector?(rendered, "section.gem-c-attachment")
     assert_match(/Attachment Title/, rendered)
   end
 
@@ -44,12 +44,12 @@ class GovspeakAttachmentTest < Minitest::Test
     assert_equal("<p>some text [Attachment:attachment.pdf]</p>\n", rendered)
 
     rendered = render_govspeak("[Attachment:attachment.pdf] some text", [attachment])
-    assert_match(/<section class="gem-c-attachment/, rendered)
+    assert html_has_selector?(rendered, "section.gem-c-attachment")
     assert_match(/<p>some text<\/p>/, rendered)
 
     rendered = render_govspeak("some text\n[Attachment:attachment.pdf]\nsome more text", [attachment])
     assert_match(/<p>some text<\/p>/, rendered)
-    assert_match(/<section class="gem-c-attachment/, rendered)
+    assert html_has_selector?(rendered, "section.gem-c-attachment")
     assert_match(/<p>some more text<\/p>/, rendered)
   end
 end

data/test/support/html_helpers.rb

@@ -0,0 +1,10 @@
+module HtmlHelpers
+  def html_has_selector?(html_string, selector)
+    return false if html_string.nil? || html_string.empty?
+
+    raise "No selector specified" if selector.nil? || selector.empty?
+
+    fragment = Nokogiri::HTML.fragment(html_string)
+    fragment.css(selector).any?
+  end
+end

data/test/test_helper.rb

@@ -9,7 +9,11 @@ Bundler.setup :default, :development, :test
 
 require "minitest/autorun"
 
+require "support/html_helpers"
+
 class Minitest::Test
+  include HtmlHelpers
+
   class << self
     def test(name, &block)
       clean_name = name.gsub(/\s+/, "_")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -55,14 +55,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '35.1'
+        version: '43'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '35.1'
+        version: '43'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -330,6 +330,7 @@ files:
 - test/html_sanitizer_test.rb
 - test/html_validator_test.rb
 - test/presenters/h_card_presenter_test.rb
+- test/support/html_helpers.rb
 - test/test_helper.rb
 homepage: http://github.com/alphagov/govspeak
 licenses: []
@@ -341,14 +342,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.4
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Markup language for single domain
 test_files:
@@ -372,4 +373,5 @@ test_files:
 - test/html_sanitizer_test.rb
 - test/html_validator_test.rb
 - test/presenters/h_card_presenter_test.rb
+- test/support/html_helpers.rb
 - test/test_helper.rb