govuk-components 3.1.2 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b5dce8d53f4985c84480f5c770bb75727ab288ee938d0d4fabfbbad2a08b34a
-  data.tar.gz: a48fee01465a83dd33bbc6047d0c90599cc05574645d68c8b2cd2f6cba2f9078
+  metadata.gz: 632ec1fef8b22693d71008152c6adb25bde2cd400895618b41d14056466cd055
+  data.tar.gz: 4ccf73c83e598e6419c8e82e700870861c338a19e1d083bc2820f6433d19f549
 SHA512:
-  metadata.gz: 807a2be466fa64f2c124c1b2e39468e73b0f7bac592221aa222fc9a640a30b5a19ffd2d88a8ef77735537c0b3ee8cf7d70db61b3e04da766c6e3b6f4d493a898
-  data.tar.gz: fc0da82704eca9c674aa646836db4fefbab450258866c3b05de6767202808eea87fc7346dbf2d90af5c6040edf2b479ed9ff197ff6d891b65f455e399e741ab0
+  metadata.gz: cba06bc11666a450af21e78aa2e0516ee3d270172200e2ea0fa5256a53468535081bcf42a72827e456bbdf948bed9a629734b36534a27dcef8728ed652d6de1e
+  data.tar.gz: f967118acba6ea0c32304ac8af943bcf8a7a63dfa62ae28b004413f1dedf4ad70bd994cb8b3df144c294250929951deb927f008208144aaa7aed33fadca43022

data/README.md

@@ -6,7 +6,7 @@
 [![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/main/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.2.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.3.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Rails-6.1.5%20%E2%95%B1%207.0.3-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-2.7.5%20%20%E2%95%B1%203.0.3%20%20%E2%95%B1%203.1.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
@@ -14,6 +14,15 @@ This gem provides a suite of reusable components for the [GOV.UK Design System](
 
 It aims to implement the functionality from the original Nunjucks macros in a way that will feel more familiar to Rails developers. Blocks are preferred over strings of HTML, beneath the surface each component is just a Ruby object, everything is inheritable and overrideable.
 
+## Documentation
+
+The gem comes with [a full guide](https://govuk-components.netlify.app/) that
+covers most aspects of day-to-day use, along with code and output examples. The
+examples in the guide (and the guide itself) are built using the components,
+so it will always be up to date.
+
+[![Netlify Status](https://api.netlify.com/api/v1/badges/d40a5a0a-b086-4c35-b046-97fbcbf9f219/deploy-status)](https://app.netlify.com/sites/govuk-components/deploys)
+
 ## What’s included?
 
 All of the non-form components from the GOV.UK Design System are implemented by this library as ViewComponents. Form components are implemented by the [GOV.UK Form Builder](https://govuk-form-builder.netlify.app/).

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.html.erb

@@ -37,7 +37,7 @@
 
         <% if navigation_items.any? %>
           <%= tag.nav(**navigation_html_attributes) do %>
-            <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), aria: { controls: "navigation", label: menu_button_label }) %>
+            <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), hidden: true, aria: { controls: "navigation", label: menu_button_label }) %>
             <ul id="navigation" class="govuk-header__navigation-list">
               <% navigation_items.each do |item| %>
                 <%= item %>

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.2'.freeze
+    VERSION = '3.1.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.5
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.29.0
+        version: 3.30.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.29.0
+        version: 3.30.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -360,7 +360,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - README.md
 - Rakefile
 - app/components/govuk_component.rb
@@ -428,7 +427,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 +443,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: []

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright 2020 Peter Yates
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.