govuk-components 3.0.0b2 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae11984437c0a4e6631d19c4db1211886178b8a70498f3d2592175cb7ba466e9
-  data.tar.gz: 6cfbbf6933643393abf51f6dc6c8b6d6c62c36b5a93e62dbfdd955f3ab845fe1
+  metadata.gz: 057cf421a74d24cf1dcfa796a3fb058ca4fff573eb3d8095d04f83b4891f09da
+  data.tar.gz: 77ab1008878c995b46ff439fb5fbb396190b85b1a48978e8bffc6d2197156994
 SHA512:
-  metadata.gz: 82da69e1477bd8e07b7c778aff87da77886eb2008bbe470996635445b73de841b03b3fb91b0000d7067072b98a6998ccaafa204447e2ed284b8411204e1ff435
-  data.tar.gz: eb1ce8afdb5562b9de0eeda99bb62122101ac42656ab0a5999f10372ed343c153f8769cc8ab420e06c790c21407e94fb79932c7448c7a36da41a3d02629e62e1
+  metadata.gz: 32c6f43b3b590706e8e545afe71fe158cb33590433aa454ad84be3a20f907588097febd5890fb26d8fadbfb2d4e8332c36bafbf62394beab9d8167f83b473f84
+  data.tar.gz: 7def35bb74e158cc480d8fa7e6df578a2b4a17db10198139e64833569d6b038f67a061dc3f83bc70c49ee60aa4096e139d15a8bb68f18e981c6bc09c12bb6340

data/README.md

@@ -2,9 +2,13 @@
 
 [![Tests](https://github.com/DFE-Digital/govuk-components/workflows/Tests/badge.svg)](https://github.com/DFE-Digital/govuk-components/actions?query=workflow%3ATests)
 [![Maintainability](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/maintainability)](https://codeclimate.com/github/DFE-Digital/govuk-components/maintainability)
+[![Gem Version](https://badge.fury.io/rb/govuk-components.svg)](https://badge.fury.io/rb/govuk-components)
+[![Gem](https://img.shields.io/gem/dt/govuk-components?logo=rubygems)](https://rubygems.org/gems/govuk-components)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/cbcbc140f300b920d833/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk-components/test_coverage)
-[![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.13.1-brightgreen)](https://design-system.service.gov.uk)
+[![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk-components)](https://github.com/DFE-Digital/govuk-components/blob/main/LICENSE)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.0.0-brightgreen)](https://design-system.service.gov.uk)
+[![Rails](https://img.shields.io/badge/Rails-6.1.4.4%20%E2%95%B1%207.0.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-2.7.5%20%20%E2%95%B1%203.0.3%20%20%E2%95%B1%203.1.0-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
 This gem provides a suite of reusable components for the [GOV.UK Design System](https://design-system.service.gov.uk/). It is intended to provide a lightweight alternative to the [GOV.UK Publishing Components](https://github.com/alphagov/govuk_publishing_components) library and is built with GitHub’s [ViewComponent](https://github.com/github/view_component) framework.
 
@@ -36,7 +40,8 @@ The provided components are:
 * [Tags](https://govuk-components.netlify.app/components/tags)
 * [Warning text](https://govuk-components.netlify.app/components/warning-text)
 
-This library also provides [link](https://govuk-components.netlify.app/helpers/link) and [button](https://govuk-components.netlify.app/helpers/button) helpers.
+This library also provides [link](https://govuk-components.netlify.app/helpers/link) and
+[button](https://govuk-components.netlify.app/helpers/button) helpers.
 
 ## Alternative syntax
 
@@ -78,7 +83,6 @@ This library allows components to be rendered with Rails’ `render` method or v
     <p>Wednesday’s child is full of woe</p>
   <% end %>
 <% end %>
-
 ```
 
 Here are the rendered tabs:
@@ -126,20 +130,18 @@ gem install govuk-components
 
 ## Contributing
 
-To setup the dummy app:
-
-`cd spec/dummy`
-`yarn install`
-`bundle install`
-`bin/rails db:create`
-`bin/rails db:migrate`
-`bin/rails s`
+Bug reports and feature requests are most welcome, please raise an issue or
+submit a pull request.
 
-After changing a component or adding a new one:
+Currently we're using [GOVUK Lint](https://github.com/alphagov/govuk-lint) to
+ensure code meets the GOV.UK guidelines. Please ensure that any PRs also adhere
+to this standard.
 
-* add or update the corresponding specs, and check they pass by running `bundle exec rspec`.
+To help keep the logs clean and tidy, please configure git to use your full name:
 
-* update the examples page by cd-ing into the dummy app `cd spec/dummy` and running the rake task `bin/rake generate_examples_page`.
+```sh
+git config --global user.name "Julius Hibbert"
+```
 
 ## License
 

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

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

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

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

data/app/components/govuk_component/summary_list_component.rb

@@ -1,17 +1,25 @@
 module GovukComponent
   class SummaryListComponent < GovukComponent::Base
-    attr_reader :borders
-
-    renders_many :rows, "GovukComponent::SummaryListComponent::RowComponent"
+    attr_reader :borders, :actions
+
+    renders_many :rows, ->(classes: [], html_attributes: {}, &block) do
+      GovukComponent::SummaryListComponent::RowComponent.new(
+        show_actions_column: @show_actions_column,
+        classes: classes,
+        html_attributes: html_attributes,
+        &block
+      )
+    end
 
-    def initialize(borders: true, classes: [], html_attributes: {})
+    def initialize(rows: nil, actions: true, borders: true, classes: [], html_attributes: {})
       super(classes: classes, html_attributes: html_attributes)
 
-      @borders = borders
-    end
+      @borders             = borders
+      @show_actions_column = actions
+
+      return unless rows.presence
 
-    def any_row_has_actions?
-      rows.any? { |row| row.href.present? }
+      build(rows)
     end
 
     def classes
@@ -27,5 +35,19 @@ module GovukComponent
     def default_classes
       %w(govuk-summary-list)
     end
+
+    def build(rows)
+      @show_actions_column = rows.any? { |r| r.key?(:actions) }
+
+      rows.each do |data|
+        k, v, a = data.values_at(:key, :value, :actions)
+
+        row(**data.slice(:classes, :html_attributes)) do |r|
+          r.key(**k)
+          r.value(**v)
+          Array.wrap(a).each { |ad| r.action(**ad) }
+        end
+      end
+    end
   end
 end

data/app/helpers/govuk_skip_link_helper.rb

@@ -2,9 +2,11 @@ module GovukSkipLinkHelper
   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?
+    html_attributes_with_data_module = { data: { module: "govuk-skip-link" } }.deep_merge(html_attributes)
 
-    link_to(text, href, class: link_classes, **html_attributes)
+    return link_to(href, class: link_classes, **html_attributes_with_data_module, &block) if block_given?
+
+    link_to(text, href, class: link_classes, **html_attributes_with_data_module)
   end
 end
 

data/lib/govuk/components/engine.rb

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

data/lib/govuk/components/version.rb

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

data/lib/govuk/components.rb

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

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 3.0.0b2
+  version: 3.0.1
 platform: ruby
 authors:
 - DfE developers
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-03 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -34,9 +28,6 @@ dependencies:
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -44,9 +35,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.4.4
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -56,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.47.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.39.0
+        version: 2.47.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -360,7 +348,7 @@ homepage: https://github.com/DFE-Digital/govuk-components
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -371,12 +359,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Lightweight set of reusable GOV.UK Design System components
 test_files: []