govspeak 6.7.7 → 6.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeb616e6f8489b589e1ddda16e92727ec5c30a9ad76b88e89184aad8590276e3
-  data.tar.gz: cc776bc6208ca7baafce665f4c92a549f2ee6c70fa96652e81e2ed8a32a45f5a
+  metadata.gz: 709c3fbb62a1b1e54cae82fd1539785acaaf3586c0a094b402880bf4608df065
+  data.tar.gz: 1300878c1001b40ade71a2e5446ea1f62ea8cd1e5d764e97ef9450da6124d74a
 SHA512:
-  metadata.gz: cb08b6e651a21f26ae42efff15d74b80401b1dc26fd516b69b02394b9eeaa20825aa4e176ef789a35ae035bb5d8be13012fb42e35c88e1e487870c81c8c4d0af
-  data.tar.gz: 1dc3a85af8fb5ecacb8c9a530739e8f3742fa9ea79bd3830c73c2c5d36b907d737aec74e028a4df197f11e1c0bd7d55eb25e3f5d0009a22a930cfb4e0b449f50
+  metadata.gz: dcf825ebf9e77452c200104606486d9c0ad26c5f00855ce69c3c127d5e6cd7357d804fb3df77b3362fe797e814ed2cffe3823c2a835d1784e89b25c459abfd12
+  data.tar.gz: 607b7b974bf443801e83ec7afaab1449e00a50d63134dc90b912f62a5a5c0635ea2e54afece268dbe6c4471cc232c4f12033bef6f8961aee1816a4cd6f1fcc25

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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)

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/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "6.7.7".freeze
+  VERSION = "6.7.8".freeze
 end

data/lib/govspeak.rb

@@ -464,9 +464,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_test.rb

@@ -1048,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 6.7.7
+  version: 6.7.8
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview