govuk-components 2.0.0b2 → 2.0.0b6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d78b72089a8fad902b686ad63ecb7b101a7353a5e59bbd70369d929eb3f9b8ab
-  data.tar.gz: f72eff8f23f2a8a808f21ea5cb14be0574a61ba6688e8e137fec6387ea6f44d7
+  metadata.gz: 71ba722e8aa82977774d53d3b6d8352dbceddc1966974f356aca9e4337c9b086
+  data.tar.gz: 193426f137c69991e3d7bf57b005141778ea48d24026158af303450ed326b768
 SHA512:
-  metadata.gz: bb0b5e3653d68b5e53a8931204ce9a973d6cc8f5e778ea3d8950cd8c9499eafe6c2080b7a973ca53284d9e7de9dc0fa31bda6df3c1aa908d2477b06d4f964f7c
-  data.tar.gz: b7d8992142ec9627c957f63082b66dbacbee454e2a837209f3dd86d4fe018c929c2f113942a11d368afeb3569f210fc7ce1ed3e5c22bb211141c9ef915588912
+  metadata.gz: eed11ed8f35f73dcf0328cd6d9640037ba2971e105b6258f039eba78b183fb425a8aa2d1b4e632dfa6cecbadb443395659384d14a9ca657bc7fa190f7ebc2222
+  data.tar.gz: bc13182bb9c0ef100fe4ee4bc1ceb09ab98eedfc87a47bf538cc06d7fe5f3a01ab646fdb2f1aee96f04dd0c4760b66fc0d3a1e45b868965a11c145706a5ab5aa

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_accessor :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,35 +26,9 @@ private
     %w(govuk-accordion)
   end
 
-  class Section < GovukComponent::Base
-    attr_accessor :title, :summary, :expanded
-
-    alias_method :expanded?, :expanded
-
-    def initialize(title:, summary: nil, expanded: false, classes: [], html_attributes: {})
-      super(classes: classes, html_attributes: html_attributes)
-
-      self.title   = title
-      self.summary = summary
-      self.expanded = expanded
-    end
-
-    def id(suffix: nil)
-      [title.parameterize, suffix].compact.join('-')
-    end
-
-    def classes
-      super + (expanded? ? %w(govuk-accordion__section--expanded) : [])
-    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)
-    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_accessor :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

@@ -1,10 +1,10 @@
 class GovukComponent::BreadcrumbsComponent < GovukComponent::Base
-  attr_accessor :breadcrumbs
+  attr_reader :breadcrumbs, :hide_in_print, :collapse_on_mobile
 
   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
@@ -13,8 +13,31 @@ private
 
   def default_classes
     %w(govuk-breadcrumbs).tap do |classes|
-      classes << "govuk-!-display-none-print" if @hide_in_print
-      classes << "govuk-breadcrumbs--collapse-on-mobile" if @collapse_on_mobile
+      classes << "govuk-!-display-none-print" if hide_in_print
+      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/details_component.rb

@@ -1,5 +1,7 @@
 class GovukComponent::DetailsComponent < GovukComponent::Base
-  attr_accessor :summary_text, :text
+  attr_reader :summary_text, :text
+
+  renders_one :summary_html
 
   def initialize(summary_text:, text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -18,10 +20,14 @@ private
 
   def summary
     tag.summary(class: "govuk-details__summary") do
-      tag.span(summary_text, class: "govuk-details__summary-text")
+      tag.span(summary_content, class: "govuk-details__summary-text")
     end
   end
 
+  def summary_content
+    summary_html || summary_text
+  end
+
   def description
     tag.div(class: "govuk-details__text") do
       content.presence || text

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_accessor :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

@@ -1,7 +1,7 @@
 <%= tag.header(class: classes, role: 'banner', data: { module: 'govuk-header' }, **html_attributes) do %>
   <%= tag.div(class: container_classes) do %>
     <div class="govuk-header__logo">
-      <%= link_to(@homepage_url, class: %w(govuk-header__link govuk-header__link--homepage)) do %>
+      <%= link_to(homepage_url, class: %w(govuk-header__link govuk-header__link--homepage)) do %>
         <span class="govuk-header__logotype">
           <% if custom_logo.present? %>
             <%= custom_logo %>
@@ -21,22 +21,22 @@
       <% 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)) %>
+        <% 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.title, item.href, class: "govuk-header__link") %>
+                    <%= link_to(item.text, item.href, class: "govuk-header__link") %>
                   <% else %>
-                    <%= item.title %>
+                    <%= item.text %>
                   <% end %>
                 <% end %>
               <% end %>

data/app/components/govuk_component/header_component.rb

@@ -1,15 +1,17 @@
 class GovukComponent::HeaderComponent < GovukComponent::Base
-  renders_many :items, "Item"
+  renders_many :navigation_items, "NavigationItem"
   renders_one :custom_logo
   renders_one :product_name, "ProductName"
 
-  attr_accessor :logotype,
-                :crown,
-                :homepage_url,
-                :service_name,
-                :service_url,
-                :menu_button_label,
-                :navigation_label
+  attr_reader :logotype,
+              :crown,
+              :homepage_url,
+              :service_name,
+              :service_url,
+              :menu_button_label,
+              :navigation_label,
+              :custom_navigation_classes,
+              :custom_container_classes
 
   def initialize(classes: [],
                  html_attributes: {},
@@ -25,15 +27,15 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
 
     super(classes: classes, html_attributes: html_attributes)
 
-    @logotype           = logotype
-    @crown              = crown
-    @homepage_url       = homepage_url
-    @service_name       = service_name
-    @service_url        = service_url
-    @menu_button_label  = menu_button_label
-    @navigation_classes = navigation_classes
-    @navigation_label   = navigation_label
-    @container_classes  = container_classes
+    @logotype                  = logotype
+    @crown                     = crown
+    @homepage_url              = homepage_url
+    @service_name              = service_name
+    @service_url               = service_url
+    @menu_button_label         = menu_button_label
+    @custom_navigation_classes = navigation_classes
+    @navigation_label          = navigation_label
+    @custom_container_classes  = container_classes
   end
 
 private
@@ -43,22 +45,22 @@ private
   end
 
   def navigation_classes
-    combine_classes(%w(govuk-header__navigation), @navigation_classes)
+    combine_classes(%w(govuk-header__navigation), custom_navigation_classes)
   end
 
   def container_classes
-    combine_classes(%w(govuk-header__container govuk-width-container), @container_classes)
+    combine_classes(%w(govuk-header__container govuk-width-container), custom_container_classes)
   end
 
-  class Item < GovukComponent::Base
-    attr_accessor :title, :href, :active
+  class NavigationItem < GovukComponent::Base
+    attr_reader :text, :href, :active
 
-    def initialize(title:, href: nil, active: false, classes: [], html_attributes: {})
+    def initialize(text:, href: nil, active: false, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      self.title  = title
-      self.href   = href
-      self.active = active
+      @text   = text
+      @href   = href
+      @active = active
     end
 
     def active?
@@ -81,7 +83,7 @@ private
   end
 
   class ProductName < GovukComponent::Base
-    attr_accessor :name
+    attr_reader :name
 
     def initialize(name: nil, html_attributes: {}, classes: [])
       super(classes: classes, html_attributes: html_attributes)
@@ -90,14 +92,14 @@ private
     end
 
     def render?
-      @name.present? || content.present?
+      name.present? || content.present?
     end
 
     def call
       if content.present?
         tag.div(content, class: classes)
       else
-        tag.span(@name, class: classes)
+        tag.span(name, class: classes)
       end
     end
 

data/app/components/govuk_component/inset_text_component.rb

@@ -1,22 +1,27 @@
 class GovukComponent::InsetTextComponent < GovukComponent::Base
-  attr_accessor :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,20 +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: "region", 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
+    @role                = role
     @success             = success
     @title_heading_level = title_heading_level
     @disable_auto_focus  = disable_auto_focus
   end
 
   def render?
-    headings.any? || content.present?
+    headings.any? || text.present? || content.present?
   end
 
   def classes
@@ -25,6 +28,10 @@ class GovukComponent::NotificationBannerComponent < GovukComponent::Base
     %(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)
 
@@ -32,20 +39,20 @@ class GovukComponent::NotificationBannerComponent < GovukComponent::Base
   end
 
   class Heading < GovukComponent::Base
-    attr_accessor :text, :link_href, :link_text
+    attr_reader :text, :link_href, :link_text
 
     def initialize(text: nil, link_text: nil, link_href: nil, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @text        = text
-      @link_text   = link_text
-      @link_href   = link_href
+      @text      = text
+      @link_text = link_text
+      @link_href = link_href
     end
 
     def call
       tag.div(class: classes, **html_attributes) do
         if text.present?
-          safe_join([text, link].compact)
+          safe_join([text, link].compact, " ")
         else
           content
         end

data/app/components/govuk_component/panel_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::PanelComponent < GovukComponent::Base
-  attr_accessor :title, :body
+  attr_reader :title, :body
 
   def initialize(title: nil, body: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -35,7 +35,7 @@ private
   def panel_body
     if display_body?
       tag.div(class: "govuk-panel__body") do
-        content.presence || @body
+        content.presence || body
       end
     end
   end

data/app/components/govuk_component/phase_banner_component.rb

@@ -1,15 +1,15 @@
 class GovukComponent::PhaseBannerComponent < GovukComponent::Base
-  attr_accessor :text
+  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
 
   def phase_tag_component
-    GovukComponent::TagComponent.new(classes: "govuk-phase-banner__content__tag", **@phase_tag)
+    GovukComponent::TagComponent.new(classes: "govuk-phase-banner__content__tag", **phase_tag)
   end
 
 private

data/app/components/govuk_component/start_button_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::StartButtonComponent < GovukComponent::Base
-  attr_accessor :text, :href
+  attr_reader :text, :href
 
   def initialize(text:, href:, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -9,8 +9,8 @@ class GovukComponent::StartButtonComponent < GovukComponent::Base
   end
 
   def call
-    link_to(@href, **default_attributes, **html_attributes) do
-      safe_join([@text, icon])
+    link_to(href, **default_attributes, **html_attributes) do
+      safe_join([text, icon])
     end
   end
 

data/app/components/govuk_component/summary_list_component.rb

@@ -33,19 +33,24 @@ private
     def initialize(key:, value:, action: {}, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @key                  = key
-      @value                = value
-      @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] || {}
+      @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
+      link_classes = govuk_link_classes.append(action_classes).flatten
+
       tag.dd(class: "govuk-summary-list__actions") do
         if href.present?
-          govuk_link_to(href, class: action_classes, **action_attributes) do
+          link_to(href, class: link_classes, **action_attributes) do
             safe_join([text, tag.span(visually_hidden_text, class: "govuk-visually-hidden")])
           end
         end

data/app/components/govuk_component/tag_component.rb

@@ -1,19 +1,9 @@
 class GovukComponent::TagComponent < GovukComponent::Base
-  attr_reader :text
-
-  COLOURS = %w(
-    grey
-    green
-    turquoise
-    blue
-    red
-    purple
-    pink
-    orange
-    yellow
-  ).freeze
-
-  def initialize(text:, colour: nil, classes: [], html_attributes: {})
+  attr_reader :text, :colour
+
+  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,21 +11,25 @@ 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
 
   def colour_class
-    return nil if @colour.blank?
+    return nil if colour.blank?
 
     fail(ArgumentError, colour_error_message) unless valid_colour?
 
-    %(govuk-tag--#{@colour})
+    %(govuk-tag--#{colour})
   end
 
   def valid_colour?
@@ -43,6 +37,6 @@ private
   end
 
   def colour_error_message
-    "invalid tag colour #{@colour}, supported colours are #{COLOURS.to_sentence}"
+    "invalid tag colour #{colour}, supported colours are #{COLOURS.to_sentence}"
   end
 end

data/app/components/govuk_component/warning_text_component.rb

@@ -12,7 +12,7 @@ class GovukComponent::WarningTextComponent < GovukComponent::Base
 
   def call
     tag.div(class: classes, **html_attributes) do
-      safe_join([icon, strong])
+      safe_join([icon, (content || strong)])
     end
   end
 

data/app/helpers/govuk_components_helper.rb

@@ -11,7 +11,7 @@ module GovukComponentsHelper
     govuk_notification_banner: 'GovukComponent::NotificationBannerComponent',
     govuk_panel: 'GovukComponent::PanelComponent',
     govuk_phase_banner: 'GovukComponent::PhaseBannerComponent',
-    govuk_start_now_button: 'GovukComponent::StartButtonComponent',
+    govuk_start_button: 'GovukComponent::StartButtonComponent',
     govuk_summary_list: 'GovukComponent::SummaryListComponent',
     govuk_tabs: 'GovukComponent::TabComponent',
     govuk_tag: 'GovukComponent::TagComponent',

data/app/helpers/govuk_link_helper.rb

@@ -1,26 +1,110 @@
 module GovukLinkHelper
-  def govuk_link_to(*args, button: false, **kwargs, &block)
-    link_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  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
+
+  BUTTON_STYLES = {
+    disabled:  "govuk-button--disabled",
+    secondary: "govuk-button--secondary",
+    warning:   "govuk-button--warning",
+  }.freeze
+
+  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
+
+    [default_class] + LINK_STYLES.values_at(*styles).compact
+  end
+
+  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
+
+  def govuk_link_to(name = nil, options = nil, extra_options = {}, &block)
+    extra_options = options if block_given?
+    html_options = build_html_options(extra_options)
+
+    if block_given?
+      link_to(name, html_options, &block)
+    else
+      link_to(name, options, html_options)
+    end
+  end
+
+  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 govuk_mail_to(*args, button: false, **kwargs, &block)
-    mail_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  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 govuk_button_to(*args, **kwargs)
-    button_to(*args, **inject_class(kwargs, class_name: 'govuk-button'))
+  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
 
 private
 
-  def inject_class(attributes, class_name:)
-    attributes.with_indifferent_access.tap do |attrs|
-      attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name)
+  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 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 link_class(button)
-    button ? 'govuk-button' : 'govuk-link'
+  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.0b2'.freeze
+    VERSION = '2.0.0b6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.0b2
+  version: 2.0.0b6
 platform: ruby
 authors:
 - DfE developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-06 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.31.1
-- !ruby/object:Gem::Dependency
-  name: capybara
-  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: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +100,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.1
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +163,8 @@ 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
@@ -194,7 +182,6 @@ files:
 - app/components/govuk_component/panel_component.rb
 - app/components/govuk_component/phase_banner_component.html.erb
 - app/components/govuk_component/phase_banner_component.rb
-- app/components/govuk_component/slot.rb
 - 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
@@ -218,7 +205,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -233,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []

data/app/components/govuk_component/slot.rb

@@ -1,9 +0,0 @@
-class GovukComponent::Slot < ViewComponent::Slot
-  include GovukComponent::Traits::CustomClasses
-  include GovukComponent::Traits::CustomHtmlAttributes
-
-  def initialize(classes: [], html_attributes: {})
-    @classes         = parse_classes(classes)
-    @html_attributes = html_attributes
-  end
-end