govuk_design_system_formbuilder 1.2.3 → 2.0.0b1

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

@@ -8,12 +8,12 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Conditional
 
-        def initialize(builder, object_name, attribute_name, value, label:, hint_text:, link_errors:, multiple:, &block)
+        def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, multiple:, &block)
           super(builder, object_name, attribute_name)
 
           @value       = value
           @label       = label
-          @hint_text   = hint_text
+          @hint        = hint
           @multiple    = multiple
           @link_errors = link_errors
 
@@ -24,45 +24,53 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          safe_join([check_box, @conditional_content])
+          safe_join([item, @conditional_content])
         end
 
       private
 
-        def check_box
-          content_tag('div', class: %(#{brand}-checkboxes__item)) do
-            safe_join([input, label_element, hint_element])
+        def item
+          tag.div(class: %(#{brand}-checkboxes__item)) do
+            safe_join([check_box, label_element, hint_element])
           end
         end
 
-        def input
-          @builder.check_box(@attribute_name, input_options, @value, false)
+        def check_box
+          @builder.check_box(@attribute_name, options, @value, false)
         end
 
-        def input_options
+        def options
           {
             id: field_id(link_errors: @link_errors),
-            class: check_box_classes,
+            class: classes,
             multiple: @multiple,
             aria: { describedby: hint_id },
             data: { 'aria-controls' => @conditional_id }
           }
         end
 
+        def classes
+          %w(checkboxes__input).prefix(brand)
+        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
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text, @value, checkbox: true)
+          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
         end
 
-        def conditional_classes
-          %w(checkboxes__conditional checkboxes__conditional--hidden).prefix(brand)
+        def hint_options
+          { checkbox: true }
         end
 
-        def check_box_classes
-          %w(checkboxes__input).prefix(brand)
+        def conditional_classes
+          %w(checkboxes__conditional checkboxes__conditional--hidden).prefix(brand)
         end
       end
     end

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -9,19 +9,20 @@ module GOVUKDesignSystemFormBuilder
 
       SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, hint_text:, date_of_birth: false, omit_day:, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, date_of_birth: false, omit_day:, form_group:, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend        = legend
         @caption       = caption
-        @hint_text     = hint_text
+        @hint          = hint
         @date_of_birth = date_of_birth
         @omit_day      = omit_day
+        @form_group    = form_group
       end
 
       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::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).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,8 +30,12 @@ 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
+        tag.div(class: %(#{brand}-date-input)) do
           safe_join([day, month, year])
         end
       end
@@ -42,61 +47,59 @@ 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)
-                )
-              ]
-            )
+        tag.div(class: %(#{brand}-date-input__item)) do
+          tag.div(class: %(#{brand}-form-group)) do
+            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: id(segment, link_errors)
+        )
+      end
+
+      def input(segment, link_errors, width, value)
+        tag.input(
+          id: id(segment, link_errors),
+          class: classes(width),
+          name: name(segment),
+          type: 'text',
+          pattern: '[0-9]*',
+          inputmode: 'numeric',
+          value: value,
+          autocomplete: date_of_birth_autocomplete_value(segment)
+        )
+      end
+
+      def 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
-        %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 id(segment, link_errors)
         if has_errors? && link_errors
           field_id(link_errors: link_errors)
         else
@@ -104,11 +107,11 @@ module GOVUKDesignSystemFormBuilder
         end
       end
 
-      def date_part_attribute_name(segment)
+      def 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
@@ -118,6 +121,10 @@ module GOVUKDesignSystemFormBuilder
 
         { day: 'bday-day', month: 'bday-month', year: 'bday-year' }.fetch(segment)
       end
+
+      def label_classes
+        %w(label date-input__label).prefix(brand)
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -12,18 +12,18 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless has_errors?
 
-        content_tag('span', class: %(#{brand}-error-message), id: error_id) do
-          safe_join([error_prefix, error_message])
+        tag.span(class: %(#{brand}-error-message), id: error_id) do
+          safe_join([hidden_prefix, message])
         end
       end
 
     private
 
-      def error_prefix
+      def hidden_prefix
         tag.span('Error: ', class: %(#{brand}-visually-hidden))
       end
 
-      def error_message
+      def message
         @builder.object.errors.messages[@attribute_name]&.first
       end
     end

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -12,32 +12,32 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless object_has_errors?
 
-        content_tag('div', class: error_summary_class, **error_summary_options) do
-          safe_join([error_title, error_summary])
+        tag.div(class: summary_class, **summary_options) do
+          safe_join([title, summary])
         end
       end
 
     private
 
-      def error_title
-        tag.h2(@title, id: error_summary_title_id, class: error_summary_class('title'))
+      def title
+        tag.h2(@title, id: summary_title_id, class: summary_class('title'))
       end
 
-      def error_summary
-        content_tag('div', class: error_summary_class('body')) do
-          content_tag('ul', class: [%(#{brand}-list), error_summary_class('list')]) do
-            safe_join(error_list)
+      def summary
+        tag.div(class: summary_class('body')) do
+          tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
+            safe_join(list)
           end
         end
       end
 
-      def error_list
+      def list
         @builder.object.errors.messages.map do |attribute, messages|
-          error_list_item(attribute, messages.first)
+          list_item(attribute, messages.first)
         end
       end
 
-      def error_list_item(attribute, message)
+      def list_item(attribute, message)
         tag.li(link_to(message, same_page_link(field_id(attribute)), data: { turbolinks: false }))
       end
 
@@ -45,7 +45,7 @@ module GOVUKDesignSystemFormBuilder
         '#'.concat(target)
       end
 
-      def error_summary_class(part = nil)
+      def summary_class(part = nil)
         if part
           %(#{brand}-error-summary).concat('__', part)
         else
@@ -57,7 +57,7 @@ module GOVUKDesignSystemFormBuilder
         build_id('field-error', attribute_name: attribute)
       end
 
-      def error_summary_title_id
+      def summary_title_id
         'error-summary-title'
       end
 
@@ -65,7 +65,7 @@ module GOVUKDesignSystemFormBuilder
         @builder.object.errors.any?
       end
 
-      def error_summary_options
+      def summary_options
         {
           tabindex: -1,
           role: 'alert',
@@ -73,7 +73,7 @@ module GOVUKDesignSystemFormBuilder
             module: %(#{brand}-error-summary)
           },
           aria: {
-            labelledby: error_summary_title_id
+            labelledby: summary_title_id
           }
         }
       end

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -8,17 +8,18 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Label
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, form_group:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
         @label         = label
         @caption       = caption
-        @hint_text     = hint_text
+        @hint          = hint
         @extra_options = kwargs
+        @form_group    = form_group
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, file])
         end
       end
@@ -26,18 +27,18 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def file
-        @builder.file_field(@attribute_name, **file_options, **@extra_options)
+        @builder.file_field(@attribute_name, **options, **@extra_options)
       end
 
-      def file_options
+      def options
         {
           id: field_id(link_errors: true),
-          class: file_classes,
+          class: classes,
           aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
         }
       end
 
-      def file_classes
+      def classes
         %w(file-upload).prefix(brand).tap do |c|
           c.push(%(#{brand}-file-upload--error)) if has_errors?
         end

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -3,40 +3,67 @@ module GOVUKDesignSystemFormBuilder
     class Hint < Base
       using PrefixableArray
 
-      include Traits::Hint
       include Traits::Localisation
 
-      def initialize(builder, object_name, attribute_name, text, value = nil, radio: false, checkbox: false)
+      def initialize(builder, object_name, attribute_name, value: nil, text: nil, content: nil, radio: false, checkbox: false, **kwargs)
         super(builder, object_name, attribute_name)
 
-        @value          = value
-        @hint_text      = hint_text(text)
-        @radio_class    = radio_class(radio)
-        @checkbox_class = checkbox_class(checkbox)
+        @radio           = radio
+        @checkbox        = checkbox
+        @html_attributes = kwargs
+
+        if content
+          @content = capture { content.call }
+        else
+          @text  = retrieve_text(text)
+          @value = value
+        end
+      end
+
+      def active?
+        [@text, @content].any?(&:present?)
       end
 
       def html
-        return nil if @hint_text.blank?
+        return nil unless active?
+
+        content_tag(hint_tag, **hint_options, **@html_attributes) { hint_body }
+      end
+
+      def hint_id
+        return nil unless active?
 
-        tag.span(@hint_text, class: hint_classes, id: hint_id)
+        build_id('hint')
       end
 
     private
 
-      def hint_text(supplied)
-        [supplied.presence, localised_text(:hint)].compact.first
+      def hint_options
+        { class: classes, id: hint_id }
+      end
+
+      def hint_tag
+        @content.presence ? 'div' : 'span'
+      end
+
+      def hint_body
+        @content || @text
+      end
+
+      def retrieve_text(supplied)
+        supplied.presence || localised_text(:hint)
       end
 
-      def hint_classes
-        %w(hint).prefix(brand).push(@radio_class, @checkbox_class).compact
+      def classes
+        %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