govuk-components 2.0.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ac79b41b17e5f17f5f6b80e195595ae1396f5d83a3a14c14564412831fdbc8
-  data.tar.gz: 587e0b9a9688c4c239e1e8cbdf44111c88aa82cd1014197293b308d0b2409f36
+  metadata.gz: a251ce9b412d46a7fd70155a08ba3cc2f6e9830baca832622bdeb459936b791f
+  data.tar.gz: 85cccf721573ce9c734d7156de9da9c1ceefc22cac05888d8163d9441420be7b
 SHA512:
-  metadata.gz: 826c5c80a39daefff656c96139c8f3c0ad6ceaffa7c8000a482f5b35a085b0f3251c7ded964c5bff0bc7a977287f77ed4ca2f5e4684d73e279d589de946e97a3
-  data.tar.gz: cb1e686cf23ef788c4d45544bd1c4cc97cdb91a560a9ca7653d71b299dedfc735721b67b7d22062823f21283f56889e43e6a3b8e35eac29d8395cf9b1dfc169c
+  metadata.gz: c94357e58eee8a5ee0ae6e059f3177e340340d7af7cd19cfc3de607cc3b04e52d62e689a9291cc94ae568a1e1de809e224c566cb82a9b148986346773b45064b
+  data.tar.gz: 89494b6d782f7aaf2e4453fc317c917bb87e6dafabd21cd8b6d0d363ebba546ae2ffbdef43f129d8eaff875f0a3cd1b804a99f271f5a33779fca3ec8fddf2d0b

data/README.md

@@ -4,7 +4,7 @@
 [![Maintainability](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/maintainability)](https://codeclimate.com/github/DFE-Digital/govuk-components/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.1-brightgreen)](https://design-system.service.gov.uk)
 
 This gem provides a suite of reusable components for the [GOV.UK Design System](https://design-system.service.gov.uk/). It is intended to provide a lightweight alternative to the [GOV.UK Publishing Components](https://github.com/alphagov/govuk_publishing_components) library and is built with Github's [ViewComponent](https://github.com/github/view_component) framework.
 
@@ -32,6 +32,7 @@ The provided components are:
 * [Start button](https://dfe-digital.github.io/govuk-components/#start-button)
 * [Summary list](https://dfe-digital.github.io/govuk-components/#summary-list)
 * [Tabs](https://dfe-digital.github.io/govuk-components/#tabs)
+* [Tables](https://dfe-digital.github.io/govuk-components/#table)
 * [Tags](https://dfe-digital.github.io/govuk-components/#tags)
 * [Warning text](https://dfe-digital.github.io/govuk-components/#warning-text)
 
@@ -44,7 +45,7 @@ All of the components can be rendered in two ways:
 * directly using Rails' `#render` method:
 
   ```erb
-    <%= render GovukComponent::GovukComponent::WarningTextComponent.new do %>
+    <%= render GovukComponent::WarningTextComponent.new do %>
       A serious warning
     <% end %>
   ```

data/app/components/govuk_component/breadcrumbs_component.rb

@@ -33,7 +33,7 @@ private
     if link.present?
       list_item { link_to(text, link, class: "govuk-breadcrumbs__link") }
     else
-      list_item(aria: { current: "page" }) { text }
+      list_item(aria: { current: "page" }) { text.to_s }
     end
   end
 

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

@@ -33,11 +33,7 @@
             <%= tag.ul(class: navigation_classes, id: "navigation", aria: { label: navigation_label }) do %>
               <% 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") %>
-                  <% else %>
-                    <%= item.text %>
-                  <% end %>
+                  <%= item %>
                 <% end %>
               <% end %>
             <% end %>

data/app/components/govuk_component/header_component.rb

@@ -53,17 +53,20 @@ private
   end
 
   class NavigationItem < GovukComponent::Base
-    attr_reader :text, :href, :active
+    attr_reader :text, :href, :options, :active
 
-    def initialize(text:, href: nil, active: false, classes: [], html_attributes: {})
+    def initialize(text:, href: nil, options: {}, active: nil, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @text   = text
-      @href   = href
-      @active = active
+      @text    = text
+      @href    = href
+      @options = options
+      @active  = active
     end
 
     def active?
+      return current_page?(href) if active.nil?
+
       active
     end
 
@@ -75,6 +78,14 @@ private
       href.present?
     end
 
+    def call
+      if link?
+        link_to(text, href, **options, class: "govuk-header__link")
+      else
+        text
+      end
+    end
+
   private
 
     def default_classes

data/app/components/govuk_component/table_component/body_component.html.erb

@@ -0,0 +1,5 @@
+<%= tag.tbody(class: classes, **html_attributes) do %>
+  <% rows.each do |row| %>
+    <%= row %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,21 @@
+class GovukComponent::TableComponent::BodyComponent < GovukComponent::Base
+  renders_many :rows, GovukComponent::TableComponent::RowComponent
+
+  def initialize(rows: nil, first_cell_is_header: false, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    build_rows_from_row_data(rows, first_cell_is_header)
+  end
+
+private
+
+  def build_rows_from_row_data(data, first_cell_is_header)
+    return if data.blank?
+
+    data.each { |d| row(cell_data: d, first_cell_is_header: first_cell_is_header) }
+  end
+
+  def default_classes
+    %w(govuk-table__body)
+  end
+end

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

@@ -0,0 +1,39 @@
+class GovukComponent::TableComponent::CaptionComponent < GovukComponent::Base
+  attr_reader :text, :size
+
+  SIZES = %w(s m l xl).freeze
+
+  def initialize(text: nil, id: nil, size: 'm', classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @id   = id
+    @text = text
+    @size = size
+  end
+
+  def call
+    tag.caption(caption_content, class: classes, **html_attributes)
+  end
+
+  def render?
+    caption_content.present?
+  end
+
+private
+
+  def caption_content
+    @caption_content ||= (content || text)
+  end
+
+  def default_classes
+    %w(govuk-table__caption).tap do |c|
+      c << caption_size_class if @size
+    end
+  end
+
+  def caption_size_class
+    fail(ArgumentError, "bad size #{size}, must be in #{SIZES}") unless size.in?(SIZES)
+
+    %(govuk-table__caption--#{size})
+  end
+end

data/app/components/govuk_component/table_component/cell_component.html.erb

@@ -0,0 +1 @@
+<%= content_tag(cell_element, cell_content, class: classes, **html_attributes) %>

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

@@ -0,0 +1,55 @@
+class GovukComponent::TableComponent::CellComponent < GovukComponent::Base
+  attr_reader :text, :header, :numeric, :width
+
+  alias_method :numeric?, :numeric
+
+  WIDTHS = {
+    "full"           => "govuk-input govuk-!-width-full",
+    "three-quarters" => "govuk-input govuk-!-width-three-quarters",
+    "two-thirds"     => "govuk-input govuk-!-width-two-thirds",
+    "one-half"       => "govuk-input govuk-!-width-one-half",
+    "one-third"      => "govuk-input govuk-!-width-one-third",
+    "one-quarter"    => "govuk-input govuk-!-width-one-quarter",
+  }.freeze
+
+  def initialize(header: false, text: nil, numeric: false, width: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @header  = header
+    @text    = text
+    @numeric = numeric
+    @width   = width
+  end
+
+private
+
+  def width?
+    width.present?
+  end
+
+  def cell_content
+    content || text
+  end
+
+  def cell_element
+    header ? :th : :td
+  end
+
+  def default_classes
+    if header
+      %w(govuk-table__header).tap do |c|
+        c << "govuk-table__header--numeric" if numeric?
+        c << width_class if width?
+      end
+    else
+      %w(govuk-table__cell).tap do |c|
+        c << "govuk-table__cell--numeric" if numeric?
+        c << width_class if width?
+      end
+    end
+  end
+
+  def width_class
+    WIDTHS.fetch(width)
+  end
+end

data/app/components/govuk_component/table_component/head_component.html.erb

@@ -0,0 +1,5 @@
+<%= tag.thead(class: classes, **html_attributes) do %>
+  <% rows.each do |row| %>
+    <%= row %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,23 @@
+class GovukComponent::TableComponent::HeadComponent < GovukComponent::Base
+  renders_many :rows, GovukComponent::TableComponent::RowComponent
+
+  attr_reader :row_data
+
+  def initialize(rows: nil, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    build_rows_from_row_data(rows)
+  end
+
+private
+
+  def build_rows_from_row_data(data)
+    return if data.blank?
+
+    data.each { |d| row(cell_data: d, header: true) }
+  end
+
+  def default_classes
+    %w(govuk-table__head)
+  end
+end

data/app/components/govuk_component/table_component/row_component.html.erb

@@ -0,0 +1,5 @@
+<%= tag.tr(class: classes, **html_attributes) do %>
+  <% cells.each do |cell| %>
+    <%= cell %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,30 @@
+class GovukComponent::TableComponent::RowComponent < GovukComponent::Base
+  renders_many :cells, GovukComponent::TableComponent::CellComponent
+
+  attr_reader :header, :first_cell_is_header
+
+  def initialize(cell_data: nil, first_cell_is_header: false, header: false, classes: [], html_attributes: {})
+    super(classes: classes, html_attributes: html_attributes)
+
+    @header = header
+    @first_cell_is_header = first_cell_is_header
+
+    build_cells_from_cell_data(cell_data)
+  end
+
+private
+
+  def build_cells_from_cell_data(cell_data)
+    return if cell_data.blank?
+
+    cell_data.map.with_index { |cd, i| cell(header: cell_is_header?(i), text: cd) }
+  end
+
+  def cell_is_header?(count)
+    header || (first_cell_is_header && count.zero?)
+  end
+
+  def default_classes
+    %w(govuk-table__row)
+  end
+end

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

@@ -0,0 +1,7 @@
+<%= tag.table(id: id, class: classes, **html_attributes) do %>
+  <%= caption %>
+  <%= head %>
+  <% bodies.each do |body| %>
+    <%= body %>
+  <% end %>
+<% end %>

data/app/components/govuk_component/table_component.rb

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

data/app/helpers/govuk_components_helper.rb

@@ -13,6 +13,7 @@ module GovukComponentsHelper
     govuk_phase_banner: 'GovukComponent::PhaseBannerComponent',
     govuk_start_button: 'GovukComponent::StartButtonComponent',
     govuk_summary_list: 'GovukComponent::SummaryListComponent',
+    govuk_table: 'GovukComponent::TableComponent',
     govuk_tabs: 'GovukComponent::TabComponent',
     govuk_tag: 'GovukComponent::TagComponent',
     govuk_warning_text: 'GovukComponent::WarningTextComponent',

data/lib/govuk/components/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.2
 platform: ruby
 authors:
 - DfE developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.0
+        version: 2.39.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.36.0
+        version: 2.39.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +191,17 @@ files:
 - 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/table_component.html.erb
+- app/components/govuk_component/table_component.rb
+- app/components/govuk_component/table_component/body_component.html.erb
+- app/components/govuk_component/table_component/body_component.rb
+- app/components/govuk_component/table_component/caption_component.rb
+- app/components/govuk_component/table_component/cell_component.html.erb
+- app/components/govuk_component/table_component/cell_component.rb
+- app/components/govuk_component/table_component/head_component.html.erb
+- app/components/govuk_component/table_component/head_component.rb
+- app/components/govuk_component/table_component/row_component.html.erb
+- app/components/govuk_component/table_component/row_component.rb
 - app/components/govuk_component/tag_component.rb
 - app/components/govuk_component/traits/custom_classes.rb
 - app/components/govuk_component/traits/custom_html_attributes.rb
@@ -209,7 +220,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -225,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []