govuk_design_system_formbuilder 5.3.3 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49872073d9196fcaf016da8e8bb5b732cb44c4f93942ab929ea18aff46108547
-  data.tar.gz: a1620cf4f0462a5ef72d74f10e3bab677374d7ff99a3b3c885e11bc5919a091d
+  metadata.gz: e699e3c09adb56d1637b9b73f5e944ee43b459344b8b4f6cef45ea2fa2a289e8
+  data.tar.gz: 9d29d136a1f9578710be19d585c1d74661dd739089212eea8b32e3c92319317c
 SHA512:
-  metadata.gz: 3067ff3c0f078d9c605abb7ce902bab9ac27da088c3b7618818d0162bcf25685716fbd66499e2c6a081344d0aebd906bbf077bfe351fc55eab58000c19a5bf4d
-  data.tar.gz: 25e79221ae4bc57c38c9fffd3f6725ec98b5f6c2c724d05d09f954f6f9c8f52af1327e76748979774d6976974ad6418a0ec64f2e2d319eac44a580265ef0816b
+  metadata.gz: 5121bef0b86ee59184d441e702bb4df4abe041fd8debd96c954b5d1957fa3b028902b536afeb2690fa8707ef8bfc60afbbf49b04e6b7c87feee319e76dc9a4a1
+  data.tar.gz: 113424beb03532e4b5999b78c55e975bdd774e1bce6b177555c78d3ceda2e2256014ae872e374f9ce8723dbe0881f8a9d553992bf1d0ff6a2146e6f856beb930

data/README.md

@@ -6,9 +6,9 @@
 [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/110136fb22341d3ba646/test_coverage)](https://codeclimate.com/github/x-govuk/govuk-form-builder/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/x-govuk/govuk-form-builder)](https://github.com/x-govuk/govuk-form-builder/blob/main/LICENSE)
-[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-5.3.1-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-5.4.1-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Rails-6.1.7%20%E2%95%B1%207.1.3-E16D6D)](https://weblog.rubyonrails.org/releases/)
-[![Ruby](https://img.shields.io/badge/Ruby-3.1.4%20%20%E2%95%B1%203.2.3%20%20%E2%95%B1%203.3.0-E16D6D)](https://www.ruby-lang.org/en/downloads/)
+[![Ruby](https://img.shields.io/badge/Ruby-3.1.6%20%20%E2%95%B1%203.2.4%20%20%E2%95%B1%203.3.4-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
 This library provides an easy-to-use form builder for the [GOV.UK Design System](https://design-system.service.gov.uk/).
 
@@ -118,8 +118,8 @@ Approximately [100 services use this library](https://github.com/x-govuk/govuk-f
 here are a few from the <abbr title="Department for Education">DfE</abbr>, <abbr title="Ministry of Justice">MoJ</abbr>, and
 <abbr title="Department for Business, Energy & Industrial Strategy">BEIS</abbr>.
 
-* [Apply for teacher training](https://www.github.com/x-govuk/apply-for-teacher-training)
-* [Teaching Vacancies](https://www.github.com/x-govuk/teaching-vacancies)
+* [Apply for teacher training](https://www.github.com/dfe-digital/apply-for-teacher-training)
+* [Teaching Vacancies](https://www.github.com/dfe-digital/teaching-vacancies)
 * [Manage children's vaccinations](https://github.com/nhsuk/manage-childrens-vaccinations)
 * [Claim for crown court defence](https://www.github.com/ministryofjustice/Claim-for-Crown-Court-Defence)
 * [Appeal to the tax tribunal](https://www.github.com/ministryofjustice/tax-tribunals-datacapture)

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -922,6 +922,8 @@ module GOVUKDesignSystemFormBuilder
     # @option caption kwargs [Hash] additional arguments are applied as attributes on the caption +span+ element
     # @param omit_day [Boolean] do not render a day input, only capture month and year
     # @param maxlength_enabled [Boolean] adds maxlength attribute to day, month and year inputs (2, 2, and 4, respectively)
+    # @param segments [Hash] allows Rails' multiparameter attributes to be overridden on a field-by-field basis. Hash must
+    #   contain +day:+, +month:+ and +year:+ keys. Defaults to the default value set in the +default_date_segments+ setting in {GOVUKDesignSystemFormBuilder.DEFAULTS}
     # @param form_group [Hash] configures the form group
     # @option form_group kwargs [Hash] additional attributes added to the form group
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element
@@ -944,8 +946,8 @@ module GOVUKDesignSystemFormBuilder
     # @example A date input with legend supplied as a proc
     #  = f.govuk_date_field :finishes_on,
     #    legend: -> { tag.h3('Which category do you belong to?') }
-    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, maxlength_enabled: false, form_group: {}, **kwargs, &block)
-      Elements::Date.new(self, object_name, attribute_name, hint:, legend:, caption:, date_of_birth:, omit_day:, maxlength_enabled:, form_group:, **kwargs, &block).html
+    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, maxlength_enabled: false, segments: config.default_date_segments, form_group: {}, **kwargs, &block)
+      Elements::Date.new(self, object_name, attribute_name, hint:, legend:, caption:, date_of_birth:, omit_day:, maxlength_enabled:, segments:, form_group:, **kwargs, &block).html
     end
 
     # Generates a summary of errors in the form, each linking to the corresponding

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -10,7 +10,7 @@ module GOVUKDesignSystemFormBuilder
 
       MULTIPARAMETER_KEY = { day: 3, month: 2, year: 1 }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, omit_day:, maxlength_enabled:, form_group:, date_of_birth: false, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, omit_day:, maxlength_enabled:, segments:, form_group:, date_of_birth: false, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend            = legend
@@ -19,6 +19,7 @@ module GOVUKDesignSystemFormBuilder
         @date_of_birth     = date_of_birth
         @omit_day          = omit_day
         @maxlength_enabled = maxlength_enabled
+        @segments          = segments
         @form_group        = form_group
         @html_attributes   = kwargs
       end
@@ -33,10 +34,6 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
-      def segments
-        config.default_date_segments
-      end
-
       def fieldset_options
         { legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id] }
       end
@@ -139,7 +136,7 @@ module GOVUKDesignSystemFormBuilder
         if has_errors? && link_errors
           field_id(link_errors:)
         else
-          [@object_name, @attribute_name, segments.fetch(segment)].join("_")
+          [@object_name, @attribute_name, @segments.fetch(segment)].join("_")
         end
       end
 
@@ -148,7 +145,7 @@ module GOVUKDesignSystemFormBuilder
           "%<object_name>s[%<input_name>s(%<segment>s)]",
           object_name: @object_name,
           input_name: @attribute_name,
-          segment: segments.fetch(segment)
+          segment: @segments.fetch(segment)
         )
       end
 

data/lib/govuk_design_system_formbuilder/elements/legend.rb

@@ -65,6 +65,8 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def size_class(size)
+        return nil if size.nil?
+
         fail "invalid size '#{size}', must be xl, l, m or s" unless size.in?(%w(xl l m s))
 
         %(fieldset__legend--#{size})

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '5.3.3'.freeze
+  VERSION = '5.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.4.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 5.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.16.0
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -176,28 +176,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.15
+        version: 4.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.12.15
+        version: 4.13.0
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -260,14 +260,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
@@ -384,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: GOV.UK Form Builder for Ryby on Rails