govuk_design_system_formbuilder 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04804863d4a75157988de721c6fda535eb35df444b8a99a8830b7b9758f8e03
-  data.tar.gz: 162d14ae3760447cf707bc89195daa2a66ca104265258d751b1082325ed56aa8
+  metadata.gz: 5d0ec456d05c0f92a86c39b688f0ac2a498160f473002f2fb4004567f4b17496
+  data.tar.gz: 0aa054ef3feb33eaf5b402aaea08ab2942e9b9be6708f04de41c1255e455dc86
 SHA512:
-  metadata.gz: 71814ceeaf1bb257102a0b4f3e04675bf44aa10a3b85837420d30295bf1b77e9f63c6498dc6d0a8560c5cfb7abcecd7ec057d7ce73a7b2f0f682849eae71a7ba
-  data.tar.gz: 16d9e596f3a56b25a5413aed0b996d1965cd0be1a2fb6653217cea9b41b1334f9918a75f71ea0f6ba51844b617bd0a2a3a0686c4c8fb34f05b999afce50f8f67
+  metadata.gz: 8a79e3ac6187857d917f7eb253abfbb414b8ed44a3a4488a29f82052ca234daeba9f1926a0df12697544fa266420ebe8eba8ab26840fe8d371b713d82c2df312
+  data.tar.gz: 1334ddb5eb6a36dfbcd5b8f91b50548ecfac38481682e683aec5071d2f91b7577f3cadd532c8dd8c1b1c5dba34fa837479ef55d5f63669b15756159e5b9fb5aa

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -312,7 +312,10 @@ module GOVUKDesignSystemFormBuilder
     # @option label size [String] the size of the label font, can be +xl+, +l+, +m+, +s+ or nil
     # @option label tag [Symbol,String] the label's wrapper tag, intended to allow labels to act as page headings
     # @option label hidden [Boolean] control the visability of the label. Hidden labels will stil be read by screenreaders
+    # @param options [Hash] Options hash passed through to Rails' +collection_select+ helper
+    # @param html_options [Hash] HTML Options hash passed through to Rails' +collection_select+ helper
     # @param block [Block] arbitrary HTML that will be rendered between the hint and the input
+    # @see https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-collection_select Rails collection_select (called by govuk_collection_select)
     # @return [ActiveSupport::SafeBuffer] HTML output
     #
     # @example A select box with hint

data/lib/govuk_design_system_formbuilder/containers/character_count.rb

@@ -14,17 +14,18 @@ module GOVUKDesignSystemFormBuilder
       def html
         return yield unless limit?
 
-        content_tag(
-          'div',
-          class: %(#{brand}-character-count),
-          data: { module: %(#{brand}-character-count) }.merge(**limit, **threshold).compact
-        ) do
-          yield
-        end
+        content_tag('div', **character_count_options) { yield }
       end
 
     private
 
+      def character_count_options
+        {
+          class: %(#{brand}-character-count),
+          data: { module: %(#{brand}-character-count) }.merge(**limit, **threshold).compact
+        }
+      end
+
       def limit
         if @max_words
           { maxwords: @max_words }

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -10,13 +10,20 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', class: check_boxes_classes, data: { module: %(#{brand}-checkboxes) }) do
+        content_tag('div', **check_boxes_options) do
           yield
         end
       end
 
     private
 
+      def check_boxes_options
+        {
+          class: check_boxes_classes,
+          data: { module: %(#{brand}-checkboxes) }
+        }
+      end
+
       def check_boxes_classes
         %w(checkboxes).prefix(brand).tap do |c|
           c.push(%(#{brand}-checkboxes--small)) if @small

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -17,7 +17,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_element.error_id, hint_element.hint_id]).html do
+          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([hint_element, error_element, checkboxes])
           end
         end
@@ -25,6 +25,14 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def fieldset_options
+        {
+          legend: @legend,
+          caption: @caption,
+          described_by: [error_element.error_id, hint_element.hint_id]
+        }
+      end
+
       def checkboxes
         Containers::CheckBoxes.new(@builder, small: @small, classes: @classes).html do
           @block_content

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -26,18 +26,29 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
-          safe_join([legend_content, (@block_content || yield)])
+        content_tag('fieldset', **fieldset_options) do
+          safe_join([legend, (@block_content || yield)])
         end
       end
 
     private
 
-      def legend_content
-        @legend_raw || legend
+      def fieldset_options
+        {
+          class: fieldset_classes,
+          aria: { describedby: @described_by }
+        }
+      end
+
+      def fieldset_classes
+        %w(fieldset).prefix(brand)
       end
 
       def legend
+        @legend_raw || legend_content
+      end
+
+      def legend_content
         if legend_text.present?
           content_tag('legend', class: legend_classes) do
             content_tag(@legend_options.dig(:tag), class: legend_heading_classes) do
@@ -48,18 +59,17 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def legend_text
-        [@legend_options.dig(:text), localised_text(:legend)].compact.first
+        @legend_options.dig(:text) || localised_text(:legend)
       end
 
-      def fieldset_classes
-        %w(fieldset).prefix(brand)
+      def legend_size
+        @legend_options.dig(:size).tap do |size|
+          fail "invalid size '#{size}', must be #{LEGEND_SIZES.join(', ')}" unless size.in?(LEGEND_SIZES)
+        end
       end
 
       def legend_classes
-        size = @legend_options.dig(:size)
-        fail "invalid size '#{size}', must be #{LEGEND_SIZES.join(', ')}" unless size.in?(LEGEND_SIZES)
-
-        [%(fieldset__legend), %(fieldset__legend--#{size})].prefix(brand).tap do |classes|
+        [%(fieldset__legend), %(fieldset__legend--#{legend_size})].prefix(brand).tap do |classes|
           classes.push(%(#{brand}-visually-hidden)) if @legend_options.dig(:hidden)
         end
       end

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -18,7 +18,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_element.error_id, hint_element.hint_id]).html do
+          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([hint_element, error_element, radios])
           end
         end
@@ -26,6 +26,14 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def fieldset_options
+        {
+          legend: @legend,
+          caption: @caption,
+          described_by: [error_element.error_id, hint_element.hint_id]
+        }
+      end
+
       def radios
         Containers::Radios.new(@builder, inline: @inline, small: @small, classes: @classes).html do
           @block_content

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -13,13 +13,20 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', class: radios_classes, data: { module: %(#{brand}-radios) }) do
+        content_tag('div', **radios_options) do
           yield
         end
       end
 
     private
 
+      def radios_options
+        {
+          class: radios_classes,
+          data: { module: %(#{brand}-radios) }
+        }
+      end
+
       def radios_classes
         %w(radios).prefix(brand).tap do |c|
           c.push(%(#{brand}-radios--inline)) if @inline

data/lib/govuk_design_system_formbuilder/containers/supplemental.rb

@@ -10,9 +10,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil if @content.blank?
 
-        content_tag('div', id: supplemental_id) do
-          @content
-        end
+        content_tag('div', id: supplemental_id) { @content }
       end
 
       def supplemental_id

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

@@ -22,7 +22,7 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id]).html do
+            Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, check_boxes])
             end
           end
@@ -30,6 +30,14 @@ module GOVUKDesignSystemFormBuilder
 
       private
 
+        def fieldset_options
+          {
+            legend: @legend,
+            caption: @caption,
+            described_by: [error_id, hint_id, supplemental_id]
+          }
+        end
+
         def check_boxes
           Containers::CheckBoxes.new(@builder, small: @small, classes: @classes).html do
             collection

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

@@ -50,7 +50,11 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, checkbox: true, value: @value, link_errors: @link_errors, **label_options)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+        end
+
+        def label_options
+          { checkbox: true, value: @value, link_errors: @link_errors }
         end
 
         def hint_element

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -21,7 +21,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id]).html do
+          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
             safe_join([supplemental_content, hint_element, error_element, date])
           end
         end
@@ -29,6 +29,10 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def fieldset_options
+        { legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id] }
+      end
+
       def date
         content_tag('div', class: %(#{brand}-date-input)) do
           safe_join([day, month, year])
@@ -42,61 +46,63 @@ module GOVUKDesignSystemFormBuilder
       def day
         return nil if omit_day?
 
-        date_part_input(:day, link_errors: true)
+        date_part(:day, width: 2, link_errors: true)
       end
 
       def month
-        date_part_input(:month, link_errors: omit_day?)
+        date_part(:month, width: 2, link_errors: omit_day?)
       end
 
       def year
-        date_part_input(:year, width: 4)
+        date_part(:year, width: 4)
       end
 
-      def date_part_input(segment, width: 2, link_errors: false)
+      def date_part(segment, width:, link_errors: false)
         value = @builder.object.try(@attribute_name).try(segment)
 
         content_tag('div', class: %w(date-input__item).prefix(brand)) do
           content_tag('div', class: %w(form-group).prefix(brand)) do
-            safe_join(
-              [
-                tag.label(
-                  segment.capitalize,
-                  class: date_part_label_classes,
-                  for: date_part_attribute_id(segment, link_errors)
-                ),
-
-                tag.input(
-                  id: date_part_attribute_id(segment, link_errors),
-                  class: date_part_input_classes(width),
-                  name: date_part_attribute_name(segment),
-                  type: 'text',
-                  pattern: '[0-9]*',
-                  inputmode: 'numeric',
-                  value: value,
-                  autocomplete: date_of_birth_autocomplete_value(segment)
-                )
-              ]
-            )
+            safe_join([label(segment, link_errors), input(segment, link_errors, width, value)])
           end
         end
       end
 
-      def date_part_input_classes(width)
+      def label(segment, link_errors)
+        tag.label(
+          segment.capitalize,
+          class: label_classes,
+          for: input_id(segment, link_errors)
+        )
+      end
+
+      def input(segment, link_errors, width, value)
+        tag.input(
+          id: input_id(segment, link_errors),
+          class: input_classes(width),
+          name: input_name(segment),
+          type: 'text',
+          pattern: '[0-9]*',
+          inputmode: 'numeric',
+          value: value,
+          autocomplete: date_of_birth_autocomplete_value(segment)
+        )
+      end
+
+      def input_classes(width)
         %w(input date-input__input).prefix(brand).tap do |classes|
           classes.push(%(#{brand}-input--width-#{width}))
           classes.push(%(#{brand}-input--error)) if has_errors?
         end
       end
 
-      def date_part_label_classes
+      def label_classes
         %w(label date-input__label).prefix(brand)
       end
 
       # if the field has errors we want the govuk_error_summary to
       # be able to link to the day field. Otherwise, generate IDs
       # in the normal fashion
-      def date_part_attribute_id(segment, link_errors)
+      def input_id(segment, link_errors)
         if has_errors? && link_errors
           field_id(link_errors: link_errors)
         else
@@ -104,11 +110,11 @@ module GOVUKDesignSystemFormBuilder
         end
       end
 
-      def date_part_attribute_name(segment)
+      def input_name(segment)
         format(
-          "%<object_name>s[%<attribute_name>s(%<segment>s)]",
+          "%<object_name>s[%<input_name>s(%<segment>s)]",
           object_name: @object_name,
-          attribute_name: @attribute_name,
+          input_name: @attribute_name,
           segment: SEGMENTS.fetch(segment)
         )
       end

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -9,10 +9,10 @@ module GOVUKDesignSystemFormBuilder
       def initialize(builder, object_name, attribute_name, text, value = nil, radio: false, checkbox: false)
         super(builder, object_name, attribute_name)
 
-        @value          = value
-        @hint_text      = hint_text(text)
-        @radio_class    = radio_class(radio)
-        @checkbox_class = checkbox_class(checkbox)
+        @value     = value
+        @hint_text = hint_text(text)
+        @radio     = radio
+        @checkbox  = checkbox
       end
 
       def html
@@ -24,19 +24,19 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def hint_text(supplied)
-        [supplied.presence, localised_text(:hint)].compact.first
+        supplied.presence || localised_text(:hint)
       end
 
       def hint_classes
-        %w(hint).prefix(brand).push(@radio_class, @checkbox_class).compact
+        %w(hint).prefix(brand).push(radio_class, checkbox_class).compact
       end
 
-      def radio_class(radio)
-        radio ? %(#{brand}-radios__hint) : nil
+      def radio_class
+        @radio ? %(#{brand}-radios__hint) : nil
       end
 
-      def checkbox_class(checkbox)
-        checkbox ? %(#{brand}-checkboxes__hint) : nil
+      def checkbox_class
+        @checkbox ? %(#{brand}-checkboxes__hint) : nil
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -14,14 +14,14 @@ module GOVUKDesignSystemFormBuilder
         if content
           @content = content.call
         else
-          @value          = value # used by field_id
-          @text           = label_text(text, hidden)
-          @size_class     = label_size_class(size)
-          @radio_class    = radio_class(radio)
-          @checkbox_class = checkbox_class(checkbox)
-          @tag            = tag
-          @link_errors    = link_errors
-          @caption        = caption
+          @value       = value # used by field_id
+          @text        = label_text(text, hidden)
+          @size_class  = label_size_class(size)
+          @radio       = radio
+          @checkbox    = checkbox
+          @tag         = tag
+          @link_errors = link_errors
+          @caption     = caption
         end
       end
 
@@ -38,7 +38,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def label
-        @builder.label(@attribute_name, label_options) do
+        @builder.label(@attribute_name, **label_options) do
           @content || safe_join([caption, @text])
         end
       end
@@ -57,20 +57,24 @@ module GOVUKDesignSystemFormBuilder
         {
           value: @value,
           for: field_id(link_errors: @link_errors),
-          class: %w(label).prefix(brand).push(@size_class, @weight_class, @radio_class, @checkbox_class).compact
+          class: %w(label).prefix(brand).push(@size_class, @weight_class, radio_class, checkbox_class).compact
         }
       end
 
       def caption
-        caption_element.html unless [@radio_class, @checkbox_class].any?
+        caption_element.html unless [@radio, @checkbox].any?
       end
 
-      def radio_class(radio)
-        radio ? %(#{brand}-radios__label) : nil
+      def radio_class
+        return nil unless @radio
+
+        %(#{brand}-radios__label)
       end
 
-      def checkbox_class(checkbox)
-        checkbox ? %(#{brand}-checkboxes__label) : nil
+      def checkbox_class
+        return nil unless @checkbox
+
+        %(#{brand}-checkboxes__label)
       end
 
       def label_size_class(size)

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

@@ -24,7 +24,7 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            Containers::Fieldset.new(@builder, @object_name, @attribute_name, legend: @legend, caption: @caption, described_by: [error_id, hint_id, supplemental_id]).html do
+            Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, radios])
             end
           end
@@ -32,6 +32,14 @@ module GOVUKDesignSystemFormBuilder
 
       private
 
+        def fieldset_options
+          {
+            legend: @legend,
+            caption: @caption,
+            described_by: [error_id, hint_id, supplemental_id]
+          }
+        end
+
         def radios
           Containers::Radios.new(@builder, inline: @inline, small: @small, classes: @classes).html do
             safe_join(collection)

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

@@ -47,7 +47,17 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, text: @label_text, value: @value, radio: true, size: label_size, link_errors: @link_errors)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_options)
+        end
+
+        def label_options
+          {
+            text: @label_text,
+            value: @value,
+            radio: true,
+            size: label_size,
+            link_errors: @link_errors
+          }
         end
 
         def label_size

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

@@ -35,7 +35,11 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, radio: true, value: @value, link_errors: @link_errors, **label_options)
+          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+        end
+
+        def label_options
+          { radio: true, value: @value, link_errors: @link_errors }
         end
 
         def hint_element
@@ -43,7 +47,7 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def input
-          @builder.radio_button(@attribute_name, @value, input_options)
+          @builder.radio_button(@attribute_name, @value, **input_options)
         end
 
         def input_options

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -1,8 +1,6 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Select < Base
-      using PrefixableArray
-
       include Traits::Error
       include Traits::Label
       include Traits::Hint
@@ -30,7 +28,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def select
-        @builder.collection_select(@attribute_name, @collection, @value_method, @text_method, @options, select_options)
+        @builder.collection_select(@attribute_name, @collection, @value_method, @text_method, @options, **select_options)
       end
 
       def select_options
@@ -42,9 +40,15 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def select_classes
-        %w(select).prefix(brand).tap do |classes|
-          classes.push(%(#{brand}-select--error)) if has_errors?
-        end
+        [%(#{brand}-select), select_error_class, select_custom_classes].flatten.compact
+      end
+
+      def select_error_class
+        %(#{brand}-select--error) if has_errors?
+      end
+
+      def select_custom_classes
+        @html_options.dig(:class)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -30,7 +30,7 @@ module GOVUKDesignSystemFormBuilder
       def submit_classes
         %w(button)
           .prefix(brand)
-          .push(warning_class, secondary_class, disabled_class, @classes, padding_class(@block_content.present?))
+          .push(warning_class, secondary_class, disabled_class, padding_class, @classes)
           .compact
       end
 
@@ -53,8 +53,8 @@ module GOVUKDesignSystemFormBuilder
         %(#{brand}-button--secondary) if @secondary
       end
 
-      def padding_class(content_present)
-        %(#{brand}-!-margin-right-1) if content_present
+      def padding_class
+        %(#{brand}-!-margin-right-1) if @block_content
       end
 
       def disabled_class

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -11,18 +11,18 @@ module GOVUKDesignSystemFormBuilder
       def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, rows:, max_words:, max_chars:, threshold:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @label      = label
-        @caption    = caption
-        @hint_text  = hint_text
-        @attributes = kwargs
-        @max_words  = max_words
-        @max_chars  = max_chars
-        @threshold  = threshold
-        @rows       = rows
+        @label           = label
+        @caption         = caption
+        @hint_text       = hint_text
+        @max_words       = max_words
+        @max_chars       = max_chars
+        @threshold       = threshold
+        @rows            = rows
+        @html_attributes = kwargs
       end
 
       def html
-        Containers::CharacterCount.new(@builder, max_words: @max_words, max_chars: @max_chars, threshold: @threshold).html do
+        Containers::CharacterCount.new(@builder, **character_count_options).html do
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
             safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
@@ -31,8 +31,12 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def character_count_options
+        { max_words: @max_words, max_chars: @max_chars, threshold: @threshold }
+      end
+
       def text_area
-        @builder.text_area(@attribute_name, **text_area_options, **@attributes.merge(rows: @rows))
+        @builder.text_area(@attribute_name, **text_area_options, **@html_attributes)
       end
 
       def text_area_classes
@@ -46,6 +50,7 @@ module GOVUKDesignSystemFormBuilder
         {
           id: field_id(link_errors: true),
           class: text_area_classes,
+          rows: @rows,
           aria: { describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id) },
         }
       end
@@ -59,9 +64,17 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit?
+        limit_quantity.present?
+      end
+
+      def limit_quantity
         @max_words || @max_chars
       end
 
+      def limit_type
+        @max_words.present? ? 'words' : 'characters'
+      end
+
       def limit_description
         return nil unless limit?
 
@@ -74,14 +87,6 @@ module GOVUKDesignSystemFormBuilder
         %w(hint character-count__message).prefix(brand)
       end
 
-      def limit_quantity
-        @max_words || @max_chars
-      end
-
-      def limit_type
-        @max_words.present? ? 'words' : 'characters'
-      end
-
       def limit_description_id
         return nil unless limit?
 

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -4,11 +4,11 @@ module GOVUKDesignSystemFormBuilder
       def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @width      = width
-        @attributes = kwargs
-        @label      = label
-        @caption    = caption
-        @hint_text  = hint_text
+        @width           = width
+        @label           = label
+        @caption         = caption
+        @hint_text       = hint_text
+        @html_attributes = kwargs
       end
 
       def html
@@ -20,7 +20,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def input
-        @builder.send(builder_method, @attribute_name, **input_options.merge(@attributes))
+        @builder.send(builder_method, @attribute_name, **input_options, **@html_attributes)
       end
 
       def input_options

data/lib/govuk_design_system_formbuilder/traits/label.rb

@@ -4,10 +4,10 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def label_element
-        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_options)
+        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
       end
 
-      def label_options
+      def label_content
         case @label
         when Hash
           @label

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.2.3'.freeze
+  VERSION = '1.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.0
+        version: 3.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.0
+        version: 3.20.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement