govuk-components 2.1.4 → 3.0.0b3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a21817c2a776dc4571b5d5dab5a6492d4648672c6ec1603b1955132a811108
-  data.tar.gz: 00e69dbbf540695dcaa130e21f9a340293d80cc73bbb1b9ee6827e39c063d0e7
+  metadata.gz: 07ed020fcee80322b4d5d89f39eab0fc2ee474916f94359a80ca9801a08a24aa
+  data.tar.gz: fe4a45acd08735f21c6b465b956d7372c7e3b8843016284a010aac7a080b6619
 SHA512:
-  metadata.gz: e2308aa03c1af4efb1aae22af50322cbb7aebdf03b1c8668b12918b8c1edcf53c197217ef66b7ab19d46c218386f60075f78e99957726e898e3492df5e0c7dfa
-  data.tar.gz: 77bccd1dd23d937d82c1e058fed2803a14e62a99e15acdb4841134249b24bef8992a9347c11920a95a620d28a13f0d7af187f992c1e8f232c45eda5c99bc969e
+  metadata.gz: f7892945af9393cac946f328fe0262da01ecd2c0a489f00a002e2599b03d94d48fef1e1c1e5e679270fdd9c15f8448f7a3835858db34487219eb1c671cbd6ca3
+  data.tar.gz: 39dee312be4c324de08d94077d53b05af472a33773f0c1187aaa9986e13ccbaa4d33f4ae7665b666e4a35fd680c1224a6c536666f544f9d17dff8cfa1e322552

data/README.md

@@ -2,47 +2,52 @@
 
 [![Tests](https://github.com/DFE-Digital/govuk-components/workflows/Tests/badge.svg)](https://github.com/DFE-Digital/govuk-components/actions?query=workflow%3ATests)
 [![Maintainability](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/maintainability)](https://codeclimate.com/github/DFE-Digital/govuk-components/maintainability)
+[![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)
 [![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/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.1-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.0.0-brightgreen)](https://design-system.service.gov.uk)
+[![Rails](https://img.shields.io/badge/Rails-6.1.4.4%20%E2%95%B1%207.0.0-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-2.7.5%20%20%E2%95%B1%203.0.3-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
-This gem provides a suite of reusable components for the [GOV.UK Design System](https://design-system.service.gov.uk/). It is intended to provide a lightweight alternative to the [GOV.UK Publishing Components](https://github.com/alphagov/govuk_publishing_components) library and is built with Github's [ViewComponent](https://github.com/github/view_component) framework.
+This gem provides a suite of reusable components for the [GOV.UK Design System](https://design-system.service.gov.uk/). It is intended to provide a lightweight alternative to the [GOV.UK Publishing Components](https://github.com/alphagov/govuk_publishing_components) library and is built with GitHub’s [ViewComponent](https://github.com/github/view_component) framework.
 
 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.
 
-## What's included?
+## What’s included?
 
-All of the non-form components from the GOV.UK Design System are implmented by this library as ViewComponents. Form components are implemented by the [form builder](https://govuk-form-builder.netlify.app/).
+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/).
 
 The provided components are:
 
-* [Accordion](https://dfe-digital.github.io/govuk-components/#accordion)
-* [Back link](https://dfe-digital.github.io/govuk-components/#back-links)
-* [Back to top link](https://dfe-digital.github.io/govuk-components/#back-to-top-link)
-* [Breadcrumbs](https://dfe-digital.github.io/govuk-components/#breadcrumbs)
-* [Cookie banner](https://dfe-digital.github.io/govuk-components/#cookie-banner)
-* [Details](https://dfe-digital.github.io/govuk-components/#details)
-* [Footer](https://dfe-digital.github.io/govuk-components/#footer)
-* [Header](https://dfe-digital.github.io/govuk-components/#header)
-* [Inset text](https://dfe-digital.github.io/govuk-components/#inset-text)
-* [Notification banner](https://dfe-digital.github.io/govuk-components/#notification-banner)
-* [Panel](https://dfe-digital.github.io/govuk-components/#panel)
-* [Phase banner](https://dfe-digital.github.io/govuk-components/#phase-banner)
-* [Skip link](https://dfe-digital.github.io/govuk-components/#skip-link)
-* [Start button](https://dfe-digital.github.io/govuk-components/#start-button)
-* [Summary list](https://dfe-digital.github.io/govuk-components/#summary-list)
-* [Tabs](https://dfe-digital.github.io/govuk-components/#tabs)
-* [Tables](https://dfe-digital.github.io/govuk-components/#table)
-* [Tags](https://dfe-digital.github.io/govuk-components/#tags)
-* [Warning text](https://dfe-digital.github.io/govuk-components/#warning-text)
-
-This library also provides [several link helpers](https://dfe-digital.github.io/govuk-components/#links-and-buttons) that are commonly used in services, including `#govuk_link_to` and `#govuk_button_to`.
+* [Accordion](https://govuk-components.netlify.app/components/accordion)
+* [Back link](https://govuk-components.netlify.app/components/back-links)
+* [Back to top link](https://govuk-components.netlify.app/components/back-to-top-link)
+* [Breadcrumbs](https://govuk-components.netlify.app/components/breadcrumbs)
+* [Cookie banner](https://govuk-components.netlify.app/components/cookie-banner)
+* [Details](https://govuk-components.netlify.app/components/details)
+* [Footer](https://govuk-components.netlify.app/components/footer)
+* [Header](https://govuk-components.netlify.app/components/header)
+* [Inset text](https://govuk-components.netlify.app/components/inset-text)
+* [Notification banner](https://govuk-components.netlify.app/components/notification-banner)
+* [Panel](https://govuk-components.netlify.app/components/panel)
+* [Phase banner](https://govuk-components.netlify.app/components/phase-banner)
+* [Skip link](https://govuk-components.netlify.app/components/skip-link)
+* [Start button](https://govuk-components.netlify.app/components/start-button)
+* [Summary list](https://govuk-components.netlify.app/components/summary-list)
+* [Tabs](https://govuk-components.netlify.app/components/tabs)
+* [Tables](https://govuk-components.netlify.app/components/table)
+* [Tags](https://govuk-components.netlify.app/components/tags)
+* [Warning text](https://govuk-components.netlify.app/components/warning-text)
+
+This library also provides [link](https://govuk-components.netlify.app/helpers/link) and
+[button](https://govuk-components.netlify.app/helpers/button) helpers.
 
 ## Alternative syntax
 
 All of the components can be rendered in two ways:
 
-* directly using Rails' `#render` method:
+* directly using Rails’ `#render` method:
 
   ```erb
     <%= render GovukComponent::WarningTextComponent.new do %>
@@ -58,28 +63,26 @@ All of the components can be rendered in two ways:
     <% end %>
   ```
 
-  The naming convention for helpers is `govuk_` followed by the component's name in snake case. You can
-  see the full list in [GovukComponentsHelper](app/helpers/govuk_components_helper.rb).
+  The naming convention for helpers is `govuk_` followed by the component’s name in snake case. You can see the full list in [GovukComponentsHelper](app/helpers/govuk_components_helper.rb).
 
 ## Example use
 
-This library allows components to be rendered with Rails' `render` method or via the provided helpers. Here we'll use the `govuk_tabs` to render three tabbed sections:
+This library allows components to be rendered with Rails’ `render` method or via the provided helpers. Here we’ll use the `govuk_tabs` to render three tabbed sections:
 
 ```erb
 <%= govuk_tabs(title: 'Days of the week') do |component| %>
   <% component.tab(label: 'Monday') do %>
-    <p>Monday's child is fair of face</p>
+    <p>Monday’s child is fair of face</p>
   <% end %>
 
   <% component.tab(label: 'Tuesday') do %>
-    <p>Tuesday's child is full of grace</p>
+    <p>Tuesday’s child is full of grace</p>
   <% end %>
 
   <% component.tab(label: 'Wednesday') do %>
-    <p>Wednesday's child is full of woe</p>
+    <p>Wednesday’s child is full of woe</p>
   <% end %>
 <% end %>
-
 ```
 
 Here are the rendered tabs:
@@ -107,38 +110,38 @@ require "govuk/components"
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application’s Gemfile:
 
 ```ruby
 gem 'govuk-components'
 ```
 
 And then execute:
-```bash
-$ bundle
+
+```sh
+bundle
 ```
 
 Or install it yourself as:
-```bash
-$ gem install govuk-components
+
+```sh
+gem install govuk-components
 ```
 
 ## Contributing
 
-To setup the dummy app:
+Bug reports and feature requests are most welcome, please raise an issue or
+submit a pull request.
 
-`cd spec/dummy`
-`yarn install`
-`bundle install`
-`bin/rails db:create`
-`bin/rails db:migrate`
-`bin/rails s`
+Currently we're using [GOVUK Lint](https://github.com/alphagov/govuk-lint) to
+ensure code meets the GOV.UK guidelines. Please ensure that any PRs also adhere
+to this standard.
 
-After changing a component or adding a new one:
+To help keep the logs clean and tidy, please configure git to use your full name:
 
-* add or update the corresponding specs, and check they pass by running `bundle exec rspec`.
-
-* update the examples page by cd-ing into the dummy app `cd spec/dummy` and running the rake task `bin/rake generate_examples_page`.
+```sh
+git config --global user.name "Julius Hibbert"
+```
 
 ## License
 

data/app/components/govuk_component/back_link_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::BackLinkComponent < GovukComponent::Base
   attr_reader :text, :href
 
-  def initialize(href:, text: nil, classes: nil, html_attributes: {})
+  def initialize(href:, text: 'Back', classes: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
@@ -15,7 +15,7 @@ class GovukComponent::BackLinkComponent < GovukComponent::Base
 private
 
   def link_content
-    text || content || fail(ArgumentError, "no text or content")
+    content || text || fail(ArgumentError, "no text or content")
   end
 
   def default_classes

data/app/components/govuk_component/cookie_banner_component.rb

@@ -1,25 +1,27 @@
-class GovukComponent::CookieBannerComponent < GovukComponent::Base
-  renders_many :messages, GovukComponent::CookieBannerComponent::MessageComponent
+module GovukComponent
+  class CookieBannerComponent < GovukComponent::Base
+    renders_many :messages, "GovukComponent::CookieBannerComponent::MessageComponent"
 
-  attr_accessor :aria_label, :hidden, :hide_in_print
+    attr_accessor :aria_label, :hidden, :hide_in_print
 
-  def initialize(aria_label: "Cookie banner", hidden: false, hide_in_print: true, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: 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
-    @hide_in_print = hide_in_print
-  end
+      @aria_label    = aria_label
+      @hidden        = hidden
+      @hide_in_print = hide_in_print
+    end
 
-  def call
-    tag.div(class: classes, role: "region", aria: { label: aria_label }, hidden: hidden, **html_attributes) do
-      safe_join(messages)
+    def call
+      tag.div(class: classes, role: "region", aria: { label: aria_label }, data: { nosnippet: true }, hidden: hidden, **html_attributes) do
+        safe_join(messages)
+      end
     end
-  end
 
-private
+  private
 
-  def default_classes
-    class_names("govuk-cookie-banner", "govuk-!-display-none-print" => hide_in_print).split
+    def default_classes
+      class_names("govuk-cookie-banner", "govuk-!-display-none-print" => hide_in_print).split
+    end
   end
 end

data/app/components/govuk_component/details_component.rb

@@ -3,7 +3,7 @@ class GovukComponent::DetailsComponent < GovukComponent::Base
 
   renders_one :summary_html
 
-  def initialize(summary_text:, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
+  def initialize(summary_text: nil, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @summary_text = summary_text

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

@@ -36,7 +36,9 @@
           <% end %>
 
           <% if meta_content.present? %>
-            <%= meta_content %>
+            <div class="govuk-footer__meta-custom">
+              <%= meta_content %>
+            </div>
           <% end %>
         </div>
 

data/app/components/govuk_component/footer_component.rb

@@ -77,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/header_component.html.erb

@@ -36,14 +36,14 @@
         <% end %>
 
         <% if navigation_items.any? %>
-          <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), aria: { controls: "navigation", label: menu_button_label }) %>
-          <nav>
-            <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
+          <%= tag.nav(class: navigation_classes, aria: { label: navigation_label }) do %>
+            <%= tag.button("Menu", type: "button", class: %w(govuk-header__menu-button govuk-js-header-toggle), aria: { controls: "navigation", label: menu_button_label }) %>
+            <ul id="navigation" class="govuk-header__navigation-list">
               <% navigation_items.each do |item| %>
                 <%= item %>
               <% end %>
-            <% end %>
-          </nav>
+            </ul>
+          <% end %>
         <% end %>
       </div>
     <% end %>

data/app/components/govuk_component/phase_banner_component.rb

@@ -9,7 +9,7 @@ class GovukComponent::PhaseBannerComponent < GovukComponent::Base
   end
 
   def phase_tag_component
-    GovukComponent::TagComponent.new(classes: "govuk-phase-banner__content__tag", **phase_tag)
+    GovukComponent::TagComponent.new(**phase_tag.deep_merge(classes: "govuk-phase-banner__content__tag"))
   end
 
 private

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

@@ -9,12 +9,11 @@ class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Ba
     @visually_hidden_text = visually_hidden_text
   end
 
-  def call
-    # when no href is provided return an empty string so the dd container
-    # will render, it's useful in lists where some rows have actions
-    # and others don't
-    return "" if href.blank?
+  def render?
+    href.present?
+  end
 
+  def call
     link_classes = govuk_link_classes.append(classes).flatten
 
     link_to(href, class: link_classes, **html_attributes) do

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

@@ -1,12 +1,14 @@
 class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
-  attr_reader :href, :visually_hidden_text
+  attr_reader :href, :visually_hidden_text, :show_actions_column
 
   renders_one :key, GovukComponent::SummaryListComponent::KeyComponent
   renders_one :value, GovukComponent::SummaryListComponent::ValueComponent
   renders_many :actions, GovukComponent::SummaryListComponent::ActionComponent
 
-  def initialize(classes: [], html_attributes: {})
+  def initialize(show_actions_column: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
+
+    @show_actions_column = show_actions_column
   end
 
   def call
@@ -18,7 +20,7 @@ class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
 private
 
   def actions_content
-    return if actions.blank?
+    return unless show_actions_column && actions.any?
 
     (actions.one?) ? single_action : actions_list
   end
@@ -36,7 +38,9 @@ private
   end
 
   def default_classes
-    %w(govuk-summary-list__row)
+    %w(govuk-summary-list__row).tap do |c|
+      c << "govuk-summary-list__row--no-actions" if show_actions_column && actions.none?
+    end
   end
 
   def actions_class

data/app/components/govuk_component/summary_list_component.rb

@@ -1,29 +1,35 @@
-class GovukComponent::SummaryListComponent < GovukComponent::Base
-  attr_reader :borders
-
-  renders_many :rows, GovukComponent::SummaryListComponent::RowComponent
-
-  def initialize(borders: true, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
-
-    @borders = borders
-  end
-
-  def any_row_has_actions?
-    rows.any? { |row| row.href.present? }
-  end
-
-  def classes
-    super.append(borders_class).compact
-  end
-
-private
-
-  def borders_class
-    %(govuk-summary-list--no-border) unless borders
-  end
-
-  def default_classes
-    %w(govuk-summary-list)
+module GovukComponent
+  class SummaryListComponent < GovukComponent::Base
+    attr_reader :borders, :actions
+
+    renders_many :rows, ->(classes: [], html_attributes: {}, &block) do
+      GovukComponent::SummaryListComponent::RowComponent.new(
+        show_actions_column: @show_actions_column,
+        classes: classes,
+        html_attributes: html_attributes,
+        &block
+      )
+    end
+
+    def initialize(actions: true, borders: true, classes: [], html_attributes: {})
+      super(classes: classes, html_attributes: html_attributes)
+
+      @borders             = borders
+      @show_actions_column = actions
+    end
+
+    def classes
+      super.append(borders_class).compact
+    end
+
+  private
+
+    def borders_class
+      %(govuk-summary-list--no-border) unless borders
+    end
+
+    def default_classes
+      %w(govuk-summary-list)
+    end
   end
 end

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

@@ -1,5 +1,5 @@
 class GovukComponent::TableComponent::BodyComponent < GovukComponent::Base
-  renders_many :rows, GovukComponent::TableComponent::RowComponent
+  renders_many :rows, "GovukComponent::TableComponent::RowComponent"
 
   def initialize(rows: nil, first_cell_is_header: false, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)

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

@@ -4,12 +4,12 @@ class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
   alias_method :numeric?, :numeric
 
   WIDTHS = {
-    "full"           => "govuk-input govuk-!-width-full",
-    "three-quarters" => "govuk-input govuk-!-width-three-quarters",
-    "two-thirds"     => "govuk-input govuk-!-width-two-thirds",
-    "one-half"       => "govuk-input govuk-!-width-one-half",
-    "one-third"      => "govuk-input govuk-!-width-one-third",
-    "one-quarter"    => "govuk-input govuk-!-width-one-quarter",
+    "full"           => "govuk-!-width-full",
+    "three-quarters" => "govuk-!-width-three-quarters",
+    "two-thirds"     => "govuk-!-width-two-thirds",
+    "one-half"       => "govuk-!-width-one-half",
+    "one-third"      => "govuk-!-width-one-third",
+    "one-quarter"    => "govuk-!-width-one-quarter",
   }.freeze
 
   def initialize(header: false, text: nil, numeric: false, width: nil, classes: [], html_attributes: {})

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

@@ -1,5 +1,5 @@
 class GovukComponent::TableComponent::HeadComponent < GovukComponent::Base
-  renders_many :rows, GovukComponent::TableComponent::RowComponent
+  renders_many :rows, "GovukComponent::TableComponent::RowComponent"
 
   attr_reader :row_data
 

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

@@ -1,5 +1,5 @@
 class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
-  renders_many :cells, GovukComponent::TableComponent::CellComponent
+  renders_many :cells, "GovukComponent::TableComponent::CellComponent"
 
   attr_reader :header, :first_cell_is_header
 

data/app/components/govuk_component/table_component.rb

@@ -1,33 +1,35 @@
-class GovukComponent::TableComponent < GovukComponent::Base
-  renders_one :caption, GovukComponent::TableComponent::CaptionComponent
-  renders_one :head, GovukComponent::TableComponent::HeadComponent
-  renders_many :bodies, GovukComponent::TableComponent::BodyComponent
+module GovukComponent
+  class TableComponent < GovukComponent::Base
+    renders_one :caption, "GovukComponent::TableComponent::CaptionComponent"
+    renders_one :head, "GovukComponent::TableComponent::HeadComponent"
+    renders_many :bodies, "GovukComponent::TableComponent::BodyComponent"
 
-  attr_accessor :id, :first_cell_is_header, :caption_text
+    attr_accessor :id, :first_cell_is_header, :caption_text
 
-  def initialize(id: nil, rows: nil, head: nil, caption: nil, first_cell_is_header: false, classes: [], html_attributes: {})
-    super(classes: classes, html_attributes: html_attributes)
+    def initialize(id: nil, rows: nil, head: nil, caption: nil, first_cell_is_header: false, classes: [], html_attributes: {})
+      super(classes: classes, html_attributes: html_attributes)
 
-    @id                   = id
-    @first_cell_is_header = first_cell_is_header
-    @caption_text         = caption
+      @id                   = id
+      @first_cell_is_header = first_cell_is_header
+      @caption_text         = caption
 
-    # when no rows are passed in it's likely we're taking the slot approach
-    return unless rows.presence
+      # when no rows are passed in it's likely we're taking the slot approach
+      return unless rows.presence
 
-    # if no head is passed in,use the first row for headers
-    build(*(head ? [head, rows] : [rows[0], rows[1..]]), caption_text)
-  end
+      # if no head is passed in,use the first row for headers
+      build(*(head ? [head, rows] : [rows[0], rows[1..]]), caption_text)
+    end
 
-private
+  private
 
-  def build(head_data, body_data, caption_text)
-    caption(text: caption_text)
-    head(rows: [head_data])
-    body(rows: body_data, first_cell_is_header: first_cell_is_header)
-  end
+    def build(head_data, body_data, caption_text)
+      caption(text: caption_text)
+      head(rows: [head_data])
+      body(rows: body_data, first_cell_is_header: first_cell_is_header)
+    end
 
-  def default_classes
-    %w(govuk-table)
+    def default_classes
+      %w(govuk-table)
+    end
   end
 end

data/app/components/govuk_component/traits.rb

@@ -0,0 +1 @@
+module GovukComponent::Traits; end

data/app/components/govuk_component/warning_text_component.rb

@@ -3,7 +3,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
 
   ICON = '!'.freeze
 
-  def initialize(text:, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
+  def initialize(text: nil, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
@@ -12,7 +12,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
 
   def call
     tag.div(class: classes, **html_attributes) do
-      safe_join([icon, (content || strong)])
+      safe_join([icon, warning_text])
     end
   end
 
@@ -22,9 +22,9 @@ private
     tag.span(ICON, class: 'govuk-warning-text__icon', aria: { hidden: true })
   end
 
-  def strong
+  def warning_text
     tag.strong(class: 'govuk-warning-text__text') do
-      safe_join([assistive, text])
+      safe_join([assistive, (content || text)])
     end
   end
 

data/app/components/govuk_component.rb

@@ -0,0 +1 @@
+module GovukComponent; end

data/app/helpers/govuk_link_helper.rb

@@ -56,7 +56,11 @@ module GovukLinkHelper
     html_options = build_html_options(extra_options, style: :button)
 
     if block_given?
-      button_to(name, html_options, &block)
+      if Rails.version >= "7.0.0" && name.is_a?(Hash)
+        button_to(name.merge(html_options), &block)
+      else
+        button_to(name, html_options, &block)
+      end
     else
       button_to(name, options, html_options)
     end
@@ -114,7 +118,7 @@ private
     attributes ||= {}
 
     attributes.with_indifferent_access.tap do |attrs|
-      attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name).flatten
+      attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name).flatten.join(" ")
     end
   end
 end

data/lib/govuk/components/engine.rb

@@ -1,3 +1,5 @@
+require "rails/engine"
+
 module Govuk
   module Components
     class Engine < ::Rails::Engine

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.1.4'.freeze
+    VERSION = '3.0.0b3'.freeze
   end
 end

data/lib/govuk/components.rb

@@ -1,3 +1,4 @@
-require "view_component/engine"
+require "rails/engine"
+require "view_component"
 require "govuk/components/helpers/css_utilities"
 require "govuk/components/engine"

metadata

@@ -1,57 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 3.0.0b3
 platform: ruby
 authors:
 - DfE developers
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: view_component
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.47.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.47.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +162,132 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: htmlbeautifier
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: nanoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.11'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.27.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.27.0
+- !ruby/object:Gem::Dependency
+  name: rubypants
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sassc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: slim_lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.22.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: A collection of components intended to ease the building of GOV.UK Design
   System web applications
 email:
@@ -161,6 +299,7 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/components/govuk_component.rb
 - app/components/govuk_component/accordion_component.html.erb
 - app/components/govuk_component/accordion_component.rb
 - app/components/govuk_component/accordion_component/section_component.html.erb
@@ -203,6 +342,7 @@ files:
 - app/components/govuk_component/table_component/row_component.html.erb
 - app/components/govuk_component/table_component/row_component.rb
 - app/components/govuk_component/tag_component.rb
+- app/components/govuk_component/traits.rb
 - app/components/govuk_component/traits/custom_classes.rb
 - app/components/govuk_component/traits/custom_html_attributes.rb
 - app/components/govuk_component/warning_text_component.rb
@@ -220,7 +360,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -231,12 +371,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []