govspeak 5.9.0 → 5.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefa5ca742f032b154510d7a90ca70e4cb26adb803811ed4aac9377d07ea21ff
-  data.tar.gz: 6fdb391bb18c3b90c07f5d52a75758edc82711848da11578aab725eae6b556d7
+  metadata.gz: a66dce46f2af9208dfc78c813b601fe8a447a0c5a68c085516dcf37d9fd5567d
+  data.tar.gz: 62323ec0ee81856973bea87d1575a5aac0d1c4f957ad2261d3081ec6206a45f9
 SHA512:
-  metadata.gz: 2af64448e8f05a2e7aff9da5f81e252ff4ad5d466b8c9e7eba24114f937993f99ba0e8e59b1481c6fb1dba6dd6b438ec28e5735380b3d4879355a8eba20d4809
-  data.tar.gz: f4a4dbb952b94c994c8697d52b8a905bf457a98883ef8d23a8f661528f719632f28acb0c1cbcc1e7a26195340dafce0e2e7bac950f8e89eb0e4f675fea7af291
+  metadata.gz: 4b14f7a1707a14e6342b709425556c5d69f64c12ba6523fc0c30ad5a8a98580e05115842cb7c70aa949c219683901e050c415df7b63249c910c59c73a75e011c
+  data.tar.gz: '02386b5204b077af3a5fa03512e0ed451b77ec3a65e38b17015bab5267431b25382b0103338128c02583e6a3b075eb6ff7f41210a3bdcb8a236d139d182cd6c6'

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.9.1
+
+* Don't render `[Image: {file-name}]` within a paragraph to avoid invalid HTML
+
 ## 5.9.0
 
 * Add image credits to embedded images

data/lib/govspeak.rb

@@ -29,6 +29,7 @@ module Govspeak
     Parser = Kramdown::Parser::KramdownWithAutomaticExternalLinks
     PARSER_CLASS_NAME = Parser.name.split("::").last
     UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.freeze
+    NEW_PARAGRAPH_LOOKBEHIND = %q{(?<=\A|\n\n|\r\n\r\n)}.freeze
 
     @extensions = []
 
@@ -287,7 +288,7 @@ module Govspeak
       %{\n<div class="address"><div class="adr org fn"><p>\n#{body.sub("\n", '').gsub("\n", '<br />')}\n</p></div></div>\n}
     }
 
-    extension("legislative list", /(?<=\A|\n\n|\r\n\r\n)^\$LegislativeList\s*$(.*?)\$EndLegislativeList/m) do |body|
+    extension("legislative list", /#{NEW_PARAGRAPH_LOOKBEHIND}\$LegislativeList\s*$(.*?)\$EndLegislativeList/m) do |body|
       Govspeak::KramdownOverrides.with_kramdown_ordered_lists_disabled do
         Kramdown::Document.new(body.strip).to_html.tap do |doc|
           doc.gsub!('<ul>', '<ol>')
@@ -324,7 +325,7 @@ module Govspeak
       end
     end
 
-    extension("Priority list", /(?<=\A|\n\n|\r\n\r\n)^\$PriorityList:(\d+)\s*$(.*?)(?:^\s*$|\Z)/m) do |number_to_show, body|
+    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|
@@ -357,7 +358,7 @@ module Govspeak
       @renderer.result(binding)
     end
 
-    extension('Image', /\[Image:\s*(.*?)\s*\]/) do |image_id|
+    extension('Image', /#{NEW_PARAGRAPH_LOOKBEHIND}\[Image:\s*(.*?)\s*\]/) do |image_id|
       image = images.detect { |c| c.is_a?(Hash) && c[:id] == image_id }
       next "" unless image
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "5.9.0".freeze
+  VERSION = "5.9.1".freeze
 end

data/test/govspeak_images_test.rb

@@ -93,4 +93,27 @@ class GovspeakImagesTest < Minitest::Test
       )
     end
   end
+
+  test "Image is not inserted when it does not start on a new line" do
+    given_govspeak "some text [Image:image-id]", images: [build_image] do
+      assert_html_output("<p>some text [Image:image-id]</p>")
+    end
+
+    given_govspeak "[Image:image-id]", images: [build_image] do
+      assert_html_output(
+        %{<figure class="image embedded">} +
+        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
+        %{</figure>}
+      )
+    end
+
+    given_govspeak "[Image:image-id] some text", images: [build_image] do
+      assert_html_output(
+        %{<figure class="image embedded">} +
+        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
+        %{</figure>\n} +
+        %{<p>some text</p>}
+      )
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.9.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -359,27 +359,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 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_link_extractor_test.rb
 - test/govspeak_structured_headers_test.rb
-- test/govspeak_attachments_image_test.rb
-- test/govspeak_attachments_test.rb
-- test/test_helper.rb
-- test/govspeak_attachments_inline_test.rb
-- test/html_sanitizer_test.rb
-- test/govspeak_button_test.rb
 - test/govspeak_images_bang_test.rb
-- test/govspeak_images_test.rb
-- test/html_validator_test.rb
+- test/govspeak_button_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
-- test/govspeak_test.rb
-- test/govspeak_link_extractor_test.rb
+- test/blockquote_extra_quote_remover_test.rb
+- test/govspeak_test_helper.rb
 - test/govspeak_link_test.rb
+- test/govspeak_images_test.rb
 - test/govspeak_contacts_test.rb
+- test/test_helper.rb
+- test/html_validator_test.rb
+- test/html_sanitizer_test.rb
+- test/govspeak_attachments_inline_test.rb
+- test/govspeak_test.rb
+- test/govspeak_attachments_test.rb
+- test/govspeak_attachments_image_test.rb
 - test/presenters/h_card_presenter_test.rb