govspeak 6.7.2 → 6.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3edb8b047b41d9c15581ec77b6b4ba829dae69f64729265deaf5cad25b91744a
-  data.tar.gz: 2e899be9ea70576afb234804213e8697278483a77118dc5f03857bdf7ca0e49d
+  metadata.gz: a3fb6617b89131244243bd9fcc7317e6c28266122a75eb01f7e2164cd2d46775
+  data.tar.gz: d6241111b4db6cee72273862559d27abd842a83171cd044069ca370c20f3e0e8
 SHA512:
-  metadata.gz: 8779eb8e734e660d3ce9b7e020f18c14792ba1488fb92f59d23455e0cf5474f2ded6d376bd3c25e0b09c7e27362a5e56a271bf1f3084ce60a8cc355d07a97b34
-  data.tar.gz: 569414d843883df41a9bd9abbc286b94667e50b0156321468d01008980fd28863ef65e127a422a7e55c4793b649901000a6a474e0450903a801287880fa75af6
+  metadata.gz: 7ed67517b5fdf63bd9e5e8e95510d801ea4457ed7fb290777f72d263802b67bd9cf30a4644b99edc6c11571bd93a9b61862e076e2d68fe43973b083d6bab98df
+  data.tar.gz: 58f86183335235a8b07cd059fe82e509e5e9701bbbbab02af250598778a720c65e136fb29e505acfe3a68727aeb09ae5e7b4d18cca20b93f67bfd3d940082fb1

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 * Minimum Ruby version specified at 2.6 [215](https://github.com/alphagov/govspeak/pull/215)
 
+## 6.7.3
+
+* Fix regex for footnotes in legislative lists [218](
+https://github.com/alphagov/govspeak/pull/218
+
 ## 6.7.2
 
 * Fix footnotes in legislative lists [216](https://github.com/alphagov/govspeak/pull/216)

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.7.2".freeze
+  VERSION = "6.7.3".freeze
 end

data/lib/govspeak.rb

@@ -135,7 +135,7 @@ module Govspeak
 
     def legislative_list_footnote_definitions(source)
       is_legislative_list = source.scan(/\$LegislativeList.*?\[\^\d\]*.*?\$EndLegislativeList/m).size.positive?
-      footnotes = source.scan(/\[\^(\d)\]:(.*)/)
+      footnotes = source.scan(/\[\^(\d+)\]:(.*)/)
       @acronyms = source.scan(/(?<=\*)\[(.*)\]:(.*)/)
 
       if is_legislative_list && footnotes.size.positive?

data/test/govspeak_test.rb

@@ -685,6 +685,145 @@ Teston
     )
   end
 
+  test_given_govspeak "
+    $LegislativeList
+    * 1. Item 1[^1]
+    * 2. Item 2[^2]
+    * 3. Item 3[^3]
+    $EndLegislativeList
+
+    This is a paragraph with a footnote[^4].
+
+    $LegislativeList
+    * 1. Item 1[^5]
+    * 2. Item 2[^6]
+    * 3. Item 3[^7]
+    $EndLegislativeList
+
+    This is a paragraph with a footnote[^8].
+
+    $LegislativeList
+    * 1. Item 1[^9]
+    * 2. Item 2[^10]
+    * 3. Item 3[^11]
+    $EndLegislativeList
+
+    This is a paragraph with a footnote[^12].
+
+    [^1]: Footnote definition 1
+    [^2]: Footnote definition 2
+    [^3]: Footnote definition 3
+    [^4]: Footnote definition 4
+    [^5]: Footnote definition 5
+    [^6]: Footnote definition 6
+    [^7]: Footnote definition 7
+    [^8]: Footnote definition 8
+    [^9]: Footnote definition 9
+    [^10]: Footnote definition 10
+    [^11]: Footnote definition 11
+    [^12]: Footnote definition 12
+  " do
+    assert_html_output %(
+      <ol class="legislative-list">
+        <li>1. Item 1<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">[footnote 1]</a></sup>
+      </li>
+        <li>2. Item 2<sup id="fnref:2" role="doc-noteref"><a href="#fn:2" class="footnote" rel="footnote">[footnote 2]</a></sup>
+      </li>
+        <li>3. Item 3<sup id="fnref:3" role="doc-noteref"><a href="#fn:3" class="footnote" rel="footnote">[footnote 3]</a></sup>
+      </li>
+      </ol>
+
+      <p>This is a paragraph with a footnote<sup id="fnref:4" role="doc-noteref"><a href="#fn:4" class="footnote" rel="footnote">[footnote 4]</a></sup>.</p>
+
+      <ol class="legislative-list">
+        <li>1. Item 1<sup id="fnref:5" role="doc-noteref"><a href="#fn:5" class="footnote" rel="footnote">[footnote 5]</a></sup>
+      </li>
+        <li>2. Item 2<sup id="fnref:6" role="doc-noteref"><a href="#fn:6" class="footnote" rel="footnote">[footnote 6]</a></sup>
+      </li>
+        <li>3. Item 3<sup id="fnref:7" role="doc-noteref"><a href="#fn:7" class="footnote" rel="footnote">[footnote 7]</a></sup>
+      </li>
+      </ol>
+
+      <p>This is a paragraph with a footnote<sup id="fnref:8" role="doc-noteref"><a href="#fn:8" class="footnote" rel="footnote">[footnote 8]</a></sup>.</p>
+
+      <ol class="legislative-list">
+        <li>1. Item 1<sup id="fnref:9" role="doc-noteref"><a href="#fn:9" class="footnote" rel="footnote">[footnote 9]</a></sup>
+      </li>
+        <li>2. Item 2<sup id="fnref:10" role="doc-noteref"><a href="#fn:10" class="footnote" rel="footnote">[footnote 10]</a></sup>
+      </li>
+        <li>3. Item 3<sup id="fnref:11" role="doc-noteref"><a href="#fn:11" class="footnote" rel="footnote">[footnote 11]</a></sup>
+      </li>
+      </ol>
+
+      <p>This is a paragraph with a footnote<sup id="fnref:12" role="doc-noteref"><a href="#fn:12" class="footnote" rel="footnote">[footnote 12]</a></sup>.</p>
+
+      <div class="footnotes" role="doc-endnotes">
+        <ol>
+          <li id="fn:1" role="doc-endnote">
+        <p>
+          Footnote definition 1<a href="#fnref:1" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:2" role="doc-endnote">
+        <p>
+          Footnote definition 2<a href="#fnref:2" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:3" role="doc-endnote">
+        <p>
+          Footnote definition 3<a href="#fnref:3" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:4" role="doc-endnote">
+        <p>
+          Footnote definition 4<a href="#fnref:4" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:5" role="doc-endnote">
+        <p>
+          Footnote definition 5<a href="#fnref:5" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:6" role="doc-endnote">
+        <p>
+          Footnote definition 6<a href="#fnref:6" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:7" role="doc-endnote">
+        <p>
+          Footnote definition 7<a href="#fnref:7" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:8" role="doc-endnote">
+        <p>
+          Footnote definition 8<a href="#fnref:8" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:9" role="doc-endnote">
+        <p>
+          Footnote definition 9<a href="#fnref:9" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:10" role="doc-endnote">
+        <p>
+          Footnote definition 10<a href="#fnref:10" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:11" role="doc-endnote">
+        <p>
+          Footnote definition 11<a href="#fnref:11" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+      <li id="fn:12" role="doc-endnote">
+        <p>
+          Footnote definition 12<a href="#fnref:12" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+        </p>
+      </li>
+        </ol>
+      </div>
+    )
+  end
+
   test_given_govspeak "
     $LegislativeList
     * 1. Item 1[^1] with a [link](http://www.gov.uk)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.7.3
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -372,24 +372,24 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/govspeak_attachments_image_test.rb
-- test/govspeak_structured_headers_test.rb
+- test/test_helper.rb
+- test/blockquote_extra_quote_remover_test.rb
 - test/govspeak_images_bang_test.rb
-- test/govspeak_link_test.rb
+- test/govspeak_contacts_test.rb
+- test/govspeak_table_with_headers_test.rb
+- test/govspeak_link_extractor_test.rb
+- test/govspeak_attachments_image_test.rb
+- test/html_validator_test.rb
+- test/govspeak_button_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
 - test/govspeak_test_helper.rb
-- test/blockquote_extra_quote_remover_test.rb
-- test/govspeak_attachments_inline_test.rb
-- test/govspeak_attachment_test.rb
-- test/test_helper.rb
-- test/govspeak_test.rb
-- test/presenters/h_card_presenter_test.rb
 - test/govspeak_footnote_test.rb
-- test/govspeak_attachment_link_test.rb
-- test/govspeak_link_extractor_test.rb
-- test/govspeak_button_test.rb
-- test/govspeak_images_test.rb
-- test/html_validator_test.rb
+- test/govspeak_link_test.rb
+- test/govspeak_structured_headers_test.rb
 - test/html_sanitizer_test.rb
-- test/govspeak_table_with_headers_test.rb
-- test/govspeak_contacts_test.rb
+- test/govspeak_images_test.rb
+- test/govspeak_test.rb
+- test/govspeak_attachment_link_test.rb
+- test/govspeak_attachment_test.rb
+- test/presenters/h_card_presenter_test.rb
+- test/govspeak_attachments_inline_test.rb