govuk-components 3.1.1 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb212d5aeb799affbe885b0a386f4f012e29938efeb71c7f4931c8ba5d16eb15
-  data.tar.gz: 45cb8082ee1df09af0a0528d1fb6f05e3113b2bd958bc334065e1c651017bff2
+  metadata.gz: d3840e40ffafa0fc239e251a1fd9f76c2bf6b290d0ea2f6df6a0dfd7300dd5f7
+  data.tar.gz: e0bbfa5d779cf3a40edce2b7282beb355738643098f50bb6a24dcb5c182a3548
 SHA512:
-  metadata.gz: 46fedf48b9bacd94e9c846cad6fbf7a1bcbb342aa01f6f2e06123131dcd1982c01b0420ad2a1b9f62a78298575b81fb6de8b2047ee1d75d43ad490837046e95a
-  data.tar.gz: 3913d6cadd186bf5d0c349e644bd27234a6a0aa94b7b45fe33ed30eec342addb6ef53e5b4d43ab5e89ae7bb361d1e2cecb1d7e10580db33ccb18d74ef19ad5df
+  metadata.gz: bdf53c97e701ab06061022e6058e70a5bc8566cd5b6fb563c51c53c364d2d70281f2aea9883bafc8f7c510be4e3fbe478580cd3dd6496e00f774c7b9f5e4b044
+  data.tar.gz: 7b85bbcdd1f5f05fe12a1bacdd6a56e488428174976f1b92db1eb9cfb17e9487f3c569e14532c91e6f5611e94afff18251984200c8406345dd463f296f1421e9

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -28,7 +28,7 @@ private
     when Hash
       breadcrumbs.map { |text, link| build_list_item(text, link) }
     else
-      fail(ArgumentError, "breadcrumb must be an array or hash")
+      fail(ArgumentError, "breadcrumbs must be an array or hash")
     end
   end
 

data/app/components/govuk_component/footer_component.rb

@@ -65,9 +65,14 @@ private
   def build_meta_links(links)
     return [] if links.blank?
 
-    fail(ArgumentError, 'meta links must be a hash') unless links.is_a?(Hash)
-
-    links.map { |text, href| raw(link_to(text, href, class: %w(govuk-footer__link))) }
+    case links
+    when Array
+      links.map { |link| raw(link_to(link[:text], link[:href], class: %w(govuk-footer__link), **link.fetch(:attr, {}))) }
+    when Hash
+      links.map { |text, href| raw(link_to(text, href, class: %w(govuk-footer__link))) }
+    else
+      fail(ArgumentError, 'meta links must be a hash or array of hashes') unless links.is_a?(Hash)
+    end
   end
 
   def default_licence

data/app/components/govuk_component/header_component.rb

@@ -105,6 +105,7 @@ private
 
     def active?
       return @active_override unless @active_override.nil?
+      return false if href.blank?
 
       current_page?(href)
     end

data/app/components/govuk_component/start_button_component.rb

@@ -1,29 +1,38 @@
 class GovukComponent::StartButtonComponent < GovukComponent::Base
   BUTTON_ATTRIBUTES = {
-    role: 'button',
     draggable: 'false',
     data: { module: 'govuk-button' }
   }.freeze
 
-  attr_reader :text, :href
+  LINK_ATTRIBUTES = BUTTON_ATTRIBUTES.merge({ role: 'button' }).freeze
 
-  def initialize(text:, href:, classes: [], html_attributes: {})
+  attr_reader :text, :href, :as_button
+
+  def initialize(text:, href:, as_button: false, classes: [], html_attributes: {})
     @text = text
     @href = href
+    @as_button = as_button
 
     super(classes: classes, html_attributes: html_attributes)
   end
 
   def call
-    link_to(href, **html_attributes) do
-      safe_join([text, icon])
+    if as_button
+      button_to(href, **html_attributes) do
+        safe_join([text, icon])
+      end
+    else
+      link_to(href, **html_attributes) do
+        safe_join([text, icon])
+      end
     end
   end
 
 private
 
   def default_attributes
-    BUTTON_ATTRIBUTES.merge({ class: %w(govuk-button govuk-button--start) })
+    (as_button ? BUTTON_ATTRIBUTES : LINK_ATTRIBUTES)
+      .merge({ class: %w(govuk-button govuk-button--start) })
   end
 
   def icon

data/app/helpers/govuk_link_helper.rb

@@ -68,7 +68,7 @@ module GovukLinkHelper
 
   def govuk_button_link_to(name = nil, options = nil, extra_options = {}, &block)
     extra_options = options if block_given?
-    html_options = GovukComponent::StartButtonComponent::BUTTON_ATTRIBUTES
+    html_options = GovukComponent::StartButtonComponent::LINK_ATTRIBUTES
       .merge build_html_options(extra_options, style: :button)
 
     if block_given?

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '3.1.1'.freeze
+    VERSION = '3.1.4'.freeze
   end
 end

data/lib/govuk/components.rb

@@ -3,3 +3,4 @@ require "view_component"
 require "govuk/components/helpers/css_utilities"
 require "govuk/components/engine"
 require "html_attributes_utils"
+require "pagy"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.4
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: pagy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
@@ -226,20 +240,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.11'
-- !ruby/object:Gem::Dependency
-  name: pagy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 5.10.1
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -428,7 +428,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -444,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []