govspeak 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a1d2187e10b165f7f6872389a4bf16e48c1ba9
-  data.tar.gz: 04d622ee297eb5cbdd0284c42ecd2f8b0f8ef543
+  metadata.gz: 54b9c75ce59284172221f263176a47cc93035180
+  data.tar.gz: 9a6f7c98b35bc753ecc21e0e8aa25234867d2f19
 SHA512:
-  metadata.gz: 63b8fb72f6f042920bca9e5b867101e2e03e1c46aac5ab32ce779fee79042ecf957f3c8311164308264ce8c36830bef951211275b37516b73318b88b8e13cff0
-  data.tar.gz: f6fd90f8a72f143aa865f3535463e0e9a7e1f8049ac92ebf6c2c6a2a5780800101ce97fb0713b1046428e17a301d7cab61133bc6fb2f56cc47aed400b216aa6a
+  metadata.gz: 17fac603e4006e23750e4c129b69650d1ec106a71d0b1568a542fa4f1f65e474edd60c56d39de6297481281c1d1e45a51fbda84c41443915a63e9a9edb59006a
+  data.tar.gz: e29081388c7bf5207a68bd41a7dc1c1fdf0c3d7e3d040d88ee6ce102e9d19e91931f30144d3dc4299f8f0feb3f69c4481f06e3564a3d76767cb7cbf9641f04c5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.5.1
+
+* Continue to support non-strict URIs in links on Ruby 2.2.x. See [https://github.com/alphagov/govspeak/issues/57](https://github.com/alphagov/govspeak/issues/57)
+
 ## 3.5.0
 
 * Add `{stat-headline}*10m* big numbers{/stat-headline}` markdown for HTML publications

data/lib/govspeak/html_sanitizer.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'sanitize'
 require 'with_deep_merge'
 
@@ -13,7 +14,7 @@ class Govspeak::HtmlSanitizer
       return unless sanitize_context[:node_name] == "img"
 
       node = sanitize_context[:node]
-      image_uri = URI.parse(node['src'])
+      image_uri = Addressable::URI.parse(node['src'])
       unless image_uri.relative? || @allowed_image_hosts.include?(image_uri.host)
         node.unlink # the node isn't sanitary. Remove it from the document.
       end

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 end

data/lib/kramdown/parser/kramdown_with_automatic_external_links.rb

@@ -1,4 +1,4 @@
-require "uri"
+require "addressable/uri"
 require "kramdown/options"
 
 module Kramdown
@@ -29,11 +29,11 @@ EOF
       def add_link(el, href, title, alt_text = nil)
         if el.type == :a
           begin
-            host = URI.parse(href).host
+            host = Addressable::URI.parse(href).host
             unless host.nil? || (@document_domains.compact.include?(host))
               el.attr['rel'] = 'external'
             end
-          rescue URI::InvalidURIError, URI::InvalidComponentError
+          rescue Addressable::URI::InvalidURIError
             # it's safe to ignore these very *specific* exceptions
           end
         end

data/test/govspeak_test.rb

@@ -257,14 +257,29 @@ Teston
     assert html.include?("¥")
   end
 
-  test "should be assume link with invalid uri is internal" do
+  test "should assume a link with an invalid uri is internal" do
     html = Govspeak::Document.new("[link](:invalid-uri)").to_html
     refute html.include?('rel="external"')
   end
 
-  test "should be assume link with invalid uri component is internal" do
-    html = Govspeak::Document.new("[link](mailto://www.example.com)").to_html
+  test "should treat a mailto as internal" do
+    html = Govspeak::Document.new("[link](mailto:a@b.com)").to_html
     refute html.include?('rel="external"')
+    assert_equal %Q{<p><a href="mailto:a@b.com">link</a></p>\n}, deobfuscate_mailto(html)
+  end
+
+  test "permits mailto:// URI" do
+    html = Govspeak::Document.new("[link](mailto://a@b.com)").to_html
+    assert_equal %Q{<p><a rel="external" href="mailto://a@b.com">link</a></p>\n}, deobfuscate_mailto(html)
+  end
+
+  test "permits dud mailto: URI" do
+    html = Govspeak::Document.new("[link](mailto:)").to_html
+    assert_equal %Q{<p><a href="mailto:">link</a></p>\n}, deobfuscate_mailto(html)
+  end
+
+  test "permits trailing whitespace in an URI" do
+    Govspeak::Document.new("[link](http://example.com/%20)").to_html
   end
 
   # Regression test - the surrounded_by helper doesn't require the closing x

data/test/govspeak_test_helper.rb

@@ -63,6 +63,14 @@ module GovspeakTestHelper
     asserter.instance_eval(&block)
   end
 
+  def deobfuscate_mailto(html)
+    # Kramdown obfuscates mailto addresses as an anti-spam measure. It
+    # obfuscates by encoding them as HTML entities.
+    # https://github.com/gettalong/kramdown/blob/7a7bd675b9d2593ad40c26fc4c77bf8407b70b42/lib/kramdown/converter/html.rb#L237-L246
+    coder = HTMLEntities.new
+    coder.decode(html)
+  end
+
   module ClassMethods
     def test_given_govspeak(govspeak, images=[], options = {}, &block)
       test "Given #{govspeak}" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Ben Griffiths
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -67,6 +67,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement