govspeak 6.7.5 → 6.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4fa452bfd1c6f1cdff6b638f91dfbc9961ea2bd7568f4feadd12fe73772532
-  data.tar.gz: 925ff3efcbb3b3a9a1aa6e0319e9f5a3ec1540febd0168b8517c5aa884e6e69c
+  metadata.gz: 4de0ad0d505ecb467987eb27087a076411a0bd6de2fe535eb058b0550d17d09d
+  data.tar.gz: 5b1cba9b7ecc6bc47d1f1646e0dfbb3ff3c2a5cee04a41079c8bb419b0b21610
 SHA512:
-  metadata.gz: 574ea02a4f90e336a7c2a3b6642a7c1fe91924e8d71f4c55eb71053875c607c19de73aefbb34218d0cbe563c8e95982baf18ce42860a1002e58008efab20a93e
-  data.tar.gz: db21f5a85823c27024ff78970ec8d8dab64584910f90fdbed5649516abfbf5110fca8c52c99b978c54db3e060e1c654ac46e0995b87f5b8ab400c9dfa971b756
+  metadata.gz: def9659344fe5ed585999686924483c0c8dbc6a130820b86fa427d3eee31b635f2ac64efd0e15a2e42d5102e0b709f15f13c5d70f9d76c90757241bb6734bd23
+  data.tar.gz: 6ff2c9ae06337d1b8030cf823c8dab8983a99c0fab7abe7673e7c917347ff91be94834c6b00601397ecef2ada1837e58c69cf21419a872571e218bc55e64d695

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.8.0
+
+* Drop support for Ruby 2.6 which reaches End of Life (EOL) on 31/03/2022
+* Add support for Rails 7 by loosening the version constraint on `activeview` gem
+* Fix deprecation notices caused by the bump in Ruby version
+
+## 6.7.8
+
+* Fixes bug which reverts acronyms from being converted into abbr tags [#229](https://github.com/alphagov/govspeak/pull/229)
+
+## 6.7.7
+
+* Fix broken HTML in CTA extension. [#226](https://github.com/alphagov/govspeak/pull/226)
+
+## 6.7.6
+
+* Add draggable false to button markup and validation [#224](https://github.com/alphagov/govspeak/pull/224)
+
 ## 6.7.5
 
 * Fix footnotes in call-to-action boxes [222](https://github.com/alphagov/govspeak/pull/222)

data/README.md

@@ -28,8 +28,7 @@ Once govspeak has been updated and version incremented then:
 
 Also, consider if:
 - [whitehall](https://github.com/alphagov/whitehall) needs updating (as custom govspeak changes are present)
-- [govuk-content-schema](https://github.com/alphagov/govuk-content-schemas) needs updating
-- [govpspeak-preview](https://github.com/alphagov/govspeak-preview) is worth updating
+- [govpspeak-preview](https://github.com/alphagov/govspeak-preview) needs updating
 
 Any pages that use govspeak to generate Content will need to *republished* in order for the new changes to be reflected.  
 

data/lib/govspeak/html_sanitizer.rb

@@ -55,7 +55,7 @@ class Govspeak::HtmlSanitizer
       elements: Sanitize::Config::RELAXED[:elements] + %w[govspeak-embed-attachment govspeak-embed-attachment-link svg path].concat(allowed_elements),
       attributes: {
         :all => Sanitize::Config::RELAXED[:attributes][:all] + %w[role aria-label],
-        "a" => Sanitize::Config::RELAXED[:attributes]["a"] + [:data],
+        "a" => Sanitize::Config::RELAXED[:attributes]["a"] + [:data] + %w[draggable],
         "svg" => Sanitize::Config::RELAXED[:attributes][:all] + %w[xmlns width height viewbox focusable],
         "path" => Sanitize::Config::RELAXED[:attributes][:all] + %w[fill d],
         "div" => [:data],

data/lib/govspeak/template_renderer.rb

@@ -17,7 +17,7 @@ module Govspeak
     def t(*args)
       options = args.last.is_a?(Hash) ? args.last.dup : {}
       key = args.shift
-      I18n.t!(key, options.merge(locale: locale))
+      I18n.t!(key, **options.merge(locale: locale))
     end
 
     def format_with_html_line_breaks(string)

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.7.5".freeze
+  VERSION = "6.8.0".freeze
 end

data/lib/govspeak.rb

@@ -1,3 +1,4 @@
+require "active_support"
 require "active_support/core_ext/hash"
 require "active_support/core_ext/array"
 require "erb"
@@ -224,7 +225,7 @@ module Govspeak
       text = text.strip
       href = href.strip
 
-      %(\n<a role="button" class="#{button_classes}" href="#{href}" #{data_attribute}>#{text}</a>\n)
+      %(\n<a role="button" draggable="false" class="#{button_classes}" href="#{href}" #{data_attribute}>#{text}</a>\n)
     end
 
     extension("highlight-answer") do |body|
@@ -322,7 +323,7 @@ module Govspeak
     end
 
     extension("call-to-action", surrounded_by("$CTA")) do |body|
-      doc = Kramdown::Document.new(body.strip).to_html
+      doc = Kramdown::Document.new(preprocess(body.strip), @options).to_html
       doc = %(\n<div class="call-to-action">\n#{doc}</div>\n)
       footnotes = body.scan(/\[\^(\d+)\]/).flatten
 
@@ -464,9 +465,10 @@ module Govspeak
     end
 
     def add_acronym_alt_text(html)
-      @acronyms.each do |acronym|
-        html.gsub!(acronym[0], "<abbr title=\"#{acronym[1].strip}\">#{acronym[0]}</abbr>")
-      end
+      # FIXME: this code is buggy and replaces abbreviations in HTML tags - removing the functionality for now
+      # @acronyms.each do |acronym|
+      #   html.gsub!(acronym[0], "<abbr title=\"#{acronym[1].strip}\">#{acronym[0]}</abbr>")
+      # end
     end
   end
 end

data/test/govspeak_button_test.rb

@@ -47,7 +47,7 @@ class GovspeakTest < Minitest::Test
     assert_html_output %(
       <p>Text before the button with line breaks</p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="http://www.gov.uk">Start Now</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="http://www.gov.uk">Start Now</a></p>
 
       <p>test after the button</p>
     )
@@ -65,21 +65,21 @@ class GovspeakTest < Minitest::Test
   # Make sure button renders when typical linebreaks are before it, seen in publishing applications
   test_given_govspeak "{button}[Line breaks](https://gov.uk/random){/button}\r\n\r\n{button}[Continue](https://gov.uk/random){/button}\r\n\r\n{button}[Continue](https://gov.uk/random){/button}" do
     assert_html_output %(
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Line breaks</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Line breaks</a></p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Continue</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Continue</a></p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Continue</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Continue</a></p>
     )
   end
 
   test_given_govspeak "{button}[More line breaks](https://gov.uk/random){/button}\n\n{button}[Continue](https://gov.uk/random){/button}\n\n{button}[Continue](https://gov.uk/random){/button}" do
     assert_html_output %(
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">More line breaks</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">More line breaks</a></p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Continue</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Continue</a></p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Continue</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Continue</a></p>
     )
   end
 
@@ -104,7 +104,7 @@ class GovspeakTest < Minitest::Test
       <p>lorem lorem lorem
       lorem lorem lorem</p>
 
-      <p><a class="gem-c-button govuk-button" role="button" href="https://gov.uk/random">Random page</a></p>
+      <p><a class="gem-c-button govuk-button" role="button" draggable="false" href="https://gov.uk/random">Random page</a></p>
 
       <p>lorem lorem lorem
       lorem lorem lorem</p>

data/test/govspeak_test.rb

@@ -440,6 +440,60 @@ Teston
       </div>)
   end
 
+  test_given_govspeak "
+    $CTA
+
+    This is a test:
+
+    s1. This is number 1.
+    s2. This is number 2.
+    s3. This is number 3.
+    s4. This is number 4.
+
+    $CTA" do
+    assert_html_output %(
+        <div class="call-to-action">
+        <p>This is a test:</p>
+
+        <ol class="steps">
+        <li>
+        <p>This is number 1.</p>
+        </li>
+        <li>
+        <p>This is number 2.</p>
+        </li>
+        <li>
+        <p>This is number 3.</p>
+        </li>
+        <li>
+        <p>This is number 4.</p>
+        </li>
+        </ol>
+        </div>
+        )
+  end
+
+  test_given_govspeak "
+    $CTA
+    [external link](http://www.external.com) some text
+    $CTA
+    " do
+    assert_html_output %(
+      <div class="call-to-action">
+      <p><a rel="external" href="http://www.external.com">external link</a> some text</p>
+      </div>)
+  end
+
+  test_given_govspeak "
+    $CTA
+    [internal link](http://www.not-external.com) some text
+    $CTA", document_domains: %w[www.not-external.com] do
+    assert_html_output %(
+      <div class="call-to-action">
+      <p><a href="http://www.not-external.com">internal link</a> some text</p>
+      </div>)
+  end
+
   test_given_govspeak "
     $CTA
     Click here to start the tool
@@ -994,43 +1048,44 @@ Teston
     )
   end
 
-  test_given_govspeak "
-    $LegislativeList
-    * 1. Item 1[^1] with an ACRONYM
-    * 2. Item 2[^2]
-    * 3. Item 3
-    $EndLegislativeList
-
-    [^1]: Footnote definition one
-    [^2]: Footnote definition two with an ACRONYM
-
-    *[ACRONYM]: This is the acronym explanation
-  " do
-    assert_html_output %(
-      <ol class="legislative-list">
-        <li>1. Item 1<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">[footnote 1]</a></sup> with an <abbr title="This is the acronym explanation">ACRONYM</abbr>
-      </li>
-        <li>2. Item 2<sup id="fnref:2" role="doc-noteref"><a href="#fn:2" class="footnote" rel="footnote">[footnote 2]</a></sup>
-      </li>
-        <li>3. Item 3</li>
-      </ol>
-
-      <div class="footnotes" role="doc-endnotes">
-        <ol>
-          <li id="fn:1" role="doc-endnote">
-        <p>
-          Footnote definition one<a href="#fnref:1" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
-        </p>
-      </li>
-      <li id="fn:2" role="doc-endnote">
-        <p>
-          Footnote definition two with an <abbr title="This is the acronym explanation">ACRONYM</abbr><a href="#fnref:2" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
-        </p>
-      </li>
-        </ol>
-      </div>
-    )
-  end
+  # FIXME: this code is buggy and replaces abbreviations in HTML tags - removing the functionality for now
+  # test_given_govspeak "
+  #   $LegislativeList
+  #   * 1. Item 1[^1] with an ACRONYM
+  #   * 2. Item 2[^2]
+  #   * 3. Item 3
+  #   $EndLegislativeList
+  #
+  #   [^1]: Footnote definition one
+  #   [^2]: Footnote definition two with an ACRONYM
+  #
+  #   *[ACRONYM]: This is the acronym explanation
+  # " do
+  #   assert_html_output %(
+  #     <ol class="legislative-list">
+  #       <li>1. Item 1<sup id="fnref:1" role="doc-noteref"><a href="#fn:1" class="footnote" rel="footnote">[footnote 1]</a></sup> with an <abbr title="This is the acronym explanation">ACRONYM</abbr>
+  #     </li>
+  #       <li>2. Item 2<sup id="fnref:2" role="doc-noteref"><a href="#fn:2" class="footnote" rel="footnote">[footnote 2]</a></sup>
+  #     </li>
+  #       <li>3. Item 3</li>
+  #     </ol>
+  #
+  #     <div class="footnotes" role="doc-endnotes">
+  #       <ol>
+  #         <li id="fn:1" role="doc-endnote">
+  #       <p>
+  #         Footnote definition one<a href="#fnref:1" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+  #       </p>
+  #     </li>
+  #     <li id="fn:2" role="doc-endnote">
+  #       <p>
+  #         Footnote definition two with an <abbr title="This is the acronym explanation">ACRONYM</abbr><a href="#fnref:2" class="reversefootnote" role="doc-backlink" aria-label="go to where this is referenced">↩</a>
+  #       </p>
+  #     </li>
+  #       </ol>
+  #     </div>
+  #   )
+  # end
 
   test_given_govspeak "
     The quick brown

data/test/test_helper.rb

@@ -1,8 +1,6 @@
 require "simplecov"
-require "simplecov-rcov"
 
 SimpleCov.start
-SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 
 $LOAD_PATH.unshift(File.expand_path("../lib")) unless $LOAD_PATH.include?(File.expand_path("../lib"))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.7.5
+  version: 6.8.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-02 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -194,16 +188,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -218,20 +212,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  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
@@ -340,36 +320,36 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Markup language for single domain
 test_files:
-- test/test_helper.rb
+- test/govspeak_test_helper.rb
 - test/blockquote_extra_quote_remover_test.rb
-- test/govspeak_images_bang_test.rb
-- test/govspeak_contacts_test.rb
-- test/govspeak_table_with_headers_test.rb
 - test/govspeak_link_extractor_test.rb
-- test/govspeak_attachments_image_test.rb
-- test/html_validator_test.rb
-- test/govspeak_button_test.rb
+- test/govspeak_images_test.rb
+- test/govspeak_link_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
-- test/govspeak_test_helper.rb
 - test/govspeak_footnote_test.rb
-- test/govspeak_link_test.rb
+- test/presenters/h_card_presenter_test.rb
+- test/govspeak_attachments_inline_test.rb
 - test/govspeak_structured_headers_test.rb
+- test/test_helper.rb
+- test/govspeak_button_test.rb
+- test/govspeak_attachment_test.rb
 - test/html_sanitizer_test.rb
-- test/govspeak_images_test.rb
+- test/govspeak_contacts_test.rb
+- test/govspeak_attachments_image_test.rb
+- test/govspeak_images_bang_test.rb
 - test/govspeak_test.rb
+- test/govspeak_table_with_headers_test.rb
+- test/html_validator_test.rb
 - test/govspeak_attachment_link_test.rb
-- test/govspeak_attachment_test.rb
-- test/presenters/h_card_presenter_test.rb
-- test/govspeak_attachments_inline_test.rb