govspeak 10.0.1 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de3347bfd5e3aba6d0a7cf2ba84cf597d2eddb62556d14b52e110ea3bbe16cd3
-  data.tar.gz: 411758a6ca88e78f95f68d3a7dc74caaca36990e38b773ba69b7f9623b4657a2
+  metadata.gz: 244ad3768386af3b3e111493610fd0dd3b3ae892a1661da85be36d1c2d135f94
+  data.tar.gz: 915d3141f07e1578263645cdba00d39c02f9987ea15133a50bd6bf09b37d0f32
 SHA512:
-  metadata.gz: 055607cd4fab072fff74e3d22f5c8fd071db22593da91b38c46d88415e41c153d5916fdd1afc4bbd2912a8d6a06cf32312af22bea5d853a62b39cd7ae7bc7eeb
-  data.tar.gz: 5886753801ee61e2a3e23261c99d278c7f53279e5e5acf5d0d0f9930570d64ecac55a1a821afc1a3e6ba05f9d6fac5cc87017ab6988d3363258625b8d85f4ee9
+  metadata.gz: b493113cc87018ba77ec5238a160758492056b86b5d10e26fa5e9cd95374197769dcdddcf7fb2965bb0b0ca80fde42af7f0daa3435f66483c4a03f7c94123b57
+  data.tar.gz: c2880fc10ca8248e274054dde5a741a375e32a58e0ae20b96a8e98f94109d438d1e0d8dd37eaf9c0937fe4139b758999bd1960ff5ea041a5f6ee4de25a36d899

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 10.2.0
+
+* Revert 'Add GA4 indexes to attachments that render a details component' ([#389](https://github.com/alphagov/govspeak/pull/389))
+
+## 10.1.0
+
+* Allow acronyms/abbreviations in steps ([#387](https://github.com/alphagov/govspeak/pull/387)).
+* Add GA4 indexes to attachments that render a details component ([#385](https://github.com/alphagov/govspeak/pull/385))
+
 ## 10.0.1
 
 * Update dependencies
@@ -15,7 +24,7 @@
 
 ## 8.8.3
 
-* Update dependencies (actionview < 8.0.2, sanitize < 8, rubocop-govuk = 5.0.7) 
+* Update dependencies (actionview < 8.0.2, sanitize < 8, rubocop-govuk = 5.0.7)
 
 ## 8.8.2
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "10.0.1".freeze
+  VERSION = "10.2.0".freeze
 end

data/lib/govspeak.rb

@@ -317,10 +317,19 @@ module Govspeak
     end
 
     extension("numbered list", /^[ \t]*((s\d+\.\s.*(?:\n|$))+)/) do |body|
-      body.gsub!(/s(\d+)\.\s(.*)(?:\n|$)/) do
-        "<li>#{Govspeak::Document.new(Regexp.last_match(2).strip, attachments:).to_html}</li>\n"
+      li_elements = body.gsub!(/s(\d+)\.\s(.*)(?:\n|$)/).map do
+        element = <<~BODY
+          <li markdown="1">
+            #{Regexp.last_match(2).strip}
+          </li>
+        BODY
+        element.strip
       end
-      %(<ol class="steps">\n#{body}</ol>)
+      <<~BODY
+        <ol class="steps">
+          #{li_elements.join("\n  ")}
+        </ol>
+      BODY
     end
 
     def self.devolved_options

data/test/govspeak_attachment_link_test.rb

@@ -58,13 +58,13 @@ class GovspeakAttachmentLinkTest < Minitest::Test
 
     expected_output = <<~TEXT
       <ol class="steps">
-      <li>
-      <p>First item with <span class="gem-c-attachment-link">
+        <li>
+          <p>First item with <span class="gem-c-attachment-link">
         <a class="govuk-link" href="http://example.com/attachment.pdf">Attachment Title</a>  </span></p>
-      </li>
-      <li>
-      <p>Second item without attachment</p>
-      </li>
+        </li>
+        <li>
+          <p>Second item without attachment</p>
+        </li>
       </ol>
     TEXT
 

data/test/govspeak_test.rb

@@ -582,21 +582,38 @@ Teston
           <p>This is a test:</p>
 
           <ol class="steps">
+          <li>
+              <p>This is number 1.</p>
+            </li>
+          <li>
+              <p>This is number 2.</p>
+            </li>
+          <li>
+              <p>This is number 3.</p>
+            </li>
+          <li>
+              <p>This is number 4.</p>
+            </li>
+        </ol>
+        </div>
+        )
+  end
+
+  test_given_govspeak "
+    s1. This is number 1.
+    s2. This is number 2 with an ACRONYM.
+
+    *[ACRONYM]: This is the acronym explanation" do
+    assert_html_output <<~HTML
+      <ol class="steps">
         <li>
-        <p>This is number 1.</p>
-        </li>
-        <li>
-        <p>This is number 2.</p>
-        </li>
-        <li>
-        <p>This is number 3.</p>
+          <p>This is number 1.</p>
         </li>
         <li>
-        <p>This is number 4.</p>
+          <p>This is number 2 with an <abbr title="This is the acronym explanation">ACRONYM</abbr>.</p>
         </li>
-        </ol>
-        </div>
-        )
+      </ol>
+    HTML
   end
 
   test_given_govspeak "
@@ -841,15 +858,15 @@ Teston
     " do
     assert_html_output %(
       <ol class="steps">
-      <li>
-      <p>zippy</p>
-      </li>
-      <li>
-      <p>bungle</p>
-      </li>
-      <li>
-      <p>george</p>
-      </li>
+        <li>
+          <p>zippy</p>
+        </li>
+        <li>
+          <p>bungle</p>
+        </li>
+        <li>
+          <p>george</p>
+        </li>
       </ol>)
     assert_text_output "zippy bungle george"
   end
@@ -868,12 +885,12 @@ Teston
       </ul>
 
       <ol class="steps">
-      <li>
-      <p>step</p>
-      </li>
-      <li>
-      <p>list</p>
-      </li>
+        <li>
+          <p>step</p>
+        </li>
+        <li>
+          <p>list</p>
+        </li>
       </ol>)
     assert_text_output "unordered list step list"
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 bindir: bin
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.3
+rubygems_version: 3.6.5
 specification_version: 4
 summary: Markup language for single domain
 test_files: