govuk_publishing_components 24.3.0 → 24.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27bbb3cbb2bca8d09be089a66cbbfa710fea05a35e275d9dbd92237b78206f49
-  data.tar.gz: 582f39e64a1af7c58a13c01adb9bb8a25e0c2042da02ce81688ce9ad2a74282f
+  metadata.gz: cbfbb444f86b61f46e110ab8615ca02b163357d6bf3125c4f4459bed3da8b92d
+  data.tar.gz: 012a4752e5fd69378516db6348f18b14902714dc56e209951879f490af850f77
 SHA512:
-  metadata.gz: d357fa3acf40c80ff22f1f619f0f412904d60d3d8cbab2279e166a77a02a58be06a15801360e5d3748877ebd6353cebfc402914eba08931b28489256ee7b3048
-  data.tar.gz: 82c84f467d4903b1f916af25bc73fd151857db158b5fe84ae3f442d6a7ef5725ca97db85a558132f0ef968f4ef80e67145f94a5c96b2d8e9887f6c3982e35db4
+  metadata.gz: 94f375971a2803179d77d070ee86113ea6e6a17d5e547d94c7229b7fcd643b2e8636eccb1f03369e26bb074517bdf411312826a721701efd55363fab244033a2
+  data.tar.gz: 62c13a38b68951a6492044e29b4a7989ea2ea62e185b58c307707bdbbe9a013e4db03dc7c52b7d378f04474be5e8505751e5395d4c58f5d6cc8e8ded2a9ede83

data/app/assets/stylesheets/govuk_publishing_components/components/_cookie-banner.scss

@@ -46,11 +46,18 @@ $govuk-cookie-banner-background: govuk-colour("light-grey", "grey-4");
   }
 }
 
+// Override style from design system so we can have consistent
+// padding on the the banner and the confirmation
+
+.govuk-cookie-banner {
+  padding-top: 0;
+}
+
 // Override the styles from govuk_template
 // stylelint-disable selector-max-id
 .gem-c-cookie-banner#global-cookie-message {
   background-color: $govuk-cookie-banner-background;
-  padding: 0;
+  padding: govuk-spacing(3) 0 0 0;
   box-sizing: border-box;
 
   .gem-c-cookie-banner__message,

data/app/assets/stylesheets/govuk_publishing_components/components/_search.scss

@@ -34,6 +34,21 @@ $large-input-size: 50px;
   }
 }
 
+%gem-c-search-input-focus {
+  outline: $govuk-focus-width solid $govuk-focus-colour;
+  // Ensure outline appears outside of the element
+  outline-offset: 0;
+  // Double the border by adding its width again. Use `box-shadow` for this // instead of changing `border-width`
+  // Also, `outline` cannot be utilised here as it is already used for the yellow focus state.
+  box-shadow: inset 0 0 0 $govuk-border-width-form-element;
+
+  @include govuk-if-ie8 {
+    // IE8 doesn't support `box-shadow` so double the border with
+    // `border-width`.
+    border-width: $govuk-border-width-form-element * 2;
+  }
+}
+
 .gem-c-search__input[type="search"] { // overly specific to prevent some overrides from outside
   @include govuk-font($size: 19, $line-height: (28 / 19));
   margin: 0;
@@ -59,25 +74,14 @@ $large-input-size: 50px;
   }
 
   &:focus {
-    outline: $govuk-focus-width solid $govuk-focus-colour;
-    // Ensure outline appears outside of the element
-    outline-offset: 0;
-    // Double the border by adding its width again. Use `box-shadow` for this // instead of changing `border-width`
-    // Also, `outline` cannot be utilised here as it is already used for the yellow focus state.
-    box-shadow: inset 0 0 0 $govuk-border-width-form-element;
-
-    @include govuk-if-ie8 {
-      // IE8 doesn't support `box-shadow` so double the border with
-      // `border-width`.
-      border-width: $govuk-border-width-form-element * 2;
-    }
+    @extend %gem-c-search-input-focus;
   }
 }
 
 @include govuk-compatibility(govuk_template) {
   //  ultra specific rule overrides focus styling from govuk_template
   #global-header .gem-c-search__input[type="search"]:focus { // stylelint-disable selector-max-id
-    @extend .gem-c-search__input[type="search"]:focus; // stylelint-disable scss/at-extend-no-missing-placeholder
+    @extend %gem-c-search-input-focus;
   }
 }
 

data/app/models/govuk_publishing_components/audit_applications.rb

@@ -22,7 +22,7 @@ module GovukPublishingComponents
         @find_all_print_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components_print/
         find_print_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/print\/)[a-zA-Z_-]+(?=['"])/
 
-        @find_all_javascripts = /\/\/[ ]*= require govuk_publishing_components\/all_components/
+        @find_all_javascripts = /\/\/ *= require govuk_publishing_components\/all_components/
         find_javascripts = /(?<=require govuk_publishing_components\/components\/)[a-zA-Z_-]+/
 
         components_in_templates = find_components(templates, find_components, "templates") || []

data/app/models/govuk_publishing_components/audit_comparer.rb

@@ -110,8 +110,8 @@ module GovukPublishingComponents
           next if second[:components].include?("all")
 
           in_current.each do |component|
-            if @gem_data.include?("component_#{second_location}".to_sym)
-              warnings << create_warning(component, "Included in #{first_location} but not #{second_location}") if @gem_data["component_#{second_location}".to_sym].include?(component)
+            if @gem_data.include?("component_#{second_location}".to_sym) && @gem_data["component_#{second_location}".to_sym].include?(component)
+              warnings << create_warning(component, "Included in #{first_location} but not #{second_location}")
             end
           end
         end

data/app/models/govuk_publishing_components/component_example.rb

@@ -57,13 +57,14 @@ module GovukPublishingComponents
     # Safe HTML can be passed to components, simulate
     # by marking any string that comes from YAML as safe
     def html_safe_strings(obj)
-      if obj.is_a?(String)
+      case obj
+      when String
         obj.html_safe
-      elsif obj.is_a?(Hash)
+      when Hash
         obj.each do |key, value|
           obj[key] = html_safe_strings(value)
         end
-      elsif obj.is_a?(Array)
+      when Array
         obj.map! { |e| html_safe_strings(e) }
       else
         obj

data/app/views/govuk_publishing_components/components/_breadcrumbs.html.erb

@@ -13,7 +13,7 @@
   <%= raw JSON.pretty_generate(breadcrumb_presenter.structured_data) %>
 </script>
 
-<div class="<%= classes %>" data-module="track-click">
+<div class="<%= classes %>" data-module="gem-track-click">
   <ol class="govuk-breadcrumbs__list">
     <% breadcrumbs.each_with_index do |crumb, index| %>
       <% breadcrumb = GovukPublishingComponents::Presenters::Breadcrumb.new(crumb, index) %>

data/app/views/govuk_publishing_components/components/_contents_list.html.erb

@@ -15,7 +15,7 @@
     "aria-label": aria_label,
     role: "navigation",
     data: {
-      module: "track-click"
+      module: "gem-track-click"
     }
   ) do %>
     <%= content_tag(

data/app/views/govuk_publishing_components/components/_cookie_banner.html.erb

@@ -14,7 +14,7 @@
   text = raw(text)
 
   cookie_preferences_href ||= "/help/cookies"
-  confirmation_message ||= raw("You can <a class='govuk-link' href='#{cookie_preferences_href}' data-module='track-click' data-track-category='cookieBanner' data-track-action='Cookie banner settings clicked from confirmation'>change your cookie settings</a> at any time.")
+  confirmation_message ||= raw("You can <a class='govuk-link' href='#{cookie_preferences_href}' data-module='gem-track-click' data-track-category='cookieBanner' data-track-action='Cookie banner settings clicked from confirmation'>change your cookie settings</a> at any time.")
   services_cookies ||= nil
   css_classes = %w(gem-c-cookie-banner govuk-clearfix)
   css_classes << "gem-c-cookie-banner--services" if services_cookies
@@ -35,12 +35,12 @@
             <%= render "govuk_publishing_components/components/button", {
               name: "cookies",
               text: services_cookies.dig(:yes, :text) || "Yes",
-              data_attributes: { module: "track-click", "accept-cookies": "true", }.merge(services_cookies.dig(:yes, :data_attributes) || {})
+              data_attributes: { module: "gem-track-click", "accept-cookies": "true", }.merge(services_cookies.dig(:yes, :data_attributes) || {})
             } %>
             <%= render "govuk_publishing_components/components/button", {
               name: "cookies",
               text: services_cookies.dig(:no, :text) || "No",
-              data_attributes: { module: "track-click", "reject-cookies": "true", }.merge(services_cookies.dig(:no, :data_attributes) || {})
+              data_attributes: { module: "gem-track-click", "reject-cookies": "true", }.merge(services_cookies.dig(:no, :data_attributes) || {})
             } %>
             <% if services_cookies[:cookie_preferences] %>
               <%= link_to services_cookies.dig(:cookie_preferences, :text), services_cookies.dig(:cookie_preferences, :href), class: "govuk-link" %>
@@ -52,7 +52,7 @@
                 name: "cookies",
                 text: "Accept additional cookies",
                 data_attributes: {
-                  module: "track-click",
+                  module: "gem-track-click",
                   "accept-cookies": "true",
                   "track-category": "cookieBanner",
                   "track-action": "Cookie banner accepted",
@@ -63,7 +63,7 @@
                 name: "cookies",
                 text: "Reject additional cookies",
                 data_attributes: {
-                  module: "track-click",
+                  module: "gem-track-click",
                   "reject-cookies": "true",
                   "track-category": "cookieBanner",
                   "track-action": "Cookie banner rejected",
@@ -77,7 +77,7 @@
   <div class="gem-c-cookie-banner__confirmation govuk-width-container" tabindex="-1" hidden>
     <p class="gem-c-cookie-banner__confirmation-message" role="alert"><%= confirmation_message %></p>
     <div class="govuk-button-group">
-      <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide this message</button>
+      <button class="gem-c-cookie-banner__hide-button govuk-button" data-hide-cookie-banner="true" data-module="gem-track-click" data-track-category="cookieBanner" data-track-action="Hide cookie banner">Hide this message</button>
     </div>
   </div>
 </div>

data/app/views/govuk_publishing_components/components/_highlight_boxes.html.erb

@@ -9,7 +9,7 @@
 %>
 <% if items.any? %>
   <% unless within_multitype_list %>
-    <ol class="gem-c-highlight-boxes" <%= "data-module=track-click" if highlight_boxes_helper.data_tracking? %>>
+    <ol class="gem-c-highlight-boxes" <%= "data-module=gem-track-click" if highlight_boxes_helper.data_tracking? %>>
   <% end %>
     <% items.each do |content_item| %>
       <li class="gem-c-highlight-boxes__item-wrapper <%= half_width_class %>">

data/app/views/govuk_publishing_components/components/_image_card.html.erb

@@ -9,7 +9,7 @@
 %>
 <% if card_helper.href || card_helper.extra_links.any? %>
   <div class="<%= classes %> <%= brand_helper.brand_class %>"
-    <%= "data-module=track-click" if card_helper.is_tracking? %>
+    <%= "data-module=gem-track-click" if card_helper.is_tracking? %>
     <%= "lang=#{card_helper.lang}" if card_helper.lang %>>
     <div class="gem-c-image-card__text-wrapper">
       <div class="gem-c-image-card__header-and-context-wrapper">

data/app/views/govuk_publishing_components/components/_metadata.html.erb

@@ -16,7 +16,7 @@
   classes << "gem-c-metadata--inverse" if inverse
 %>
 <%= content_tag :div, class: classes, data: { module: "gem-toggle" } do %>
-  <dl data-module="track-click">
+  <dl data-module="gem-track-click">
     <% if from.any? %>
       <dt class="gem-c-metadata__term"><%= t("govuk_component.metadata.from", default: "From") %>:</dt>
       <dd class="gem-c-metadata__definition">

data/app/views/govuk_publishing_components/components/_organisation_logo.html.erb

@@ -26,7 +26,7 @@
 %>
 <<%= wrapping_element %>
   class="<%= wrapper_classes.join(" ") %>"
-  <%= "data-module=track-click" if organisation[:data_attributes] %>
+  <%= "data-module=gem-track-click" if organisation[:data_attributes] %>
 >
   <% if organisation[:url] %>
     <%= link_to organisation[:url],

data/app/views/govuk_publishing_components/components/_previous_and_next_navigation.html.erb

@@ -4,7 +4,7 @@
   role="navigation"
   aria-label="<%= t("govuk_component.previous_and_next_navigation.pagination", default: "Pagination") %>"
 >
-  <ul class="gem-c-pagination__list" data-module="track-click">
+  <ul class="gem-c-pagination__list" data-module="gem-track-click">
     <% if local_assigns.include?(:previous_page) %>
       <li class="gem-c-pagination__item gem-c-pagination__item--previous">
         <a href="<%= previous_page[:url] %>"

data/app/views/govuk_publishing_components/components/_share_links.html.erb

@@ -14,7 +14,7 @@
   classes << brand_helper.brand_class
 
   data_attributes ||= {}
-  data_attributes[:module] = 'track-click'
+  data_attributes[:module] = 'gem-track-click'
 %>
 <% if links.any? %>
   <%= tag.div(class: classes, data: data_attributes) do %>

data/app/views/govuk_publishing_components/components/_step_by_step_nav_header.html.erb

@@ -28,7 +28,7 @@
     <%= raw JSON.pretty_generate(breadcrumb_presenter.structured_data) %>
   </script>
 
-  <h2 class="<%= classes %>" data-module="track-click">
+  <h2 class="<%= classes %>" data-module="gem-track-click">
     <span class="gem-c-step-nav-header__part-of">Part of</span>
     <% if path %>
       <a href="<%= path %>"

data/app/views/govuk_publishing_components/components/_step_by_step_nav_related.html.erb

@@ -6,7 +6,7 @@
 <% if links.any? %>
   <div 
     class="gem-c-step-nav-related <%= "gem-c-step-nav-related--singular" if links.length == 1 %>" 
-    data-module="track-click">
+    data-module="gem-track-click">
     <h2 class="gem-c-step-nav-related__heading">
       <span class="gem-c-step-nav-related__pretitle"><%= pretitle %></span>
       <% if links.length == 1 && !always_display_as_list %>

data/app/views/govuk_publishing_components/components/_subscription_links.html.erb

@@ -27,7 +27,7 @@
     <% end %>
     <ul
       class="gem-c-subscription-links__list<%= ' gem-c-subscription-links__list--small' if local_assigns[:small_form] == true %>"
-      <%= "data-module=track-click" if sl_helper.tracking_is_present? %>
+      <%= "data-module=gem-track-click" if sl_helper.tracking_is_present? %>
     >
       <% if sl_helper.email_signup_link.present? %>
         <li class="gem-c-subscription-links__list-item<%= ' gem-c-subscription-links__list-item--small' if local_assigns[:small_form] == true %>" >

data/app/views/govuk_publishing_components/components/_taxonomy_list.html.erb

@@ -9,7 +9,7 @@
   taxonomy_list_helper = GovukPublishingComponents::Presenters::TaxonomyListHelper.new(image_cards)
 %>
 <% if highlight_box || document_list || image_cards %>
-  <ul class="gem-c-taxonomy-list" data-module="track-click">
+  <ul class="gem-c-taxonomy-list" data-module="gem-track-click">
     <% if image_cards %>
       <% taxonomy_list_helper.image_card_data.each do |image_card| %>
         <li class="gem-c-taxonomy-list__item">

data/app/views/govuk_publishing_components/components/_translation_nav.html.erb

@@ -7,7 +7,7 @@
   <nav role="navigation"
     class="gem-c-translation-nav <%= translation_helper.classes %> <%= brand_helper.brand_class %>"
     aria-label="<%= t("common.translations") %>"
-    <%= "data-module=\"track-click\"" if translation_helper.tracking_is_present? %>
+    <%= "data-module=\"gem-track-click\"" if translation_helper.tracking_is_present? %>
   >
     <ul class="gem-c-translation-nav__list">
       <% translation_helper.translations.each.with_index do |translation, i| %>

data/app/views/govuk_publishing_components/components/contextual_sidebar/_brexit_cta.html.erb

@@ -3,7 +3,7 @@
 <% link_path = t("components.related_navigation.transition.link_path") %>
 
 <% data_attributes = {
-  "module": "track-click",
+  "module": "gem-track-click",
   "track-category": "relatedLinkClicked",
   "track-action": "1.0 Transition",
   "track-label": link_path,

data/app/views/govuk_publishing_components/components/docs/inverse_header.yml

@@ -45,7 +45,7 @@ examples:
     data:
       padding_top: false
       block: |
-        <div class="gem-c-breadcrumbs " data-module="track-click">
+        <div class="gem-c-breadcrumbs " data-module="gem-track-click">
           <ol>
             <li class="">
                 <a data-track-category="breadcrumbClicked" data-track-action="1" data-track-label="/section" data-track-options="{&quot;dimension28&quot;:&quot;2&quot;,&quot;dimension29&quot;:&quot;Section&quot;}" class="gem-c-breadcrumbs--inverse" aria-current="false" href="/section">Section</a>

data/app/views/govuk_publishing_components/components/layout_header/_navigation_items.html.erb

@@ -1,3 +1,5 @@
+<% navigation_aria_label ||= "Top level" %>
+
 <% if navigation_items.any? %>
   <button role="button" class="govuk-header__menu-button gem-c-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="Show or hide Top Level Navigation">Menu</button>
   <%= tag.nav class: "gem-c-header__nav", aria: { label: navigation_aria_label } do %>

data/app/views/govuk_publishing_components/components/related_navigation/_section.html.erb

@@ -16,7 +16,7 @@
     %>
   <% end %>
 
-  <ul class="gem-c-related-navigation__link-list" data-module="track-click">
+  <ul class="gem-c-related-navigation__link-list" data-module="gem-track-click">
     <% constructed_link_array = [] %>
 
     <% section_link_limit = related_nav_helper.calculate_section_link_limit(links) %>
@@ -26,7 +26,7 @@
         link_element = link_to(
           link[:text],
           link[:path],
-          class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link, (index >= section_link_limit)),
+          class: related_nav_helper.section_css_class("gem-c-related-navigation__section-link", section_title, link: link, link_is_inline: (index >= section_link_limit)),
           rel: link[:rel],
           lang: shared_helper.t_locale_check(link[:locale]),
           data: {

data/lib/govuk_publishing_components/app_helpers/table_helper.rb

@@ -15,6 +15,7 @@ module GovukPublishingComponents
           yield(builder)
         end
       end
+
       class TableBuilder
         include ActionView::Helpers::UrlHelper
         include ActionView::Helpers::TagHelper
@@ -57,7 +58,7 @@ module GovukPublishingComponents
 
         def cell(str, opt = {})
           classes = %w[govuk-table__cell]
-          classes << "govuk-table__cell--" + opt[:format] if opt[:format]
+          classes << "govuk-table__cell--#{opt[:format]}" if opt[:format]
           classes << "govuk-table__cell--empty" unless str
           str ||= "Not set"
           tag.td str, class: classes

data/lib/govuk_publishing_components/presenters/machine_readable/faq_page_schema.rb

@@ -88,7 +88,7 @@ module GovukPublishingComponents
       end
 
       def section_url(anchor)
-        return page_url + "#" + anchor if anchor.present?
+        return "#{page_url}##{anchor}" if anchor.present?
 
         page_url
       end

data/lib/govuk_publishing_components/presenters/machine_readable/html_publication_schema.rb

@@ -1,12 +1,6 @@
 module GovukPublishingComponents
   module Presenters
     class HtmlPublicationSchema < FaqPageSchema
-      attr_reader :page
-
-      def initialize(page)
-        @page = page
-      end
-
       def structured_data
         return ArticleSchema.new(page).structured_data if less_than_two_headings_of_any_one_type?
 
@@ -55,7 +49,7 @@ module GovukPublishingComponents
       # {:a => :b, :b => :c}
       def pairs_hash(array)
         all_but_last = array[0..-2]
-        all_but_first = array[1..-1]
+        all_but_first = array[1..]
         pairs = [all_but_last, all_but_first].transpose
         Hash[pairs]
       end

data/lib/govuk_publishing_components/presenters/meta_tags.rb

@@ -20,8 +20,7 @@ module GovukPublishingComponents
         meta_tags = add_organisation_tags(meta_tags)
         meta_tags = add_political_tags(meta_tags)
         meta_tags = add_taxonomy_tags(meta_tags)
-        meta_tags = add_step_by_step_tags(meta_tags)
-        meta_tags
+        add_step_by_step_tags(meta_tags)
       end
 
     private

data/lib/govuk_publishing_components/presenters/related_navigation_helper.rb

@@ -58,14 +58,14 @@ module GovukPublishingComponents
           I18n.t(
             "components.related_#{@context}_navigation." + section_title,
             default: [
-              I18n.t("components.related_navigation." + section_title),
+              I18n.t("components.related_navigation.#{section_title}"),
               section_title.tr("_", " "),
             ],
           )
         end
       end
 
-      def section_css_class(css_class, section_title, link = {}, link_is_inline = false)
+      def section_css_class(css_class, section_title, link: {}, link_is_inline: false)
         css_classes = [css_class]
         css_classes << "#{css_class}--#{@context}" unless @context.nil?
         css_classes << "#{css_class}--inline" if link_is_inline

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.3.0".freeze
+  VERSION = "24.3.1".freeze
 end

data/lib/tasks/govuk_publishing_components_tasks.rake

@@ -14,7 +14,7 @@ namespace :component do
 
     if components_missing_docs.any?
       error = "You have components which are missing documentation. These components will not be displayed in the component guide:\n"
-      components_missing_docs.each { |component| error += "\t" + component + "\n" }
+      components_missing_docs.each { |component| error += "\t#{component}\n" }
       error += "\n"
       raise NotImplementedError, error
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.3.0
+  version: 24.3.1
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-18 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config
@@ -238,16 +238,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.0.pre.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 4.0.0.pre.1
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1860,7 +1860,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="