govspeak 8.8.3 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce925a76848a185792f6437ff7aab6b040012b0505901a154d2ccd6537700335
-  data.tar.gz: 2bf3201946f0d8523bd5ec039e2c8c1b8be6febb90bfadf2c66bdc353eb9f144
+  metadata.gz: 4b920cf6948fc17a6bc0046c71bc4a92cde77dd1f1fab57b58be2d8a4d077ea9
+  data.tar.gz: d60959650aae08193cfedc1ad48cf1a6e3eb65c584b825d60701c2bbdf0dae31
 SHA512:
-  metadata.gz: 587a8a16641f0ed9980e1ffdccc4bc210c2e0c7690e1e0a85d1415bed5a8a1cd5010fd3b25ed482df3fe062ae304205d41c80fbe04ebe37dee9fb5294337a8e8
-  data.tar.gz: 64b061a60ac3175f81faf6075b6df2c52a51bf9aa4465837fc690222171f18a6e8940b5b9ee8e1a6a5af4560c2e440682a380c6fc12d087d970bb3fe13e4973b
+  metadata.gz: bc7e37cc770324bad3ad12fadba04eeb24fcf894411b052312029753a5532e647006f417e77f3080ea88c8ff43b67ad7c1f9834a9bc14ffa9e983cc1e59f2360
+  data.tar.gz: 9c93d9f23dfc2387b64f3280a431b28f110737b784811c31aa58a5045cb18797a0eac13fb18c3579393aa5c07054e6739ed9f9035e57b95353ee75d00acb16f8

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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))
+
 ## 8.8.3
 
 * Update dependencies (actionview < 8.0.2, sanitize < 8, rubocop-govuk = 5.0.7) 

data/README.md

@@ -81,18 +81,6 @@ creates an example box
 
 ## Highlights
 
-### Advisory (DEPRECATED: marked for removal. Use 'Information callouts' instead.)
-
-    @This is a very important message or warning@
-
-highlights the enclosed text in yellow
-
-```html
-<h3 role="note" aria-label="Important" class="advisory">
-  <span>This is a very important message or warning</span>
-</h3>
-```
-
 ### Answer (DEPRECATED: marked for removal)
 
     {::highlight-answer}

data/lib/govspeak/version.rb

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

data/lib/govspeak.rb

@@ -201,10 +201,6 @@ module Govspeak
 #{Govspeak::Document.new(body.strip).to_html}</div>\n)
     end
 
-    extension("important", surrounded_by("@")) do |body|
-      %(\n\n<div role="note" aria-label="Important" class="advisory">#{insert_strong_inside_p(body)}</div>\n)
-    end
-
     extension("helpful", surrounded_by("%")) do |body|
       %(\n\n<div role="note" aria-label="Warning" class="application-notice help-notice">\n#{Govspeak::Document.new(body.strip).to_html}</div>\n)
     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/govspeak_test.rb

@@ -209,27 +209,6 @@ Teston
     assert_text_output "I am very informational"
   end
 
-  test_given_govspeak "@ I am very important @" do
-    assert_html_output %(
-      <div role="note" aria-label="Important" class="advisory">
-      <p><strong>I am very important</strong></p>
-      </div>)
-    assert_text_output "I am very important"
-  end
-
-  test_given_govspeak "
-    The following is very important
-    @ I am very important @
-    " do
-    assert_html_output %(
-      <p>The following is very important</p>
-
-      <div role="note" aria-label="Important" class="advisory">
-      <p><strong>I am very important</strong></p>
-      </div>)
-    assert_text_output "The following is very important I am very important"
-  end
-
   test_given_govspeak "% I am very helpful %" do
     assert_html_output %(
       <div role="note" aria-label="Warning" class="application-notice help-notice">
@@ -1527,14 +1506,6 @@ Teston
       '
   end
 
-  test_given_govspeak "@ Message with [a link](http://foo.bar/)@" do
-    assert_html_output %(
-      <div role="note" aria-label="Important" class="advisory">
-      <p><strong>Message with <a rel="external" href="http://foo.bar/">a link</a></strong></p>
-      </div>
-      )
-  end
-
   test "sanitize source input by default" do
     document = Govspeak::Document.new("<script>doBadThings();</script>")
     assert_equal "", document.to_html.strip

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: 8.8.3
+  version: 10.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2025-01-03 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