govspeak 8.3.0 → 8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92a47d834646bd30072105c15ed418c6fbd09ad18c5469928be7d76a6cdf8d97
-  data.tar.gz: 94a44d03aa697a24937596786e8dff07da213ad085ca39ce52394cb040c3c7d1
+  metadata.gz: 330ac68b36870075d83d6cae5223e28d12186d7b9435be02df50829f11d8c27e
+  data.tar.gz: 3d0b8d3e7b1f98d9e3c814f141319a56a8388ac114b308aba7c3945e5661bbe4
 SHA512:
-  metadata.gz: b0e59b5d11641d737428bc419c77c749300115625442fb44b0eba026e1b3755e648a1a14ff5199c004ef18cdc72a66953f3c90feb883592dfd8e86719536068c
-  data.tar.gz: 3ab9bb92193243b5c0b0920260c7ae23773495d3683df54197775aef23337d743edc091a6068291d744fee7010142650e3896a6735310e7456227ab7e587465d
+  metadata.gz: c23c1e930d96b6c67fcc9a46c3fc2b1e048d3c5cf9f741e55de28b94bb334e56a07108326cf5bc96c140764f860a0532ff38df87dbb9e04355576f93ebe7efad
+  data.tar.gz: ed762ebf793ee83971ddcf4a5102379b2ad0dea4adea3134c8bd818c9c15d1d03e957b2b433549bc0846525bea1fb3a19c3574eafb1ac46dc1b98f27c59009cb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.3.1
+
+* Bug fixes related to block elements in call to action and legislative list components ([#293](https://github.com/alphagov/govspeak/pull/293))
+
 ## 8.3.0
 
 * Various bug fixes related to abbreviations in call to action and legislative list components ([#291](https://github.com/alphagov/govspeak/pull/291))

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "8.3.0".freeze
+  VERSION = "8.3.1".freeze
 end

data/lib/govspeak.rb

@@ -278,9 +278,7 @@ module Govspeak
 
     extension("call-to-action", surrounded_by("$CTA")) do |body|
       <<~BODY
-        {::options parse_block_html=\"true\" /}
-        <div class="call-to-action">#{body}</div>
-        {::options parse_block_html=\"false\" /}
+        <div class="call-to-action" markdown="1">#{body}</div>
       BODY
     end
 
@@ -303,9 +301,9 @@ module Govspeak
       # The surrounding div is neccessary to control flow in `parse_block_html` and
       # maintain the same functionality as a previous version of this extension.
       <<~BODY
-        {::options parse_block_html=\"true\" ordered_lists_disabled=\"true\" /}
-        <div class="legislative-list-wrapper">#{body}</div>
-        {::options parse_block_html=\"false\" ordered_lists_disabled=\"false\" /}
+        {::options ordered_lists_disabled=\"true\" /}
+        <div class="legislative-list-wrapper" markdown="1">#{body}</div>
+        {::options ordered_lists_disabled=\"false\" /}
       BODY
     end
 

data/test/govspeak_images_test.rb

@@ -4,13 +4,6 @@ require "govspeak_test_helper"
 class GovspeakImagesTest < Minitest::Test
   include GovspeakTestHelper
 
-  def build_image(attrs = {})
-    attrs[:alt_text] ||= "my alt"
-    attrs[:url] ||= "http://example.com/image.jpg"
-    attrs[:id] ||= "image-id"
-    attrs
-  end
-
   test "Image:image-id syntax renders an image in options[:images]" do
     given_govspeak "[Image:image-id]", images: [build_image] do
       assert_html_output(

data/test/govspeak_test.rb

@@ -683,6 +683,24 @@ Teston
     )
   end
 
+  test "CTA with image" do
+    given_govspeak "
+    $CTA
+    [Image:image-id]
+    $CTA
+
+    Some text
+    ", images: [build_image] do
+      assert_html_output %(
+      <div class="call-to-action">
+        <figure class="image embedded"><div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div></figure>
+      </div>
+
+      <p>Some text</p>
+    )
+    end
+  end
+
   test_given_govspeak "
     1. rod
     2. jane
@@ -1268,6 +1286,24 @@ Teston
     )
   end
 
+  test "LegislativeList with image" do
+    given_govspeak "
+    $LegislativeList
+    [Image:image-id]
+    $EndLegislativeList
+
+    Some text
+    ", images: [build_image] do
+      assert_html_output %(
+      <div class="legislative-list-wrapper">
+        <figure class="image embedded"><div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div></figure>
+      </div>
+
+      <p>Some text</p>
+    )
+    end
+  end
+
   test_given_govspeak "
     Zippy, Bungle and George did not qualify for the tax exemption in s428. They filled in their tax return accordingly.
     " do

data/test/govspeak_test_helper.rb

@@ -73,6 +73,13 @@ module GovspeakTestHelper
     coder.decode(html)
   end
 
+  def build_image(attrs = {})
+    attrs[:alt_text] ||= "my alt"
+    attrs[:url] ||= "http://example.com/image.jpg"
+    attrs[:id] ||= "image-id"
+    attrs
+  end
+
   module ClassMethods
     def test_given_govspeak(govspeak, options = {}, &block)
       test "Given #{govspeak}" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 8.3.0
+  version: 8.3.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -327,7 +327,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.21
 signing_key: 
 specification_version: 4
 summary: Markup language for single domain