govuk-components 5.0.0b4 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e61252c526732d7919b0fc8c0818af26742357a007b18a0e919448ac8069319
-  data.tar.gz: 4c1271fc9c6ccfb1c15b33e4716841d86f0bbb5d77b2747a4ec2a6a21163448c
+  metadata.gz: 803f46227b24a4b94f6c9a18dba4040b95de1248ec04711fdba577848ed69d9c
+  data.tar.gz: 05d27bec17047ccf6dbb45b9e7bd2d7d5986dad4edb8724c3a144139d5e03baa
 SHA512:
-  metadata.gz: 22eb5f538044e5047270e2ed6cf8b5a93770a46913cf4df3ad259ccd560c6085ddfe257fe93fafbfbe518e05b25c0dbb471a0dd8c12ee2a35a8be44c4496bbfa
-  data.tar.gz: 2aa37663c893724c13382561c3120e754cb49ea0bc7cc9c52846d2cda203beb772e06e3c7b1c03b2c69e18bae8c586f2f12efa0dd4901330d53ed12b9f7de3a2
+  metadata.gz: 6a3b59c877f5dd616144faca5585a4a8c7750d78f7398f3424de98f4096af2e30c70aaa9fa3b959de294a064bdaeee55560aac2c0a43c135ee76ce6f5b92397e
+  data.tar.gz: '00668905d6bb618e00f3c61283b74d093d978c33c55d2e5fd0723bf3ac002d52e8ee6ec2b4a409f02e81ec89f2342afe15fda0cc8245468a06c66a7365e69862'

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/x-govuk/govuk-components/test_coverage)
 [![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-4.7.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-5.0.0-brightgreen)](https://design-system.service.gov.uk)
 [![ViewComponent](https://img.shields.io/badge/ViewComponent-3.3.0-brightgreen)](https://viewcomponent.org/)
 [![Rails](https://img.shields.io/badge/Rails-7.0.8%20%E2%95%B1%207.1.0-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.0.6%20%20%E2%95%B1%203.1.4%20%20%E2%95%B1%203.2.2-E16D6D)](https://www.ruby-lang.org/en/downloads/)

data/app/components/govuk_component/summary_list_component/action_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Base
-  attr_reader :href, :text, :visually_hidden_text, :attributes, :classes
+  attr_reader :href, :text, :visually_hidden_text, :visually_hidden_action_suffix, :attributes, :classes
 
-  def initialize(href: nil, text: 'Change', visually_hidden_text: false, classes: [], html_attributes: {})
+  def initialize(href: nil, text: 'Change', visually_hidden_text: false, visually_hidden_action_suffix: nil, classes: [], html_attributes: {})
     @visually_hidden_text = visually_hidden_text
 
     if config.require_summary_list_action_visually_hidden_text && visually_hidden_text == false
@@ -9,9 +9,9 @@ class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Ba
     end
 
     super(classes: classes, html_attributes: html_attributes)
-
     @href = href
     @text = text
+    @visually_hidden_action_suffix = visually_hidden_action_suffix
   end
 
   def render?
@@ -36,7 +36,13 @@ private
     content || text || fail(ArgumentError, "no text or content")
   end
 
+  def visually_hidden_content
+    return "#{visually_hidden_text} (#{visually_hidden_action_suffix})" if visually_hidden_action_suffix
+
+    visually_hidden_text
+  end
+
   def visually_hidden_span
-    tag.span(%( #{visually_hidden_text}), class: "#{brand}-visually-hidden") if visually_hidden_text.present?
+    tag.span(%( #{visually_hidden_content}), class: "#{brand}-visually-hidden") if visually_hidden_text.present?
   end
 end

data/app/components/govuk_component/summary_list_component/card_component.html.erb

@@ -5,7 +5,7 @@
     <% if actions.any? %>
       <ul class="<%= brand %>-summary-card__actions">
         <% actions.each do |action| %>
-          <%= tag.li(action, class: "#{brand}-summary-card__action") %>
+          <%= tag.li(action_text(action), class: "#{brand}-summary-card__action") %>
         <% end %>
       </ul>
     <% end %>

data/app/components/govuk_component/summary_list_component/card_component.rb

@@ -16,4 +16,8 @@ private
   def default_attributes
     { class: "#{brand}-summary-card" }
   end
+
+  def action_text(action)
+    safe_join([action, tag.span(" (" + title + ")", class: "#{brand}-visually-hidden")])
+  end
 end

data/app/components/govuk_component/summary_list_component/row_component.rb

@@ -1,12 +1,23 @@
 class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
-  attr_reader :href, :visually_hidden_text, :show_actions_column
+  attr_reader :href, :visually_hidden_text, :show_actions_column, :visually_hidden_action_suffix
 
   renders_one :key, GovukComponent::SummaryListComponent::KeyComponent
   renders_one :value, GovukComponent::SummaryListComponent::ValueComponent
-  renders_many :actions, GovukComponent::SummaryListComponent::ActionComponent
+  renders_many :actions, ->(href: nil, text: 'Change', visually_hidden_text: false, classes: [], html_attributes: {}, &block) do
+    GovukComponent::SummaryListComponent::ActionComponent.new(
+      href: href,
+      text: text,
+      visually_hidden_text: visually_hidden_text,
+      visually_hidden_action_suffix: visually_hidden_action_suffix,
+      classes: classes,
+      html_attributes: html_attributes,
+      &block
+    )
+  end
 
-  def initialize(show_actions_column: nil, classes: [], html_attributes: {})
+  def initialize(show_actions_column: nil, visually_hidden_action_suffix: nil, classes: [], html_attributes: {})
     @show_actions_column = show_actions_column
+    @visually_hidden_action_suffix = visually_hidden_action_suffix
 
     super(classes: classes, html_attributes: html_attributes)
   end

data/app/components/govuk_component/summary_list_component.rb

@@ -1,20 +1,22 @@
 module GovukComponent
   class SummaryListComponent < GovukComponent::Base
-    attr_reader :borders, :actions, :card
+    attr_reader :borders, :actions, :card, :visually_hidden_action_suffix
 
     renders_many :rows, ->(classes: [], html_attributes: {}, &block) do
       GovukComponent::SummaryListComponent::RowComponent.new(
         show_actions_column: @show_actions_column,
+        visually_hidden_action_suffix: visually_hidden_action_suffix || card&.title,
         classes: classes,
         html_attributes: html_attributes,
         &block
       )
     end
 
-    def initialize(rows: nil, actions: true, borders: config.default_summary_list_borders, card: nil, classes: [], html_attributes: {})
-      @borders             = borders
-      @show_actions_column = actions
-      @card                = card
+    def initialize(rows: nil, actions: true, borders: config.default_summary_list_borders, card: {}, visually_hidden_action_suffix: nil, classes: [], html_attributes: {})
+      @borders                       = borders
+      @show_actions_column           = actions
+      @card                          = GovukComponent::SummaryListComponent::CardComponent.new(**card) if card.present?
+      @visually_hidden_action_suffix = visually_hidden_action_suffix
 
       super(classes: classes, html_attributes: html_attributes)
 
@@ -26,16 +28,20 @@ module GovukComponent
     def call
       summary_list = tag.dl(**html_attributes) { safe_join(rows) }
 
-      (card.nil?) ? summary_list : card_with(summary_list)
+      (card?) ? card_with(summary_list) : summary_list
     end
 
   private
 
+    def card?
+      @card.present?
+    end
+
     # we're not using `renders_one` here because we always want the card to render
     # outside of the summary list. when manually building use
     # govuk_summary_list_card { govuk_summary_list }
     def card_with(summary_list)
-      render(GovukComponent::SummaryListComponent::CardComponent.new(**card)) { summary_list }
+      render(@card) { summary_list }
     end
 
     def borders_class

data/app/helpers/govuk_link_helper.rb

@@ -44,7 +44,7 @@ module GovukLinkHelper
   end
 
   def govuk_breadcrumb_link_to(name, href = nil, **kwargs, &block)
-    link_args = { class: "#{brand}-breadcrumbs--link" }.deep_merge_html_attributes(kwargs)
+    link_args = { class: "#{brand}-breadcrumbs__link" }.deep_merge_html_attributes(kwargs)
 
     link_to(name, href, **link_args, &block)
   end
@@ -88,12 +88,18 @@ private
   end
 
   def extract_link_args(new_tab: false, inverse: false, muted: false, no_underline: false, no_visited_state: false, text_colour: false, **kwargs)
+    Rails.logger.warn(actions_warning_message(kwargs.fetch(:action))) if kwargs.key?(:action)
+    Rails.logger.warn(controller_warning_message(kwargs.fetch(:controller))) if kwargs.key?(:controller)
+
     link_classes = extract_link_classes(inverse: inverse, muted: muted, no_underline: no_underline, no_visited_state: no_visited_state, text_colour: text_colour)
 
     { **link_classes, **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
   end
 
   def extract_button_link_args(new_tab: false, disabled: false, inverse: false, secondary: false, warning: false, **kwargs)
+    Rails.logger.warn(actions_warning_message(kwargs.fetch(:action))) if kwargs.key?(:action)
+    Rails.logger.warn(controller_warning_message(kwargs.fetch(:controller))) if kwargs.key?(:controller)
+
     button_classes = extract_button_classes(inverse: inverse, secondary: secondary, warning: warning)
 
     { **button_classes, **button_attributes(disabled), **new_tab_args(new_tab) }.deep_merge_html_attributes(kwargs)
@@ -139,6 +145,14 @@ private
 
     safe_join([govuk_visually_hidden(prefix), text, govuk_visually_hidden(suffix)].compact)
   end
+
+  def actions_warning_message(value)
+    "action: '#{value}' parameter detected Support for old style controller/action links has been removed. See https://github.com/x-govuk/govuk-components/releases/tag/v5.0.0"
+  end
+
+  def controller_warning_message(value)
+    "controller: '#{value}' parameter detected. Support for old style controller/action links has been removed. See https://github.com/x-govuk/govuk-components/releases/tag/v5.0.0"
+  end
 end
 
 ActiveSupport.on_load(:action_view) { include GovukLinkHelper }

data/app/helpers/{govuk_rails_compatibile_link_helper.rb → govuk_rails_compatible_link_helper.rb}

@@ -1,6 +1,6 @@
 require "html_attributes_utils"
 
-module GovukRailsCompatibileLinkHelper
+module GovukRailsCompatibleLinkHelper
   using HTMLAttributesUtils
 
   def govuk_link_classes(*styles, default_class: "#{brand}-link")

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '5.0.0b4'.freeze
+    VERSION = '5.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 5.0.0b4
+  version: 5.0.1
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-29 00:00:00.000000000 Z
+date: 2023-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -53,7 +53,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +63,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -280,14 +280,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: slim_lint
   requirement: !ruby/object:Gem::Requirement
@@ -385,7 +385,7 @@ files:
 - app/helpers/govuk_components_helper.rb
 - app/helpers/govuk_exit_this_page_link_helper.rb
 - app/helpers/govuk_link_helper.rb
-- app/helpers/govuk_rails_compatibile_link_helper.rb
+- app/helpers/govuk_rails_compatible_link_helper.rb
 - app/helpers/govuk_skip_link_helper.rb
 - app/helpers/govuk_visually_hidden_helper.rb
 - app/helpers/title_with_error_prefix_helper.rb
@@ -410,9 +410,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.33
 signing_key: