govspeak 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e18592538eaa9b77c4ab24a8ff70cbae1c53d6a
-  data.tar.gz: 3d6e5d43ffba151480e89c71c0f4675eeeecaf35
+  metadata.gz: d7009625d218a2a0653f0eb0ce8531b82700dbd4
+  data.tar.gz: c7b44ac063219357394b040641b5c6416ade46a3
 SHA512:
-  metadata.gz: 8228d583156faaed9cfec6eda50eb29c223003db5af23bc008853ac09d1e0f004eafdc23727cbca6d43db715667d84c0a430fe81b479a425f5fd813660863d8c
-  data.tar.gz: e9bcad53b426131c7b8c523c2abb4f24fdf1a5bf5450096ea60841e248240ea2cdd7137eb0de5857fb6c55aacfaa9f12a8bd1b3fd8d4e7b264a7433127f8c839
+  metadata.gz: 9e2c8cc7949cc19311b28c37713584c13d35f7293082491a21a05cd457bf59a9145dcd3b8efcb446c56ab40f8de41c39a49827d702a9e6ab041569ca6c23cfc9
+  data.tar.gz: 2bd2cf3a1ed5babbf9211dc77deb4ac7ed2ad1d0ad0f313627aff56ab81e1367ee5614b1451c56148eafebf17b25c864a77db43e57de62b3b3016ebbf304f4d7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 5.0.3
+
+* Fix matching links/attachments/contacts by regex to use equality [#105](https://github.com/alphagov/govspeak/pull/105)
+
 ## 5.0.2
 * Loosen ActionView dependency to allow use with Rails
 5 [#99](https://github.com/alphagov/govspeak/pull/99)

data/README.md

@@ -42,9 +42,12 @@ In addition to the [standard Markdown syntax](http://daringfireball.net/projects
 
 creates a callout with an info (i) icon.
 
-    <div role="note" aria-label="Information" class="application-notice info-notice">
-      <p>This is an information callout</p>
-    </div>
+```html
+<div role="note" aria-label="Information" class="application-notice info-notice">
+  <p>This is an information callout</p>
+</div>
+```
+
 
 ### Warning callouts
 
@@ -52,9 +55,11 @@ creates a callout with an info (i) icon.
 
 creates a callout with a warning or alert (!) icon
 
-    <div role="note" aria-label="Help" class="application-notice help-notice">
-      <p>This is a warning callout</p>
-    </div>
+```html
+<div role="note" aria-label="Help" class="application-notice help-notice">
+  <p>This is a warning callout</p>
+</div>
+```
 
 ### Example callout
 
@@ -64,9 +69,11 @@ creates a callout with a warning or alert (!) icon
 
 creates an example box
 
-    <div class="example">
-    <p><strong>Example:</strong> Open the pod bay doors</p>
-    </div>
+```html
+<div class="example">
+  <p><strong>Example:</strong> Open the pod bay doors</p>
+</div>
+```
 
 ## Highlights
 
@@ -76,9 +83,11 @@ creates an example box
 
 highlights the enclosed text in yellow
 
-    <h3 role="note" aria-label="Important" class="advisory">
-    	<span>This is a very important message or warning</span>
-    </h3>
+```html
+<h3 role="note" aria-label="Important" class="advisory">
+  <span>This is a very important message or warning</span>
+</h3>
+```
 
 ### Answer
 
@@ -88,9 +97,11 @@ highlights the enclosed text in yellow
 
 creates a large highlight box with optional preamble text and giant text denoted with `**`
 
-    <div class="highlight-answer">
-    <p>The VAT rate is <em>20%</em></p>
-    </div>
+```html
+<div class="highlight-answer">
+  <p>The VAT rate is <em>20%</em></p>
+</div>
+```
 
 ### Statistic headline
 
@@ -124,9 +135,15 @@ Creates the following:
 
 creates a contact box
 
-    <div class="contact">
-    <p><strong>Student Finance England</strong><br><strong>Telephone:</strong> 0845 300 50 90<br><strong>Minicom:</strong> 0845 604 44 34</p>
-    </div>
+```html
+<div class="contact">
+  <p>
+    <strong>Student Finance England</strong><br>
+    <strong>Telephone:</strong> 0845 300 50 90<br>
+    <strong>Minicom:</strong> 0845 604 44 34
+  </p>
+</div>
+```
 
 ### Address
 
@@ -138,11 +155,17 @@ creates a contact box
 
 creates an address box
 
-    <div class="address"><div class="adr org fn"><p>
-    Hercules House
-    <br>Hercules Road
-    <br>London SE1 7DU
-    <br></p></div></div>
+```html
+<div class="address">
+  <div class="adr org fn">
+    <p>
+      Hercules House<br>
+      Hercules Road<br>
+      London SE1 7DU<br>
+    </p>
+  </div>
+</div>
+```
 
 ## Downloads
 
@@ -154,9 +177,11 @@ creates an address box
 
 creates a file download box
 
-    <div class="form-download">
-    <p><a href="http://example.com/" title="Example form" rel="external">An example form download link.</a></p>
-    </div>
+```html
+<div class="form-download">
+  <p><a href="http://example.com/" title="Example form" rel="external">An example form download link.</a></p>
+</div>
+```
 
 ## Place
 
@@ -166,9 +191,11 @@ creates a file download box
 
 creates a place box
 
-    <div class="place">
-    <p>This is a place</p>
-    </div>
+```html
+<div class="place">
+  <p>This is a place</p>
+</div>
+```
 
 ## Information
 
@@ -178,9 +205,11 @@ creates a place box
 
 creates an information box
 
-    <div class="information">
-    <p>This is information</p>
-    </div>
+```html
+<div class="information">
+  <p>This is information</p>
+</div>
+```
 
 ## Additional Information
 
@@ -190,9 +219,11 @@ creates an information box
 
 creates an additional information box
 
-    <div class="additional-information">
-    <p>This is additional information</p>
-    </div>
+```html
+<div class="additional-information">
+  <p>This is additional information</p>
+</div>
+```
 
 ## Call to Action
 
@@ -202,9 +233,11 @@ creates an additional information box
 
 creates an additional information box
 
-    <div class="call-to-action">
-    <p>This is a call to action</p>
-    </div>
+```html
+<div class="call-to-action">
+  <p>This is a call to action</p>
+</div>
+```
 
 ## Summary
 
@@ -214,9 +247,11 @@ creates an additional information box
 
 creates a summary box
 
-    <div class="summary">
-    <p>This is a summary</p>
-    </div>
+```html
+<div class="summary">
+  <p>This is a summary</p>
+</div>
+```
 
 ## External Link
 
@@ -224,7 +259,9 @@ creates a summary box
 
 creates a link specified as external
 
-    <a href="https://example.com/report" rel="external">External Report</a>
+```html
+<a href="https://example.com/report" rel="external">External Report</a>
+```
 
 ## Steps
 
@@ -264,13 +301,15 @@ For lists where you want to specify a number of items to be highlighted as prior
 
 creates a list with priority items flagged with a class
 
-    <ul>
-      <li class="primary-item">Item 1</li>
-      <li class="primary-item">Item 2</li>
-      <li class="primary-item">Item 3</li>
-      <li>Item 4</li>
-      <li>Item 5</li>
-    </ul>
+```html
+<ul>
+  <li class="primary-item">Item 1</li>
+  <li class="primary-item">Item 2</li>
+  <li class="primary-item">Item 3</li>
+  <li>Item 4</li>
+  <li>Item 5</li>
+</ul>
+```
 
 ## Devolved content
 
@@ -283,12 +322,14 @@ creates a list with priority items flagged with a class
 
 will create a box for the specified locality
 
-    <div class="devolved-content england">
-      <p class="devolved-header">This section applies to England</p>
-      <div class="devolved-body">
-        <p>content goes here</p>
-      </div>
-    </div>
+```html
+<div class="devolved-content england">
+  <p class="devolved-header">This section applies to England</p>
+  <div class="devolved-body">
+    <p>content goes here</p>
+  </div>
+</div>
+```
 
 ## Barcharts
 
@@ -301,18 +342,21 @@ rendered as a bar chart.
     {barchart}
 
 will be rendered as
-    <table class="js-barchart-table mc-auto-outdent">
-      <thead>
-        <tr>
-          <th>col</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>val</td>
-        </tr>
-      </tbody>
-    </table>
+
+```html
+<table class="js-barchart-table mc-auto-outdent">
+  <thead>
+    <tr>
+      <th>col</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td>val</td>
+    </tr>
+  </tbody>
+</table>
+```
 
 ## Embedded Content
 
@@ -345,22 +389,24 @@ with options provided
 
 will output an attachment box
 
-    <section class="attachment embedded">
-      <div class="attachment-thumb">
-        <a href="http://example.com/test.pdf" aria-hidden="true" class="embedded"><img src="/images/pub-cover.png" alt="Pub cover"></a>
-      </div>
-      <div class="attachment-details">
-        <h2 class="title">
-          <a href="http://example.com/test.pdf" aria-describedby="attachment-123-accessibility-help">Attachment Title</a>
-        </h2>
-        <p class="metadata">
-          <span class="references">Ref: ISBN <span class="isbn">isbn-123</span></span>
-        </p>
-        <p>
-          <a href="http://example.com/order" class="order_url" title="Order a copy of the publication">Order a copy</a>(<span class="price">£12.30</span>)
-        </p>
-      </div>
-    </section>
+```html
+<section class="attachment embedded">
+  <div class="attachment-thumb">
+    <a href="http://example.com/test.pdf" aria-hidden="true" class="embedded"><img src="/images/pub-cover.png" alt="Pub cover"></a>
+  </div>
+  <div class="attachment-details">
+    <h2 class="title">
+      <a href="http://example.com/test.pdf" aria-describedby="attachment-123-accessibility-help">Attachment Title</a>
+    </h2>
+    <p class="metadata">
+      <span class="references">Ref: ISBN <span class="isbn">isbn-123</span></span>
+    </p>
+    <p>
+      <a href="http://example.com/order" class="order_url" title="Order a copy of the publication">Order a copy</a>(<span class="price">£12.30</span>)
+    </p>
+  </div>
+</section>
+```
 
 ### Inline Attachment
 
@@ -382,7 +428,9 @@ with options provided
 
 will output an attachment within a block of text
 
-    <p>Details referenced in <span class="attachment-inline"><a href="http://example.com/my-thorough-study.pdf">My Thorough Study</a></span>
+```html
+<p>Details referenced in <span class="attachment-inline"><a href="http://example.com/my-thorough-study.pdf">My Thorough Study</a></span></p>
+```
 
 ### Image Attachments
 
@@ -404,7 +452,13 @@ with options provided
 
 will output a image section
 
-    <figure class="image embedded"><div class="img"><img src="http://example.com/lovely-landscape.jpg" alt="A Lovely Landscape"></div></figure>
+```html
+<figure class="image embedded">
+  <div class="img">
+    <img src="http://example.com/lovely-landscape.jpg" alt="A Lovely Landscape">
+  </div>
+</figure>
+```
 
 ### Link
 
@@ -426,7 +480,9 @@ with options provided
 
 will output
 
-    <p>A link to <a href="http://example.com">An excellent website</a></p>
+```html
+<p>A link to <a href="http://example.com">An excellent website</a></p>
+```
 
 ### Contact
 
@@ -450,20 +506,22 @@ with options provided
 
 will output
 
-    <div id="contact_123" class="contact">
-      <div class="content">
-        <h3>Government Digital Service</h3>
-        <div class="vcard contact-inner">
-          <div class="email-url-number">
-            <p class="email">
-              <span class="type">Email</span>
-              <a href="mailto:people@digital.cabinet-office.gov.uk" class="email">people@digital.cabinet-office.gov.uk</a>
-            </p>
-            <p class="tel">
-              <span class="type">helpdesk</span>
-              +4412345 67890
-            </p>
-          </div>
-        </div>
+```html
+<div id="contact_123" class="contact">
+  <div class="content">
+    <h3>Government Digital Service</h3>
+    <div class="vcard contact-inner">
+      <div class="email-url-number">
+        <p class="email">
+          <span class="type">Email</span>
+          <a href="mailto:people@digital.cabinet-office.gov.uk" class="email">people@digital.cabinet-office.gov.uk</a>
+        </p>
+        <p class="tel">
+          <span class="type">helpdesk</span>
+          +4412345 67890
+        </p>
       </div>
     </div>
+  </div>
+</div>
+```

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "5.0.2"
+  VERSION = "5.0.3"
 end

data/lib/govspeak.rb

@@ -190,7 +190,7 @@ module Govspeak
     end
 
     extension('attachment', /\[embed:attachments:(?!inline:|image:)\s*(.*?)\s*\]/) do |content_id, body|
-      attachment = attachments.detect { |a| a[:content_id].match(content_id) }
+      attachment = attachments.detect { |a| a[:content_id] == content_id }
       next "" unless attachment
       attachment = AttachmentPresenter.new(attachment)
       content = File.read(__dir__ + '/templates/attachment.html.erb')
@@ -198,7 +198,7 @@ module Govspeak
     end
 
     extension('attachment inline', /\[embed:attachments:inline:\s*(.*?)\s*\]/) do |content_id|
-      attachment = attachments.detect { |a| a[:content_id].match(content_id) }
+      attachment = attachments.detect { |a| a[:content_id] == content_id }
       next "" unless attachment
       attachment = AttachmentPresenter.new(attachment)
       span_id = attachment.id ? %{ id="attachment_#{attachment.id}"} : ""
@@ -210,7 +210,7 @@ module Govspeak
     end
 
     extension('attachment image', /\[embed:attachments:image:\s*(.*?)\s*\]/) do |content_id|
-      attachment = attachments.detect { |a| a[:content_id].match(content_id) }
+      attachment = attachments.detect { |a| a[:content_id] == content_id }
       next "" unless attachment
       attachment = AttachmentPresenter.new(attachment)
       title = (attachment.title || "").tr("\n", " ")
@@ -300,7 +300,7 @@ module Govspeak
     end
 
     extension('embed link', /\[embed:link:\s*(.*?)\s*\]/) do |content_id|
-      link = links.detect { |l| l[:content_id].match(content_id) }
+      link = links.detect { |l| l[:content_id] == content_id }
       next "" unless link
       if link[:url]
         "[#{link[:title]}](#{link[:url]})"
@@ -315,7 +315,7 @@ module Govspeak
     private :render_hcard_address
 
     extension('Contact', /\[Contact:\s*(.*?)\s*\]/) do |content_id|
-      contact = contacts.detect { |c| c[:content_id].match(content_id) }
+      contact = contacts.detect { |c| c[:content_id] == content_id }
       next "" unless contact
       contact = ContactPresenter.new(contact)
       @renderer ||= ERB.new(File.read(__dir__ + '/templates/contact.html.erb'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -233,6 +233,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: govuk-lint
+  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
@@ -305,17 +319,17 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/govspeak_contacts_test.rb
-- test/govspeak_test_helper.rb
+- test/govspeak_structured_headers_test.rb
+- test/with_deep_merge_test.rb
 - test/blockquote_extra_quote_remover_test.rb
-- test/govspeak_test.rb
+- test/govspeak_test_helper.rb
+- test/govspeak_link_test.rb
+- test/govspeak_contacts_test.rb
 - test/test_helper.rb
-- test/govspeak_attachments_test.rb
-- test/presenters/h_card_presenter_test.rb
+- test/html_validator_test.rb
+- test/html_sanitizer_test.rb
 - test/govspeak_attachments_inline_test.rb
-- test/with_deep_merge_test.rb
+- test/govspeak_test.rb
+- test/govspeak_attachments_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
+- test/presenters/h_card_presenter_test.rb