govuk-components 2.0.0b3 → 2.0.0b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6865ba0192a8b3b74dbf3606bdb5c223f6e8ccd200257779d4e55516e07765a5
-  data.tar.gz: a97b96623bc61a2ed3a1d1cd18b65c7e5a77ac0070fd65d22bd2d35f5763f68b
+  metadata.gz: adc43cd112d0d674ac3780c1b8d82b73085994b4d94d4637b555309c35339f3f
+  data.tar.gz: c48babb1d6c848ce088a4677021dfdf6b85e99381de187856db129f3256026c1
 SHA512:
-  metadata.gz: 7382fc831161df5683e09d30f7f8e296f6019fd6137e476556e9f0056a45c644cade8f66db02ef05c57984a977a3bd82d53781259612cb4513b1a30290e495e3
-  data.tar.gz: 7961d834d1c290a9bd3ac4b79b145013b943eb4ada59f983ebb20461e692aedfd1944130f194ca4a65f041aeb938dcd629e751f42573e84d7a6980be521153e5
+  metadata.gz: c8d079f362768501769be70a9ab9e18664b995f32a36693b1b7f6be230c4394d61a006255703f467fd7d80b190976690f1268ca303914e1c6155bc9e2f56ab4b
+  data.tar.gz: ffee587ebba53cdde8399c898a34cf0def0d7d43327153300972afd6a0e6c4e08fdf64bfb3bda90b178152ab0f71f50daca9532f33542dc5654d80a259ca99c6

data/app/components/govuk_component/accordion_component.rb

@@ -1,7 +1,7 @@
 class GovukComponent::AccordionComponent < GovukComponent::Base
   renders_many :sections, "Section"
 
-  attr_accessor :id
+  attr_reader :id
 
   def initialize(id: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -16,26 +16,22 @@ private
   end
 
   class Section < GovukComponent::Base
-    attr_accessor :title, :summary, :expanded
+    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)
 
-      self.title   = title
-      self.summary = summary
-      self.expanded = expanded
+      @title    = title
+      @summary  = summary
+      @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
@@ -43,7 +39,9 @@ private
   private
 
     def default_classes
-      %w(govuk-accordion__section)
+      %w(govuk-accordion__section).tap do |classes|
+        classes.append("govuk-accordion__section--expanded") if expanded?
+      end
     end
   end
 end

data/app/components/govuk_component/back_link_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::BackLinkComponent < GovukComponent::Base
-  attr_accessor :text, :href, :options
+  attr_reader :text, :href, :options
 
   def initialize(text:, href:, classes: nil, html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -9,7 +9,7 @@ class GovukComponent::BackLinkComponent < GovukComponent::Base
   end
 
   def call
-    link_to(@text, @href, class: classes, **html_attributes)
+    link_to(text, href, class: classes, **html_attributes)
   end
 
 private

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -1,5 +1,5 @@
 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)
@@ -13,8 +13,8 @@ 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
 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.rb

@@ -2,7 +2,7 @@ class GovukComponent::FooterComponent < GovukComponent::Base
   renders_one :meta_content
   renders_one :meta
 
-  attr_accessor :meta_items, :meta_items_title, :meta_licence, :copyright
+  attr_reader :meta_items, :meta_items_title, :meta_licence, :copyright
 
   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)
     super(classes: classes, html_attributes: html_attributes)

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

@@ -34,9 +34,9 @@
               <% 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

@@ -3,13 +3,15 @@ class GovukComponent::HeaderComponent < GovukComponent::Base
   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
+    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,5 +1,5 @@
 class GovukComponent::InsetTextComponent < GovukComponent::Base
-  attr_accessor :text
+  attr_reader :text
 
   def initialize(text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)

data/app/components/govuk_component/notification_banner_component.rb

@@ -32,20 +32,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,5 +1,5 @@
 class GovukComponent::PhaseBannerComponent < GovukComponent::Base
-  attr_accessor :text
+  attr_reader :text, :phase_tag
 
   def initialize(phase_tag: nil, text: nil, classes: [], html_attributes: {})
     super(classes: classes, html_attributes: html_attributes)
@@ -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(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,13 +33,16 @@ 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

data/app/components/govuk_component/tag_component.rb

@@ -1,5 +1,5 @@
 class GovukComponent::TagComponent < GovukComponent::Base
-  attr_reader :text
+  attr_reader :text, :colour
 
   COLOURS = %w(
     grey
@@ -31,11 +31,11 @@ private
   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 +43,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_link_helper.rb

@@ -1,10 +1,14 @@
 module GovukLinkHelper
-  def govuk_link_to(*args, button: false, **kwargs, &block)
-    link_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  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_to(*args, **inject_class(kwargs, class_name: classes), &block)
   end
 
-  def govuk_mail_to(*args, button: false, **kwargs, &block)
-    mail_to(*args, **inject_class(kwargs, class_name: link_class(button)), &block)
+  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)
+
+    mail_to(*args, **inject_class(kwargs, class_name: classes), &block)
   end
 
   def govuk_button_to(*args, **kwargs)
@@ -13,6 +17,17 @@ module GovukLinkHelper
 
 private
 
+  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),
+    ]
+  end
+
   def inject_class(attributes, class_name:)
     attributes.with_indifferent_access.tap do |attrs|
       attrs[:class] = Array.wrap(attrs[:class]).prepend(class_name)
@@ -22,6 +37,26 @@ private
   def link_class(button)
     button ? 'govuk-button' : 'govuk-link'
   end
+
+  def no_visited_state_class(no_visited_state)
+    'govuk-link--no-visited-state' if no_visited_state
+  end
+
+  def muted_class(muted)
+    'govuk-link--muted' if muted
+  end
+
+  def text_colour_class(colour)
+    'govuk-link--text-colour' if colour
+  end
+
+  def inverse_class(inverse)
+    'govuk-link--inverse' if inverse
+  end
+
+  def no_underline_class(no_underline)
+    'govuk-link--no-underline' if no_underline
+  end
 end
 
 ActiveSupport.on_load(:action_view) { include GovukLinkHelper }

data/lib/govuk/components/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.0b3
+  version: 2.0.0b4
 platform: ruby
 authors:
 - DfE developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-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
@@ -194,7 +180,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 +203,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 +218,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