govspeak 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0c2e0694235f631985feeea77f20f07f8ce6ccaf55a8317a83b42583a6bcd2
-  data.tar.gz: f98e90a503d00b4dd7c92c9b4dd9e1ff4e3a14494787a344f3722cd788515294
+  metadata.gz: b48fa791c90052e6ee6f2c235d3baba095c5de501f32b7e2748f05396a799899
+  data.tar.gz: c5e325373b8c6d20e2d59db3b38b5345ccce22a83edba93a9ec41ba03156e1cb
 SHA512:
-  metadata.gz: b45e92bd8d25ef8a0674de0aba0ac4785589a3af588bf07893b567e09792b13deb15101ba85aef05c45b4429982add8ff52669abfa8b273a9ce29d51591c908b
-  data.tar.gz: b193767c7dd265bf61ac851cdc2b0caafd249f63057f5b2008e9dea991ae8d79166fa86169305cf099d3a3ddf1fbe0f1c256f02216d27ae95d2ad2f7a2f17d1e
+  metadata.gz: 3ddd06fa6841ce2efcbfbf660ae09eeff3114b6f4e5de067ed7b09457f6be14e29caa5803b281e24dad159e7c2a49594ef9e98a7d68f54e01930a4a31932ce32
+  data.tar.gz: e4811322275d4f221e198bf8112040340e922d3713ab82bac32395ad386243259e4f4fca1973cb050af9df12e4c1b10b8c17a62febb7f06c2ddbbbacc857d16d

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.1.1
+
+* Fix wrapping `AttachmentLink:attachment-id` in a paragraph when used inline
+
 ## 6.1.0
 
 * Remove `[embed:attachments:content-id]` this isn't used by any apps and has never worked

data/lib/govspeak.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/array'
 require 'erb'
 require 'htmlentities'
 require 'kramdown'
-require 'kramdown/parser/kramdown_with_automatic_external_links'
+require 'kramdown/parser/govuk'
 require 'rinku'
 require 'govuk_publishing_components'
 require 'govspeak/header_extractor'
@@ -21,14 +21,13 @@ require 'govspeak/presenters/h_card_presenter'
 require 'govspeak/presenters/image_presenter'
 require 'govspeak/presenters/attachment_image_presenter'
 
-
 module Govspeak
   def self.root
     File.expand_path('..', File.dirname(__FILE__))
   end
 
   class Document
-    Parser = Kramdown::Parser::KramdownWithAutomaticExternalLinks
+    Parser = Kramdown::Parser::Govuk
     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
@@ -354,6 +353,8 @@ module Govspeak
     # Content Publisher and should be considered experimental as it is likely
     # to be iterated in the short term.
     extension('Attachment', /#{NEW_PARAGRAPH_LOOKBEHIND}\[Attachment:\s*(.*?)\s*\]/) do |attachment_id|
+      next "" if attachments.none? { |a| a[:id] == attachment_id }
+
       %{<govspeak-embed-attachment id="#{attachment_id}"></govspeak-embed-attachment>}
     end
 
@@ -361,6 +362,8 @@ module Govspeak
     # syntax is being used by Content Publisher and should be considered
     # experimental
     extension('AttachmentLink', /\[AttachmentLink:\s*(.*?)\s*\]/) do |attachment_id|
+      next "" if attachments.none? { |a| a[:id] == attachment_id }
+
       %{<govspeak-embed-attachment-link id="#{attachment_id}"></govspeak-embed-attachment-link>}
     end
 

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.1.0".freeze
+  VERSION = "6.1.1".freeze
 end

data/lib/kramdown/parser/{kramdown_with_automatic_external_links.rb → govuk.rb}

@@ -20,7 +20,9 @@ module Kramdown
   end
 
   module Parser
-    class KramdownWithAutomaticExternalLinks < Kramdown::Parser::Kramdown
+    class Govuk < Kramdown::Parser::Kramdown
+      CUSTOM_INLINE_ELEMENTS = %w(govspeak-embed-attachment-link).freeze
+
       def initialize(source, options)
         @document_domains = options[:document_domains] || %w(www.gov.uk)
         super
@@ -41,6 +43,12 @@ module Kramdown
         end
         super
       end
+
+      def parse_block_html
+        return false if CUSTOM_INLINE_ELEMENTS.include?(@src[1].downcase)
+
+        super
+      end
     end
   end
 end

data/test/govspeak_attachment_link_test.rb

@@ -22,4 +22,19 @@ class GovspeakAttachmentLinkTest < Minitest::Test
     assert_match(/<span class="gem-c-attachment-link">/, rendered)
     assert_match(%r{href="http://example.com/attachment.pdf"}, rendered)
   end
+
+  test "renders an attachment link inside a paragraph" do
+    attachment = {
+      id: "attachment.pdf",
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }
+
+    rendered = render_govspeak("[AttachmentLink:attachment.pdf] test", [attachment])
+    root = Nokogiri::HTML.fragment(rendered).css(":root").first
+
+    assert(root.name, "p")
+    assert(root.css("p").size, 0)
+    assert_match(/Attachment Title\s*test/, root.text)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.1.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -260,7 +260,7 @@ files:
 - lib/govspeak/structured_header_extractor.rb
 - lib/govspeak/template_renderer.rb
 - lib/govspeak/version.rb
-- lib/kramdown/parser/kramdown_with_automatic_external_links.rb
+- lib/kramdown/parser/govuk.rb
 - lib/templates/contact.html.erb
 - locales/ar.yml
 - locales/be.yml
@@ -344,22 +344,22 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
+- test/govspeak_attachments_inline_test.rb
+- test/govspeak_attachment_test.rb
 - test/govspeak_attachment_link_test.rb
+- test/govspeak_images_test.rb
+- test/govspeak_link_test.rb
+- test/govspeak_images_bang_test.rb
+- test/govspeak_link_extractor_test.rb
+- test/govspeak_contacts_test.rb
 - test/test_helper.rb
-- test/govspeak_button_test.rb
 - test/govspeak_test.rb
-- test/html_validator_test.rb
-- test/govspeak_attachment_test.rb
-- test/govspeak_contacts_test.rb
-- test/govspeak_test_helper.rb
-- test/blockquote_extra_quote_remover_test.rb
 - test/govspeak_attachments_image_test.rb
-- test/html_sanitizer_test.rb
-- test/govspeak_link_test.rb
-- test/govspeak_extract_contact_content_ids_test.rb
+- test/html_validator_test.rb
 - test/govspeak_structured_headers_test.rb
-- test/govspeak_images_test.rb
+- test/govspeak_extract_contact_content_ids_test.rb
+- test/blockquote_extra_quote_remover_test.rb
 - test/presenters/h_card_presenter_test.rb
-- test/govspeak_images_bang_test.rb
-- test/govspeak_link_extractor_test.rb
-- test/govspeak_attachments_inline_test.rb
+- test/govspeak_button_test.rb
+- test/govspeak_test_helper.rb
+- test/html_sanitizer_test.rb