govuk-components 4.0.0a2 → 4.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a89715e3ac54c26a25f8711ffcc1bcbae3c7cd697e6dc4993d6581c52fe4885
-  data.tar.gz: 8c781f15f6e02d50b5c463732770340502a7c3e300b63f633c6ca09b084effab
+  metadata.gz: bd7e8066fccea2b88cdf610a3311daf69e72552d2025e740417a8716851866bc
+  data.tar.gz: 506bd4f0a292bae9d908038af9597c83adca6e3b2a8cc912adb79566977d238c
 SHA512:
-  metadata.gz: 4c89afcba1f59b8b7d02142b891904667a9b6aaeb84db7f1d4c6c373d516b7ee302aa23e6431d21e3144f1ea6bbdc7d78703bc6d3dfe88e5c00c2f987ce8368c
-  data.tar.gz: 1dc348dde934a1806118c18c75d20b4cee98b03ba2032a1a86a4a0519461662acab039b8a8f65fd41ef3406faf634da95e72db9a2e33456af191375f87477b19
+  metadata.gz: f77444b5107f2a0d3ccb9166bb28297b6a8d643a0e4d4ac9310dd33699df7de1e51ab9ccd4ce4fc457267f43b497d5b17b2f5904b79007dac418f987900364ea
+  data.tar.gz: fc20ae15eba5a9d0faf7e953a9d28958928ecbed0b9a82c4d23643cac88ca60846e7f5cffa1fe11d38ad38c90ebb9582ef6abf0d3be9c1fa85b3f101e4281d2d

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

@@ -1,26 +1,29 @@
 class GovukComponent::AccordionComponent::SectionComponent < GovukComponent::Base
-  attr_reader :heading_text, :summary_text, :expanded, :heading_level
+  attr_reader :heading_text, :summary_text, :expanded, :heading_level, :accordion_id
 
   renders_one :heading_html
   renders_one :summary_html
 
   alias_method :expanded?, :expanded
 
-  def initialize(heading_text:, summary_text:, expanded:, heading_level:, classes: [], html_attributes: {})
+  def initialize(heading_text:, summary_text:, expanded:, heading_level:, accordion_id: nil, classes: [], html_attributes: {})
     @heading_text  = heading_text
     @summary_text  = summary_text
     @expanded      = expanded
     @heading_level = heading_level
+    @accordion_id  = accordion_id
 
     super(classes: classes, html_attributes: html_attributes)
   end
 
   def id(suffix: nil)
+    prefix = @accordion_id
+
     # 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)
+    @unique_identifier ||= heading_text&.parameterize || SecureRandom.hex(4)
 
-    [@prefix, suffix].compact.join('-')
+    [prefix, @unique_identifier, suffix].compact.join('-')
   end
 
   def heading_content

data/app/components/govuk_component/accordion_component.rb

@@ -7,14 +7,16 @@ class GovukComponent::AccordionComponent < GovukComponent::Base
       html_attributes: html_attributes,
       summary_text: summary_text,
       heading_text: heading_text,
+      accordion_id: accordion_id,
       &block
     )
   end
 
-  attr_reader :id, :heading_level
+  attr_reader :accordion_id, :heading_level
 
   def initialize(heading_level: 2, classes: [], html_attributes: {})
     @heading_level = heading_tag(heading_level)
+    @accordion_id  = html_attributes[:id]
 
     super(classes: classes, html_attributes: html_attributes)
   end
@@ -22,7 +24,7 @@ class GovukComponent::AccordionComponent < GovukComponent::Base
 private
 
   def default_attributes
-    { class: %w(govuk-accordion), data: { module: 'govuk-accordion' } }
+    { class: %w(govuk-accordion), data: { module: 'govuk-accordion' } }.compact
   end
 
   def heading_tag(level)

data/app/components/govuk_component/header_component.rb

@@ -125,11 +125,11 @@ private
     end
 
     def render?
-      name.present? || content.present?
+      name.present? || content?
     end
 
     def call
-      if content.present?
+      if content?
         tag.div(content, **html_attributes)
       else
         tag.span(name, **html_attributes)

data/app/components/govuk_component/notification_banner_component.rb

@@ -27,7 +27,7 @@ class GovukComponent::NotificationBannerComponent < GovukComponent::Base
   end
 
   def render?
-    headings.any? || text.present? || content.present?
+    headings.any? || text.present? || content?
   end
 
   class Heading < GovukComponent::Base

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

@@ -20,7 +20,7 @@ class GovukComponent::SummaryListComponent::ActionComponent < GovukComponent::Ba
 
   def call
     link_to(href, **html_attributes) do
-      safe_join([action_text, visually_hidden_span].compact, " ")
+      safe_join([action_text, visually_hidden_span].compact)
     end
   end
 
@@ -37,6 +37,6 @@ private
   end
 
   def visually_hidden_span
-    tag.span(visually_hidden_text, class: "govuk-visually-hidden") if visually_hidden_text.present?
+    tag.span(%( #{visually_hidden_text}), class: "govuk-visually-hidden") if visually_hidden_text.present?
   end
 end

data/lib/govuk/components/version.rb

@@ -1,5 +1,5 @@
 module Govuk
   module Components
-    VERSION = '4.0.0a2'.freeze
+    VERSION = '4.0.0rc1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk-components
 version: !ruby/object:Gem::Version
-  version: 4.0.0a2
+  version: 4.0.0rc1
 platform: ruby
 authors:
 - DfE developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0rc1
+        version: 3.0.0rc6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0rc1
+        version: 3.0.0rc6
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -218,14 +218,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -274,14 +274,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: slim_lint
   requirement: !ruby/object:Gem::Requirement