govuk_design_system_formbuilder 3.0.2 → 3.0.3b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f231ec181996fa0acbc3e94d5382e576331b5900a3399f9b052e0fbd6bc5a7c7
-  data.tar.gz: 403b62c7f06b053696f7c6fa94eb7ec7971581021cec7b859c20ef5aa318e7b9
+  metadata.gz: e8688a1ed5a9271f5618ba56617a4eab9aa1c341514b6d956558adc314282a2a
+  data.tar.gz: 29e1c726ef83a28da2bda26a917590ee672e4fb85cb1c3a9a89000636c2fef09
 SHA512:
-  metadata.gz: bce07c94910264bcc88923e9096a84b39bf53104ab6b17571dcc3cc1e5ff2d71cf84782d5497cf67ed0d47d1cba92fcb616cabcf11b03fa2ec3de7a17e7e50c8
-  data.tar.gz: b4aa94516e3026f53ed50830566ca15e314830d2237e6359bd88eea3469746c8e365ee4eb5a80610db22595396c800fd7659d7aafa48d999a21ed51fbb8e06e7
+  metadata.gz: fa735d3a296e2dd9f3b12cdb689fd659a9696f8cd33f866502cb48ddc63bba05013d4e87e6c688dacf25cc2de63b554fa6da6acf65bf9887c7e660265d21cc9c
+  data.tar.gz: 8273c13b2e36dba076b2120ee5ddd66c25c62153f9aabcc7e041d5eca9e93c4eadde7cfffedf88ebbabb8a7a509551ef0d7f5a3425c002d8afb02e245fb222d2

data/README.md

@@ -7,8 +7,8 @@
 [![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/)
+[![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/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.0.3b1'.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,29 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3b1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-04-19 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.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -190,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.26.0
+        version: 3.28.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -368,9 +368,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.6
 signing_key: