govuk_design_system_formbuilder 1.2.3 → 2.0.0b1

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
+        tag.div(**options) { yield }
       end
 
     private
 
+      def 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

@@ -1,8 +1,6 @@
 module GOVUKDesignSystemFormBuilder
   module Containers
     class CheckBoxes < Base
-      using PrefixableArray
-
       def initialize(builder, small:, classes: nil)
         @builder = builder
         @small   = small
@@ -10,18 +8,28 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', class: check_boxes_classes, data: { module: %(#{brand}-checkboxes) }) do
-          yield
-        end
+        tag.div(**options) { yield }
       end
 
     private
 
-      def check_boxes_classes
-        %w(checkboxes).prefix(brand).tap do |c|
-          c.push(%(#{brand}-checkboxes--small)) if @small
-          c.push(@classes) if @classes
-        end
+      def options
+        {
+          class: classes,
+          data: { module: %(#{brand}-checkboxes) }
+        }
+      end
+
+      def classes
+        [%(#{brand}-checkboxes), small_class, custom_classes].flatten.compact
+      end
+
+      def small_class
+        %(#{brand}-checkboxes--small) if @small
+      end
+
+      def custom_classes
+        Array.wrap(@classes)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -4,20 +4,21 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       include Traits::Hint
 
-      def initialize(builder, object_name, attribute_name, hint_text:, legend:, caption:, small:, classes:, &block)
+      def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, small:, classes:, form_group:, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend        = legend
         @caption       = caption
-        @hint_text     = hint_text
+        @hint          = hint
         @small         = small
         @classes       = classes
+        @form_group    = form_group
         @block_content = capture { block.call }
       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_element.error_id, hint_element.hint_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([hint_element, error_element, checkboxes])
           end
         end
@@ -25,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 checkboxes
         Containers::CheckBoxes.new(@builder, small: @small, classes: @classes).html do
           @block_content

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -1,80 +1,40 @@
 module GOVUKDesignSystemFormBuilder
   module Containers
     class Fieldset < Base
-      using PrefixableArray
-
-      include Traits::Caption
-      include Traits::Localisation
-
-      LEGEND_SIZES = %w(xl l m s).freeze
-
       def initialize(builder, object_name = nil, attribute_name = nil, legend: {}, caption: {}, described_by: nil, &block)
         super(builder, object_name, attribute_name, &block)
 
+        @legend         = legend
+        @caption        = caption
         @described_by   = described_by(described_by)
         @attribute_name = attribute_name
-
-        case legend
-        when Proc
-          @legend_raw = legend.call
-        when Hash
-          @legend_options = legend_defaults.merge(legend)
-          @caption        = caption
-        else
-          fail(ArgumentError, %(legend must be a Proc or Hash))
-        end
       end
 
       def html
-        content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
-          safe_join([legend_content, (@block_content || yield)])
+        tag.fieldset(**options) do
+          safe_join([legend_element, (@block_content || yield)])
         end
       end
 
     private
 
-      def legend_content
-        @legend_raw || legend
-      end
-
-      def legend
-        if legend_text.present?
-          content_tag('legend', class: legend_classes) do
-            content_tag(@legend_options.dig(:tag), class: legend_heading_classes) do
-              safe_join([caption_element, legend_text])
-            end
-          end
-        end
-      end
-
-      def legend_text
-        [@legend_options.dig(:text), localised_text(:legend)].compact.first
+      def options
+        {
+          class: classes,
+          aria: { describedby: @described_by }
+        }
       end
 
-      def fieldset_classes
-        %w(fieldset).prefix(brand)
+      def classes
+        %(#{brand}-fieldset)
       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|
-          classes.push(%(#{brand}-visually-hidden)) if @legend_options.dig(:hidden)
-        end
+      def legend_element
+        @legend_element ||= Elements::Legend.new(@builder, @object_name, @attribute_name, **legend_options)
       end
 
-      def legend_heading_classes
-        %w(fieldset__heading).prefix(brand)
-      end
-
-      def legend_defaults
-        {
-          hidden: false,
-          text: nil,
-          tag:  config.default_legend_tag,
-          size: config.default_legend_size
-        }
+      def legend_options
+        { legend: @legend, caption: @caption }
       end
     end
   end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -1,24 +1,33 @@
 module GOVUKDesignSystemFormBuilder
   module Containers
     class FormGroup < Base
-      using PrefixableArray
-
-      def initialize(builder, object_name, attribute_name)
+      def initialize(builder, object_name, attribute_name, classes: nil, **kwargs)
         super(builder, object_name, attribute_name)
+
+        @classes       = classes
+        @extra_options = kwargs
       end
 
       def html
-        content_tag('div', class: form_group_classes) do
-          yield
-        end
+        tag.div(class: classes, **@extra_options) { yield }
       end
 
     private
 
-      def form_group_classes
-        %w(form-group).prefix(brand).tap do |classes|
-          classes.push(%(#{brand}-form-group--error)) if has_errors?
-        end
+      def classes
+        [form_group_class, error_class, custom_classes].flatten.compact
+      end
+
+      def form_group_class
+        %(#{brand}-form-group)
+      end
+
+      def error_class
+        %(#{brand}-form-group--error) if has_errors?
+      end
+
+      def custom_classes
+        Array.wrap(@classes)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -4,21 +4,22 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Error
 
-      def initialize(builder, object_name, attribute_name, hint_text:, legend:, caption:, inline:, small:, classes:, &block)
+      def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, inline:, small:, classes:, form_group:, &block)
         super(builder, object_name, attribute_name)
 
         @inline        = inline
         @small         = small
         @legend        = legend
         @caption       = caption
-        @hint_text     = hint_text
+        @hint          = hint
         @classes       = classes
+        @form_group    = form_group
         @block_content = capture { block.call }
       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_element.error_id, hint_element.hint_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([hint_element, error_element, radios])
           end
         end
@@ -26,6 +27,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

@@ -1,8 +1,6 @@
 module GOVUKDesignSystemFormBuilder
   module Containers
     class Radios < Base
-      using PrefixableArray
-
       include Traits::Hint
 
       def initialize(builder, inline:, small:, classes:)
@@ -13,19 +11,32 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', class: radios_classes, data: { module: %(#{brand}-radios) }) do
-          yield
-        end
+        tag.div(**options) { yield }
       end
 
     private
 
-      def radios_classes
-        %w(radios).prefix(brand).tap do |c|
-          c.push(%(#{brand}-radios--inline)) if @inline
-          c.push(%(#{brand}-radios--small))  if @small
-          c.push(@classes)                   if @classes
-        end
+      def options
+        {
+          class: classes,
+          data: { module: %(#{brand}-radios) }
+        }
+      end
+
+      def classes
+        [%(#{brand}-radios), inline_class, small_class, custom_classes].flatten.compact
+      end
+
+      def inline_class
+        %(#{brand}-radios--inline) if @inline
+      end
+
+      def small_class
+        %(#{brand}-radios--small)  if @small
+      end
+
+      def custom_classes
+        Array.wrap(@classes)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/containers/supplemental.rb

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

data/lib/govuk_design_system_formbuilder/elements/caption.rb

@@ -6,8 +6,8 @@ module GOVUKDesignSystemFormBuilder
       def initialize(builder, object_name, attribute_name, text:, size: nil)
         super(builder, object_name, attribute_name)
 
-        @text       = caption_text(text)
-        @size_class = caption_size_class(size)
+        @text       = text(text)
+        @size_class = size_class(size)
       end
 
       def html
@@ -16,11 +16,13 @@ module GOVUKDesignSystemFormBuilder
         tag.span(@text, class: @size_class)
       end
 
-      def caption_text(override)
+    private
+
+      def text(override)
         override || localised_text(:caption)
       end
 
-      def caption_size_class(size)
+      def size_class(size)
         case size || config.default_caption_size
         when 'xl' then %(#{brand}-caption-xl)
         when 'l'  then %(#{brand}-caption-l)

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

@@ -6,23 +6,24 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Supplemental
 
-        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method: nil, hint_text:, legend:, caption:, small:, classes:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method: nil, hint:, legend:, caption:, small:, classes:, form_group:, &block)
           super(builder, object_name, attribute_name, &block)
 
-          @collection    = collection
-          @value_method  = value_method
-          @text_method   = text_method
-          @hint_method   = hint_method
-          @small         = small
-          @legend        = legend
-          @caption       = caption
-          @hint_text     = hint_text
-          @classes       = classes
+          @collection   = collection
+          @value_method = value_method
+          @text_method  = text_method
+          @hint_method  = hint_method
+          @small        = small
+          @legend       = legend
+          @caption      = caption
+          @hint         = hint
+          @classes      = classes
+          @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, check_boxes])
             end
           end
@@ -30,6 +31,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/collection_check_box.rb

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module CheckBoxes
       class CollectionCheckBox < Base
-        using PrefixableArray
-
         include Traits::CollectionItem
         include Traits::Hint
 
@@ -13,12 +11,12 @@ module GOVUKDesignSystemFormBuilder
           @checkbox    = checkbox
           @item        = checkbox.object
           @value       = checkbox.value
-          @hint_text   = retrieve(@item, hint_method)
+          @hint        = { text: retrieve(@item, hint_method) }
           @link_errors = link_errors
         end
 
         def html
-          content_tag('div', class: %(#{brand}-checkboxes__item)) do
+          tag.div(class: %(#{brand}-checkboxes__item)) do
             safe_join([check_box, label_element, hint_element])
           end
         end
@@ -26,10 +24,10 @@ module GOVUKDesignSystemFormBuilder
       private
 
         def check_box
-          @checkbox.check_box(**check_box_options)
+          @checkbox.check_box(**options)
         end
 
-        def check_box_options
+        def options
           {
             id: field_id(link_errors: @link_errors),
             class: %(#{brand}-checkboxes__input),
@@ -42,7 +40,11 @@ module GOVUKDesignSystemFormBuilder
         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 hint_options
+          { value: @value, checkbox: true }
         end
       end
     end