govspeak 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dec9f9ee71166be1a0eead7618adabb81efd51f4
-  data.tar.gz: cdc03d5927dac0271c21d8bba7dddbb565cccf27
+  metadata.gz: 0b89deebe8f9edfbab700411aad9fe2a35920ea1
+  data.tar.gz: 0c2bdf232a565f530966c9cf5799e6d856690e35
 SHA512:
-  metadata.gz: 02d24aa502bf2dbb098d03f07fe991b978f272e479ee2beaaab52bb7a4c6fd0927f9e52d40339ec8fd48c432eb316657ae1557f46d0bc8cb44bf9b06eab69844
-  data.tar.gz: 3cfbf2cc7011d73d4f35f223eb7c83946e7f1efba721a2a4f40e03ee1b5ffb75763a0a9671ae32e5c7a001d69c6437b5002ed8e0285ed3cd65f79583c8a65b31
+  metadata.gz: e70fdccd35a61cc375508ae191b2264ed294ad5d9c578d1776fdae7be705be5c21ed2dd8dc05fb28e97e2599faf655aaf164d24baab3cd986e8557fe1954e19a
+  data.tar.gz: 4d3bbd83d9a8b487bac5fc59bc1bb9ad55c6f93ea1fd489f9b44d41a68efd803a326da21ecfb3a2b16915b62031e381359440c2fab751144ade636c137dc53bb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.2.2
+* Fix rendering buttons with inconsistent linebreaks seen in publishing [#118](https://github.com/alphagov/govspeak/pull/118)
+
 ## 5.2.1
 * Fix validation to make sure buttons are considered valid
 * Only allow buttons to be used on new lines, not when indented or inline within text (useful for guides) [#116](https://github.com/alphagov/govspeak/pull/116)

data/lib/govspeak.rb

@@ -136,7 +136,7 @@ module Govspeak
     end
 
     extension('button', %r{
-      ^ # Match start of line only, allows for indenting code examples
+      (?:\r|\n|^) # non-capturing match to make sure start of line and linebreak
       {button(.*?)} # match opening bracket and capture attributes
         \s* # any whitespace between opening bracket and link
         \[ # match start of link markdown
@@ -147,7 +147,7 @@ module Govspeak
         \) # match end of link text markdown
         \s*  # any whitespace between opening bracket and link
       {\/button} # match ending bracket
-      $ # Match end of line only, allows for indenting code examples
+      (?:\r|\n|$) # non-capturing match to make sure end of line and linebreak
     }x) { |attributes, text, href|
       button_classes = "button"
       button_classes << " button-start" if attributes =~ /start/

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "5.2.1".freeze
+  VERSION = "5.2.2".freeze
 end

data/test/govspeak_button_test.rb

@@ -79,4 +79,53 @@ class GovspeakTest < Minitest::Test
       </code></pre>
     }
   end
+
+  # Make sure button renders when typical linebreaks are before it, seen in publishing applications
+  test_given_govspeak "{button}[Line breaks](https://gov.uk/random){/button}\r\n\r\n{button}[Continue](https://gov.uk/random){/button}\r\n\r\n{button}[Continue](https://gov.uk/random){/button}" do
+    assert_html_output %{
+      <p><a role="button" class="button" href="https://gov.uk/random">Line breaks</a></p>
+
+      <p><a role="button" class="button" href="https://gov.uk/random">Continue</a></p>
+
+      <p><a role="button" class="button" href="https://gov.uk/random">Continue</a></p>
+    }
+  end
+
+  test_given_govspeak "{button}[More line breaks](https://gov.uk/random){/button}\n\n{button}[Continue](https://gov.uk/random){/button}\n\n{button}[Continue](https://gov.uk/random){/button}" do
+    assert_html_output %{
+      <p><a role="button" class="button" href="https://gov.uk/random">More line breaks</a></p>
+
+      <p><a role="button" class="button" href="https://gov.uk/random">Continue</a></p>
+
+      <p><a role="button" class="button" href="https://gov.uk/random">Continue</a></p>
+    }
+  end
+
+  test_given_govspeak %{
+    ## Register to vote
+
+    Introduction text about the service.
+
+    lorem lorem lorem
+    lorem lorem lorem
+
+    {button start}[Start Now](https://gov.uk/random){/button}
+
+    lorem lorem lorem
+    lorem lorem lorem
+  } do
+    assert_html_output %{
+      <h2 id="register-to-vote">Register to vote</h2>
+
+      <p>Introduction text about the service.</p>
+
+      <p>lorem lorem lorem
+      lorem lorem lorem</p>
+
+      <p><a role="button" class="button button-start" href="https://gov.uk/random">Start Now</a></p>
+
+      <p>lorem lorem lorem
+      lorem lorem lorem</p>
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Ben Griffiths
@@ -320,18 +320,18 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
+- test/blockquote_extra_quote_remover_test.rb
 - test/govspeak_test_helper.rb
-- test/govspeak_test.rb
+- test/govspeak_structured_headers_test.rb
 - test/govspeak_attachments_image_test.rb
-- test/with_deep_merge_test.rb
-- test/govspeak_link_test.rb
+- test/govspeak_attachments_test.rb
 - test/test_helper.rb
-- test/html_validator_test.rb
-- test/blockquote_extra_quote_remover_test.rb
+- test/govspeak_attachments_inline_test.rb
 - test/html_sanitizer_test.rb
-- test/govspeak_attachments_test.rb
 - test/govspeak_button_test.rb
-- test/govspeak_structured_headers_test.rb
-- test/presenters/h_card_presenter_test.rb
+- test/with_deep_merge_test.rb
+- test/html_validator_test.rb
+- test/govspeak_test.rb
+- test/govspeak_link_test.rb
 - test/govspeak_contacts_test.rb
-- test/govspeak_attachments_inline_test.rb
+- test/presenters/h_card_presenter_test.rb