govuk-components 2.1.3 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ff2f2871745bc313242de390b143fd475f0983e6ddf03c627512d26e5c52b8c
-  data.tar.gz: c191fa0f05fea8fa6bc19d9fddf8528802086a05f63217e4b48079329cf25a87
+  metadata.gz: 14fa3254f2a6cfe00069f3342241b165dbf00f746a6bff31170f291977614f32
+  data.tar.gz: a61d4942fa381ee173bc0f397517485f0b0617e5eff7b7a015bbdb9c7ab2fd5f
 SHA512:
-  metadata.gz: ea255c815feebd10555c8f403b4cd3ebac0d807cd1f4fe9a34442318a2f95d75cbbe309fb0f18aebbfcc0a7c32ee3bc962c971717fe7f9506ab10844eea8cda0
-  data.tar.gz: 6dada7350b560d7b967fa1bba83231d82173b1f81c90c563d803583fc4d99347a9973e193adda2eb58af86a86183d5e22d3b17d5e7be3aa9fb0ec8066af75c04
+  metadata.gz: 163dc576f943962d3730e505b131a98963231b3ae95d3bfdf0d78409c5aa35f9198c518978dfbfc16e8dbadc99ae19fcde97a7b318e782fbb476190eb810dad1
+  data.tar.gz: 05a0b60347a348e4f006d0c5e4dad3e2afe3a603b0a6fae3150d2ef34ff200f6f83ab6dce65bd009dcf897ca649aaaca1fc7e66ac59044ba1bd40c0aef884bf5

data/app/components/govuk_component/accordion_component/section_component.rb

@@ -34,8 +34,6 @@ class GovukComponent::AccordionComponent::SectionComponent < GovukComponent::Bas
 private
 
   def default_classes
-    %w(govuk-accordion__section).tap do |classes|
-      classes.append("govuk-accordion__section--expanded") if expanded?
-    end
+    class_names("govuk-accordion__section", "govuk-accordion__section--expanded" => expanded?).split
   end
 end

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -12,10 +12,11 @@ class GovukComponent::BreadcrumbsComponent < GovukComponent::Base
 private
 
   def default_classes
-    %w(govuk-breadcrumbs).tap do |classes|
-      classes << "govuk-!-display-none-print" if hide_in_print
-      classes << "govuk-breadcrumbs--collapse-on-mobile" if collapse_on_mobile
-    end
+    class_names(
+      "govuk-breadcrumbs",
+      "govuk-!-display-none-print" => hide_in_print,
+      "govuk-breadcrumbs--collapse-on-mobile" => collapse_on_mobile
+    ).split
   end
 
   def build_list(breadcrumbs)

data/app/components/govuk_component/cookie_banner_component.rb

@@ -1,13 +1,14 @@
 class GovukComponent::CookieBannerComponent < GovukComponent::Base
   renders_many :messages, GovukComponent::CookieBannerComponent::MessageComponent
 
-  attr_accessor :aria_label, :hidden
+  attr_accessor :aria_label, :hidden, :hide_in_print
 
-  def initialize(aria_label: "Cookie banner", hidden: false, classes: [], html_attributes: {})
+  def initialize(aria_label: "Cookie banner", hidden: false, hide_in_print: true, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @aria_label = aria_label
-    @hidden     = hidden
+    @aria_label    = aria_label
+    @hidden        = hidden
+    @hide_in_print = hide_in_print
   end
 
   def call
@@ -19,6 +20,6 @@ class GovukComponent::CookieBannerComponent < GovukComponent::Base
 private
 
   def default_classes
-    %w(govuk-cookie-banner)
+    class_names("govuk-cookie-banner", "govuk-!-display-none-print" => hide_in_print).split
   end
 end

data/app/components/govuk_component/footer_component.html.erb

@@ -1,5 +1,13 @@
 <%= tag.footer(class: classes, role: 'contentinfo', **html_attributes) do %>
   <%= tag.div(class: container_classes, **container_html_attributes) do %>
+    <% if navigation.present? %>
+      <div class="govuk-footer__navigation">
+        <%= navigation %>
+      </div>
+
+      <hr class="govuk-footer__section-break">
+    <% end %>
+
     <%= tag.div(class: meta_classes, **meta_html_attributes) do %>
       <% if meta.present? %>
         <%= meta %>
@@ -31,9 +39,8 @@
             <%= meta_content %>
           <% end %>
         </div>
-        <div class="govuk-footer__meta">
-          <%= tag.div(copyright, class: "govuk-footer__meta-item") %>
-        </div>
+
+        <%= tag.div(copyright, class: "govuk-footer__meta-item") %>
       <% end %>
     <% end %>
   <% end %>

data/app/components/govuk_component/footer_component.rb

@@ -1,6 +1,7 @@
 class GovukComponent::FooterComponent < GovukComponent::Base
   renders_one :meta_html
   renders_one :meta
+  renders_one :navigation
 
   attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright, :custom_container_classes
 
@@ -76,7 +77,7 @@ private
   end
 
   def default_copright_text
-    raw(%(&copy Crown copyright))
+    raw(%(© Crown copyright))
   end
 
   def default_copyright_url

data/app/components/govuk_component/tab_component.rb

@@ -35,9 +35,7 @@ private
     end
 
     def li_classes(i = nil)
-      %w(govuk-tabs__list-item).tap do |c|
-        c.append("govuk-tabs__list-item--selected") if i&.zero?
-      end
+      class_names("govuk-tabs__list-item", "govuk-tabs__list-item--selected" => i&.zero?).split
     end
 
     def li_link

data/app/components/govuk_component/table_component/caption_component.rb

@@ -26,9 +26,7 @@ private
   end
 
   def default_classes
-    %w(govuk-table__caption).tap do |c|
-      c << caption_size_class if @size
-    end
+    class_names("govuk-table__caption", caption_size_class => size).split
   end
 
   def caption_size_class

data/app/components/govuk_component/table_component/cell_component.rb

@@ -37,19 +37,13 @@ private
 
   def default_classes
     if header
-      %w(govuk-table__header).tap do |c|
-        c << "govuk-table__header--numeric" if numeric?
-        c << width_class if width?
-      end
+      class_names("govuk-table__header", "govuk-table__header--numeric" => numeric?, width_class => width?).split
     else
-      %w(govuk-table__cell).tap do |c|
-        c << "govuk-table__cell--numeric" if numeric?
-        c << width_class if width?
-      end
+      class_names("govuk-table__cell", "govuk-table__cell--numeric" => numeric?, width_class => width?).split
     end
   end
 
   def width_class
-    WIDTHS.fetch(width)
+    WIDTHS.fetch(width, nil)
   end
 end

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.1.3'.freeze
+    VERSION = '2.1.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.6
 platform: ruby
 authors:
 - DfE developers
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.49.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.49.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components