govuk_design_system_formbuilder 2.5.1b1 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f503a3ef6180ed825ae959e1ae649d0b8e2d3b806e8705e9ec40802b29fef2cb
-  data.tar.gz: 0ca7e8d4b36a8f19799bb3a85fd533ebaa820f3baf1591ef421f4d7010d20c42
+  metadata.gz: 98eb37a7c0dc6926abc94003671567e1d6d9ff64026d92dbd2bbeb62e132b5ac
+  data.tar.gz: 3bdd6d81f7c94f28e39841088d056c8eb7615dab89cd750e589d516f71faae0a
 SHA512:
-  metadata.gz: 60a7c79b00eb5e5536509a3c77f688efde68a51764c05a7507bca26c289336d3238d4d5554d2b973fc186ec5f0c8e20f670e912aacac91fafa20e184d3c7eb84
-  data.tar.gz: a4a8c1d7ccee0ffc54a8de95450fc0603053f6efb2770963e81fe32c192ee464e402138fae41c5ab72a19c6afbbd8848c2817959008ee1ca1dceb90e4b922566
+  metadata.gz: eae5b13528432a2c01a85aba212b74ecfcdb5740ecbe43bf6548749ebc1ab98b7a37281f7bea6b4e85964d73076e19a1a05326011d2edd71f1599075e6545e2b
+  data.tar.gz: c24c784e74e4ae48fdafcca7bf3ba3b5e5f3e22a371f0b5e16bd6fc364f1cb3d386be4bff9ea03de0ce3d5857676eca58001b09284a625d9fcd2dc6ef728a9e5

data/lib/govuk_design_system_formbuilder.rb

@@ -72,8 +72,7 @@ module GOVUKDesignSystemFormBuilder
     localisation_schema_legend: nil,
     localisation_schema_caption: nil,
 
-    enable_logger: true,
-    enable_log_on_invalid_date: false
+    enable_logger: true
   }.freeze
 
   DEFAULTS.each_key { |k| config_accessor(k) { DEFAULTS[k] } }

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -82,10 +82,6 @@ module GOVUKDesignSystemFormBuilder
 
             nil
           end
-        elsif config.enable_log_on_invalid_date
-          warn("invalid Date-like object: should be a Date, Time, DateTime or Hash in MULTIPARAMETER_KEY format")
-
-          nil
         else
           fail(ArgumentError, "invalid Date-like object: must be a Date, Time, DateTime or Hash in MULTIPARAMETER_KEY format")
         end

data/lib/govuk_design_system_formbuilder/traits/html_attributes.rb

@@ -1,11 +1,22 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module HTMLAttributes
-      # Attributes eases working with default and custom attributes by
+      # 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.3 compatibility
       class Attributes
+        # Don't try to deep merge these fields, when we remove duplicates
+        # whilst merging the resulting values later, repeating words are lost
+        SKIP = [
+          %i(id),
+          %i(value),
+          %i(title),
+          %i(alt),
+          %i(href),
+          %i(aria label)
+        ].freeze
+
         def initialize(defaults, custom)
           @merged = defaults.deeper_merge(deep_split_values(custom))
         end
@@ -16,19 +27,27 @@ module GOVUKDesignSystemFormBuilder
 
       private
 
-        def deep_split_values(hash)
+        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)
+                            deep_split_values(value, key)
                           when String
-                            value.split
+                            split_list_values(key, value, parent)
                           else
                             value
                           end
           end
         end
 
+        def split_list_values(key, value, parent = nil)
+          if [parent, key].compact.in?(SKIP)
+            value
+          else
+            value.split
+          end
+        end
+
         def deep_join_values(hash)
           hash.each.with_object({}) do |(key, value), result|
             result[key] = case value

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.5.1b1'.freeze
+  VERSION = '2.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.5.1b1
+  version: 2.5.1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-24 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -363,9 +363,9 @@ 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.1.6
 signing_key: