RubyGems - govuk_design_system_formbuilder - Versions diffs - 2.7.1 → 2.7.2 - Mend

govuk_design_system_formbuilder 2.7.1 → 2.7.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710ba81f8f737d55dd18626c24a9353862d9b53886127a064e5dc10ddf6fd750
-  data.tar.gz: e82e7198bf059a97d9b0cb9ce0659133b8082dfac2e71c7c37fc4ff3ff1e38fa
+  metadata.gz: 06a3aa374a6a6fa23d1fb52cdb7585fe50e067580328683b5dcbbcd8c6444aab
+  data.tar.gz: 15c814a5314cbf8aa97fd9e8d47c640062286d6a2239be89265015f6eafab172
 SHA512:
-  metadata.gz: cd1fee6e4db64215afaa4ceb8083138ee01f11407137cf5885bf8823e0e86cf34ef27e7178118e2a10fe82eef82ce22163d7cef6e1f8f953e5356dde0de1fe96
-  data.tar.gz: c5b20b72db3dd9598fe20e3c42527b715cca82d936bd53a9255b7033fff6620fd631e74f3072d5092852b838be89ebb4dd3b04d567c711a17d6a909e52a0eed3
+  metadata.gz: c4319d5fbd9168b1869aa94a1206f57c50f4e2d1a238a06da0bbcae0a55b82a020895ca1cfc59de86fdb9ee0248cbd283a3f5b22142946b9951a96906e870c9e
+  data.tar.gz: eec0ec045b248bd16cf671b4d289ea91429338693c541c74c30d92d481b2f2a833c490b064ed58bce7e95a49af03725faa6cb58b0222f0a5411153d1673d4a89

data/lib/govuk_design_system_formbuilder/base.rb CHANGED Viewed

@@ -57,7 +57,7 @@ module GOVUKDesignSystemFormBuilder
         @builder.object.errors.messages[@attribute_name].present?
     end
-    def described_by(*ids)
+    def combine_references(*ids)
       ids.flatten.compact
     end

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb CHANGED Viewed

@@ -22,7 +22,7 @@ module GOVUKDesignSystemFormBuilder
       end
       def classes
-        [%(#{brand}-checkboxes), small_class, custom_classes].flatten.compact
+        combine_references(%(#{brand}-checkboxes), small_class, custom_classes)
       end
       def small_class

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb CHANGED Viewed

@@ -5,6 +5,8 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, small:, classes:, form_group:, multiple:, &block)
+        fail LocalJumpError, 'no block given' unless block_given?
         super(builder, object_name, attribute_name, &block)
         @legend        = legend
@@ -14,7 +16,6 @@ module GOVUKDesignSystemFormBuilder
         @classes       = classes
         @form_group    = form_group
         @multiple      = multiple
-        @block_content = capture { block.call }
       end
       def html

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         @legend          = legend
         @caption         = caption
-        @described_by    = described_by(described_by)
+        @described_by    = combine_references(described_by)
         @attribute_name  = attribute_name
         @html_attributes = kwargs
       end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb CHANGED Viewed

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
     private
       def classes
-        [form_group_class, error_class, custom_classes].flatten.compact
+        combine_references(form_group_class, error_class, custom_classes)
       end
       def form_group_class

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb CHANGED Viewed

@@ -5,7 +5,9 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, inline:, small:, classes:, form_group:, &block)
-        super(builder, object_name, attribute_name)
+        fail LocalJumpError, 'no block given' unless block_given?
+        super(builder, object_name, attribute_name, &block)
         @inline        = inline
         @small         = small
@@ -14,7 +16,6 @@ module GOVUKDesignSystemFormBuilder
         @hint          = hint
         @classes       = classes
         @form_group    = form_group
-        @block_content = capture { block.call }
       end
       def html

data/lib/govuk_design_system_formbuilder/containers/radios.rb CHANGED Viewed

@@ -25,7 +25,7 @@ module GOVUKDesignSystemFormBuilder
       end
       def classes
-        [%(#{brand}-radios), inline_class, small_class, custom_classes].flatten.compact
+        combine_references(%(#{brand}-radios), inline_class, small_class, custom_classes)
       end
       def inline_class

data/lib/govuk_design_system_formbuilder/elements/check_boxes/fieldset_check_box.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         include Traits::FieldsetItem
         def initialize(builder, object_name, attribute_name, value, unchecked_value, label:, hint:, link_errors:, multiple:, exclusive:, **kwargs, &block)
-          super(builder, object_name, attribute_name)
+          super(builder, object_name, attribute_name, &block)
           @value           = value
           @unchecked_value = unchecked_value
@@ -19,7 +19,7 @@ module GOVUKDesignSystemFormBuilder
           @html_attributes = kwargs
           @exclusive       = exclusive
-          conditional_content(&block)
+          conditional_content(@block_content)
         end
       private

data/lib/govuk_design_system_formbuilder/elements/collection_select.rb CHANGED Viewed

@@ -40,7 +40,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
         }
       end

data/lib/govuk_design_system_formbuilder/elements/file.rb CHANGED Viewed

@@ -35,7 +35,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
         }
       end

data/lib/govuk_design_system_formbuilder/elements/radios/fieldset_radio_button.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         include Traits::FieldsetItem
         def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, **kwargs, &block)
-          super(builder, object_name, attribute_name)
+          super(builder, object_name, attribute_name, &block)
           @value           = value
           @label           = label
@@ -16,7 +16,7 @@ module GOVUKDesignSystemFormBuilder
           @link_errors     = has_errors? && link_errors
           @html_attributes = kwargs
-          conditional_content(&block)
+          conditional_content(@block_content)
         end
       private

data/lib/govuk_design_system_formbuilder/elements/select.rb CHANGED Viewed

@@ -38,7 +38,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: described_by(hint_id, error_id) }
+          aria: { describedby: combine_references(hint_id, error_id) }
         }
       end
     end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb CHANGED Viewed

@@ -53,7 +53,7 @@ module GOVUKDesignSystemFormBuilder
           id: field_id(link_errors: true),
           class: classes,
           rows: @rows,
-          aria: { describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id) },
+          aria: { describedby: combine_references(hint_id, error_id, supplemental_id, limit_description_id) },
         }
       end

data/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module GOVUKDesignSystemFormBuilder
       using PrefixableArray
       def html
-        safe_join([item, @conditional])
+        safe_join([item, @conditional_content])
       end
     private
@@ -61,9 +61,9 @@ module GOVUKDesignSystemFormBuilder
         build_id('conditional')
       end
-      def conditional_content(&block)
-        if (conditional_block_content = block_given? && (capture { block.call }).presence)
-          @conditional    = conditional_container(conditional_block_content)
+      def conditional_content(block_content)
+        if block_content.present?
+          @conditional_content = conditional_container(block_content)
           @conditional_id = conditional_id
         end
       end

data/lib/govuk_design_system_formbuilder/traits/input.rb CHANGED Viewed

@@ -48,7 +48,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
+          aria: { describedby: combine_references(hint_id, error_id, supplemental_id) }
         }
       end

data/lib/govuk_design_system_formbuilder/traits/select.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module GOVUKDesignSystemFormBuilder
     private
       def classes
-        [%(#{brand}-select), error_class].flatten.compact
+        combine_references(%(#{brand}-select), error_class)
       end
       def error_class

data/lib/govuk_design_system_formbuilder/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.7.1'.freeze
+  VERSION = '2.7.2'.freeze
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge