govuk_design_system_formbuilder 2.5.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98eb37a7c0dc6926abc94003671567e1d6d9ff64026d92dbd2bbeb62e132b5ac
-  data.tar.gz: 3bdd6d81f7c94f28e39841088d056c8eb7615dab89cd750e589d516f71faae0a
+  metadata.gz: '08308443752eddad69642235b4098b788ed5c5eb701b6f97d344171b9654a135'
+  data.tar.gz: 0f3b209aee144ea52d46798b14a29ea1a85b9acf545413d0219efeff03b92e8e
 SHA512:
-  metadata.gz: eae5b13528432a2c01a85aba212b74ecfcdb5740ecbe43bf6548749ebc1ab98b7a37281f7bea6b4e85964d73076e19a1a05326011d2edd71f1599075e6545e2b
-  data.tar.gz: c24c784e74e4ae48fdafcca7bf3ba3b5e5f3e22a371f0b5e16bd6fc364f1cb3d386be4bff9ea03de0ce3d5857676eca58001b09284a625d9fcd2dc6ef728a9e5
+  metadata.gz: 425224ce7905d2dd33d2123698c6f35f68e2ac640743326f811ab7b45241134f640bc054b7b75a3813edd2be558b794119437d8d4917adbe03f5cc42e38a74b9
+  data.tar.gz: 22d147336200ed390422201ece082289db29d6ee637aad76157195c9401fbbe52cfe6c9c9a80cd357f41543d133009a248a207547b0debaae46503503d26fe93

data/README.md

@@ -7,9 +7,9 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/test_coverage)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/test_coverage)
 [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=DFE-Digital/govuk_design_system_formbuilder)](https://dependabot.com)
 [![GitHub license](https://img.shields.io/github/license/DFE-Digital/govuk_design_system_formbuilder)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/blob/master/LICENSE)
-[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.11.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.12.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Ruby-2.6.7%20%E2%95%B1%202.7.3%20%E2%95%B1%203.0.1-E16D6D)](https://www.ruby-lang.org/en/downloads/)
-[![Ruby](https://img.shields.io/badge/Rails-6.0.3.6%20%E2%95%B1%206.1.3.1-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Rails-6.0.4%20%E2%95%B1%206.1.3.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
 
 This library provides an easy-to-use form builder for the [GOV.UK Design System](https://design-system.service.gov.uk/).
 

data/lib/govuk_design_system_formbuilder.rb

@@ -1,7 +1,7 @@
 require 'deep_merge/rails_compat'
 require 'active_support/configurable'
 
-[%w(traits *.rb), %w(*.rb), %w(elements ** *.rb), %w(containers ** *.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)) }
   .each { |file| require file }
 
@@ -41,6 +41,10 @@ module GOVUKDesignSystemFormBuilder
   # * +:default_collection_radio_buttons_include_hidden+ controls whether or not
   #   a hidden field is added when rendering a collection of radio buttons
   #
+  # * +:default_error_summary_error_order_method+ is the method that the library
+  #   will check for on the bound object to see whether or not to try ordering the
+  #   error messages
+  #
   # * +:localisation_schema_fallback+ sets the prefix elements for the array
   #   used to build the localisation string. The final two elements are always
   #   are the object name and attribute name. The _special_ value +__context__+,
@@ -62,6 +66,7 @@ module GOVUKDesignSystemFormBuilder
     default_submit_button_text: 'Continue',
     default_radio_divider_text: 'or',
     default_error_summary_title: 'There is a problem',
+    default_error_summary_error_order_method: nil,
     default_collection_check_boxes_include_hidden: true,
     default_collection_radio_buttons_include_hidden: true,
     default_submit_validate: false,
@@ -108,6 +113,8 @@ module GOVUKDesignSystemFormBuilder
     include GOVUKDesignSystemFormBuilder::Builder
   end
 
+  class FormBuilderProxy < FormBuilder; end
+
   # Disable Rails' div.field_with_error wrapper
   ActionView::Base.field_error_proc = ->(html_tag, _instance) { html_tag }
 end

data/lib/govuk_design_system_formbuilder/base.rb

@@ -1,12 +1,4 @@
 module GOVUKDesignSystemFormBuilder
-  module PrefixableArray
-    refine Array do
-      def prefix(text, delimiter: '-')
-        map { |item| text + delimiter + item }
-      end
-    end
-  end
-
   class Base
     delegate :content_tag, :safe_join, :tag, :link_to, :capture, to: :@builder
     delegate :config, to: GOVUKDesignSystemFormBuilder
@@ -23,21 +15,6 @@ module GOVUKDesignSystemFormBuilder
       html || ''
     end
 
-  private
-
-    # returns the attributes bound to the object that are
-    # required to build all contained elements
-    #
-    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
-    #   builder, object name and attribute name
-    def bound
-      [@builder, @object_name, @attribute_name]
-    end
-
-    def brand(override = nil)
-      override || config.brand
-    end
-
     # returns the id value used for the input
     #
     # @note field_id is overridden so that the error summary can link to the
@@ -59,6 +36,21 @@ module GOVUKDesignSystemFormBuilder
       end
     end
 
+  private
+
+    # returns the attributes bound to the object that are
+    # required to build all contained elements
+    #
+    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
+    #   builder, object name and attribute name
+    def bound
+      [@builder, @object_name, @attribute_name]
+    end
+
+    def brand(override = nil)
+      override || config.brand
+    end
+
     def has_errors?
       @builder.object.respond_to?(:errors) &&
         @builder.object.errors.any? &&

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -843,7 +843,7 @@ module GOVUKDesignSystemFormBuilder
 
     # Generates a submit button, green by default
     #
-    # @param text [String] the button text
+    # @param text [String,Proc] the button text. When a +Proc+ is provided its contents will be rendered within the button element
     # @param warning [Boolean] makes the button red ({https://design-system.service.gov.uk/components/button/#warning-buttons warning}) when true
     # @param secondary [Boolean] makes the button grey ({https://design-system.service.gov.uk/components/button/#secondary-buttons secondary}) when true
     # @param classes [Array,String] Classes to add to the submit button
@@ -853,7 +853,7 @@ module GOVUKDesignSystemFormBuilder
     #   client-side validation provided by the browser. This is to provide a more consistent and accessible user
     #   experience
     # @param disabled [Boolean] makes the button disabled when true
-    # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +input+ element
+    # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the +button+ element
     # @param block [Block] When content is passed in via a block the submit element and the block content will
     #   be wrapped in a +<div class="govuk-button-group">+ which will space the buttons and links within
     #   evenly.
@@ -861,8 +861,9 @@ module GOVUKDesignSystemFormBuilder
     # @return [ActiveSupport::SafeBuffer] HTML output
     # @note Only the first additional button or link (passed in via a block) will be given the
     #   correct left margin, subsequent buttons will need to be manually accounted for
-    # @note This helper always renders an +<input type='submit'>+ tag, HTML content is not supported inside. You
-    #   can place +<button>+ tags inside the form to have the same effect
+    # @note This helper always renders an +<button type='submit'>+ tag. Previous versions of this gem rendered
+    #   a +`<input type='submit'>' tag instead, but there is a {https://github.com/alphagov/govuk_elements/issues/545 longstanding bug}
+    #   with this approach where the top few pixels don't initiate a submission when clicked.
     # @see https://design-system.service.gov.uk/components/button/#stop-users-from-accidentally-sending-information-more-than-once
     #   GOV.UK double click prevention
     #
@@ -930,7 +931,11 @@ module GOVUKDesignSystemFormBuilder
     # @param title [String] the error summary heading
     # @param link_base_errors_to [Symbol,String] set the field that errors on +:base+ are linked
     #   to, as there won't be a field representing the object base.
+    # @param order [Array<Symbol>] the attribute order in which error messages are displayed. Ordered
+    #   attributes will appear first and unordered ones will be last, sorted in the default manner (in
+    #   which they were defined on the model).
     # @option kwargs [Hash] kwargs additional arguments are applied as attributes to the error summary +div+ element
+    # @param block [Block] arbitrary HTML that will be rendered between title and error message list
     #
     # @note Only the first error in the +#errors+ array for each attribute will
     #   be included.
@@ -939,8 +944,8 @@ module GOVUKDesignSystemFormBuilder
     #   = f.govuk_error_summary 'Uh-oh, spaghettios'
     #
     # @see https://design-system.service.gov.uk/components/error-summary/ GOV.UK error summary
-    def govuk_error_summary(title = config.default_error_summary_title, link_base_errors_to: nil, **kwargs)
-      Elements::ErrorSummary.new(self, object_name, title, link_base_errors_to: link_base_errors_to, **kwargs).html
+    def govuk_error_summary(title = config.default_error_summary_title, link_base_errors_to: nil, order: nil, **kwargs, &block)
+      Elements::ErrorSummary.new(self, object_name, title, link_base_errors_to: link_base_errors_to, order: order, **kwargs, &block).html
     end
 
     # Generates a fieldset containing the contents of the block

data/lib/govuk_design_system_formbuilder/builder_helper.rb

@@ -0,0 +1,65 @@
+module GOVUKDesignSystemFormBuilder
+  # NOTE: this is currently considered experimental, it's likely to change based on feedback.
+  #
+  # BuilderHelper contains methods that expose the form builder's functionality
+  # externally. The objectives are to allow:
+  #
+  # * rendering the error summary outside of the form
+  #
+  # * setting the id of custom form elements (rich text editors, date pickers,
+  #   sliders, etc) using the formbuilder's internal logic, allowing them to be
+  #   linked from the error summary
+  module BuilderHelper
+    # Returns the form builder generated id for an object's attribute, allowing
+    # users to force their custom element ids to match those that'll be generated
+    # by the error summary.
+    # @param object [ActiveRecord::Base,ActiveModel::Model,Object] the object that we want to
+    #   generate an id for
+    # @param object_name [Symbol] the object's name, the singular version of the object's class
+    #   name, e.g., +Person+ is +:person+.
+    # @param attribute_name [Symbol] the attribute we're generating an id for
+    # @param value [Object] the value of the attribute. Only necessary for fields with
+    #   multiple form elements like radio buttons and checkboxes
+    # @param link_errors [Boolean] toggles whether or not to override the field id with the
+    #   error id when there are errors on the +object+. Only relevant for radio buttons
+    #   and check boxes.
+    def govuk_field_id(object, attribute_name, object_name = nil, value: nil, link_errors: true)
+      (object_name = retrieve_object_name(object)) if object_name.nil?
+
+      proxy_base(object, object_name, attribute_name, value: value).field_id(link_errors: link_errors)
+    end
+
+    # Renders an error summary
+    # @param object [ActiveRecord::Base,ActiveModel::Model,Object] the object we'll be rendering
+    #   the errors for
+    # @param object_name [Symbol] the object's name, the singular version of the object's class
+    #   name, e.g., +Person+ is +:person+. If none is supplied we'll try to infer it from
+    #   the object, so it'll probably be necessary for regular Ruby objects
+    # @option args [Array] options passed through to the builder's +#govuk_error_summary+
+    # @option kwargs [Hash] keyword options passed through to the builder's +#govuk_error_summary+
+    #
+    # @example
+    #   = govuk_error_summary(@registration)
+    #
+    # @see https://design-system.service.gov.uk/components/error-summary/ GOV.UK error summary
+    def govuk_error_summary(object, object_name = nil, *args, **kwargs, &block)
+      (object_name = retrieve_object_name(object)) if object_name.nil?
+
+      proxy_builder(object, object_name, self, {}).govuk_error_summary(*args, **kwargs, &block)
+    end
+
+  private
+
+    def proxy_base(object, object_name, attribute_name, value: nil)
+      GOVUKDesignSystemFormBuilder::Proxy.new(object, object_name, attribute_name, value: value)
+    end
+
+    def proxy_builder(object, object_name, template, options)
+      GOVUKDesignSystemFormBuilder::FormBuilderProxy.new(object_name, object, template, options)
+    end
+
+    def retrieve_object_name(object)
+      object.to_model.model_name.singular
+    end
+  end
+end

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

@@ -2,13 +2,10 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module CheckBoxes
       class FieldsetCheckBox < Base
-        using PrefixableArray
-
         include Traits::Label
         include Traits::Hint
-        include Traits::FieldsetItem
-        include Traits::Conditional
         include Traits::HTMLAttributes
+        include Traits::FieldsetItem
 
         def initialize(builder, object_name, attribute_name, value, unchecked_value, label:, hint:, link_errors:, multiple:, **kwargs, &block)
           super(builder, object_name, attribute_name)
@@ -21,49 +18,22 @@ module GOVUKDesignSystemFormBuilder
           @link_errors     = link_errors
           @html_attributes = kwargs
 
-          if block_given?
-            @conditional_content = wrap_conditional(block)
-            @conditional_id      = conditional_id
-          end
-        end
-
-        def html
-          safe_join([item, @conditional_content])
+          conditional_content(&block)
         end
 
       private
 
-        def item
-          tag.div(class: %(#{brand}-checkboxes__item)) do
-            safe_join([check_box, label_element, hint_element])
-          end
+        def input_type
+          :checkboxes
         end
 
-        def check_box
+        def input
           @builder.check_box(@attribute_name, attributes(@html_attributes), @value, @unchecked_value)
         end
 
-        def options
-          {
-            id: field_id(link_errors: @link_errors),
-            class: classes,
-            multiple: @multiple,
-            aria: { describedby: [hint_id] },
-            data: { 'aria-controls' => @conditional_id }
-          }
-        end
-
-        def classes
-          %w(checkboxes__input).prefix(brand)
-        end
-
         def fieldset_options
           { checkbox: true }
         end
-
-        def conditional_classes
-          %w(checkboxes__conditional checkboxes__conditional--hidden).prefix(brand)
-        end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -4,12 +4,13 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       include Traits::HTMLAttributes
 
-      def initialize(builder, object_name, title, link_base_errors_to:, **kwargs)
-        super(builder, object_name, nil)
+      def initialize(builder, object_name, title, link_base_errors_to:, order:, **kwargs, &block)
+        super(builder, object_name, nil, &block)
 
         @title               = title
         @link_base_errors_to = link_base_errors_to
         @html_attributes     = kwargs
+        @order               = order
       end
 
       def html
@@ -27,17 +28,45 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def summary
-        tag.div(class: summary_class('body')) do
-          tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
-            safe_join(list)
-          end
-        end
+        tag.div(class: summary_class('body')) { safe_join([@block_content, list]) }
       end
 
       def list
-        @builder.object.errors.messages.map do |attribute, messages|
-          list_item(attribute, messages.first)
+        tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
+          safe_join(error_messages.map { |attribute, messages| list_item(attribute, messages.first) })
+        end
+      end
+
+      def error_messages
+        messages = @builder.object.errors.messages
+
+        if reorder_errors?
+          adjustment = error_order.size + messages.size
+
+          return messages.sort_by.with_index do |(attr, _val), i|
+            error_order.index(attr) || (i + adjustment)
+          end
         end
+
+        @builder.object.errors.messages
+      end
+
+      def reorder_errors?
+        object = @builder.object
+
+        @order || (error_order_method &&
+                   object.respond_to?(error_order_method) &&
+                   object.send(error_order_method).present?)
+      end
+
+      def error_order
+        @order || @builder.object.send(config.default_error_summary_error_order_method)
+      end
+
+      # this method will be called on the bound object to see if custom error ordering
+      # has been enabled
+      def error_order_method
+        config.default_error_summary_error_order_method
       end
 
       def list_item(attribute, message)

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

@@ -2,13 +2,10 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Radios
       class FieldsetRadioButton < Base
-        using PrefixableArray
-
         include Traits::Label
         include Traits::Hint
-        include Traits::FieldsetItem
-        include Traits::Conditional
         include Traits::HTMLAttributes
+        include Traits::FieldsetItem
 
         def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, **kwargs, &block)
           super(builder, object_name, attribute_name)
@@ -19,43 +16,21 @@ module GOVUKDesignSystemFormBuilder
           @link_errors     = has_errors? && link_errors
           @html_attributes = kwargs
 
-          if block_given?
-            @conditional_content = wrap_conditional(block)
-            @conditional_id      = conditional_id
-          end
-        end
-
-        def html
-          safe_join([radio, @conditional_content])
+          conditional_content(&block)
         end
 
       private
 
-        def radio
-          tag.div(class: %(#{brand}-radios__item)) do
-            safe_join([input, label_element, hint_element])
-          end
-        end
-
-        def fieldset_options
-          { radio: true }
+        def input_type
+          :radios
         end
 
         def input
           @builder.radio_button(@attribute_name, @value, **attributes(@html_attributes))
         end
 
-        def options
-          {
-            id: field_id(link_errors: @link_errors),
-            aria: { describedby: [hint_id] },
-            data: { 'aria-controls' => @conditional_id },
-            class: %w(radios__input).prefix(brand)
-          }
-        end
-
-        def conditional_classes
-          %w(radios__conditional radios__conditional--hidden).prefix(brand)
+        def fieldset_options
+          { radio: true }
         end
       end
     end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -9,7 +9,7 @@ module GOVUKDesignSystemFormBuilder
 
         fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
 
-        @text                 = text
+        @text                 = build_text(text)
         @prevent_double_click = prevent_double_click
         @warning              = warning
         @secondary            = secondary
@@ -26,6 +26,17 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def build_text(text)
+        case text
+        when String
+          text
+        when Proc
+          capture { text.call }
+        else
+          fail(ArgumentError, %(text must be a String or Proc))
+        end
+      end
+
       def button_group
         Containers::ButtonGroup.new(@builder, buttons).html
       end
@@ -35,11 +46,12 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def submit
-        @builder.submit(@text, **attributes(@html_attributes))
+        @builder.tag.button(@text, **attributes(@html_attributes))
       end
 
       def options
         {
+          type: 'submit',
           formnovalidate: !@validate,
           disabled: @disabled,
           class: classes,

data/lib/govuk_design_system_formbuilder/proxy.rb

@@ -0,0 +1,13 @@
+require_relative 'base'
+
+module GOVUKDesignSystemFormBuilder
+  class Proxy < GOVUKDesignSystemFormBuilder::Base
+    NullBuilder = Struct.new(:object)
+
+    def initialize(object, object_name, attribute_name, value: nil)
+      super(NullBuilder.new(object), object_name, attribute_name)
+
+      @value = value
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/refinements/prefixable_array.rb

@@ -0,0 +1,9 @@
+module GOVUKDesignSystemFormBuilder
+  module PrefixableArray
+    refine Array do
+      def prefix(text, delimiter: '-')
+        map { |item| [text, item].join(delimiter.to_s) }
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb

@@ -1,8 +1,38 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module FieldsetItem
+      using PrefixableArray
+
+      def html
+        safe_join([item, @conditional])
+      end
+
     private
 
+      def class_prefix
+        %(#{brand}-#{input_type})
+      end
+
+      def item
+        tag.div(class: %(#{class_prefix}__item)) do
+          safe_join([input, label_element, hint_element])
+        end
+      end
+
+      def options
+        {
+          id: field_id(link_errors: @link_errors),
+          class: classes,
+          multiple: @multiple,
+          aria: { describedby: [hint_id] },
+          data: { 'aria-controls' => @conditional_id }
+        }
+      end
+
+      def classes
+        [%(#{class_prefix}__input)]
+      end
+
       def label_element
         @label_element ||= if @label.nil?
                              Elements::Null.new
@@ -26,6 +56,27 @@ module GOVUKDesignSystemFormBuilder
       def hint_options
         { value: @value }.merge(fieldset_options)
       end
+
+      def conditional_id
+        build_id('conditional')
+      end
+
+      def conditional_content(&block)
+        if (conditional_block_content = block_given? && (capture { block.call }).presence)
+          @conditional    = conditional_container(conditional_block_content)
+          @conditional_id = conditional_id
+        end
+      end
+
+      def conditional_container(content)
+        tag.div(class: conditional_classes, id: conditional_id) do
+          content
+        end
+      end
+
+      def conditional_classes
+        %w(__conditional __conditional--hidden).prefix(class_prefix, delimiter: nil)
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/traits/html_attributes.rb

@@ -6,16 +6,11 @@ module GOVUKDesignSystemFormBuilder
       #   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
+        # Rather than attempt to combine these attributes, just overwrite the
+        # form internally-generated values with those that are passed in. This
+        # prevents the merge/unique value logic from affecting the content
+        # (i.e. by remvoving duplicated words).
+        UNMERGEABLE = [%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))
@@ -33,19 +28,17 @@ module GOVUKDesignSystemFormBuilder
                           when Hash
                             deep_split_values(value, key)
                           when String
-                            split_list_values(key, value, parent)
+                            split_mergeable(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
+        def split_mergeable(key, value, parent = nil)
+          return value if [parent, key].compact.in?(UNMERGEABLE)
+
+          value.split
         end
 
         def deep_join_values(hash)

data/lib/govuk_design_system_formbuilder/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.1
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -274,14 +274,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.21.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.21.1
 description: A Rails form builder that generates form inputs adhering to the GOV.UK
   Design System
 email:
@@ -295,6 +295,7 @@ files:
 - lib/govuk_design_system_formbuilder.rb
 - lib/govuk_design_system_formbuilder/base.rb
 - lib/govuk_design_system_formbuilder/builder.rb
+- lib/govuk_design_system_formbuilder/builder_helper.rb
 - lib/govuk_design_system_formbuilder/containers/button_group.rb
 - lib/govuk_design_system_formbuilder/containers/character_count.rb
 - lib/govuk_design_system_formbuilder/containers/check_boxes.rb
@@ -330,9 +331,10 @@ files:
 - lib/govuk_design_system_formbuilder/elements/select.rb
 - lib/govuk_design_system_formbuilder/elements/submit.rb
 - lib/govuk_design_system_formbuilder/elements/text_area.rb
+- lib/govuk_design_system_formbuilder/proxy.rb
+- lib/govuk_design_system_formbuilder/refinements/prefixable_array.rb
 - lib/govuk_design_system_formbuilder/traits/caption.rb
 - lib/govuk_design_system_formbuilder/traits/collection_item.rb
-- lib/govuk_design_system_formbuilder/traits/conditional.rb
 - lib/govuk_design_system_formbuilder/traits/error.rb
 - lib/govuk_design_system_formbuilder/traits/fieldset_item.rb
 - lib/govuk_design_system_formbuilder/traits/hint.rb

data/lib/govuk_design_system_formbuilder/traits/conditional.rb

@@ -1,17 +0,0 @@
-module GOVUKDesignSystemFormBuilder
-  module Traits
-    module Conditional
-    private
-
-      def conditional_id
-        build_id('conditional')
-      end
-
-      def wrap_conditional(block)
-        tag.div(class: conditional_classes, id: conditional_id) do
-          capture { block.call }
-        end
-      end
-    end
-  end
-end