govspeak 6.4.0 → 6.5.4

data/lib/govspeak/link_extractor.rb

@@ -20,8 +20,8 @@ module Govspeak
     end
 
     def extract_href_from_link(link)
-      href = link['href'] || ''
-      if website_root && href.start_with?('/')
+      href = link["href"] || ""
+      if website_root && href.start_with?("/")
         "#{website_root}#{href}"
       else
         href
@@ -29,7 +29,7 @@ module Govspeak
     end
 
     def document_anchors
-      processed_govspeak.css('a[href]').css('a:not([href^="mailto"])').css('a:not([href^="#"])')
+      processed_govspeak.css("a[href]").css('a:not([href^="mailto"])').css('a:not([href^="#"])')
     end
 
     def processed_govspeak

data/lib/govspeak/post_processor.rb

@@ -2,8 +2,8 @@ module Govspeak
   class PostProcessor
     @extensions = []
 
-    def self.extensions
-      @extensions
+    class << self
+      attr_reader :extensions
     end
 
     def self.process(html, govspeak_document)
@@ -38,11 +38,11 @@ module Govspeak
         el.children = xml
           .gsub(
             %r{&lt;(div class="img")&gt;(.*?)&lt;(/div)&gt;},
-            "<\\1>\\2<\\3>"
+            "<\\1>\\2<\\3>",
           )
           .gsub(
             %r{&lt;(figcaption)&gt;(.*?)&lt;(/figcaption&)gt;},
-            "<\\1>\\2<\\3>"
+            "<\\1>\\2<\\3>",
           )
       end
     end
@@ -59,7 +59,7 @@ module Govspeak
         attachment_html = GovukPublishingComponents.render(
           "govuk_publishing_components/components/attachment",
           attachment: attachment,
-          locale: govspeak_document.locale
+          locale: govspeak_document.locale,
         )
         el.swap(attachment_html)
       end
@@ -77,7 +77,7 @@ module Govspeak
         attachment_html = GovukPublishingComponents.render(
           "govuk_publishing_components/components/attachment_link",
           attachment: attachment,
-          locale: govspeak_document.locale
+          locale: govspeak_document.locale,
         )
         el.swap(attachment_html)
       end
@@ -85,21 +85,39 @@ module Govspeak
 
     extension("Add table headers and row / column scopes") do |document|
       document.css("thead th").map do |el|
-        el.content = el.content.gsub(/^# /, '')
-        el.content = el.content.gsub(/[[:space:]]/, '') if el.content.blank? # Removes a strange whitespace in the cell if the cell is already blank.
-        el.name = 'td' if el.content.blank? # This prevents a `th` with nothing inside it; a `td` is preferable.
+        el.content = el.content.gsub(/^# /, "")
+        el.content = el.content.gsub(/[[:space:]]/, "") if el.content.blank? # Removes a strange whitespace in the cell if the cell is already blank.
+        el.name = "td" if el.content.blank? # This prevents a `th` with nothing inside it; a `td` is preferable.
         el[:scope] = "col" if el.content.present? # `scope` shouldn't be used if there's nothing in the table heading.
       end
 
       document.css(":not(thead) tr td:first-child").map do |el|
         if el.content.match?(/^#($|\s.*$)/)
-          el.content = el.content.gsub(/^#($|\s)/, '') # Replace '# ' and '#', but not '#Word'.
-          el.name = 'th' if el.content.present? # This also prevents a `th` with nothing inside it; a `td` is preferable.
-          el[:scope] = 'row' if el.content.present? # `scope` shouldn't be used if there's nothing in the table heading.
+          el.content = el.content.gsub(/^#($|\s)/, "") # Replace '# ' and '#', but not '#Word'.
+          el.name = "th" if el.content.present? # This also prevents a `th` with nothing inside it; a `td` is preferable.
+          el[:scope] = "row" if el.content.present? # `scope` shouldn't be used if there's nothing in the table heading.
         end
       end
     end
 
+    extension("use gem component for buttons") do |document|
+      document.css(".govuk-button").map do |el|
+        button_html = GovukPublishingComponents.render(
+          "govuk_publishing_components/components/button",
+          text: el.content,
+          href: el["href"],
+          start: el["data-start"],
+          data_attributes: {
+            module: el["data-module"],
+            "tracking-code": el["data-tracking-code"],
+            "tracking-name": el["data-tracking-name"],
+          },
+        ).squish.gsub("> <", "><").gsub!(/\s+/, " ")
+
+        el.swap(button_html)
+      end
+    end
+
     attr_reader :input, :govspeak_document
 
     def initialize(html, govspeak_document)

data/lib/govspeak/presenters/attachment_presenter.rb

@@ -34,15 +34,15 @@ module Govspeak
     def attachment_attributes
       attributes = []
       if file_extension == "html"
-        attributes << content_tag(:span, 'HTML', class: 'type')
+        attributes << content_tag(:span, "HTML", class: "type")
       elsif attachment[:external?]
-        attributes << content_tag(:span, url, class: 'url')
+        attributes << content_tag(:span, url, class: "url")
       else
-        attributes << content_tag(:span, humanized_content_type(file_extension), class: 'type') if file_extension
-        attributes << content_tag(:span, number_to_human_size(attachment[:file_size]), class: 'file-size') if attachment[:file_size]
-        attributes << content_tag(:span, pluralize(attachment[:number_of_pages], "page"), class: 'page-length') if attachment[:number_of_pages]
+        attributes << content_tag(:span, humanized_content_type(file_extension), class: "type") if file_extension
+        attributes << content_tag(:span, number_to_human_size(attachment[:file_size]), class: "file-size") if attachment[:file_size]
+        attributes << content_tag(:span, pluralize(attachment[:number_of_pages], "page"), class: "page-length") if attachment[:number_of_pages]
       end
-      attributes.join(', ').html_safe
+      attributes.join(", ").html_safe
     end
 
     MS_WORD_DOCUMENT_HUMANIZED_CONTENT_TYPE = "MS Word Document".freeze
@@ -55,41 +55,41 @@ module Govspeak
 
     def humanized_content_type(file_extension)
       file_extension_vs_humanized_content_type = {
-        "chm"  => file_abbr_tag('CHM', 'Microsoft Compiled HTML Help'),
-        "csv"  => file_abbr_tag('CSV', 'Comma-separated Values'),
-        "diff" => file_abbr_tag('DIFF', 'Plain text differences'),
+        "chm"  => file_abbr_tag("CHM", "Microsoft Compiled HTML Help"),
+        "csv"  => file_abbr_tag("CSV", "Comma-separated Values"),
+        "diff" => file_abbr_tag("DIFF", "Plain text differences"),
         "doc"  => MS_WORD_DOCUMENT_HUMANIZED_CONTENT_TYPE,
         "docx" => MS_WORD_DOCUMENT_HUMANIZED_CONTENT_TYPE,
-        "dot"  => file_abbr_tag('DOT', 'MS Word Document Template'),
-        "dxf"  => file_abbr_tag('DXF', 'AutoCAD Drawing Exchange Format'),
-        "eps"  => file_abbr_tag('EPS', 'Encapsulated PostScript'),
-        "gif"  => file_abbr_tag('GIF', 'Graphics Interchange Format'),
-        "gml"  => file_abbr_tag('GML', 'Geography Markup Language'),
-        "html" => file_abbr_tag('HTML', 'Hypertext Markup Language'),
-        "ics" => file_abbr_tag('ICS', 'iCalendar file'),
+        "dot"  => file_abbr_tag("DOT", "MS Word Document Template"),
+        "dxf"  => file_abbr_tag("DXF", "AutoCAD Drawing Exchange Format"),
+        "eps"  => file_abbr_tag("EPS", "Encapsulated PostScript"),
+        "gif"  => file_abbr_tag("GIF", "Graphics Interchange Format"),
+        "gml"  => file_abbr_tag("GML", "Geography Markup Language"),
+        "html" => file_abbr_tag("HTML", "Hypertext Markup Language"),
+        "ics" => file_abbr_tag("ICS", "iCalendar file"),
         "jpg"  => "JPEG",
-        "odp"  => file_abbr_tag('ODP', 'OpenDocument Presentation'),
-        "ods"  => file_abbr_tag('ODS', 'OpenDocument Spreadsheet'),
-        "odt"  => file_abbr_tag('ODT', 'OpenDocument Text document'),
-        "pdf"  => file_abbr_tag('PDF', 'Portable Document Format'),
-        "png"  => file_abbr_tag('PNG', 'Portable Network Graphic'),
+        "odp"  => file_abbr_tag("ODP", "OpenDocument Presentation"),
+        "ods"  => file_abbr_tag("ODS", "OpenDocument Spreadsheet"),
+        "odt"  => file_abbr_tag("ODT", "OpenDocument Text document"),
+        "pdf"  => file_abbr_tag("PDF", "Portable Document Format"),
+        "png"  => file_abbr_tag("PNG", "Portable Network Graphic"),
         "ppt"  => MS_POWERPOINT_PRESENTATION_HUMANIZED_CONTENT_TYPE,
         "pptx" => MS_POWERPOINT_PRESENTATION_HUMANIZED_CONTENT_TYPE,
-        "ps"   => file_abbr_tag('PS', 'PostScript'),
-        "rdf"  => file_abbr_tag('RDF', 'Resource Description Framework'),
-        "rtf"  => file_abbr_tag('RTF', 'Rich Text Format'),
-        "sch"  => file_abbr_tag('SCH', 'XML based Schematic'),
+        "ps"   => file_abbr_tag("PS", "PostScript"),
+        "rdf"  => file_abbr_tag("RDF", "Resource Description Framework"),
+        "rtf"  => file_abbr_tag("RTF", "Rich Text Format"),
+        "sch"  => file_abbr_tag("SCH", "XML based Schematic"),
         "txt"  => "Plain text",
-        "wsdl" => file_abbr_tag('WSDL', 'Web Services Description Language'),
+        "wsdl" => file_abbr_tag("WSDL", "Web Services Description Language"),
         "xls"  => MS_EXCEL_SPREADSHEET_HUMANIZED_CONTENT_TYPE,
-        "xlsm" => file_abbr_tag('XLSM', 'MS Excel Macro-Enabled Workbook'),
+        "xlsm" => file_abbr_tag("XLSM", "MS Excel Macro-Enabled Workbook"),
         "xlsx" => MS_EXCEL_SPREADSHEET_HUMANIZED_CONTENT_TYPE,
-        "xlt"  => file_abbr_tag('XLT', 'MS Excel Spreadsheet Template'),
-        "xsd"  => file_abbr_tag('XSD', 'XML Schema'),
-        "xslt" => file_abbr_tag('XSLT', 'Extensible Stylesheet Language Transformation'),
-        "zip"  => file_abbr_tag('ZIP', 'Zip archive'),
+        "xlt"  => file_abbr_tag("XLT", "MS Excel Spreadsheet Template"),
+        "xsd"  => file_abbr_tag("XSD", "XML Schema"),
+        "xslt" => file_abbr_tag("XSLT", "Extensible Stylesheet Language Transformation"),
+        "zip"  => file_abbr_tag("ZIP", "Zip archive"),
       }
-      file_extension_vs_humanized_content_type.fetch(file_extension.to_s.downcase, '')
+      file_extension_vs_humanized_content_type.fetch(file_extension.to_s.downcase, "")
     end
 
     def link(body, url, options = {})

data/lib/govspeak/presenters/contact_presenter.rb

@@ -1,5 +1,5 @@
-require 'active_support/core_ext/array'
-require 'active_support/core_ext/hash'
+require "active_support/core_ext/array"
+require "active_support/core_ext/hash"
 
 module Govspeak
   class ContactPresenter

data/lib/govspeak/presenters/h_card_presenter.rb

@@ -2,7 +2,7 @@ module Govspeak
   class HCardPresenter
     def self.address_formats
       @address_formats ||= YAML.load_file(
-        File.expand_path('config/address_formats.yml', Govspeak.root)
+        File.expand_path("config/address_formats.yml", Govspeak.root),
       )
     end
 
@@ -44,7 +44,7 @@ module Govspeak
         address.gsub!(/\{\{#{hcard_name}\}\}/, interpolate_address_property(our_name, hcard_name))
       end
 
-      address.gsub(/^\n/, '')         # get  rid of blank lines
+      address.gsub(/^\n/, "")         # get  rid of blank lines
              .strip                   # get rid of any trailing whitespace
              .gsub(/\n/, "<br />\n")  # add break tags where appropriate
     end
@@ -55,7 +55,7 @@ module Govspeak
     end
 
     def default_format_string
-      self.class.address_formats['gb']
+      self.class.address_formats["gb"]
     end
   end
 end

data/lib/govspeak/presenters/image_presenter.rb

@@ -32,10 +32,10 @@ module Govspeak
 
     def figcaption_html
       lines = []
-      lines << '<figcaption>'
+      lines << "<figcaption>"
       lines << %{<p>#{caption}</p>} if caption.present?
       lines << %{<p>#{I18n.t('govspeak.image.figure.credit', credit: credit)}</p>} if credit.present?
-      lines << '</figcaption>'
+      lines << "</figcaption>"
       lines.join
     end
   end

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.4.0".freeze
+  VERSION = "6.5.4".freeze
 end

data/lib/kramdown/parser/govuk.rb

@@ -33,13 +33,13 @@ module Kramdown
           begin
             host = Addressable::URI.parse(href).host
             unless host.nil? || @document_domains.compact.include?(host)
-              element.attr['rel'] = 'external'
+              element.attr["rel"] = "external"
             end
-          # rubocop:disable Lint/HandleExceptions
+          # rubocop:disable Lint/SuppressedException
           rescue Addressable::URI::InvalidURIError
             # it's safe to ignore these very *specific* exceptions
           end
-          # rubocop:enable Lint/HandleExceptions
+          # rubocop:enable Lint/SuppressedException
         end
         super
       end

data/test/blockquote_extra_quote_remover_test.rb

@@ -28,67 +28,67 @@ class BlockquoteExtraQuoteRemoverTest < Minitest::Test
   test "transforms text with surrounding quotes" do
     assert_remover_transforms(
       %{He said:\n> "yes, it's true!"\n\napparently.} =>
-      %{He said:\n> yes, it's true!\n\napparently.}
+      %{He said:\n> yes, it's true!\n\napparently.},
     )
   end
 
   test "leaves quotes in the middle of the string" do
     assert_remover_transforms(
       %{He said:\n> "yes, it's true!" whilst sipping a cocktail. "And yes, I did rather enjoy it." \n\napparently.} =>
-      %{He said:\n> yes, it's true!" whilst sipping a cocktail. "And yes, I did rather enjoy it.\n\napparently.}
+      %{He said:\n> yes, it's true!" whilst sipping a cocktail. "And yes, I did rather enjoy it.\n\napparently.},
     )
   end
 
   test "leaves trailing text and quote intact" do
     assert_remover_transforms(
       %{He said:\n> "yes, it's true!" whilst sipping a cocktail.} =>
-      %{He said:\n> yes, it's true!" whilst sipping a cocktail.}
+      %{He said:\n> yes, it's true!" whilst sipping a cocktail.},
     )
   end
 
   test "windows line breaks" do
     assert_remover_transforms(
       %{Sir George Young MP, said\r\n>  "I welcome the positive public response to the e-petitions site, which is important way of building a bridge between people and Parliament.”\r\n## The special relationship} =>
-      %{Sir George Young MP, said\r\n> I welcome the positive public response to the e-petitions site, which is important way of building a bridge between people and Parliament.\r\n## The special relationship}
+      %{Sir George Young MP, said\r\n> I welcome the positive public response to the e-petitions site, which is important way of building a bridge between people and Parliament.\r\n## The special relationship},
     )
   end
 
   test "no space in front" do
     assert_remover_transforms(
       %{>"As we continue with the redundancy process we will ensure we retain the capabilities that our armed forces will require to meet the challenges of the future. The redundancy programme will not impact adversely on the current operations in Afghanistan, where our armed forces continue to fight so bravely on this country's behalf."} =>
-      %{> As we continue with the redundancy process we will ensure we retain the capabilities that our armed forces will require to meet the challenges of the future. The redundancy programme will not impact adversely on the current operations in Afghanistan, where our armed forces continue to fight so bravely on this country's behalf.}
+      %{> As we continue with the redundancy process we will ensure we retain the capabilities that our armed forces will require to meet the challenges of the future. The redundancy programme will not impact adversely on the current operations in Afghanistan, where our armed forces continue to fight so bravely on this country's behalf.},
     )
   end
 
   test "handles space after a quote" do
     assert_remover_transforms(
       %{>" Test"} =>
-      %{> Test}
+      %{> Test},
     )
   end
 
   test "remove double double quotes" do
     assert_remover_transforms(
       %{We heard it said:\n\n> ""Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.""} =>
-      %{We heard it said:\n\n> Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.}
+      %{We heard it said:\n\n> Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.},
     )
     assert_remover_transforms(
       %{> ""Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.} =>
-      %{> Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.}
+      %{> Today the coalition is remedying those deficiencies by putting in place a new fast track process where the people's elected representatives have responsibility for the final decisions about Britain's future instead of unelected commissioners.},
     )
   end
 
   test "removes quotes correctly from multi-line blockquotes" do
     assert_remover_transforms(
       %{> "Here is a block quote using 2 lines and two of the arrows.\n> I am not sure how this will render.  I think it will mash them together."} =>
-      %{> Here is a block quote using 2 lines and two of the arrows.\n> I am not sure how this will render.  I think it will mash them together.}
+      %{> Here is a block quote using 2 lines and two of the arrows.\n> I am not sure how this will render.  I think it will mash them together.},
     )
   end
 
   test "preserves multiline blockquotes with plain newlines quotes" do
     assert_remover_transforms(
       %{> "line 1\n> \n> "line 2\n> \n> "line 3"} =>
-      %{> line 1\n> \n> line 2\n> \n> line 3}
+      %{> line 1\n> \n> line 2\n> \n> line 3},
       )
   end
 

data/test/govspeak_attachments_image_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class GovspeakAttachmentsImageTest < Minitest::Test
   def build_attachment(args = {})
@@ -17,7 +17,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   end
 
   def compress_html(html)
-    html.gsub(/[\n\r]+[\s]*/, '')
+    html.gsub(/[\n\r]+[\s]*/, "")
   end
 
   test "renders an empty string for an image attachment not found" do
@@ -27,7 +27,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "wraps an attachment in a figure with the id if the id is present" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: 10, content_id: "1fe8")]
+      [build_attachment(id: 10, content_id: "1fe8")],
     )
     assert_match(/<figure id="attachment_10" class="image embedded">/, rendered)
   end
@@ -35,7 +35,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "wraps an attachment in a figure without the id if the id is not present" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: nil, content_id: "1fe8")]
+      [build_attachment(id: nil, content_id: "1fe8")],
     )
     assert_match(/<figure class="image embedded">/, rendered)
   end
@@ -43,7 +43,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "renders an attachment if there are spaces around the content_id" do
     rendered = render_govspeak(
       "[embed:attachments:image: 1fe8 ]",
-      [build_attachment(id: 10, content_id: "1fe8")]
+      [build_attachment(id: 10, content_id: "1fe8")],
     )
     assert_match(/<figure id="attachment_10" class="image embedded">/, rendered)
   end
@@ -51,7 +51,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "has an image element to the file" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: nil, url: "http://a.b/c.jpg", content_id: "1fe8")]
+      [build_attachment(id: nil, url: "http://a.b/c.jpg", content_id: "1fe8")],
     )
     assert_match(%r{<img.*src="http://a.b/c.jpg"}, rendered)
   end
@@ -59,7 +59,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "renders the image title as an alt tag" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: nil, title: "My Title", content_id: "1fe8")]
+      [build_attachment(id: nil, title: "My Title", content_id: "1fe8")],
     )
     assert_match(%r{<img.*alt="My Title"}, rendered)
   end
@@ -67,7 +67,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "can render a nil image title" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: nil, title: nil, content_id: "1fe8")]
+      [build_attachment(id: nil, title: nil, content_id: "1fe8")],
     )
     assert_match(%r{<img.*alt=""}, rendered)
   end
@@ -75,7 +75,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "a full image attachment rendering looks correct" do
     rendered = render_govspeak(
       "[embed:attachments:image:1fe8]",
-      [build_attachment(id: 10, url: "http://a.b/c.jpg", title: "My Title", content_id: "1fe8")]
+      [build_attachment(id: 10, url: "http://a.b/c.jpg", title: "My Title", content_id: "1fe8")],
     )
     expected_html_output = %{
       <figure id="attachment_10" class="image embedded">
@@ -89,7 +89,7 @@ class GovspeakAttachmentsImageTest < Minitest::Test
   test "can be rendered inside a table" do
     rendered = render_govspeak(
       "| [embed:attachments:image:1fe8] |",
-      [build_attachment(content_id: "1fe8", id: nil)]
+      [build_attachment(content_id: "1fe8", id: nil)],
     )
 
     regex = %r{<td><figure class="image embedded"><div class="img">(.*?)</div></figure></td>}

data/test/govspeak_attachments_inline_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class GovspeakAttachmentsInlineTest < Minitest::Test
   def build_attachment(args = {})
@@ -23,7 +23,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "wraps an attachment in a span with the id if the id is present" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(id: 10, content_id: "1fe8")]
+      [build_attachment(id: 10, content_id: "1fe8")],
     )
     assert_match(/<span id="attachment_10" class="attachment-inline">/, rendered)
   end
@@ -31,7 +31,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "wraps an attachment in a span without the id if the id is not present" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(id: nil, content_id: "1fe8")]
+      [build_attachment(id: nil, content_id: "1fe8")],
     )
     assert_match(/<span class="attachment-inline">/, rendered)
   end
@@ -39,7 +39,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "renders an attachment where the content id has spaces" do
     rendered = render_govspeak(
       "[embed:attachments:inline:  1fe8  ]",
-      [build_attachment(id: nil, content_id: "1fe8")]
+      [build_attachment(id: nil, content_id: "1fe8")],
     )
     assert_match(/<span class="attachment-inline">/, rendered)
   end
@@ -47,7 +47,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "links to the attachment file" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", title: "My Pdf")]
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", title: "My Pdf")],
     )
     assert_match(%r{<a href="http://a.b/f.pdf">My Pdf</a>}, rendered)
   end
@@ -55,7 +55,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "renders with a nil title" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", title: nil)]
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", title: nil)],
     )
     assert_match(%r{<a href="http://a.b/f.pdf"></a>}, rendered)
   end
@@ -63,7 +63,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "renders on a single line" do
     rendered = render_govspeak(
       "[embed:attachments:inline:2bc1]",
-      [build_attachment(content_id: "2bc1", external?: true)]
+      [build_attachment(content_id: "2bc1", external?: true)],
     )
     assert_match(%r{<span id="attachment[^\n]*</span>}, rendered)
   end
@@ -71,7 +71,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "doesn't have spaces between the span and the link" do
     rendered = render_govspeak(
       "[embed:attachments:inline:2bc1]",
-      [build_attachment(content_id: "2bc1", id: nil)]
+      [build_attachment(content_id: "2bc1", id: nil)],
     )
     assert_match(%r{<span class="attachment-inline"><a href=".*">.*</a></span>}, rendered)
   end
@@ -79,7 +79,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will show HTML type (in brackets) if file_extension is specified as html" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", file_extension: "html")]
+      [build_attachment(content_id: "1fe8", file_extension: "html")],
     )
     assert_match(%r{(<span class="type">HTML</span>)}, rendered)
   end
@@ -87,7 +87,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will show url (in brackets) if specified as external" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", external?: true)]
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", external?: true)],
     )
     assert_match(%r{(<span class="url">http://a.b/f.pdf</span>)}, rendered)
   end
@@ -95,7 +95,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will not show url if file_extension is specified as html" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", file_extension: "html", external?: true)]
+      [build_attachment(content_id: "1fe8", url: "http://a.b/f.pdf", file_extension: "html", external?: true)],
     )
     refute_match(%r{(<span class="url">http://a.b/f.pdf</span>)}, rendered)
   end
@@ -103,7 +103,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will show a file extension in a abbr element for non html" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", file_extension: "csv")]
+      [build_attachment(content_id: "1fe8", file_extension: "csv")],
     )
     refute_match(%r{<span class="type"><abbr title="Comma-separated values">CSV</abbr></span>}, rendered)
   end
@@ -111,7 +111,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will show file size in a span" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", file_size: 1024)]
+      [build_attachment(content_id: "1fe8", file_size: 1024)],
     )
     assert_match(%r{<span class="file-size">1 KB</span>}, rendered)
   end
@@ -119,12 +119,12 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
   test "will show number of pages" do
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", number_of_pages: 1)]
+      [build_attachment(content_id: "1fe8", number_of_pages: 1)],
     )
     assert_match(%r{<span class="page-length">1 page</span>}, rendered)
     rendered = render_govspeak(
       "[embed:attachments:inline:1fe8]",
-      [build_attachment(content_id: "1fe8", number_of_pages: 2)]
+      [build_attachment(content_id: "1fe8", number_of_pages: 2)],
     )
     assert_match(%r{<span class="page-length">2 pages</span>}, rendered)
   end
@@ -139,7 +139,7 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
         file_extension: "txt",
         file_size: 2048,
         number_of_pages: 2,
-      )]
+      )],
     )
     link = %{<a href="#{Regexp.quote('http://a.b/test.txt')}">My Attached Text File</a>}
     type = %{<span class="type">Plain text</span>}
@@ -153,8 +153,8 @@ class GovspeakAttachmentsInlineTest < Minitest::Test
       "[embed:attachments:inline:1fe8] and [embed:attachments:inline:2abc]",
       [
         build_attachment(content_id: "1fe8", url: "http://a.b/test.txt", title: "Text File"),
-        build_attachment(content_id: "2abc", url: "http://a.b/test.pdf", title: "PDF File")
-      ]
+        build_attachment(content_id: "2abc", url: "http://a.b/test.pdf", title: "PDF File"),
+      ],
     )
     assert_match(%r{<a href="http://a.b/test.txt">Text File</a>}, rendered)
     assert_match(%r{<a href="http://a.b/test.pdf">PDF File</a>}, rendered)