govspeak 6.0.0 → 6.1.0

data/locales/vi.yml

@@ -1,23 +1,6 @@
 ---
 vi:
   govspeak:
-    attachment:
-      accessibility:
-        full_help_html: |-
-          Để yêu cầu tài liệu này dưới định dạng khác như tài liệu chữ nổi, tiếng hay một định dạng file khác, xin mời email đến %{email}
-          cung cấp địa chỉ của bạn, số điện thoại cùng với tiêu đề của tài liệu ("%{title}")%{references}.
-        heading: 'File này không phù hợp với công nghệ hỗ trợ của người dùng '
-        request_a_different_format: Yêu cầu một định dạng khác
-      headings:
-        order_a_copy: Đặt một bản sao
-        order_a_copy_full: Đặt một bản sao của ấn phẩm truyền thông
-        published: Đã đăng
-        reference: đối với
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:
     contact:
       contact_form: Mẫu liên hệ
       email: Email

data/locales/zh-hk.yml

@@ -1,21 +1,6 @@
 ---
 zh-hk:
   govspeak:
-    attachment:
-      accessibility:
-        full_help_html: 尋求另一種檔案格式：點字或音檔
-        heading: 此檔案不適合使用科技輔助的使用者
-        request_a_different_format: 尋求別種格式
-      headings:
-        order_a_copy: 訂閱副本
-        order_a_copy_full: 訂閱報告副本
-        published: 已發布
-        reference: 參考
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:
     contact:
       contact_form: "聯絡資料表"
       email: "電子郵件"

data/locales/zh-tw.yml

@@ -1,21 +1,6 @@
 ---
 zh-tw:
   govspeak:
-    attachment:
-      accessibility:
-        full_help_html: 尋求另一種檔案格式：點字或音檔
-        heading: 此檔案不適合使用科技輔助的使用者
-        request_a_different_format: 尋求別種格式
-      headings:
-        order_a_copy: 訂購備份
-        order_a_copy_full: 訂購發行刊物
-        published: 發行
-        reference: 參考
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:
     contact:
       contact_form: "聯絡資料表"
       email: "電子郵件"

data/locales/zh.yml

@@ -1,21 +1,6 @@
 ---
 zh:
   govspeak:
-    attachment:
-      accessibility:
-        full_help_html: 申请本文件的其它格式，如盲文、音频或者不同的文件类型，请发送邮件%{email}并写明您的地址、电话号码以及此报告的标题("%{title}")%{references}。
-        heading: 此文件可能对使用辅助技术的用户不适合。
-        request_a_different_format: 申请另一种格式。
-      headings:
-        order_a_copy: 订阅副本
-        order_a_copy_full: 订阅报告副本
-        published: 已发布
-        reference: Ref
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:
     contact:
       contact_form: "联系表格"
       email: "邮件"

data/test/blockquote_extra_quote_remover_test.rb

@@ -60,6 +60,13 @@ class BlockquoteExtraQuoteRemoverTest < Minitest::Test
     )
   end
 
+  test "handles space after a quote" do
+    assert_remover_transforms(
+      %{>" 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.""} =>

data/test/govspeak_attachment_link_test.rb

@@ -0,0 +1,25 @@
+# encoding: UTF-8
+
+require "test_helper"
+
+class GovspeakAttachmentLinkTest < Minitest::Test
+  def render_govspeak(govspeak, attachments = [])
+    Govspeak::Document.new(govspeak, attachments: attachments).to_html
+  end
+
+  test "renders an empty string for attachment link that is not found" do
+    assert_equal("\n", render_govspeak("[AttachmentLink:file.pdf]", []))
+  end
+
+  test "renders an attachment link component for a found attachment link" do
+    attachment = {
+      id: "attachment.pdf",
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }
+
+    rendered = render_govspeak("[AttachmentLink:attachment.pdf]", [attachment])
+    assert_match(/<span class="gem-c-attachment-link">/, rendered)
+    assert_match(%r{href="http://example.com/attachment.pdf"}, rendered)
+  end
+end

data/test/govspeak_attachment_test.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+
+require "test_helper"
+
+class GovspeakAttachmentTest < Minitest::Test
+  def render_govspeak(govspeak, attachments = [])
+    Govspeak::Document.new(govspeak, attachments: attachments).to_html
+  end
+
+  test "renders an empty string for attachment link that is not found" do
+    assert_equal("\n", render_govspeak("[Attachment:file.pdf]", []))
+  end
+
+  test "renders an attachment component for a found attachment" do
+    attachment = {
+      id: "attachment.pdf",
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }
+
+    rendered = render_govspeak("[Attachment:attachment.pdf]", [attachment])
+    assert_match(/<section class="gem-c-attachment">/, rendered)
+    assert_match(/Attachment Title/, rendered)
+  end
+
+  test "only renders attachment when markdown extension starts on a line" do
+    attachment = {
+      id: "attachment.pdf",
+      url: "http://example.com/attachment.pdf",
+      title: "Attachment Title",
+    }
+
+    rendered = render_govspeak("some text [Attachment:attachment.pdf]", [attachment])
+    assert_equal("<p>some text [Attachment:attachment.pdf]</p>\n", rendered)
+
+    rendered = render_govspeak("[Attachment:attachment.pdf] some text", [attachment])
+    assert_match(/<section class="gem-c-attachment">/, rendered)
+    assert_match(/<p>some text<\/p>/, rendered)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -45,61 +45,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: govuk_publishing_components
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '16.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '16.16'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: kramdown
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: money
+  name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.7'
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -261,7 +261,6 @@ files:
 - lib/govspeak/template_renderer.rb
 - lib/govspeak/version.rb
 - lib/kramdown/parser/kramdown_with_automatic_external_links.rb
-- lib/templates/attachment.html.erb
 - lib/templates/contact.html.erb
 - locales/ar.yml
 - locales/be.yml
@@ -269,7 +268,6 @@ files:
 - locales/cs.yml
 - locales/cy.yml
 - locales/de.yml
-- locales/dr.yml
 - locales/el.yml
 - locales/en.yml
 - locales/es-419.yml
@@ -293,8 +291,6 @@ files:
 - locales/ro.yml
 - locales/ru.yml
 - locales/si.yml
-- locales/so.yml
-- locales/sq.yml
 - locales/sr.yml
 - locales/ta.yml
 - locales/th.yml
@@ -307,9 +303,10 @@ files:
 - locales/zh-tw.yml
 - locales/zh.yml
 - test/blockquote_extra_quote_remover_test.rb
+- test/govspeak_attachment_link_test.rb
+- test/govspeak_attachment_test.rb
 - test/govspeak_attachments_image_test.rb
 - test/govspeak_attachments_inline_test.rb
-- test/govspeak_attachments_test.rb
 - test/govspeak_button_test.rb
 - test/govspeak_contacts_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
@@ -342,26 +339,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 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_structured_headers_test.rb
-- test/govspeak_attachments_image_test.rb
-- test/govspeak_attachments_test.rb
+- test/govspeak_attachment_link_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_extract_contact_content_ids_test.rb
 - test/govspeak_test.rb
-- test/govspeak_link_extractor_test.rb
-- test/govspeak_link_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/govspeak_structured_headers_test.rb
+- test/govspeak_images_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

data/lib/templates/attachment.html.erb

@@ -1,57 +0,0 @@
-<section class="attachment <%= attachment.section_class %>">
-  <div class="attachment-thumb">
-    <%= attachment.thumbnail_link %>
-  </div>
-  <div class="attachment-details">
-    <h2 class="title"><%= attachment.attachment_details %></h2>
-    <p class="metadata">
-      <% if attachment.references? %>
-        <span class="references"><%= t('govspeak.attachment.headings.reference') %>: <%= attachment.reference %></span>
-      <% end %>
-      <% if attachment.unnumbered_paper? %>
-        <span class="unnumbered-paper">
-          <% if attachment.unnumbered_command_paper? %>
-            <%= t('govspeak.attachment.headings.unnumbered_command_paper') %>
-          <% else %>
-            <%= t('govspeak.attachment.headings.unnumbered_hoc_paper') %>
-          <% end %>
-        </span>
-      <% end %>
-      <% if attachment.previewable? %>
-        <span class="preview">
-          <strong><%= attachment.link("View online", attachment.preview_url) %></strong>
-        </span>
-        <span class="download"><%= attachment.download_link %></span>
-      <% else %>
-        <%= attachment.attachment_attributes %>
-      <% end %>
-    </p>
-    <% if attachment.order_url.present? %>
-      <p>
-        <%= attachment.link t('govspeak.attachment.headings.order_a_copy'), attachment.order_url,
-          class: "order_url", title: t('govspeak.attachment.headings.order_a_copy_full')
-        %><% if attachment.price %>(<span class="price"><%= attachment.price %></span>)<% end %>
-      </p>
-    <% end %>
-
-    <% if attachment.opendocument? %>
-      <p class="opendocument-help">
-        <%= t('govspeak.attachment.opendocument.help_html') %>
-      </p>
-    <% end %>
-
-    <% unless attachment.accessible? %>
-      <div data-module="toggle" class="accessibility-warning" id="<%= attachment.help_block_id %>">
-        <h2><%= t('govspeak.attachment.accessibility.heading') %>
-          <a class="toggler" href="#<%= attachment.help_block_toggle_id %>" data-controls="<%= attachment.help_block_toggle_id %>" data-expanded="false"><%= t('govspeak.attachment.accessibility.request_a_different_format') %></a>
-        </h2>
-        <p id="<%= attachment.help_block_toggle_id %>" class="js-hidden">
-          <%= t('govspeak.attachment.accessibility.full_help_html',
-                email: attachment.alternative_format_order_link,
-                title: attachment.title,
-                references: attachment.references_for_title) %>
-        </p>
-      </div>
-    <% end %>
-  </div>
-</section>

data/locales/dr.yml

@@ -1,20 +0,0 @@
----
-dr:
-  govspeak:
-    attachment:
-      accessibility:
-        full_help_html: جهت درخواست سند در فارمت بدیل مانند بریل، صوتی و یا هم در فارمت
-          متفاوت لطفاً آدرس، شماره تماس با نام نشریه ("%{title}")%{references} را ایمیل
-          %{email} کنید
-        heading: این فایل برای استعمال کننده گان تکنالوجی کمکی مناسب نخواهد بود
-        request_a_different_format: فارمت متفاوت را درخواست نمائید
-      headings:
-        order_a_copy: نقل را درخواست نمائید
-        order_a_copy_full: نقل نشریه را درخواست نمائید
-        published: نشر شده
-        reference: ماخذ
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:

data/locales/so.yml

@@ -1,22 +0,0 @@
----
-so:
-  govspeak:
-    attachment:
-      accessibility:
-        full_help_html: Sida aad u codsato qoraalka oo qaab kale u qoran sida isaga
-          oo lagu qorey farta loogu talogaley dadka aan indhaha lahayn, cod ah ama fayl
-          nooc kale ah fadlan e-mail soo dir %{email} adiga oo ku soo sheegaya cinwaankaada,
-          lambarka telefoonkaada adiga oo soo raacinaya cinwaanka qoraalka ("%{title}")%{references}.
-        heading: Waxaa laga yaabaa in aanu faylkan u habbooneyn kuwa isticmaala tiknolojiyada
-          la kaashado
-        request_a_different_format: Codsi isaga oo qaab kale ah
-      headings:
-        order_a_copy: Dalbo nuqul
-        order_a_copy_full: Dalbo nuqulka daabacaadda
-        published: La-daabacay
-        reference: Xigasho
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more:

data/locales/sq.yml

@@ -1,21 +0,0 @@
----
-sq:
-  govspeak:
-    attachment:
-      accessibility:
-        full_help_html: Per te kerkuar kete dokument ne format alternativ si braille,
-          audio ose format tjeter te lutem email %{email} duke cituar adresen tende,
-          telefonin dhe titullin e publikimit ("%{title}")%{references}.
-        heading: Ky dokument mund te mos jete i pershtatshem per perdoruesit e teknologjise
-          ndihmuese.
-        request_a_different_format: Kerko nje format ndryshe
-      headings:
-        order_a_copy: Porosit nje kopje
-        order_a_copy_full: Porosit nje kopje te publikimit
-        published: Publikuar
-        reference: Ref
-        unnumbered_command_paper:
-        unnumbered_hoc_paper:
-      opendocument:
-        help_html:
-      see_more: