govspeak 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e1c3a28d1f53eab54a104139116e0405c4450a
-  data.tar.gz: 89520dfd370e31fd803fa8d127fb546ab35521e3
+  metadata.gz: 52ab560c9f4e178a3079553808221fed51396b32
+  data.tar.gz: 371d78e8b275ca0c482e925a9e8a0bce71f791e0
 SHA512:
-  metadata.gz: 0afe56bcf4cd1160adb293500706b3ee3d2198b53792d18b7e8ad263ba7b81c3a770bfd63bd25e41b7ea9063d9243e31679e2fafa0b70e9a06e74f46eeb740f9
-  data.tar.gz: ff7509b60e910c01f83a8fbb7a0326b008898903186167609221c9f38fa805624f214139cea19afd2feb8181043aaf11faf455db51f5ca975078d7946c8b4bea
+  metadata.gz: 81bfefe2e2923ef22e97898e1c9183833b220de4ceaec5d53a711dbf674ea513c081fa9bfb4b9633212278b06ab5ec8b3e9366ac0acf88f4f639e5a982b89aad
+  data.tar.gz: 122a67b0d9182529e010c14cc3129b0c81b72182cb272ca6bcd167c337a965f2351398e0c2abac8595501ea1355a102fef37cee070ec0312963833606a0485b7

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.5.0
+* Ignore links with blank or missing `href`s when extracting links from a document with `Govspeak::Document#extracted_links` [#124](https://github.com/alphagov/govspeak/pull/124)
+
 ## 5.4.0
 * Add an optional `website_root` argument to `Govspeak::Document#extracted_links` in order to get all links as fully qualified URLs [#122](https://github.com/alphagov/govspeak/pull/122)
 

data/lib/govspeak/link_extractor.rb

@@ -14,17 +14,22 @@ module Govspeak
     attr_reader :document, :website_root
 
     def extract_links
-      document_anchors.map do |link|
-        if website_root && link['href'].start_with?('/')
-          "#{website_root}#{link['href']}"
-        else
-          link['href']
-        end
+      document_anchors.
+        map { |link| extract_href_from_link(link) }.
+        reject(&:blank?)
+    end
+
+    def extract_href_from_link(link)
+      href = link['href'] || ''
+      if website_root && href.start_with?('/')
+        "#{website_root}#{href}"
+      else
+        href
       end
     end
 
     def document_anchors
-      processed_govspeak.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/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "5.4.0".freeze
+  VERSION = "5.5.0".freeze
 end

data/test/govspeak_link_extractor_test.rb

@@ -14,6 +14,20 @@ class GovspeakLinkExtractorTest < Minitest::Test
 [mailto:](mailto:someone@www.example.com)
 
 [absolute_path](/cais-trwydded-yrru-dros-dro)
+
+<a href="http://www.example.com/from/html">raw_html_link</a>
+
+[empty_markdown_link]()
+
+[a_different_empty_markdown_link]( )
+
+<a>empty_raw_html_link</a>
+
+<a href="">a_second_empty_raw_link</a>
+
+<a href=" ">a_third_empty_raw_link</a>
+
+<a href>a_fourth_empty_raw_link</a>
     }
   end
 
@@ -26,7 +40,7 @@ class GovspeakLinkExtractorTest < Minitest::Test
   end
 
   test "Links are extracted from the body" do
-    expected_links = %w{http://www.example.com http://www.gov.com /cais-trwydded-yrru-dros-dro}
+    expected_links = %w{http://www.example.com http://www.gov.com /cais-trwydded-yrru-dros-dro http://www.example.com/from/html}
     assert_equal expected_links, links
   end
 
@@ -42,6 +56,11 @@ class GovspeakLinkExtractorTest < Minitest::Test
     refute_includes ["mailto:someone@www.example.com"], links
   end
 
+  test "Links are not extracted if they are blank" do
+    refute_includes [""], links
+    refute_includes [nil], links
+  end
+
   test "Absolute links are transformed to a url when website_root passed in" do
     urls = doc.extracted_links(website_root: "http://www.example.com")
     assert urls.include?("http://www.example.com/cais-trwydded-yrru-dros-dro")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-12 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown