govspeak 6.5.1 → 6.5.6

data/test/govspeak_test_helper.rb

@@ -49,7 +49,7 @@ module GovspeakTestHelper
       lines = text.split "\n"
       digits = Math.log10(lines.size + 2).ceil
       lines.map
-        .with_index { |line, i| "%<number>#{digits}d: %<line>s" % { number: i + 1, line: line } }
+        .with_index { |line, i| sprintf("%<number>#{digits}d: %<line>s", number: i + 1, line: line) }
         .join("\n")
     end
   end

data/test/html_sanitizer_test.rb

@@ -44,6 +44,15 @@ class HtmlSanitizerTest < Minitest::Test
     )
   end
 
+  test "allow data attributes on divs" do
+    html = "<div data-module='toggle' data-ecommerce-path='/' data-track-category='someDiv'>Test Div</div>"
+
+    assert_equal(
+      "<div data-module=\"toggle\" data-ecommerce-path=\"/\" data-track-category=\"someDiv\">Test Div</div>",
+      Govspeak::HtmlSanitizer.new(html).sanitize,
+    )
+  end
+
   test "allows images on whitelisted domains" do
     html = "<img src='http://allowed.com/image.jgp'>"
     sanitized_html = Govspeak::HtmlSanitizer.new(html, allowed_image_hosts: ["allowed.com"]).sanitize
@@ -70,7 +79,6 @@ class HtmlSanitizerTest < Minitest::Test
     assert_equal "<table><tbody><tr><th>thing</th><td>thing</td></tr></tbody></table>", Govspeak::HtmlSanitizer.new(html).sanitize
   end
 
-
   test "allows valid text-align properties on the style attribute for table cells and table headings" do
     %w[left right center].each do |alignment|
       html = "<table><thead><tr><th style=\"text-align: #{alignment}\">thing</th></tr></thead><tbody><tr><td style=\"text-align: #{alignment}\">thing</td></tr></tbody></table>"

data/test/presenters/h_card_presenter_test.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require "test_helper"
 require "ostruct"
 

data/test/test_helper.rb

@@ -4,7 +4,7 @@ require "simplecov-rcov"
 SimpleCov.start
 SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 
-$:.unshift(File.expand_path("../lib")) unless $:.include?(File.expand_path("../lib"))
+$LOAD_PATH.unshift(File.expand_path("../lib")) unless $LOAD_PATH.include?(File.expand_path("../lib"))
 
 require "bundler"
 Bundler.setup :default, :development, :test
@@ -16,7 +16,11 @@ class Minitest::Test
     def test(name, &block)
       clean_name = name.gsub(/\s+/, "_")
       method = "test_#{clean_name.gsub(/\s+/, '_')}".to_sym
-      already_defined = instance_method(method) rescue false
+      already_defined = begin
+                          instance_method(method)
+                        rescue StandardError
+                          false
+                        end
       raise "#{method} exists" if already_defined
 
       define_method(method, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.5.1
+  version: 6.5.6
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-19 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -54,16 +54,16 @@ dependencies:
   name: govuk_publishing_components
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '16.16'
+        version: '21.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '16.16'
+        version: '21.4'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -96,16 +96,16 @@ dependencies:
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -152,30 +152,36 @@ dependencies:
   name: sanitize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.3
+        version: 5.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.8.3
+        version: 5.14.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -194,30 +200,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 3.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -365,23 +371,23 @@ signing_key:
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/govspeak_attachments_inline_test.rb
-- test/govspeak_attachment_test.rb
-- test/govspeak_attachment_link_test.rb
-- test/govspeak_images_test.rb
+- test/govspeak_link_extractor_test.rb
+- test/govspeak_structured_headers_test.rb
+- test/govspeak_images_bang_test.rb
+- test/govspeak_button_test.rb
 - test/govspeak_table_with_headers_test.rb
+- test/govspeak_extract_contact_content_ids_test.rb
+- test/blockquote_extra_quote_remover_test.rb
+- test/govspeak_test_helper.rb
 - test/govspeak_link_test.rb
-- test/govspeak_images_bang_test.rb
-- test/govspeak_link_extractor_test.rb
+- test/govspeak_images_test.rb
+- test/govspeak_attachment_link_test.rb
 - test/govspeak_contacts_test.rb
 - test/test_helper.rb
+- test/html_validator_test.rb
+- test/html_sanitizer_test.rb
+- test/govspeak_attachments_inline_test.rb
 - test/govspeak_test.rb
+- test/govspeak_attachment_test.rb
 - test/govspeak_attachments_image_test.rb
-- test/html_validator_test.rb
-- test/govspeak_structured_headers_test.rb
-- test/govspeak_extract_contact_content_ids_test.rb
-- test/blockquote_extra_quote_remover_test.rb
 - test/presenters/h_card_presenter_test.rb
-- test/govspeak_button_test.rb
-- test/govspeak_test_helper.rb
-- test/html_sanitizer_test.rb