govspeak 8.3.2 → 8.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a58c52e5a9797911c326259920750977c19b81068825b6b947728fe6af410de
-  data.tar.gz: de9ac98e971c04c0ac4cc6d7e8f1cc987b2a5310ce2efb5bae4aa2b6ec5ccdc0
+  metadata.gz: 474078f8179d567c75b47f781c5d567072a6889a79554fefb81172316828f5fc
+  data.tar.gz: aa5a44c15285543a1749b3cf129c66eeea2cb6b58d0b98c9970bc5130320c8fb
 SHA512:
-  metadata.gz: 21b984b959a200d44869aad30b0d4db910feba0985d701b918152df0fb507cc46710ce0ee9c661f32e93686955f6c2aa722abeb2e95a96527cf3122d53742497
-  data.tar.gz: b33b3accc379b22a62a3354d041b943fdde26a5a3bc040308008d1eb1ebcd2d63b27d18d12a40a774b30b1052ef6b9741f733c6b9f5e3ab495831c305df233f5
+  metadata.gz: 210b4b75330ff66604483b61e0c2f5c78292ab7e3a957839af6f4fb7e5123b8649366945b01a4a03841f0924166475e28751e4e2531cfe10a125ba506b3f9ec6
+  data.tar.gz: 5c164df64fa4ba9c0bdba31d55644550267543e2549e764cab614db0bf2a2e07cd602d571c51ecad4ec9f402e0d76be5052cb21195616be98aba8c99a843d3c7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 8.3.4
+
+* Fix tables within call to action component ([#306](https://github.com/alphagov/govspeak/pull/306))
+
+## 8.3.3
+
+* Fix single line formatting of call to action component ([#302](https://github.com/alphagov/govspeak/pull/302))
+
 ## 8.3.2
 
 * Various bug fixes related to legislative list components ([#298](https://github.com/alphagov/govspeak/pull/298))

data/lib/govspeak/post_processor.rb

@@ -167,7 +167,7 @@ module Govspeak
 
     def output
       document = nokogiri_document
-      self.class.extensions.each do |_, block|
+      self.class.extensions.each do |(_, block)|
         instance_exec(document, &block)
       end
       document.to_html

data/lib/govspeak/presenters/contact_presenter.rb

@@ -59,7 +59,7 @@ module Govspeak
           # Not showing United Kingdom country is a "feature" lifted and shifted
           # from Whitehall:
           # https://github.com/alphagov/whitehall/blob/c67d53d80f9856549c2da1941a10dbb9170be494/lib/address_formatter/formatter.rb#L17
-          (key == "world_location" && value.strip == "United Kingdom" || value == "")
+          key == "world_location" && value.strip == "United Kingdom" || value == ""
         end
       end
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "8.3.2".freeze
+  VERSION = "8.3.4".freeze
 end

data/lib/govspeak.rb

@@ -277,7 +277,9 @@ module Govspeak
 
     extension("call-to-action", surrounded_by("$CTA")) do |body|
       <<~BODY
-        <div class="call-to-action" markdown="1">#{body}</div>
+        <div class="call-to-action" markdown="1">
+        #{body.strip.gsub(/\A^\|/, "\n|").gsub(/\|$\Z/, "|\n")}
+        </div>
       BODY
     end
 

data/test/govspeak_test.rb

@@ -425,6 +425,107 @@ Teston
     assert_text_output "Click here to start the tool"
   end
 
+  test_given_govspeak "
+    $CTA Click here to start the program $CTA
+
+    Here is some text" do
+    assert_html_output %(
+      <div class="call-to-action">
+        <p>Click here to start the program</p>
+      </div>
+
+      <p>Here is some text</p>)
+  end
+
+  test_given_govspeak "
+    Some text
+
+    $CTA     Click there to start the program     $CTA
+
+    Here is some text" do
+    assert_html_output %(
+      <p>Some text</p>
+      <div class="call-to-action">
+        <p>Click there to start the program</p>
+      </div>
+
+      <p>Here is some text</p>)
+  end
+
+  test_given_govspeak "
+    Some text
+
+    $CTAClick anywhere to start the program$CTA
+
+    Here is some text" do
+    assert_html_output %(
+      <p>Some text</p>
+      <div class="call-to-action">
+        <p>Click anywhere to start the program</p>
+      </div>
+
+      <p>Here is some text</p>)
+  end
+
+  test_given_govspeak "
+      $CTA
+      |Heading 1|Heading 2|
+      |-|-|
+      |information|more information|
+      $CTA" do
+    assert_html_output %(
+        <div class="call-to-action">
+
+        <table>
+          <thead>
+            <tr>
+              <th scope="col">Heading 1</th>
+              <th scope="col">Heading 2</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>information</td>
+              <td>more information</td>
+            </tr>
+          </tbody>
+        </table>
+
+      </div>)
+  end
+
+  test_given_govspeak "
+      $CTA
+
+      ### A heading within the CTA
+
+      |Heading 1|Heading 2|
+      |-|-|
+      |information|more information|
+
+      $CTA" do
+    assert_html_output %(
+      <div class="call-to-action">
+      <h3 id="a-heading-within-the-cta">A heading within the CTA</h3>
+
+      <table>
+        <thead>
+          <tr>
+            <th scope="col">Heading 1</th>
+            <th scope="col">Heading 2</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>information</td>
+            <td>more information</td>
+          </tr>
+        </tbody>
+      </table>
+
+    </div>)
+  end
+
   test_given_govspeak "
     Here is some text\n
 
@@ -453,7 +554,6 @@ Teston
     $CTA" do
     assert_html_output %(
         <div class="call-to-action">
-
           <p>This is a test:</p>
 
           <ol class="steps">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 8.3.2
+  version: 8.3.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.5
 signing_key: 
 specification_version: 4
 summary: Markup language for single domain