govuk-components 2.0.0b5 → 2.0.0rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3b1bf7735c433b8eef4c57aee177f73a74084c51c60e7130160401cc552bf39
-  data.tar.gz: 14540d5722d0f676cd2a4d74a75d32cee0575ad2d5d0f01a78be599e19fb7b6c
+  metadata.gz: 9edec9359b5c0de9625e624d8287300e31870ff711796dc930fb344543ed926a
+  data.tar.gz: 29acdd36e71f45b69af12d291466e360bfc4bbc77db3ac48f57469d66912e3dd
 SHA512:
-  metadata.gz: d5743001d2d5fde8ae14d3bce4bb49f77a5f7a3c3d0a5d9bc52ef158fd82b6d628af1e867ebd310331804f16057d2d12c26c30a759fb14d073e28043a0fd1b85
-  data.tar.gz: 8d44facf3b1d399a9b6e0a8cdc34b140d4839c9a1521de68b4015604df6f9a980ae29af4608ba0b62cb0dc863ed5bdd1834e4c388b6989401d0089966fd21074
+  metadata.gz: 146d5279be3e72e4164a0bbf81fa91c1262cfa88c61b28ef0be7dd1e7ccadb486ee998c1e33e6268868834019aa2c4dda0ace1adab701a34c77996db91ab3f0e
+  data.tar.gz: ab5f09b50cf6d80b776c0d2aff7824f85ad788b95c2d3f3b7e19bd998884ccb2cbe4ceb98e2eeff25619b6c5f251f156c8dc31cd2b41fd7d8b50b2ab872449c4

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

@@ -1,15 +1,5 @@
 <%= tag.div(id: @id, class: classes, data: { module: 'govuk-accordion' }, **html_attributes) do %>
   <% sections.each do |section| %>
-    <%= tag.div(id: section.id(suffix: 'section'), class: section.classes, **section.html_attributes) do %>
-      <div class="govuk-accordion__section-header">
-        <h2 class="govuk-accordion__section-heading">
-          <%= tag.span(section.title, id: section.id, class: "govuk-accordion__section-button", aria: { expanded: section.expanded?, controls: section.id(suffix: 'content') }) %>
-        </h2>
-        <% if section.summary.present? %>
-          <%= tag.div(section.summary, id: section.id(suffix: 'summary'), class: %w(govuk-accordion__section-summary govuk-body)) %>
-        <% end %>
-      </div>
-      <%= section %>
-    <% end %>
+    <%= section %>
   <% end %>
 <% end %>

data/app/components/govuk_component/accordion_component.rb

@@ -1,12 +1,23 @@
 class GovukComponent::AccordionComponent < GovukComponent::Base
-  renders_many :sections, "Section"
+  renders_many :sections, ->(heading_text: nil, summary_text: nil, expanded: false, classes: [], html_attributes: {}, &block) do
+    GovukComponent::AccordionComponent::SectionComponent.new(
+      classes: classes,
+      expanded: expanded,
+      heading_level: heading_level,      # set once at parent level, passed to all children
+      html_attributes: html_attributes,
+      summary_text: summary_text,
+      heading_text: heading_text,
+      &block
+    )
+  end
 
-  attr_reader :id
+  attr_reader :id, :heading_level
 
-  def initialize(id: nil, classes: [], html_attributes: {})
+  def initialize(id: nil, heading_level: 2, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @id = id
+    @id            = id
+    @heading_level = heading_tag(heading_level)
   end
 
 private
@@ -15,33 +26,9 @@ private
     %w(govuk-accordion)
   end
 
-  class Section < GovukComponent::Base
-    attr_reader :title, :summary, :expanded
-
-    alias_method :expanded?, :expanded
-
-    def initialize(title:, summary: nil, expanded: false, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
-      @title    = title
-      @summary  = summary
-      @expanded = expanded
-    end
-
-    def id(suffix: nil)
-      [title.parameterize, suffix].compact.join('-')
-    end
-
-    def call
-      tag.div(content, id: id(suffix: 'content'), class: %w(govuk-accordion__section-content), aria: { labelledby: id })
-    end
-
-  private
+  def heading_tag(level)
+    fail(ArgumentError, "heading_level must be 1-6") unless level.in?(1..6)
 
-    def default_classes
-      %w(govuk-accordion__section).tap do |classes|
-        classes.append("govuk-accordion__section--expanded") if expanded?
-      end
-    end
+    %(h#{level})
   end
 end

data/app/components/govuk_component/accordion_component/section_component.html.erb

@@ -0,0 +1,11 @@
+<%= tag.div(id: id(suffix: 'section'), class: classes, **html_attributes) do %>
+  <div class="govuk-accordion__section-header">
+    <%= content_tag(heading_level, class: "govuk-accordion__section-heading") do %>
+      <%= tag.span(heading_content, id: id, class: "govuk-accordion__section-button", aria: { expanded: expanded?, controls: id(suffix: 'content') }) %>
+    <% end %>
+    <% if summary_content.present? %>
+      <%= tag.div(summary_content, id: id(suffix: 'summary'), class: %w(govuk-accordion__section-summary govuk-body)) %>
+    <% end %>
+  </div>
+  <%= tag.div(content, id: id(suffix: 'content'), class: %w(govuk-accordion__section-content), aria: { labelledby: id }) %>
+<% end %>

data/app/components/govuk_component/accordion_component/section_component.rb

@@ -0,0 +1,41 @@
+class GovukComponent::AccordionComponent::SectionComponent < GovukComponent::Base
+  attr_reader :heading_text, :summary_text, :expanded, :heading_level
+
+  renders_one :heading_html
+  renders_one :summary_html
+
+  alias_method :expanded?, :expanded
+
+  def initialize(heading_text:, summary_text:, expanded:, heading_level:, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @heading_text  = heading_text
+    @summary_text  = summary_text
+    @expanded      = expanded
+    @heading_level = heading_level
+  end
+
+  def id(suffix: nil)
+    # generate a random number if we don't have heading_text to avoid attempting
+    # to parameterize a potentially-huge chunk of HTML
+    @prefix ||= heading_text&.parameterize || SecureRandom.hex(4)
+
+    [@prefix, suffix].compact.join('-')
+  end
+
+  def heading_content
+    heading_html || heading_text || fail(ArgumentError, "no heading_text or heading_html")
+  end
+
+  def summary_content
+    summary_html || summary_text
+  end
+
+private
+
+  def default_classes
+    %w(govuk-accordion__section).tap do |classes|
+      classes.append("govuk-accordion__section--expanded") if expanded?
+    end
+  end
+end

data/app/components/govuk_component/back_link_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::BackLinkComponent < GovukComponent::Base
-  attr_reader :text, :href, :options
+  attr_reader :text, :href
 
-  def initialize(text:, href:, classes: nil, html_attributes: {})
+  def initialize(href:, text: nil, classes: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
@@ -9,11 +9,15 @@ class GovukComponent::BackLinkComponent < GovukComponent::Base
   end
 
   def call
-    link_to(text, href, class: classes, **html_attributes)
+    link_to(link_content, href, class: classes, **html_attributes)
   end
 
 private
 
+  def link_content
+    text || content || fail(ArgumentError, "no text or content")
+  end
+
   def default_classes
     %w(govuk-back-link)
   end

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

@@ -1,14 +1,7 @@
 <%= tag.div(class: classes, **html_attributes) do %>
   <ol class="govuk-breadcrumbs__list">
-    <% @breadcrumbs.each do |text, link| %>
-
-      <% if link.present? %>
-        <li class="govuk-breadcrumbs__list-item">
-          <%= link_to(text, link, class: "govuk-breadcrumbs__link") %>
-        </li>
-      <% else %>
-        <%= tag.li(text, class: "govuk-breadcrumbs__list-item", aria: { current: "page" }) %>
-      <% end %>
+    <% @breadcrumbs.each do |link| %>
+      <%= link %>
     <% end %>
   </ol>
 <% end %>

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -4,7 +4,7 @@ class GovukComponent::BreadcrumbsComponent < GovukComponent::Base
   def initialize(breadcrumbs:, hide_in_print: false, collapse_on_mobile: false, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @breadcrumbs        = breadcrumbs
+    @breadcrumbs        = build_list(breadcrumbs)
     @hide_in_print      = hide_in_print
     @collapse_on_mobile = collapse_on_mobile
   end
@@ -17,4 +17,27 @@ private
       classes << "govuk-breadcrumbs--collapse-on-mobile" if collapse_on_mobile
     end
   end
+
+  def build_list(breadcrumbs)
+    case breadcrumbs
+    when Array
+      breadcrumbs.map { |item| build_list_item(item) }
+    when Hash
+      breadcrumbs.map { |text, link| build_list_item(text, link) }
+    else
+      fail(ArgumentError, "breadcrumb must be an array or hash")
+    end
+  end
+
+  def build_list_item(text, link = nil)
+    if link.present?
+      list_item { link_to(text, link, class: "govuk-breadcrumbs__link") }
+    else
+      list_item(aria: { current: "page" }) { text }
+    end
+  end
+
+  def list_item(html_attributes = {}, &block)
+    tag.li(class: "govuk-breadcrumbs__list-item", **html_attributes, &block)
+  end
 end

data/app/components/govuk_component/cookie_banner_component.rb

@@ -1,14 +1,19 @@
 class GovukComponent::CookieBannerComponent < GovukComponent::Base
-  renders_one :body
-  renders_one :actions
+  renders_many :messages, GovukComponent::CookieBannerComponent::MessageComponent
 
-  attr_accessor :title, :aria_label
+  attr_accessor :aria_label, :hidden
 
-  def initialize(title: nil, aria_label: "Cookie banner", classes: [], html_attributes: {})
+  def initialize(aria_label: "Cookie banner", hidden: false, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @title      = title
     @aria_label = aria_label
+    @hidden     = hidden
+  end
+
+  def call
+    tag.div(class: classes, role: "region", aria: { label: aria_label }, hidden: hidden, **html_attributes) do
+      safe_join(messages)
+    end
   end
 
 private

data/app/components/govuk_component/cookie_banner_component/message_component.rb

@@ -0,0 +1,60 @@
+class GovukComponent::CookieBannerComponent::MessageComponent < GovukComponent::Base
+  attr_reader :heading_text, :text, :hidden, :role
+
+  renders_many :actions
+  renders_one :heading_html
+
+  def initialize(heading_text: nil, text: nil, hidden: false, role: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @heading_text = heading_text
+    @text         = text
+    @hidden       = hidden
+    @role         = role
+  end
+
+  def call
+    tag.div(class: classes, role: role, hidden: hidden, **html_attributes) do
+      tag.div(class: "govuk-grid-row") do
+        safe_join([
+          tag.div(class: "govuk-grid-column-two-thirds") { safe_join([heading_element, message_element]) },
+          actions_element
+        ])
+      end
+    end
+  end
+
+private
+
+  def default_classes
+    %w(govuk-cookie-banner__message govuk-width-container)
+  end
+
+  def heading_element
+    tag.h2(heading_content, class: %w(govuk-cookie-banner__heading govuk-heading-m))
+  end
+
+  def heading_content
+    heading_html || heading_text || fail(ArgumentError, "no heading_text or heading_html")
+  end
+
+  def message_element
+    tag.div(message_content, class: "govuk-cookie-banner__content")
+  end
+
+  def message_content
+    content || wrap_in_p(text) || fail(ArgumentError, "no text or content")
+  end
+
+  def wrap_in_p(message_text)
+    return if message_text.blank?
+
+    tag.p(message_text)
+  end
+
+  def actions_element
+    return if actions.none?
+
+    tag.div(class: "govuk-button-group") { safe_join(actions) }
+  end
+end

data/app/components/govuk_component/details_component.rb

@@ -1,17 +1,19 @@
 class GovukComponent::DetailsComponent < GovukComponent::Base
-  attr_reader :summary_text, :text
+  attr_reader :summary_text, :text, :id, :open
 
   renders_one :summary_html
 
-  def initialize(summary_text:, text: nil, classes: [], html_attributes: {})
+  def initialize(summary_text:, text: nil, classes: [], id: nil, open: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @summary_text = summary_text
     @text         = text
+    @id           = id
+    @open         = open
   end
 
   def call
-    tag.details(class: classes, data: { module: "govuk-details" }, **html_attributes) do
+    tag.details(class: classes, data: { module: "govuk-details" }, id: id, open: open, **html_attributes) do
       safe_join([summary, description])
     end
   end

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

@@ -1,6 +1,6 @@
 <%= tag.footer(class: classes, role: 'contentinfo', **html_attributes) do %>
-  <div class="govuk-width-container ">
-    <div class="govuk-footer__meta">
+  <%= tag.div(class: container_classes, **container_html_attributes) do %>
+    <%= tag.div(class: meta_classes, **meta_html_attributes) do %>
       <% if meta.present? %>
         <%= meta %>
       <% else %>
@@ -35,6 +35,6 @@
           <%= tag.div(copyright, class: "govuk-footer__meta-item") %>
         </div>
       <% end %>
-    </div>
-  </div>
+    <% end %>
+  <% end %>
 <% end %>

data/app/components/govuk_component/footer_component.rb

@@ -1,16 +1,34 @@
 class GovukComponent::FooterComponent < GovukComponent::Base
-  renders_one :meta_content
+  renders_one :meta_html
   renders_one :meta
 
-  attr_reader :meta_items, :meta_items_title, :meta_licence, :copyright
+  attr_reader :meta_items, :meta_text, :meta_items_title, :meta_licence, :copyright, :custom_container_classes
 
-  def initialize(meta_items: {}, meta_items_title: "Support links", meta_licence: nil, classes: [], html_attributes: {}, copyright_text: default_copright_text, copyright_url: default_copyright_url)
+  def initialize(
+    classes: [],
+    container_classes: [],
+    container_html_attributes: {},
+    copyright_text: default_copright_text,
+    copyright_url: default_copyright_url,
+    html_attributes: {},
+    meta_items: {},
+    meta_items_title: "Support links",
+    meta_licence: nil,
+    meta_text: nil,
+    meta_classes: [],
+    meta_html_attributes: {}
+  )
     super(classes: classes, html_attributes: html_attributes)
 
-    @meta_items       = build_meta_links(meta_items)
-    @meta_items_title = meta_items_title
-    @meta_licence     = meta_licence
-    @copyright        = build_copyright(copyright_text, copyright_url)
+    @meta_text                        = meta_text
+    @meta_items                       = build_meta_links(meta_items)
+    @meta_items_title                 = meta_items_title
+    @meta_licence                     = meta_licence
+    @custom_meta_classes              = meta_classes
+    @custom_meta_html_attributes      = meta_html_attributes
+    @copyright                        = build_copyright(copyright_text, copyright_url)
+    @custom_container_classes         = container_classes
+    @custom_container_html_attributes = container_html_attributes
   end
 
 private
@@ -19,6 +37,26 @@ private
     %w(govuk-footer)
   end
 
+  def container_classes
+    combine_classes(%w(govuk-width-container), custom_container_classes)
+  end
+
+  def meta_content
+    meta_html || meta_text
+  end
+
+  def meta_classes
+    %w(govuk-footer__meta).append(@custom_meta_classes)
+  end
+
+  def meta_html_attributes
+    @custom_meta_html_attributes
+  end
+
+  def container_html_attributes
+    @custom_container_html_attributes
+  end
+
   def build_meta_links(links)
     return [] if links.blank?
 

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

@@ -21,17 +21,17 @@
       <% end %>
     </div>
 
-    <% if service_name.present? || items.present? %>
+    <% if service_name.present? || navigation_items.present? %>
       <div class="govuk-header__content">
         <% if service_name.present? %>
           <%= link_to(service_name, service_url, class: %w(govuk-header__link govuk-header__link--service-name)) %>
         <% end %>
 
-        <% if items.any? %>
+        <% 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 %>
-              <% items.each do |item| %>
+              <% navigation_items.each do |item| %>
                 <%= tag.li(class: item.classes.append(item.active_class), **item.html_attributes) do %>
                   <% if item.link? %>
                     <%= link_to(item.text, item.href, class: "govuk-header__link") %>

data/app/components/govuk_component/header_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::HeaderComponent < GovukComponent::Base
-  renders_many :items, "Item"
+  renders_many :navigation_items, "NavigationItem"
   renders_one :custom_logo
   renders_one :product_name, "ProductName"
 
@@ -52,7 +52,7 @@ private
     combine_classes(%w(govuk-header__container govuk-width-container), custom_container_classes)
   end
 
-  class Item < GovukComponent::Base
+  class NavigationItem < GovukComponent::Base
     attr_reader :text, :href, :active
 
     def initialize(text:, href: nil, active: false, classes: [], html_attributes: {})

data/app/components/govuk_component/inset_text_component.rb

@@ -1,22 +1,27 @@
 class GovukComponent::InsetTextComponent < GovukComponent::Base
-  attr_reader :text
+  attr_reader :text, :id
 
-  def initialize(text: nil, classes: [], html_attributes: {})
+  def initialize(text: nil, id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
+    @id   = id
   end
 
   def call
-    tag.div(class: classes, **html_attributes) { content.presence || text }
+    tag.div(class: classes, id: id, **html_attributes) { inset_text_content }
   end
 
   def render?
-    text.present? || content.present?
+    inset_text_content.present?
   end
 
 private
 
+  def inset_text_content
+    content.presence || text
+  end
+
   def default_classes
     %w(govuk-inset-text)
   end

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

@@ -1,7 +1,7 @@
-<%= tag.div(class: classes, role: "region", aria: { labelledby: title_id }, data: data_params, **html_attributes) do %>
+<%= tag.div(class: classes, role: role, aria: { labelledby: title_id }, data: data_params, **html_attributes) do %>
   <div class="govuk-notification-banner__header">
     <%= content_tag(title_tag, class: "govuk-notification-banner__title", id: title_id) do %>
-      <%= title %>
+      <%= title_content %>
     <% end %>
   </div>
   <div class="govuk-notification-banner__content">
@@ -9,6 +9,6 @@
       <%= heading %>
     <% end %>
 
-    <%= content %>
+    <%= content || text %>
   </div>
 <% end %>

data/app/components/govuk_component/notification_banner_component.rb

@@ -1,34 +1,23 @@
 class GovukComponent::NotificationBannerComponent < GovukComponent::Base
-  attr_reader :title, :title_id, :success, :title_heading_level, :disable_auto_focus
+  attr_reader :title_text, :title_id, :text, :success, :title_heading_level, :disable_auto_focus, :role
 
+  renders_one :title_html
   renders_many :headings, "Heading"
 
-  def initialize(title:, success: false, title_heading_level: 2, title_id: "govuk-notification-banner-title", disable_auto_focus: nil, classes: [], html_attributes: {})
+  def initialize(title_text: nil, text: nil, role: nil, success: false, title_heading_level: 2, title_id: "govuk-notification-banner-title", disable_auto_focus: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @title               = title
+    @title_text          = title_text
     @title_id            = title_id
+    @text                = text
     @success             = success
+    @role                = role || default_role
     @title_heading_level = title_heading_level
     @disable_auto_focus  = disable_auto_focus
   end
 
   def render?
-    headings.any? || content.present?
-  end
-
-  def classes
-    super.append(success_class).compact
-  end
-
-  def success_class
-    %(govuk-notification-banner--success) if success
-  end
-
-  def title_tag
-    fail "title_heading_level must be a number between 1 and 6" unless title_heading_level.is_a?(Integer) && title_heading_level.in?(1..6)
-
-    "h#{title_heading_level}"
+    headings.any? || text.present? || content.present?
   end
 
   class Heading < GovukComponent::Base
@@ -70,4 +59,26 @@ private
   def data_params
     { "module" => "govuk-notification-banner", "disable-auto-focus" => disable_auto_focus }.compact
   end
+
+  def classes
+    super.append(success_class).compact
+  end
+
+  def success_class
+    %(govuk-notification-banner--success) if success
+  end
+
+  def title_content
+    title_html || title_text
+  end
+
+  def title_tag
+    fail "title_heading_level must be a number between 1 and 6" unless title_heading_level.is_a?(Integer) && title_heading_level.in?(1..6)
+
+    "h#{title_heading_level}"
+  end
+
+  def default_role
+    success ? "alert" : "region"
+  end
 end

data/app/components/govuk_component/panel_component.rb

@@ -1,15 +1,19 @@
 class GovukComponent::PanelComponent < GovukComponent::Base
-  attr_reader :title, :body
+  attr_reader :id, :title_text, :text, :heading_level
 
-  def initialize(title: nil, body: nil, classes: [], html_attributes: {})
+  renders_one :title_html
+
+  def initialize(title_text: nil, text: nil, heading_level: 1, id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @title = title
-    @body  = body
+    @heading_level = heading_level
+    @title_text    = title_text
+    @text          = text
+    @id            = id
   end
 
   def call
-    tag.div(class: classes, **html_attributes) do
+    tag.div(id: id, class: classes, **html_attributes) do
       safe_join([panel_title, panel_body].compact)
     end
   end
@@ -20,27 +24,33 @@ private
     %w(govuk-panel govuk-panel--confirmation)
   end
 
-  def display_title?
-    title.present?
+  def heading_tag
+    "h#{heading_level}"
+  end
+
+  def panel_content
+    content || text
   end
 
-  def display_body?
-    body.present? || content.present?
+  def title
+    title_html || title_text
   end
 
   def panel_title
-    tag.h1(title, class: "govuk-panel__title") if display_title?
+    return if title.blank?
+
+    content_tag(heading_tag, title, class: "govuk-panel__title")
   end
 
   def panel_body
-    if display_body?
-      tag.div(class: "govuk-panel__body") do
-        content.presence || body
-      end
+    return if panel_content.blank?
+
+    tag.div(class: "govuk-panel__body") do
+      panel_content
     end
   end
 
   def render?
-    display_title? || display_body?
+    title.present? || panel_content.present?
   end
 end

data/app/components/govuk_component/phase_banner_component.rb

@@ -1,10 +1,10 @@
 class GovukComponent::PhaseBannerComponent < GovukComponent::Base
   attr_reader :text, :phase_tag
 
-  def initialize(phase_tag: nil, text: nil, classes: [], html_attributes: {})
+  def initialize(tag: nil, text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
-    @phase_tag = phase_tag
+    @phase_tag = tag
     @text      = text
   end
 

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

@@ -1,11 +1,5 @@
 <%= tag.dl(class: classes, **html_attributes) do %>
   <% rows.each do |row| %>
-    <%= tag.div(class: row.classes, **row.html_attributes) do %>
-      <%= tag.dt(row.key, class: "govuk-summary-list__key") %>
-      <%= tag.dd(row.value, class: "govuk-summary-list__value") %>
-      <% if any_row_has_actions? %>
-        <%= row.action %>
-      <% end %>
-    <% end %>
+    <%= row %>
   <% end %>
 <% end %>

data/app/components/govuk_component/summary_list_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::SummaryListComponent < GovukComponent::Base
   attr_reader :borders
 
-  renders_many :rows, "Row"
+  renders_many :rows, GovukComponent::SummaryListComponent::RowComponent
 
   def initialize(borders: true, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -26,39 +26,4 @@ private
   def default_classes
     %w(govuk-summary-list)
   end
-
-  class Row < GovukComponent::Base
-    attr_reader :key, :value, :href, :text, :visually_hidden_text, :action_classes, :action_attributes
-
-    def initialize(key:, value:, action: {}, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
-      @key   = key
-      @value = value
-
-      if action.present?
-        @href                 = action[:href]
-        @text                 = action[:text] || "Change"
-        @visually_hidden_text = " #{action[:visually_hidden_text] || key.downcase}"
-        @action_classes       = action[:classes] || []
-        @action_attributes    = action[:html_attributes] || {}
-      end
-    end
-
-    def action
-      tag.dd(class: "govuk-summary-list__actions") do
-        if href.present?
-          govuk_link_to(href, class: action_classes, **action_attributes) do
-            safe_join([text, tag.span(visually_hidden_text, class: "govuk-visually-hidden")])
-          end
-        end
-      end
-    end
-
-  private
-
-    def default_classes
-      %w(govuk-summary-list__row)
-    end
-  end
 end

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

@@ -0,0 +1,34 @@
+class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Base
+  attr_reader :href, :text, :visually_hidden_text, :attributes, :classes
+
+  def initialize(href: nil, text: 'Change', visually_hidden_text: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @href                 = href
+    @text                 = text
+    @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?
+
+    link_classes = govuk_link_classes.append(classes).flatten
+
+    link_to(href, class: link_classes, **html_attributes) do
+      safe_join([action_text, visually_hidden_span])
+    end
+  end
+
+private
+
+  def action_text
+    content || text || fail(ArgumentError, "no text or content")
+  end
+
+  def visually_hidden_span
+    tag.span(visually_hidden_text, class: "govuk-visually-hidden") if visually_hidden_text.present?
+  end
+end

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

@@ -0,0 +1,23 @@
+class GovukComponent::SummaryListComponent::KeyComponent < GovukComponent::Base
+  attr_reader :text
+
+  def initialize(text: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @text = text
+  end
+
+  def call
+    tag.dt(key_content, class: classes, **html_attributes)
+  end
+
+private
+
+  def default_classes
+    %w(govuk-summary-list__key)
+  end
+
+  def key_content
+    content || text || fail(ArgumentError, "no text or content")
+  end
+end

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

@@ -0,0 +1,45 @@
+class GovukComponent::SummaryListComponent::RowComponent < GovukComponent::Base
+  attr_reader :href, :visually_hidden_text
+
+  renders_one :key, GovukComponent::SummaryListComponent::KeyComponent
+  renders_one :value, GovukComponent::SummaryListComponent::ValueComponent
+  renders_many :actions, GovukComponent::SummaryListComponent::ActionComponent
+
+  def initialize(classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+  end
+
+  def call
+    tag.div(class: classes, **html_attributes) do
+      safe_join([key, value, actions_content])
+    end
+  end
+
+private
+
+  def actions_content
+    return if actions.blank?
+
+    (actions.one?) ? single_action : actions_list
+  end
+
+  def single_action
+    tag.dd(class: actions_class) { safe_join(actions) }
+  end
+
+  def actions_list
+    tag.dd(class: actions_class) do
+      tag.ul(class: "govuk-summary-list__actions-list") do
+        safe_join(actions.map { |action| tag.li(action, class: "govuk-summary-list__actions-list-item") })
+      end
+    end
+  end
+
+  def default_classes
+    %w(govuk-summary-list__row)
+  end
+
+  def actions_class
+    "govuk-summary-list__actions"
+  end
+end

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

@@ -0,0 +1,23 @@
+class GovukComponent::SummaryListComponent::ValueComponent < GovukComponent::Base
+  attr_reader :text
+
+  def initialize(text: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @text = text
+  end
+
+  def call
+    tag.dd(value_content, class: classes, **html_attributes)
+  end
+
+private
+
+  def default_classes
+    %w(govuk-summary-list__value)
+  end
+
+  def value_content
+    content || text || ""
+  end
+end

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

@@ -1,4 +1,4 @@
-<%= tag.div(class: classes, data: { module: 'govuk-tabs' }, **html_attributes) do %>
+<%= tag.div(id: id, class: classes, data: { module: 'govuk-tabs' }, **html_attributes) do %>
   <%= tag.h2(title, class: "govuk-tabs__title") %>
   <ul class="govuk-tabs__list">
     <% tabs.each.with_index do |tab, i| %>

data/app/components/govuk_component/tab_component.rb

@@ -1,12 +1,13 @@
 class GovukComponent::TabComponent < GovukComponent::Base
   renders_many :tabs, "Tab"
 
-  attr_reader :title
+  attr_reader :title, :id
 
-  def initialize(title:, classes: [], html_attributes: {})
+  def initialize(title:, id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @title = title
+    @id    = id
   end
 
 private
@@ -16,16 +17,17 @@ private
   end
 
   class Tab < GovukComponent::Base
-    attr_reader :title
+    attr_reader :label, :text
 
-    def initialize(title:, classes: [], html_attributes: {})
+    def initialize(label:, text: nil, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @title = title
+      @label = label
+      @text  = text
     end
 
     def id(prefix: nil)
-      [prefix, title.parameterize].join
+      [prefix, label.parameterize].join
     end
 
     def hidden_class(i = nil)
@@ -39,7 +41,7 @@ private
     end
 
     def li_link
-      link_to(title, id(prefix: '#'), class: "govuk-tabs__tab")
+      link_to(label, id(prefix: '#'), class: "govuk-tabs__tab")
     end
 
     def default_classes
@@ -47,7 +49,7 @@ private
     end
 
     def call
-      content
+      content || text || fail(ArgumentError, "no text or content")
     end
   end
 end

data/app/components/govuk_component/tag_component.rb

@@ -1,19 +1,9 @@
 class GovukComponent::TagComponent < GovukComponent::Base
   attr_reader :text, :colour
 
-  COLOURS = %w(
-    grey
-    green
-    turquoise
-    blue
-    red
-    purple
-    pink
-    orange
-    yellow
-  ).freeze
-
-  def initialize(text:, colour: nil, classes: [], html_attributes: {})
+  COLOURS = %w(grey green turquoise blue red purple pink orange yellow).freeze
+
+  def initialize(text: nil, colour: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text   = text
@@ -21,11 +11,15 @@ class GovukComponent::TagComponent < GovukComponent::Base
   end
 
   def call
-    tag.strong(@text, class: classes.append(colour_class), **html_attributes)
+    tag.strong(tag_content, class: classes.append(colour_class), **html_attributes)
   end
 
 private
 
+  def tag_content
+    @text || content || fail(ArgumentError, "no text or content")
+  end
+
   def default_classes
     %w(govuk-tag)
   end

data/app/components/govuk_component/warning_text_component.rb

@@ -1,13 +1,13 @@
 class GovukComponent::WarningTextComponent < GovukComponent::Base
-  attr_reader :text, :assistive_text
+  attr_reader :text, :icon_fallback_text
 
   ICON = '!'.freeze
 
-  def initialize(text:, assistive_text: 'Warning', classes: [], html_attributes: {})
+  def initialize(text:, icon_fallback_text: 'Warning', classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
 
     @text = text
-    @assistive_text = assistive_text
+    @icon_fallback_text = icon_fallback_text
   end
 
   def call
@@ -29,7 +29,7 @@ private
   end
 
   def assistive
-    tag.span(assistive_text, class: 'govuk-warning-text__assistive')
+    tag.span(icon_fallback_text, class: 'govuk-warning-text__assistive')
   end
 
   def default_classes

data/app/helpers/govuk_link_helper.rb

@@ -1,61 +1,121 @@
 module GovukLinkHelper
-  def govuk_link_to(*args, button: false, no_visited_state: false, muted: false, text_colour: false, inverse: false, no_underline: false, **kwargs, &block)
-    classes = build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
+  LINK_STYLES = {
+    inverse:          "govuk-link--inverse",
+    muted:            "govuk-link--muted",
+    no_underline:     "govuk-link--no-underline",
+    no_visited_state: "govuk-link--no-visited-state",
+    text_colour:      "govuk-link--text-colour",
+  }.freeze
 
-    link_to(*args, **inject_class(kwargs, class_name: classes), &block)
-  end
+  BUTTON_STYLES = {
+    disabled:  "govuk-button--disabled",
+    secondary: "govuk-button--secondary",
+    warning:   "govuk-button--warning",
+  }.freeze
 
-  def govuk_mail_to(*args, button: false, no_visited_state: false, muted: false, text_colour: false, inverse: false, no_underline: false, **kwargs, &block)
-    classes = build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
+  def govuk_link_classes(*styles, default_class: 'govuk-link')
+    if (invalid_styles = (styles - LINK_STYLES.keys)) && invalid_styles.any?
+      fail(ArgumentError, "invalid styles #{invalid_styles.to_sentence}. Valid styles are #{LINK_STYLES.keys.to_sentence}")
+    end
 
-    mail_to(*args, **inject_class(kwargs, class_name: classes), &block)
+    [default_class] + LINK_STYLES.values_at(*styles).compact
   end
 
-  def govuk_button_to(*args, **kwargs)
-    button_to(*args, **inject_class(kwargs, class_name: 'govuk-button'))
+  def govuk_button_classes(*styles, default_class: 'govuk-button')
+    if (invalid_styles = (styles - BUTTON_STYLES.keys)) && invalid_styles.any?
+      fail(ArgumentError, "invalid styles #{invalid_styles.to_sentence}. Valid styles are #{BUTTON_STYLES.keys.to_sentence}")
+    end
+
+    [default_class] + BUTTON_STYLES.values_at(*styles).compact
   end
 
-private
+  def govuk_link_to(name = nil, options = nil, extra_options = {}, &block)
+    extra_options = options if block_given?
+    html_options = build_html_options(extra_options)
 
-  def build_classes(button, no_visited_state, muted, text_colour, inverse, no_underline)
-    [
-      link_class(button),
-      no_visited_state_class(no_visited_state),
-      muted_class(muted),
-      text_colour_class(text_colour),
-      inverse_class(inverse),
-      no_underline_class(no_underline),
-    ]
+    if block_given?
+      link_to(name, html_options, &block)
+    else
+      link_to(name, options, html_options)
+    end
   end
 
-  def inject_class(attributes, class_name:)
-    attributes.with_indifferent_access.tap do |attrs|
-      attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name)
+  def govuk_mail_to(email_address, name = nil, extra_options = {}, &block)
+    extra_options = name if block_given?
+    html_options = build_html_options(extra_options)
+
+    if block_given?
+      mail_to(email_address, html_options, &block)
+    else
+      mail_to(email_address, name, html_options)
     end
   end
 
-  def link_class(button)
-    button ? 'govuk-button' : 'govuk-link'
+  def govuk_button_to(name = nil, options = nil, extra_options = {}, &block)
+    extra_options = options if block_given?
+    html_options = build_html_options(extra_options, style: :button)
+
+    if block_given?
+      button_to(name, html_options, &block)
+    else
+      button_to(name, options, html_options)
+    end
   end
 
-  def no_visited_state_class(no_visited_state)
-    'govuk-link--no-visited-state' if no_visited_state
+  def govuk_button_link_to(name = nil, options = nil, extra_options = {}, &block)
+    extra_options = options if block_given?
+    html_options = build_html_options(extra_options, style: :button)
+
+    if block_given?
+      link_to(name, html_options, &block)
+    else
+      link_to(name, options, html_options)
+    end
   end
 
-  def muted_class(muted)
-    'govuk-link--muted' if muted
+  def govuk_breadcrumb_link_to(name = nil, options = nil, extra_options = {}, &block)
+    extra_options = options if block_given?
+    html_options = build_html_options(extra_options, style: :breadcrumb)
+
+    if block_given?
+      link_to(name, html_options, &block)
+    else
+      link_to(name, options, html_options)
+    end
   end
 
-  def text_colour_class(colour)
-    'govuk-link--text-colour' if colour
+private
+
+  def build_html_options(provided_options, style: :link)
+    styles = case style
+             when :link       then LINK_STYLES
+             when :button     then BUTTON_STYLES
+             else {}
+             end
+
+    remaining_options = provided_options&.slice!(*styles.keys)
+
+    return {} unless (style_classes = build_style_classes(style, provided_options))
+
+    inject_class(remaining_options, class_name: style_classes)
   end
 
-  def inverse_class(inverse)
-    'govuk-link--inverse' if inverse
+  def build_style_classes(style, provided_options)
+    keys = *provided_options&.keys
+
+    case style
+    when :link then govuk_link_classes(*keys)
+    when :button then govuk_button_classes(*keys)
+    when :breadcrumb then %w(govuk-breadcrumbs__link)
+    end
   end
 
-  def no_underline_class(no_underline)
-    'govuk-link--no-underline' if no_underline
+  def inject_class(attributes, class_name:)
+    attributes ||= {}
+
+    attributes.with_indifferent_access.tap do |attrs|
+      attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name).flatten
+    end
   end
 end
 

data/app/helpers/govuk_skip_link_helper.rb

@@ -1,6 +1,11 @@
 module GovukSkipLinkHelper
-  def govuk_skip_link(text: 'Skip to main content', href: '#main-content')
-    link_to text, href, class: 'govuk-skip-link'
+  def govuk_skip_link(text: 'Skip to main content', href: '#main-content', classes: [], **html_attributes, &block)
+    link_classes = Array.wrap(classes).append('govuk-skip-link')
+
+    return link_to(href, class: link_classes, **html_attributes, &block) if block_given?
+
+    link_to(text, href, class: link_classes, **html_attributes)
   end
 end
+
 ActiveSupport.on_load(:action_view) { include GovukSkipLinkHelper }

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '2.0.0b5'.freeze
+    VERSION = '2.0.0rc2'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.0b5
+  version: 2.0.0rc2
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.31.1
+        version: 2.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.31.1
+        version: 2.36.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -163,12 +163,14 @@ files:
 - Rakefile
 - 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
+- app/components/govuk_component/accordion_component/section_component.rb
 - app/components/govuk_component/back_link_component.rb
 - app/components/govuk_component/base.rb
 - app/components/govuk_component/breadcrumbs_component.html.erb
 - app/components/govuk_component/breadcrumbs_component.rb
-- app/components/govuk_component/cookie_banner_component.html.erb
 - app/components/govuk_component/cookie_banner_component.rb
+- app/components/govuk_component/cookie_banner_component/message_component.rb
 - app/components/govuk_component/details_component.rb
 - app/components/govuk_component/footer_component.html.erb
 - app/components/govuk_component/footer_component.rb
@@ -183,6 +185,10 @@ files:
 - app/components/govuk_component/start_button_component.rb
 - app/components/govuk_component/summary_list_component.html.erb
 - app/components/govuk_component/summary_list_component.rb
+- app/components/govuk_component/summary_list_component/action_component.rb
+- app/components/govuk_component/summary_list_component/key_component.rb
+- app/components/govuk_component/summary_list_component/row_component.rb
+- app/components/govuk_component/summary_list_component/value_component.rb
 - app/components/govuk_component/tab_component.html.erb
 - app/components/govuk_component/tab_component.rb
 - app/components/govuk_component/tag_component.rb

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

@@ -1,17 +0,0 @@
-<%= tag.div(class: classes, role: "region", aria: { label: aria_label }, **html_attributes) do %>
-  <div class="govuk-cookie-banner__message govuk-width-container">
-    <div class="govuk-grid-row">
-      <div class="govuk-grid-column-two-thirds">
-        <% if title.present? %>
-          <%= tag.h2(title, class: %w(govuk-cookie-banner__heading govuk-heading-m)) %>
-        <% end %>
-
-        <%= tag.div(body, class: "govuk-cookie-banner__content") %>
-      </div>
-    </div>
-
-    <div class="govuk-button-group">
-      <%= actions %>
-    </div>
-  </div>
-<% end %>