govuk_design_system_formbuilder 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f231ec181996fa0acbc3e94d5382e576331b5900a3399f9b052e0fbd6bc5a7c7
-  data.tar.gz: 403b62c7f06b053696f7c6fa94eb7ec7971581021cec7b859c20ef5aa318e7b9
+  metadata.gz: ef71979d3dc464b8b7bb35004494a1f9bae9af7ac392bc9267acab8c38373964
+  data.tar.gz: fec2b0c0cc99f2ebcfb20c38c03db5f13a8b70e3f6d26e5c21b7b86735598541
 SHA512:
-  metadata.gz: bce07c94910264bcc88923e9096a84b39bf53104ab6b17571dcc3cc1e5ff2d71cf84782d5497cf67ed0d47d1cba92fcb616cabcf11b03fa2ec3de7a17e7e50c8
-  data.tar.gz: b4aa94516e3026f53ed50830566ca15e314830d2237e6359bd88eea3469746c8e365ee4eb5a80610db22595396c800fd7659d7aafa48d999a21ed51fbb8e06e7
+  metadata.gz: d7e0b380e26ee9b408adc81ff58cf655d3c8e4d133dcf30414da2f0c17dc69b26bdfcd452aee69a2f9f9efb9295c44bb2f77e903e6e830c9adae6781e054b656
+  data.tar.gz: f3ada2fd3c9489b74c608b1f647a92e1e6438e84cb6c14dd4086c69ae62e227e230ee8033c6e732da11bab9be46bcc8a9b0e96b86a01e2b76a9c967f0be4e154

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/DFE-Digital/govuk-formbuilder/test_coverage)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk-formbuilder/blob/main/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.0.1-brightgreen)](https://design-system.service.gov.uk)
-[![Rails](https://img.shields.io/badge/Rails-6.1.4.4%20%E2%95%B1%207.0.2-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/)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-4.2.0-brightgreen)](https://design-system.service.gov.uk)
+[![Rails](https://img.shields.io/badge/Rails-6.1.5%20%E2%95%B1%207.0.3-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Ruby-2.7.6%20%20%E2%95%B1%203.0.4%20%20%E2%95%B1%203.1.2-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/).
 
@@ -55,7 +55,7 @@ configured.
 To get up and running quickly and easily try kickstarting your project with a
 pre-configured template:
 
-* [DfE Boilerplate](https://github.com/DFE-Digital/govuk-rails-boilerplate)
+* [DfE Rails Template](https://github.com/DFE-Digital/rails-template)
 * [DEFRA Ruby Template](https://github.com/DEFRA/defra-ruby-template)
 
 ## Setup 🔧
@@ -130,7 +130,7 @@ git config --global user.name "Julius Hibbert"
 
 ## Services using this library
 
-Approximately [40 services use this library](https://github.com/DFE-Digital/govuk-formbuilder/network/dependents),
+Approximately [70 services use this library](https://github.com/DFE-Digital/govuk-formbuilder/network/dependents),
 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>.
 

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -913,7 +913,6 @@ 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 wildcards [Boolean] add an 'X' to the day and month patterns so users can add approximate dates
     # @param form_group [Hash] configures the form group
     # @option form_group classes [Array,String] sets the form group's classes
     # @option form_group kwargs [Hash] additional attributes added to the form group
@@ -937,8 +936,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: {}, wildcards: false, **kwargs, &block)
-      Elements::Date.new(self, object_name, attribute_name, hint: hint, legend: legend, caption: caption, date_of_birth: date_of_birth, omit_day: omit_day, maxlength_enabled: maxlength_enabled, form_group: form_group, wildcards: wildcards, **kwargs, &block).html
+    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: hint, legend: legend, caption: caption, date_of_birth: date_of_birth, omit_day: omit_day, maxlength_enabled: maxlength_enabled, form_group: 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

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
       SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
       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:, wildcards:, date_of_birth: false, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, omit_day:, maxlength_enabled:, form_group:, date_of_birth: false, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend            = legend
@@ -21,7 +21,6 @@ module GOVUKDesignSystemFormBuilder
         @omit_day          = omit_day
         @maxlength_enabled = maxlength_enabled
         @form_group        = form_group
-        @wildcards         = wildcards
         @html_attributes   = kwargs
       end
 
@@ -107,7 +106,6 @@ module GOVUKDesignSystemFormBuilder
           class: classes(width),
           name: name(segment),
           type: 'text',
-          pattern: pattern(segment),
           inputmode: 'numeric',
           value: value,
           autocomplete: date_of_birth_autocomplete_value(segment),
@@ -115,12 +113,6 @@ module GOVUKDesignSystemFormBuilder
         )
       end
 
-      def pattern(segment)
-        return '[0-9X]*' if @wildcards && segment.in?(%i(day month))
-
-        '[0-9]*'
-      end
-
       def classes(width)
         build_classes(
           %(input),

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -78,7 +78,7 @@ module GOVUKDesignSystemFormBuilder
       def limit_description
         return unless limit?
 
-        tag.span(id: limit_id, class: limit_description_classes, aria: { live: 'polite' }) do
+        tag.span(id: limit_id, class: limit_description_classes) do
           "You can enter up to #{limit_quantity} #{limit_type}"
         end
       end

data/lib/govuk_design_system_formbuilder/traits/html_attributes.rb

@@ -1,68 +1,12 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module HTMLAttributes
-      # Attributes eases working with default and custom attributes by:
-      # * deeply merging them so both the default (required) attributes are
-      #   present
-      # * joins the arrays into strings to maintain Rails 6.0.* compatibility
-      class Attributes
-        # Only try to combine and merge these attributes that contain a list of
-        # values separated by a space. All other values should be merged in a
-        # regular fashion (where the custom value overrides the default)
-        MERGEABLE = [
-          %i(class),
-          %i(aria controls),
-          %i(aria describedby),
-          %i(aria flowto),
-          %i(aria labelledby),
-          %i(aria owns),
-        ].freeze
-
-        def initialize(defaults, custom)
-          @merged = defaults.deeper_merge(deep_split_values(custom))
-        end
-
-        def to_h
-          deep_join_values(@merged)
-        end
-
-      private
-
-        def deep_split_values(hash, parent = nil)
-          hash.each.with_object({}) do |(key, value), result|
-            result[key] = case value
-                          when Hash
-                            deep_split_values(value, key)
-                          when String
-                            split_mergeable(key, value, parent)
-                          else
-                            value
-                          end
-          end
-        end
-
-        def split_mergeable(key, value, parent = nil)
-          return value.presence unless [parent, key].compact.in?(MERGEABLE)
-
-          value.split
-        end
-
-        def deep_join_values(hash)
-          hash.each.with_object({}) do |(key, value), result|
-            result[key] = case value
-                          when Hash
-                            deep_join_values(value)
-                          when Array
-                            value.uniq.join(' ').presence
-                          else
-                            value
-                          end
-          end
-        end
-      end
+      using HTMLAttributesUtils
 
       def attributes(html_attributes = {})
-        Attributes.new(options, html_attributes).to_h
+        options
+          .deep_merge_html_attributes(html_attributes)
+          .deep_tidy_html_attributes
       end
     end
   end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/lib/govuk_design_system_formbuilder.rb

@@ -1,5 +1,5 @@
-require 'deep_merge/rails_compat'
 require 'active_support/configurable'
+require 'html_attributes_utils'
 
 [%w(presenters *.rb), %w(refinements *.rb), %w(traits *.rb), %w(*.rb), %w(elements ** *.rb), %w(containers ** *.rb)]
   .flat_map { |matcher| Dir.glob(File.join(__dir__, 'govuk_design_system_formbuilder', *matcher)) }

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Peter Yates
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: html-attributes-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +140,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +196,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.29.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -357,7 +363,7 @@ metadata:
   homepage_uri: https://govuk-form-builder.netlify.app
   source_code_uri: https://github.com/DFE-Digital/govuk-formbuilder
   github_repo: https://github.com/DFE-Digital/govuk-formbuilder
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -373,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: GOV.UK-compliant Rails form builder
 test_files: []