govspeak 6.8.2 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8509b4c394ef305fd80454c6c6bdb13561332bcdedc5d0292c271387a34043c
-  data.tar.gz: a73d8175cbea307d6b8028931bd15e9b99b97f7ae7708247cc833873622a8574
+  metadata.gz: 3c3b8cb50ac3718a8e0721af172791562652e29dcbb871ef0c9627bd452a6dff
+  data.tar.gz: 1d95d42b9f7f3302ecb7357811ad3e8e65856ea1f965dbb65a5a9e3564b0069b
 SHA512:
-  metadata.gz: ae280e29132e39a4d85f6f095bfd45cfc0da7505b7148e0b48756c4c9fccd29af2a550257a6f972837b8f1c1495f817ee61653ee069db868e66fc5a149386553
-  data.tar.gz: d3e0c5858ebe636a50d44bb360c68bc2bee4cad547529872c51be3f42a5630d5444ccc29e4ef5437d096ecdc43386f18c27363f9bcfbeff801a86fb3f6bbc486
+  metadata.gz: 9c3d91185cf37171cc0cfe0ea48abfd37451c069c5ab2cff7cd7e909cf2298e92fe67b11de5985f5257d0f962f991b8240c8a38c5771792d1add389d3629e7d6
+  data.tar.gz: f3e4c332b35bcf5ab2587028d33cd85d4b933fd054334691c29febb3a85192214672ddc37a04f38117fce3e28b473068667d756e14e22e89f5614109e052cae5

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 7.0.0
+
+* BREAKING CHANGE Remove `PriorityList`, the `PrimaryList` JS module to render the priority list on the frontend is to be removed [#249](https://github.com/alphagov/govspeak/pull/249)
+
+## 6.8.4
+
+* Fix bug where inconsistent linebreaks trigger validations [#250](https://github.com/alphagov/govspeak/pull/250)
+
+## 6.8.3
+
+* Require Kramdown minimum version of 2.3.1 to avoid CVE-2021-28834 [#246](https://github.com/alphagov/govspeak/pull/246)
+
 ## 6.8.2
 
 * Fix footnote numbering [#239](https://github.com/alphagov/govspeak/pull/239)

data/README.md

@@ -292,29 +292,6 @@ For lists where you want to specify the numbering and have multiple indent level
     $EndLegislativeList
     (to indent, add 2 spaces)
 
-## Priority Lists
-
-For lists where you want to specify a number of items to be highlighted as priority.
-
-    $PriorityList:3
-    - Item 1
-    - Item 2
-    - Item 3
-    - Item 4
-    - Item 5
-
-creates a list with priority items flagged with a class
-
-```html
-<ul>
-  <li class="primary-item">Item 1</li>
-  <li class="primary-item">Item 2</li>
-  <li class="primary-item">Item 3</li>
-  <li>Item 4</li>
-  <li>Item 5</li>
-</ul>
-```
-
 ## Devolved content
 
     :england:content goes here:england:

data/lib/govspeak/html_validator.rb

@@ -20,7 +20,7 @@ private
 
   # Make whitespace in html tags consistent
   def normalise_html(html)
-    Nokogiri::HTML5.fragment(html).to_s
+    Nokogiri::HTML5.fragment(html).to_s.gsub("\n", "")
   end
 
   def govspeak_to_html(sanitize:)

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.8.2".freeze
+  VERSION = "7.0.0".freeze
 end

data/lib/govspeak.rb

@@ -405,19 +405,6 @@ module Govspeak
       end
     end
 
-    extension("Priority list", /#{NEW_PARAGRAPH_LOOKBEHIND}\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
-      number_to_show = number_to_show.to_i
-      tagged = 0
-      Govspeak::Document.new(body.strip).to_html.gsub(/<li>/) do |match|
-        if tagged < number_to_show
-          tagged += 1
-          '<li class="primary-item">'
-        else
-          match
-        end
-      end
-    end
-
     extension("embed link", /\[embed:link:\s*(.*?)\s*\]/) do |content_id|
       link = links.detect { |l| l[:content_id] == content_id }
       next "" unless link

data/test/govspeak_test.rb

@@ -1219,139 +1219,6 @@ Teston
     assert document.valid?
   end
 
-  expected_priority_list_output = %(
-    <ul>
-      <li class="primary-item">List item 1</li>
-      <li class="primary-item">List item 2</li>
-      <li class="primary-item">List item 3</li>
-      <li>List item 4</li>
-      <li>List item 5</li>
-    </ul>
-  )
-
-  test "Single priority list ending with EOF" do
-    govspeak = "$PriorityList:3
- * List item 1
- * List item 2
- * List item 3
- * List item 4
- * List item 5"
-
-    given_govspeak(govspeak) do
-      assert_html_output(expected_priority_list_output)
-    end
-  end
-
-  test "Single priority list ending with newlines" do
-    govspeak = "$PriorityList:3
-* List item 1
-* List item 2
-* List item 3
-* List item 4
-* List item 5
-
-"
-
-    given_govspeak(govspeak) do
-      assert_html_output(expected_priority_list_output)
-    end
-  end
-
-  test 'Single priority list with \n newlines' do
-    govspeak = "$PriorityList:3\n * List item 1\n * List item 2\n * List item 3\n * List item 4\n * List item 5"
-
-    given_govspeak(govspeak) do
-      assert_html_output(expected_priority_list_output)
-    end
-  end
-
-  test 'Single priority list with \r\n newlines' do
-    govspeak = "$PriorityList:3\r\n * List item 1\r\n * List item 2\r\n * List item 3\r\n * List item 4\r\n * List item 5"
-
-    given_govspeak(govspeak) do
-      assert_html_output(expected_priority_list_output)
-    end
-  end
-
-  test "Multiple priority lists" do
-    govspeak = "
-$PriorityList:3
-* List item 1
-* List item 2
-* List item 3
-* List item 4
-* List item 5
-
-$PriorityList:1
-* List item 1
-* List item 2"
-
-    given_govspeak(govspeak) do
-      assert_html_output %(
-        <ul>
-          <li class="primary-item">List item 1</li>
-          <li class="primary-item">List item 2</li>
-          <li class="primary-item">List item 3</li>
-          <li>List item 4</li>
-          <li>List item 5</li>
-        </ul>
-
-        <ul>
-          <li class="primary-item">List item 1</li>
-          <li>List item 2</li>
-        </ul>
-      )
-    end
-  end
-
-  test "Priority list placed incorrectly" do
-    govspeak = "
-    This is a paragraph
-    $PriorityList:3
-    * List item 1
-    * List item 2
-    * List item 3
-    * List item 4
-    * List item 5"
-
-    given_govspeak(govspeak) do
-      assert_html_output("
-      <p>This is a paragraph
-      $PriorityList:3
-      * List item 1
-      * List item 2
-      * List item 3
-      * List item 4
-      * List item 5</p>")
-    end
-  end
-
-  test "Priority list placed correctly" do
-    govspeak = "
-    This is a paragraph
-
-    $PriorityList:3
-    * List item 1
-    * List item 2
-    * List item 3
-    * List item 4
-    * List item 5"
-
-    given_govspeak(govspeak) do
-      assert_html_output %(
-        <p>This is a paragraph</p>
-
-        <ul>
-          <li class="primary-item">List item 1</li>
-          <li class="primary-item">List item 2</li>
-          <li class="primary-item">List item 3</li>
-          <li>List item 4</li>
-          <li>List item 5</li>
-        </ul>
-      )
-    end
-  end
-
   test "should remove quotes surrounding a blockquote" do
     govspeak = %(
 He said:

data/test/html_validator_test.rb

@@ -108,4 +108,9 @@ class HtmlValidatorTest < Minitest::Test
     assert Govspeak::HtmlValidator.new("<table><tr><td>Hello</td></tr></table>").valid?, "No <tbody> is valid"
     assert Govspeak::HtmlValidator.new("<table><tbody><tr><td>Hello</td></tr></tbody></table>").valid?, "<tbody> is valid"
   end
+
+  test "allow HTML tables with \n" do
+    html = "<table>\n<thead>\n<tr>\n<th></th>\n<th></th>\n<th colspan=\"3\"></th>\n\n</tr>\n</thead>\n<tr>\n<th></th>\n<td></td>\n<td></td>\n<td></td>\n<td></td>\n</tr>\n</table>"
+    assert Govspeak::HtmlValidator.new(html).valid?, 'Tables with no <tbody> and \n are valid'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.8.2
+  version: 7.0.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-29 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -327,29 +327,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.10
+rubygems_version: 3.3.20
 signing_key: 
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/govspeak_test_helper.rb
-- test/blockquote_extra_quote_remover_test.rb
-- test/govspeak_link_extractor_test.rb
-- test/govspeak_images_test.rb
-- test/govspeak_link_test.rb
-- test/govspeak_extract_contact_content_ids_test.rb
 - test/govspeak_footnote_test.rb
-- test/presenters/h_card_presenter_test.rb
-- test/govspeak_attachments_inline_test.rb
-- test/govspeak_structured_headers_test.rb
-- test/test_helper.rb
+- test/govspeak_attachments_image_test.rb
 - test/govspeak_button_test.rb
-- test/govspeak_attachment_test.rb
+- test/blockquote_extra_quote_remover_test.rb
+- test/test_helper.rb
+- test/presenters/h_card_presenter_test.rb
 - test/html_sanitizer_test.rb
-- test/govspeak_contacts_test.rb
-- test/govspeak_attachments_image_test.rb
-- test/govspeak_images_bang_test.rb
+- test/govspeak_structured_headers_test.rb
 - test/govspeak_test.rb
-- test/govspeak_table_with_headers_test.rb
+- test/govspeak_test_helper.rb
+- test/govspeak_link_test.rb
+- test/govspeak_contacts_test.rb
+- test/govspeak_extract_contact_content_ids_test.rb
 - test/html_validator_test.rb
+- test/govspeak_link_extractor_test.rb
+- test/govspeak_images_test.rb
 - test/govspeak_attachment_link_test.rb
+- test/govspeak_attachments_inline_test.rb
+- test/govspeak_attachment_test.rb
+- test/govspeak_table_with_headers_test.rb
+- test/govspeak_images_bang_test.rb