govspeak 4.0.0 → 5.0.0

data/test/govspeak_contacts_test.rb

@@ -1,13 +1,11 @@
 # encoding: UTF-8
 
 require 'test_helper'
-require 'ostruct'
 
 class GovspeakContactsTest < Minitest::Test
 
   def build_contact(attrs={})
-    OpenStruct.new(
-      has_postal_address?: attrs.fetch(:has_postal_address?, true),
+    {
       id: attrs.fetch(:id, 123456),
       content_id: attrs.fetch(:content_id, "4f3383e4-48a2-4461-a41d-f85ea8b89ba0"),
       title: attrs.fetch(:title, "Government Digital Service"),
@@ -20,10 +18,10 @@ class GovspeakContactsTest < Minitest::Test
       email: attrs.fetch(:email, "people@digital.cabinet-office.gov.uk"),
       contact_form_url: attrs.fetch(:contact_form_url, ""),
       contact_numbers: attrs.fetch(:contact_numbers,
-                                   [OpenStruct.new(label: "helpdesk", number: "+4412345 67890")]),
+                                   [{ label: "helpdesk", number: "+4412345 67890" }]),
       comments: attrs.fetch(:comments, ""),
       worldwide_organisation_path: attrs.fetch(:worldwide_organisation_path, nil),
-    )
+    }
   end
 
   def compress_html(html)
@@ -77,7 +75,13 @@ class GovspeakContactsTest < Minitest::Test
   end
 
   test "contact with no postal address omits the address info" do
-    contact = build_contact(has_postal_address?: false)
+    contact = build_contact(
+      recipient: nil,
+      street_address: nil,
+      locality: nil,
+      region: nil,
+      postal_code: nil,
+    )
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, { contacts: [contact] }).to_html
     expected_html_output = %{

data/test/govspeak_link_test.rb

@@ -0,0 +1,45 @@
+# encoding: UTF-8
+
+require 'test_helper'
+
+class GovspeakLinkTest < Minitest::Test
+  test "embedded link with link provided" do
+    link = {
+      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
+      url: "https://www.example.com/",
+      title: "Example website"
+    }
+    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    expected = %r{<a href="https://www.example.com/">Example website</a>}
+    assert_match(expected, rendered)
+  end
+
+  test "embedded link with markdown title" do
+    link = {
+      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
+      url: "https://www.example.com/",
+      title: "**Example website**"
+    }
+    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    expected = %r{<a href="https://www.example.com/"><strong>Example website</strong></a>}
+    assert_match(expected, rendered)
+  end
+
+  test "embedded link with url not provided" do
+    link = {
+      content_id: "e510f1c1-4862-4333-889c-8d3acd443fbf",
+      title: "Example website",
+    }
+    govspeak = "[embed:link:e510f1c1-4862-4333-889c-8d3acd443fbf]"
+    rendered = Govspeak::Document.new(govspeak, links: link).to_html
+    assert_match("Example website", rendered)
+  end
+
+  test "embedded link without link object" do
+    govspeak = "[embed:link:0726637c-8c66-47ad-834a-d815cbf51e0e]"
+    rendered = Govspeak::Document.new(govspeak).to_html
+    assert_match("", rendered)
+  end
+end

data/test/govspeak_test.rb

@@ -634,22 +634,22 @@ $CTA
   test "can reference attached images using !!n" do
     images = [OpenStruct.new(alt_text: 'my alt', url: "http://example.com/image.jpg")]
     given_govspeak "!!1", images do
-      assert_html_output %Q{
-          <figure class="image embedded">
-            <div class="img"><img alt="my alt" src="http://example.com/image.jpg"></div>
-          </figure>
-      }
+      assert_html_output(
+        %{<figure class="image embedded">} +
+        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
+        %{</figure>}
+      )
   end
 end
 
 test "alt text of referenced images is escaped" do
   images = [OpenStruct.new(alt_text: %Q{my alt '&"<>}, url: "http://example.com/image.jpg")]
   given_govspeak "!!1", images do
-    assert_html_output %Q{
-        <figure class="image embedded">
-          <div class="img"><img alt="my alt '&amp;&quot;&lt;&gt;" src="http://example.com/image.jpg"></div>
-        </figure>
-        }
+    assert_html_output(
+      %{<figure class="image embedded">} +
+      %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt '&amp;&quot;&lt;&gt;"></div>} +
+      %{</figure>}
+    )
     end
   end
 
@@ -663,23 +663,23 @@ test "alt text of referenced images is escaped" do
   test "adds image caption if given" do
     images = [OpenStruct.new(alt_text: "my alt", url: "http://example.com/image.jpg", caption: 'My Caption & so on')]
     given_govspeak "!!1", images do
-      assert_html_output %Q{
-          <figure class="image embedded">
-            <div class="img"><img alt="my alt" src="http://example.com/image.jpg"></div>
-            <figcaption>My Caption &amp; so on</figcaption>
-          </figure>
-        }
+      assert_html_output(
+        %{<figure class="image embedded">} +
+        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
+        %{<figcaption>My Caption &amp; so on</figcaption>} +
+        %{</figure>}
+      )
     end
   end
 
   test "ignores a blank caption" do
     images = [OpenStruct.new(alt_text: "my alt", url: "http://example.com/image.jpg", caption: '  ')]
     given_govspeak "!!1", images do
-      assert_html_output %Q{
-          <figure class="image embedded">
-            <div class="img"><img alt="my alt" src="http://example.com/image.jpg"></div>
-          </figure>
-        }
+      assert_html_output(
+        %{<figure class="image embedded">} +
+        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
+        %{</figure>}
+      )
     end
   end
 
@@ -874,73 +874,4 @@ Or so we thought.}
       |
     end
   end
-
-  test "inline attachment" do
-    attachment = OpenStruct.new(
-      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
-      id: 456,
-    )
-    govspeak = "[embed:attachments:inline:2b4d92f3-f8cd-4284-aaaa-25b3a640d26c]"
-    rendered = Govspeak::Document.new(govspeak, {attachments: attachment}).to_html
-    assert_match(/<span id=\"attachment_456\" class=\"attachment-inline\">/, rendered)
-  end
-
-  test "attachment" do
-    attachment = OpenStruct.new(
-      url: "www.test.com",
-      content_id: "2b4d92f3-f8cd-4284-aaaa-25b3a640d26c",
-      id: 123,
-      opendocument?: true,
-      order_url: "www.test.com",
-      price: 12.3,
-      csv?: true,
-      unnumbered_command_paper?: true,
-      isbn: 'isbn-123',
-    )
-    govspeak = "[embed:attachments:2b4d92f3-f8cd-4284-aaaa-25b3a640d26c]"
-    rendered = Govspeak::Document.new(govspeak, {attachments: attachment}).to_html
-    assert_match(/<section class=\"attachment embedded\">/, rendered)
-    assert_match(/<div class=\"attachment-thumb\">/, rendered)
-    assert_match(/attachment-123-accessibility-help/, rendered)
-    assert_match(/If you use assistive technology/, rendered)
-    assert_match(/<p class=\"opendocument-help\">/, rendered)
-    assert_match(/<span class=\"price\">£12.30/, rendered)
-    assert_match(/<span class=\"preview\">/, rendered)
-    assert_match(/<span class=\"unnumbered-paper\">/, rendered)
-    assert_match(/<span class=\"references\">/, rendered)
-  end
-
-  test "attachment that isn't provided" do
-    govspeak = "[embed:attachments:906ac8b7-850d-45c6-98e0-9525c680f891]"
-    rendered = Govspeak::Document.new(govspeak).to_html
-    assert_match("", rendered)
-  end
-
-  test "embedded link with link provided" do
-    link = OpenStruct.new(
-      content_id: "5572fee5-f38f-4641-8ffa-64fed9230ad4",
-      url: "https://www.example.com/",
-      title: "Example website"
-    )
-    govspeak = "[embed:link:5572fee5-f38f-4641-8ffa-64fed9230ad4]"
-    rendered = Govspeak::Document.new(govspeak, {links: link}).to_html
-    expected = %r{<a href="https://www.example.com/">Example website</a>}
-    assert_match(expected, rendered)
-  end
-
-  test "embedded link with link not provided" do
-    link = OpenStruct.new(
-      content_id: "e510f1c1-4862-4333-889c-8d3acd443fbf",
-      title: "Example website",
-    )
-    govspeak = "[embed:link:e510f1c1-4862-4333-889c-8d3acd443fbf]"
-    rendered = Govspeak::Document.new(govspeak, {links: link}).to_html
-    assert_match("Example website", rendered)
-  end
-
-  test "embedded link without link object" do
-    govspeak = "[embed:link:0726637c-8c66-47ad-834a-d815cbf51e0e]"
-    rendered = Govspeak::Document.new(govspeak).to_html
-    assert_match("", rendered)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -129,6 +129,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.7'
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -199,13 +213,28 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   A set of extensions to markdown layered on top of the kramdown
   library for use in the UK Government Single Domain project
 email:
 - ben@alphagov.co.uk
 - james.stewart@digital.cabinet-office.gov.uk
-executables: []
+executables:
+- govspeak
 extensions: []
 extra_rdoc_files: []
 files:
@@ -213,10 +242,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/govspeak
 - lib/govspeak.rb
 - lib/govspeak/blockquote_extra_quote_remover.rb
-- lib/govspeak/extension/attachment.html.erb
-- lib/govspeak/extension/inline_attachment.html.erb
+- lib/govspeak/cli.rb
 - lib/govspeak/header_extractor.rb
 - lib/govspeak/html_sanitizer.rb
 - lib/govspeak/html_validator.rb
@@ -226,11 +255,18 @@ files:
 - lib/govspeak/version.rb
 - lib/kramdown/parser/kramdown_with_automatic_external_links.rb
 - lib/presenters/attachment_presenter.rb
+- lib/presenters/contact_presenter.rb
 - lib/presenters/h_card_presenter.rb
+- lib/templates/attachment.html.erb
 - lib/templates/contact.html.erb
+- lib/templates/inline_attachment.html.erb
 - lib/with_deep_merge.rb
 - test/blockquote_extra_quote_remover_test.rb
+- test/govspeak_attachments_image_test.rb
+- test/govspeak_attachments_inline_test.rb
+- test/govspeak_attachments_test.rb
 - test/govspeak_contacts_test.rb
+- test/govspeak_link_test.rb
 - test/govspeak_structured_headers_test.rb
 - test/govspeak_test.rb
 - test/govspeak_test_helper.rb
@@ -268,8 +304,12 @@ test_files:
 - test/blockquote_extra_quote_remover_test.rb
 - test/govspeak_test.rb
 - test/test_helper.rb
+- test/govspeak_attachments_test.rb
 - test/presenters/h_card_presenter_test.rb
+- test/govspeak_attachments_inline_test.rb
 - test/with_deep_merge_test.rb
+- test/govspeak_attachments_image_test.rb
 - test/html_sanitizer_test.rb
 - test/html_validator_test.rb
 - test/govspeak_structured_headers_test.rb
+- test/govspeak_link_test.rb

data/lib/govspeak/extension/inline_attachment.html.erb

@@ -1,4 +0,0 @@
-<span id="attachment_<%= attachment.id %>" class="attachment-inline">
-  <%= attachment.link attachment.title, attachment.url %>
-  (<%= attachment.attachment_attributes %>)
-</span>