govuk_design_system_formbuilder 2.1.0 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55b78722270c864a735be507e018c420e14bee0e408c59da1bc61777c320bf7
-  data.tar.gz: b0d291bca6a13a77fe21db5c431bfea86184de8acd82b5e4cc3a3c944fdf322c
+  metadata.gz: f2892780c7524701d967f5ed6c409ad4eb741b5a3e6cfaf4ec65389dbaf504a4
+  data.tar.gz: 5a231ba3dfebdf493b8563fc2d7c4b11ba66d27963512e24ef6cd9647ba8bee9
 SHA512:
-  metadata.gz: a130e8bb5964af17acb89a14f02ecda2ed989c1e18c6ed970a400945be78c5a8fdc0dd735333b026f51b75a5d090c4e6403f3594feedf595b21c294abec13ae7
-  data.tar.gz: 9afc6f6e12e26bdc2cd4eafc41f2d1e5a972829fd18bd2a2571550b683500320a66f6603d159af0e7c0943b57deeaf8b47267499ac4cf2c3577d207b555cfcba
+  metadata.gz: 46966873483f3cec59d97458b1e211ab013d7056c6d18e6bd40749f393e6e5eff96e93ddf38d6888da4316cd26db7d3a6dbd9e744e40d3fa6b2b4ac5386281b8
+  data.tar.gz: cff65a82d937855335ef59346acb8d4e2a07e21ca615897c8dd9b0c873e2e919a794ac46dcfdde27054211f573c7be030d1b64a8b5fd1fa325f34ae1ecd8811d

data/README.md

@@ -1,6 +1,6 @@
 # GOV.UK Design System Form Builder for Rails
 
-[![Build Status](https://travis-ci.com/DFE-Digital/govuk_design_system_formbuilder.svg?branch=master)](https://travis-ci.com/DFE-Digital/govuk_design_system_formbuilder)
+[![Tests](https://github.com/DFE-Digital/govuk_design_system_formbuilder/workflows/Testing/badge.svg)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/actions)
 [![Maintainability](https://api.codeclimate.com/v1/badges/fde73b5dc9476197281b/maintainability)](https://codeclimate.com/github/DFE-Digital/govuk_design_system_formbuilder/maintainability)
 [![Gem Version](https://badge.fury.io/rb/govuk_design_system_formbuilder.svg)](https://badge.fury.io/rb/govuk_design_system_formbuilder)
 [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder)

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -850,6 +850,7 @@ module GOVUKDesignSystemFormBuilder
     # @option caption size [String] the size of the caption, can be +xl+, +l+ or +m+. Defaults to +m+
     # @option caption kwargs [Hash] additional arguments are applied as attributes on the caption +span+ element
     # @param omit_day [Boolean] do not render a day input, only capture month and year
+    # @param wildcards [Boolean] add an 'X' to the date wildcards so users can add approximate dates
     # @param form_group [Hash] configures the form group
     # @option form_group classes [Array,String] sets the form group's classes
     # @option form_group kwargs [Hash] additional attributes added to the form group
@@ -872,14 +873,16 @@ module GOVUKDesignSystemFormBuilder
     # @example A date input with legend supplied as a proc
     #  = f.govuk_date_field :finishes_on,
     #    legend: -> { tag.h3('Which category do you belong to?') }
-    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, form_group: {}, &block)
-      Elements::Date.new(self, object_name, attribute_name, hint: hint, legend: legend, caption: caption, date_of_birth: date_of_birth, omit_day: omit_day, form_group: form_group, &block).html
+    def govuk_date_field(attribute_name, hint: {}, legend: {}, caption: {}, date_of_birth: false, omit_day: false, form_group: {}, wildcards: false, &block)
+      Elements::Date.new(self, object_name, attribute_name, hint: hint, legend: legend, caption: caption, date_of_birth: date_of_birth, omit_day: omit_day, form_group: form_group, wildcards: wildcards, &block).html
     end
 
     # Generates a summary of errors in the form, each linking to the corresponding
     # part of the form that contains the error
     #
     # @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.
     #
     # @note Only the first error in the +#errors+ array for each attribute will
     #   be included.
@@ -888,8 +891,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)
-      Elements::ErrorSummary.new(self, object_name, title).html
+    def govuk_error_summary(title = config.default_error_summary_title, link_base_errors_to: nil)
+      Elements::ErrorSummary.new(self, object_name, title, link_base_errors_to: link_base_errors_to).html
     end
 
     # Generates a fieldset containing the contents of the block

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -30,11 +30,22 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def legend_element
-        @legend_element ||= Elements::Legend.new(@builder, @object_name, @attribute_name, **legend_options)
+        @legend_element ||= if @legend.nil?
+                              Elements::Null.new
+                            else
+                              Elements::Legend.new(@builder, @object_name, @attribute_name, **legend_options)
+                            end
       end
 
       def legend_options
-        { legend: @legend, caption: @caption }
+        case @legend
+        when Hash
+          @legend.merge(caption: @caption)
+        when Proc
+          { content: @legend }
+        else
+          fail(ArgumentError, %(legend must be a Proc or Hash))
+        end
       end
     end
   end

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

@@ -6,6 +6,7 @@ module GOVUKDesignSystemFormBuilder
 
         include Traits::Label
         include Traits::Hint
+        include Traits::FieldsetItem
         include Traits::Conditional
 
         def initialize(builder, object_name, attribute_name, value, unchecked_value, label:, hint:, link_errors:, multiple:, &block)
@@ -54,19 +55,7 @@ module GOVUKDesignSystemFormBuilder
           %w(checkboxes__input).prefix(brand)
         end
 
-        def label_element
-          @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_options, **hint_content)
-        end
-
-        def hint_options
+        def fieldset_options
           { checkbox: true }
         end
 

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -9,7 +9,7 @@ module GOVUKDesignSystemFormBuilder
 
       SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, date_of_birth: false, omit_day:, form_group:, &block)
+      def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, date_of_birth: false, omit_day:, form_group:, wildcards:, &block)
         super(builder, object_name, attribute_name, &block)
 
         @legend        = legend
@@ -18,6 +18,7 @@ module GOVUKDesignSystemFormBuilder
         @date_of_birth = date_of_birth
         @omit_day      = omit_day
         @form_group    = form_group
+        @wildcards     = wildcards
       end
 
       def html
@@ -82,13 +83,19 @@ module GOVUKDesignSystemFormBuilder
           class: classes(width),
           name: name(segment),
           type: 'text',
-          pattern: '[0-9]*',
+          pattern: pattern(segment),
           inputmode: 'numeric',
           value: value,
           autocomplete: date_of_birth_autocomplete_value(segment)
         )
       end
 
+      def pattern(segment)
+        return '[0-9X]*' if @wildcards && segment.in?(%i(day month))
+
+        '[0-9]*'
+      end
+
       def classes(width)
         %w(input date-input__input).prefix(brand).tap do |classes|
           classes.push(%(#{brand}-input--width-#{width}))

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -3,10 +3,11 @@ module GOVUKDesignSystemFormBuilder
     class ErrorSummary < Base
       include Traits::Error
 
-      def initialize(builder, object_name, title)
-        @builder = builder
-        @object_name = object_name
-        @title = title
+      def initialize(builder, object_name, title, link_base_errors_to:)
+        @builder             = builder
+        @object_name         = object_name
+        @title               = title
+        @link_base_errors_to = link_base_errors_to
       end
 
       def html
@@ -54,7 +55,11 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def field_id(attribute)
-        build_id('field-error', attribute_name: attribute)
+        if attribute.eql?(:base) && @link_base_errors_to.present?
+          build_id('field', attribute_name: @link_base_errors_to)
+        else
+          build_id('field-error', attribute_name: attribute)
+        end
       end
 
       def summary_title_id

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -25,7 +25,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        return nil unless active?
+        return unless active?
 
         content_tag(hint_tag, **hint_options, **@html_attributes) { hint_body }
       end

data/lib/govuk_design_system_formbuilder/elements/legend.rb

@@ -4,46 +4,39 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Caption
       include Traits::Localisation
 
-      def initialize(builder, object_name, attribute_name, legend:, caption:, **kwargs)
+      def initialize(builder, object_name, attribute_name, text: nil, size: config.default_legend_size, hidden: false, tag: config.default_legend_tag, caption: nil, content: nil, **kwargs)
         super(builder, object_name, attribute_name)
 
-        @html_attributes = kwargs
-
-        case legend
-        when NilClass
-          # do nothing
-        when Proc
-          @raw = capture { legend.call }
-        when Hash
-          defaults.merge(legend).tap do |l|
-            @text    = retrieve_text(l.dig(:text))
-            @hidden  = l.dig(:hidden)
-            @tag     = l.dig(:tag)
-            @size    = l.dig(:size)
-            @caption = caption
-          end
+        if content
+          @content = capture { content.call }
         else
-          fail(ArgumentError, %(legend must be a NilClass, Proc or Hash))
+          @text            = retrieve_text(text)
+          @tag             = tag
+          @size_class      = size_class(size)
+          @tag             = tag
+          @caption         = caption
+          @hidden          = hidden
+          @html_attributes = kwargs
         end
       end
 
       def html
-        @raw || content
+        @content || legend
       end
 
     private
 
       def active?
-        [@text, @raw].any?(&:present?)
+        [@text, @content].any?(&:present?)
       end
 
-      def content
+      def legend
         return unless active?
 
-        tag.legend(legend_text, class: classes, **@html_attributes)
+        tag.legend(legend_content, class: classes, **@html_attributes)
       end
 
-      def legend_text
+      def legend_content
         caption_and_text = safe_join([caption_element, @text])
 
         if @tag.present?
@@ -58,17 +51,14 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def classes
-        [%(#{brand}-fieldset__legend), size_class, visually_hidden_class].compact
+        [%(#{brand}-fieldset__legend), @size_class, visually_hidden_class].compact
       end
 
-      def size_class
-        case @size
-        when 'xl' then %(#{brand}-fieldset__legend--xl)
-        when 'l'  then %(#{brand}-fieldset__legend--l)
-        when 'm'  then %(#{brand}-fieldset__legend--m)
-        when 's'  then %(#{brand}-fieldset__legend--s)
+      def size_class(size)
+        if size.in?(%w(xl l m s))
+          %(#{brand}-fieldset__legend--#{size})
         else
-          fail "invalid size '#{@size}', must be xl, l, m or s"
+          fail "invalid size '#{size}', must be xl, l, m or s"
         end
       end
 
@@ -79,15 +69,6 @@ module GOVUKDesignSystemFormBuilder
       def heading_classes
         %(#{brand}-fieldset__heading)
       end
-
-      def defaults
-        {
-          hidden: false,
-          text: nil,
-          tag:  config.default_legend_tag,
-          size: config.default_legend_size
-        }
-      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/null.rb

@@ -0,0 +1,19 @@
+module GOVUKDesignSystemFormBuilder
+  module Elements
+    class Null < Base
+      def initialize; end
+
+      def html
+        nil
+      end
+
+      def active?
+        false
+      end
+
+      def hint_id
+        nil
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module GOVUKDesignSystemFormBuilder
 
         include Traits::Label
         include Traits::Hint
+        include Traits::FieldsetItem
         include Traits::Conditional
 
         def initialize(builder, object_name, attribute_name, value, label:, hint:, link_errors:, &block)
@@ -34,26 +35,10 @@ module GOVUKDesignSystemFormBuilder
           end
         end
 
-        def radio_options
+        def fieldset_options
           { radio: true }
         end
 
-        def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
-        end
-
-        def label_options
-          { value: @value, link_errors: @link_errors }.merge(radio_options)
-        end
-
-        def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
-        end
-
-        def hint_options
-          { value: @value }.merge(radio_options)
-        end
-
         def input
           @builder.radio_button(@attribute_name, @value, **options)
         end

data/lib/govuk_design_system_formbuilder/traits/caption.rb

@@ -4,11 +4,11 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def caption_element
-        @caption_element ||= Elements::Caption.new(@builder, @object_name, @attribute_name, **caption_options)
-      end
-
-      def caption_options
-        @caption
+        @caption_element ||= if @caption.nil?
+                               Elements::Null.new
+                             else
+                               Elements::Caption.new(@builder, @object_name, @attribute_name, **@caption)
+                             end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb

@@ -0,0 +1,31 @@
+module GOVUKDesignSystemFormBuilder
+  module Traits
+    module FieldsetItem
+    private
+
+      def label_element
+        @label_element ||= if @label.nil?
+                             Elements::Null.new
+                           else
+                             Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+                           end
+      end
+
+      def label_options
+        { value: @value, link_errors: @link_errors }.merge(fieldset_options)
+      end
+
+      def hint_element
+        @hint_element ||= if @hint.nil?
+                            Elements::Null.new
+                          else
+                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+                          end
+      end
+
+      def hint_options
+        { value: @value }.merge(fieldset_options)
+      end
+    end
+  end
+end

data/lib/govuk_design_system_formbuilder/traits/hint.rb

@@ -10,13 +10,15 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def hint_element
-        @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_content)
+        @hint_element ||= if @hint.nil?
+                            Elements::Null.new
+                          else
+                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_content)
+                          end
       end
 
       def hint_content
         case @hint
-        when NilClass
-          {}
         when Hash
           @hint
         when Proc

data/lib/govuk_design_system_formbuilder/traits/label.rb

@@ -4,7 +4,11 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def label_element
-        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
+        @label_element ||= if @label.nil?
+                             Elements::Null.new
+                           else
+                             Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
+                           end
       end
 
       def label_content

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.5
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-03 00:00:00.000000000 Z
+date: 2020-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 3.17.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.0
+        version: 3.17.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.23.0
+        version: 3.24.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.23.0
+        version: 3.24.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - lib/govuk_design_system_formbuilder/elements/inputs/url.rb
 - lib/govuk_design_system_formbuilder/elements/label.rb
 - lib/govuk_design_system_formbuilder/elements/legend.rb
+- lib/govuk_design_system_formbuilder/elements/null.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection_radio_button.rb
 - lib/govuk_design_system_formbuilder/elements/radios/fieldset_radio_button.rb
@@ -288,6 +289,7 @@ files:
 - 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
 - lib/govuk_design_system_formbuilder/traits/input.rb
 - lib/govuk_design_system_formbuilder/traits/label.rb