govspeak 10.10.0 → 10.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2fa22c7671ca33aa517fac4cb898eba4823aaa9175d4ec14afb4a74598967b
-  data.tar.gz: a5e301aef894df2901032f38d260f886b488c7c4064e9e006c29505c3b22cd85
+  metadata.gz: bbe7be2db2caf929c90abd590208e19ed0765f96769425fd5a8275ef788026bc
+  data.tar.gz: 344f21ce74192fbecd10344849e81ab557d8f12d399aa5cc6d386f3c2823cc17
 SHA512:
-  metadata.gz: 957046ca3c77b2c58857148a8b48c6e380c2d81ef5563053a934970ff9f883fd002b4868187338cf2f8b9e28b7e4563c197dddcec1e7d87ab32045946152a514
-  data.tar.gz: 6e0dd1d24b5b3cfad0656f0ff649bf0656da5a83c14cdcce61a3c384d76f2c5f64c7c813e8d741fca4a4bb486928c067485b2b9284ea5687b6e7c8de0615f02e
+  metadata.gz: cb2c38e1279c73cdf9748652c0bc509c72505ee68e81f1117f22b91cb4b04f07ef97c9be8d6234ef712d5c672f99c149f6723adfc874ed86a9455569005954e4
+  data.tar.gz: 040b0c4c9a4bb9920cad211c04f41de53285131fd0dc17f2634e0f075e0fefe3cefc69ab89decfdb8d9d8aee3cf892ff133f5d8b5178186f1eae8b25b0e221a1

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 10.11.0
+
+* feature: Remove cards from govspeak [PR #494](https://github.com/alphagov/govspeak/pull/494)
+
 ## 10.10.0
 
 * feature: Add cards to govspeak [PR #489](https://github.com/alphagov/govspeak/pull/489)

data/README.md

@@ -697,67 +697,6 @@ which outputs
 </a>
 ```
 
-### Cards
-
-Adds cards using the cards component from the components gem, using the [auto layout](https://components.publishing.service.gov.uk/component-guide/cards/auto_layout).
-
-#### Examples
-
-The most basic card.
-
-```
-{cards}[Benefits](https://www.gov.uk/browse/benefits){/cards}
-```
-
-which outputs
-
-```html
-<div class="gem-c-cards gem-c-cards--auto-layout">
-  <ul class="gem-c-cards__list">
-    <li class="gem-c-cards__list-item">
-      <div class="gem-c-cards__list-item-wrapper">
-        <h3 class="gem-c-cards__sub-heading govuk-heading-s">
-          <a class="govuk-link gem-c-cards__link gem-print-force-link-styles" href="http://www.gov.uk/browse/benefits">Benefits</a>
-        </h3>
-      </div>
-    </li>
-  </ul>
-</div>
-```
-
-To include a description on the card, include after the link.
-
-```
-{cards}[Benefits](https://www.gov.uk/browse/benefits) Includes eligibility, appeals, tax credits and Universal Credit{/cards}
-```
-
-which outputs
-
-```html
-<div class="gem-c-cards gem-c-cards--auto-layout">
-  <ul class="gem-c-cards__list">
-    <li class="gem-c-cards__list-item">
-      <div class="gem-c-cards__list-item-wrapper">
-        <h3 class="gem-c-cards__sub-heading govuk-heading-s">
-          <a class="govuk-link gem-c-cards__link gem-print-force-link-styles" href="http://www.gov.uk/browse/benefits">Benefits</a>
-        </h3>
-        <p class="govuk-body gem-c-cards__description">Includes eligibility, appeals, tax credits and Universal Credit</p>
-      </div>
-    </li>
-  </ul>
-</div>
-```
-
-To output more than one card, repeat the link pattern.
-
-```
-{cards}
-  [Benefits](https://www.gov.uk/browse/benefits) Includes eligibility, appeals, tax credits and Universal Credit
-  [Births, deaths, marriages and care](https://www.gov.uk/browse/births-deaths-marriages) Parenting, civil partnerships, divorce and Lasting Power of Attorney
-{/cards}
-```
-
-
 ## Licence
 
 [MIT License](LICENCE)

data/lib/govspeak/html_validator.rb

@@ -14,7 +14,6 @@ class Govspeak::HtmlValidator
   def valid?
     dirty_html = govspeak_to_html(sanitize: false)
     clean_html = govspeak_to_html(sanitize: true)
-
     normalise_html(dirty_html) == normalise_html(clean_html)
   end
 

data/lib/govspeak/post_processor.rb

@@ -147,30 +147,6 @@ module Govspeak
       end
     end
 
-    extension("use gem component for cards") do |document|
-      document.css(".cards").map do |cards|
-        links = cards.css(".card").map do |card|
-          {
-            link: {
-              path: card["href"],
-              text: card.css(".text").inner_html.html_safe,
-            },
-            description: card.css(".description").inner_html.html_safe,
-          }
-        end
-
-        cards_html = GovukPublishingComponents.render(
-          "govuk_publishing_components/components/cards", {
-            items: links,
-            columns: "auto",
-            margin_bottom: 6,
-          }
-        ).squish.gsub("> <", "><").gsub!(/\s+/, " ")
-
-        cards.swap(cards_html)
-      end
-    end
-
     extension("use custom footnotes") do |document|
       document.css("a.footnote").map do |el|
         footnote_number = el[:href].gsub(/\D/, "")

data/lib/govspeak/version.rb

@@ -1,3 +1,3 @@
 module Govspeak
-  VERSION = "10.10.0".freeze
+  VERSION = "10.11.0".freeze
 end

data/lib/govspeak.rb

@@ -202,22 +202,6 @@ module Govspeak
       %(\n<a role="button" draggable="false" class="#{button_classes}" href="#{href}" #{data_attribute}>#{text}</a>\n)
     end
 
-    extension("cards", %r$^{cards}(.*?){/cards}$m) do |body|
-      links = body.scan(/\s*\[([^\]]+)\]\(([^)]+)\)([^{\[$*\#]*)\s*/)
-      cards = ""
-
-      links.each do |text, href, description|
-        cards << "
-          <a class='card' href='#{href.strip}'>
-            <span class='text'>#{text.strip}</span>
-            <span class='description'>#{description.strip}</span>
-          </a>
-        "
-      end
-
-      "<div class='cards'>#{cards}</div>"
-    end
-
     extension("highlight-answer") do |body|
       %(\n\n<div class="highlight-answer">
 #{Govspeak::Document.new(body.strip, locale: @locale).to_html}</div>\n)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govspeak
 version: !ruby/object:Gem::Version
-  version: 10.10.0
+  version: 10.11.0
 platform: ruby
 authors:
 - GOV.UK Dev
@@ -333,7 +333,6 @@ files:
 - test/govspeak_attachments_image_test.rb
 - test/govspeak_attachments_inline_test.rb
 - test/govspeak_button_test.rb
-- test/govspeak_cards_test.rb
 - test/govspeak_contacts_test.rb
 - test/govspeak_devolved_content_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb
@@ -380,7 +379,6 @@ test_files:
 - test/govspeak_attachments_image_test.rb
 - test/govspeak_attachments_inline_test.rb
 - test/govspeak_button_test.rb
-- test/govspeak_cards_test.rb
 - test/govspeak_contacts_test.rb
 - test/govspeak_devolved_content_test.rb
 - test/govspeak_extract_contact_content_ids_test.rb

data/test/govspeak_cards_test.rb

@@ -1,54 +0,0 @@
-require "test_helper"
-require "govspeak_test_helper"
-
-require "ostruct"
-
-class GovspeakTest < Minitest::Test
-  include GovspeakTestHelper
-
-  test_given_govspeak "{cards}[Benefits](https://www.gov.uk/browse/benefits){/cards}" do
-    assert_html_selector ".gem-c-cards.gem-c-cards--auto-layout"
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_text_output "Benefits"
-  end
-
-  # The same as above but with line breaks
-  test_given_govspeak "{cards}\n\n\n[Benefits](https://www.gov.uk/browse/benefits)\n\n\n{/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_text_output "Benefits"
-  end
-
-  test_given_govspeak "{cards}\n[Benefits](https://www.gov.uk/browse/benefits)\n[Births, deaths, marriages and care](https://www.gov.uk/browse/births-deaths-marriages)\n{/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/births-deaths-marriages"]'
-    assert_text_output "Benefits Births, deaths, marriages and care"
-  end
-
-  test_given_govspeak "{cards}[Benefits](https://www.gov.uk/browse/benefits) This is a description{/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_html_selector ".gem-c-cards__description"
-    assert_text_output "Benefits This is a description"
-  end
-
-  # The same as above but with line breaks
-  test_given_govspeak "{cards}\n\n[Benefits](https://www.gov.uk/browse/benefits)\n\nThis is a description\n\n{/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_text_output "Benefits This is a description"
-  end
-
-  test_given_govspeak "{cards}\n\n[Benefits](https://www.gov.uk/browse/benefits)\n\nThis is a description? With punctuation! - of course, this isn't a real example, real ones wouldn't \"quote\" like this\n\n{/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_text_output "Benefits This is a description? With punctuation! - of course, this isn't a real example, real ones wouldn't \"quote\" like this"
-  end
-
-  test_given_govspeak "{cards}\n
-    [Benefits](https://www.gov.uk/browse/benefits)\n
-    This is a description\n
-    containing line breaks\n
-    [Births, deaths, marriages and care](https://www.gov.uk/browse/births-deaths-marriages)\n
-    {/cards}" do
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/benefits"]'
-    assert_html_selector 'a.gem-c-cards__link[href="https://www.gov.uk/browse/births-deaths-marriages"]'
-    assert_text_output "Benefits This is a description containing line breaks Births, deaths, marriages and care"
-  end
-end