govuk-components 6.3.0 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599145bab2755c839151a6b0274aedf1ce13e05a8f17ae59422fc114ee46c7d4
-  data.tar.gz: ba51ce7a153d2b3679eb3230822bee50eccdb188b78f9eaf10da62e78bd05dc1
+  metadata.gz: 97cb13bbf94f21942d186a15574ab81753e4c14b26382775ab5dcc748043ce68
+  data.tar.gz: b10e0c6b31295930c300d84f51501fedb36de8e33bfb4de528bfd1ae237b5729
 SHA512:
-  metadata.gz: f1ddf79f5f07a8e6864d2fdc2be917e2f53b6b0f243ea25edc6610c0aee3610b608316f1028683a7c92be6ffdfa7e1b52f107870be6084e223dc57f41465cca8
-  data.tar.gz: 74f782050a58f32622423ba4157a2e801f94c4d5ac92b91c7f0774dfe02a2506b7c0052e8847de8e1df180dc777d8fef5943c705c244cc6059d4afb05bd3f968
+  metadata.gz: 3b5077e7da99cd661503e8625735a2b13d322f772f2b83b65da20caf697ba24818b454d35a6dcd7ef48a4477e2d0710c7e3eeb976167a66f6acd4e75922504c5
+  data.tar.gz: d80c55dca5308bb77e4158274d47e93a5ce22fa98aef05441c314951232696304ce1ee083bf851e2abe1ee97c3b0edd67a18dfc2195fb512bacb64a76a9b4bf0

data/README.md

@@ -4,7 +4,7 @@
 [![Gem version](https://badge.fury.io/rb/govuk-components.svg)](https://badge.fury.io/rb/govuk-components)
 [![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
 [![Licence](https://img.shields.io/github/license/x-govuk/govuk-components)](https://github.com/x-govuk/govuk-components/blob/main/LICENSE.txt)
-[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.2.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.3.0-brightgreen)](https://design-system.service.gov.uk)
 [![ViewComponent](https://img.shields.io/badge/ViewComponent-4.6.0-brightgreen)](https://viewcomponent.org/)
 [![Rails](https://img.shields.io/badge/Rails-7.2.2%20%E2%95%B1%208.0.2%20%E2%95%B1%208.1.0-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.3.11%20%20%E2%95%B1%204.0.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)

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

@@ -1,6 +1,6 @@
 <%= tag.footer(**footer_attributes) do %>
   <%= content %>
-  <%= tag.div(role: 'contentinfo', **html_attributes) do %>
+  <%= tag.div(**html_attributes) do %>
     <%= tag.div(**container_html_attributes) do %>
       <%= tag.svg(class: "#{brand}-footer__crown", focusable: "false", role: "presentation", xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 64 60", height: "30", width: "32", fill: "currentColor") do %>
         <g>

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

@@ -0,0 +1,18 @@
+<%= tag.header(**header_html_attributes) do %>
+  <%= tag.div(class: "#{brand}-generic-header", **html_attributes) do %>
+    <%= tag.div(class: ["#{brand}-generic-header__container", "#{brand}-width-container"]) do %>
+      <%= tag.div(class: "#{brand}-generic-header__logo") do %>
+        <%=
+          case
+          when logo.present? then logo
+          when url.present? then link_to(logo_text, url, class: "#{brand}-generic-header__homepage-link")
+          else logo_text
+          end
+        %>
+      <% end %>
+      <%= content %>
+    <% end %>
+  <% end %>
+  <%= service_navigation %>
+  <%= phase_banner %>
+<% end %>

data/app/components/govuk_component/generic_header_component.rb

@@ -0,0 +1,36 @@
+class GovukComponent::GenericHeaderComponent < GovukComponent::Base
+  renders_one :logo
+  renders_one :service_navigation, "GovukComponent::ServiceNavigationComponent"
+  renders_one :phase_banner, "GovukComponent::PhaseBannerComponent"
+
+  attr_reader :url,
+              :logo_text,
+              :menu_button_label,
+              :header_html_attributes
+
+  def initialize(url: nil,
+                 logo_text: nil,
+                 classes: [],
+                 html_attributes: {},
+                 header_html_attributes: {})
+
+    @url = url
+    @logo_text = logo_text
+    @header_html_attributes = header_html_attributes
+
+    super(classes:, html_attributes:)
+  end
+
+  def before_render
+    if logo.blank?
+      fail(ArgumentError, 'logo_text missing') if logo_text.blank?
+      fail(ArgumentError, 'url missing') if url.blank?
+    end
+  end
+
+private
+
+  def default_attributes
+    { class: class_names("#{brand}-generic-header") }
+  end
+end

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

@@ -1,4 +1,4 @@
-<header>
+<%= tag.header(**header_html_attributes) do %>
   <%= tag.div(data: { module: "#{brand}-header" }, **html_attributes) do %>
     <%= tag.div(**container_html_attributes) do %>
       <div class="<%= brand %>-header__logo">
@@ -41,4 +41,4 @@
   <% end %>
   <%= service_navigation %>
   <%= phase_banner %>
-</header>
+<% end %>

data/app/components/govuk_component/header_component.rb

@@ -5,25 +5,22 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
   renders_one :phase_banner, "GovukComponent::PhaseBannerComponent"
 
   attr_reader :homepage_url,
-              :service_name,
               :service_url,
-              :menu_button_label,
               :custom_container_classes,
-              :full_width_border
+              :full_width_border,
+              :header_html_attributes
 
   def initialize(classes: [],
                  html_attributes: {},
                  homepage_url: config.default_header_homepage_url,
-                 menu_button_label: config.default_header_menu_button_label,
                  container_classes: nil,
-                 full_width_border: false)
+                 full_width_border: false,
+                 header_html_attributes: {})
 
     @homepage_url              = homepage_url
-    @service_name              = service_name
-    @service_url               = service_url
-    @menu_button_label         = menu_button_label
     @custom_container_classes  = container_classes
     @full_width_border         = full_width_border
+    @header_html_attributes    = header_html_attributes
 
     super(classes:, html_attributes:)
   end

data/app/helpers/govuk_components_helper.rb

@@ -7,6 +7,7 @@ module GovukComponentsHelper
     govuk_details: 'GovukComponent::DetailsComponent',
     govuk_exit_this_page: 'GovukComponent::ExitThisPageComponent',
     govuk_footer: 'GovukComponent::FooterComponent',
+    govuk_generic_header: 'GovukComponent::GenericHeaderComponent',
     govuk_header: 'GovukComponent::HeaderComponent',
     govuk_inset_text: 'GovukComponent::InsetTextComponent',
     govuk_notification_banner: 'GovukComponent::NotificationBannerComponent',

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '6.3.0'.freeze
+    VERSION = '6.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 6.3.0
+  version: 6.4.0
 platform: ruby
 authors:
 - DfE developers
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -360,6 +359,8 @@ files:
 - app/components/govuk_component/exit_this_page_component.rb
 - app/components/govuk_component/footer_component.html.erb
 - app/components/govuk_component/footer_component.rb
+- app/components/govuk_component/generic_header_component.html.erb
+- app/components/govuk_component/generic_header_component.rb
 - app/components/govuk_component/header_component.html.erb
 - app/components/govuk_component/header_component.rb
 - app/components/govuk_component/inset_text_component.rb
@@ -422,7 +423,6 @@ homepage: https://github.com/x-govuk/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -430,15 +430,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: GOV.UK Components for Ruby on Rails
 test_files: []