govuk_design_system_formbuilder 2.1.3 → 2.1.7b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf39d8cfcafbc412e81222f437a8a4b6ccd446fbbf8a389a3ce95fc8ac5b403
-  data.tar.gz: 211f72eccb795874319dcda270d7dd43d79cf446ea4fd4ee1ae20a2bfde35f37
+  metadata.gz: 277961fb349097190b08b5e773ecb48bb28a8d3cf32bf3d006202ad41dc911e1
+  data.tar.gz: b5f74b257afdf3df827e2d44f70055e516a7c74d4d7b4683c408c771f8194d71
 SHA512:
-  metadata.gz: da6cfc65ca96b181110a040339c39073f22652ec3d71dc20124cefe592cfa87d2faba5ddbaa3eed554c511a7775680b82576bd2fcff2152027f1d974b2967bcf
-  data.tar.gz: 80726be73183e18389a990c66f39b7a19089a87f6ccc252c58eaff92b242e012d34ea656d87898199fff64d00cf778b30df9fcea08bb28e2eca4a4798aa65c9f
+  metadata.gz: c5aa6eba88a501f7405f1a859bb73b91be9fb00c2da3e38ec6bb65c659637d15b837c696f637bb733416ba551378c53ebf359387f50fdd59f31f441f17e4e59f
+  data.tar.gz: c60364f8f675bd69e6b9cb9d2f22cd9b843c3ddd708ba018c136c87765fc7ea5b4b35a7bc2ed04d24df83ab2053bc518566b5cde65963eca54acc266e5f3d45f

data/README.md

@@ -1,13 +1,15 @@
 # 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/Tests/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)
 [![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.9.1-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.10.2-brightgreen)](https://design-system.service.gov.uk)
+[![Rails](https://img.shields.io/badge/Ruby-2.5.8%20%E2%95%B1%202.6.6%20%E2%95%B1%202.7.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
+[![Ruby](https://img.shields.io/badge/Rails-5.2.4%20%E2%95%B1%206.0.3%20%E2%95%B1%206.1.0-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 
 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/base.rb

@@ -53,7 +53,7 @@ module GOVUKDesignSystemFormBuilder
     def has_errors?
       @builder.object.respond_to?(:errors) &&
         @builder.object.errors.any? &&
-        @builder.object.errors.messages.dig(@attribute_name).present?
+        @builder.object.errors.messages[@attribute_name].present?
     end
 
     def described_by(*ids)

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -456,6 +456,7 @@ module GOVUKDesignSystemFormBuilder
     # @param inline [Boolean] controls whether the radio buttons are displayed inline or not
     # @param small [Boolean] controls whether small radio buttons are used instead of regular-sized ones
     # @param bold_labels [Boolean] controls whether the radio button labels are bold
+    # @param include_hidden [Boolean] controls whether a hidden field is inserted to allow for empty submissions
     # @param classes [Array,String] Classes to add to the radio button container.
     # @option legend text [String] the fieldset legend's text content
     # @option legend size [String] the size of the fieldset legend font, can be +xl+, +l+, +m+ or +s+
@@ -500,7 +501,7 @@ module GOVUKDesignSystemFormBuilder
     #    :name,
     #    legend: -> { tag.h3('Which category do you belong to?') }
     #
-    def govuk_collection_radio_buttons(attribute_name, collection, value_method, text_method = nil, hint_method = nil, hint: {}, legend: {}, caption: {}, inline: false, small: false, bold_labels: false, classes: nil, form_group: {}, &block)
+    def govuk_collection_radio_buttons(attribute_name, collection, value_method, text_method = nil, hint_method = nil, hint: {}, legend: {}, caption: {}, inline: false, small: false, bold_labels: false, classes: nil, include_hidden: false, form_group: {}, &block)
       Elements::Radios::Collection.new(
         self,
         object_name,
@@ -517,6 +518,7 @@ module GOVUKDesignSystemFormBuilder
         bold_labels: bold_labels,
         classes: classes,
         form_group: form_group,
+        include_hidden: include_hidden,
         &block
       ).html
     end
@@ -850,6 +852,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 day and month patterns 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,8 +875,8 @@ 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

data/lib/govuk_design_system_formbuilder/containers/character_count.rb

@@ -2,7 +2,7 @@ module GOVUKDesignSystemFormBuilder
   module Containers
     class CharacterCount < Base
       def initialize(builder, max_words:, max_chars:, threshold:)
-        @builder = builder
+        super(builder, nil, nil)
 
         fail ArgumentError, 'limit can be words or chars' if max_words && max_chars
 
@@ -11,10 +11,10 @@ module GOVUKDesignSystemFormBuilder
         @threshold = threshold
       end
 
-      def html
+      def html(&block)
         return yield unless limit?
 
-        tag.div(**options) { yield }
+        tag.div(**options, &block)
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -2,13 +2,14 @@ module GOVUKDesignSystemFormBuilder
   module Containers
     class CheckBoxes < Base
       def initialize(builder, small:, classes: nil)
-        @builder = builder
+        super(builder, nil, nil)
+
         @small   = small
         @classes = classes
       end
 
-      def html
-        tag.div(**options) { yield }
+      def html(&block)
+        tag.div(**options, &block)
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -38,7 +38,14 @@ module GOVUKDesignSystemFormBuilder
       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/containers/form_group.rb

@@ -8,8 +8,8 @@ module GOVUKDesignSystemFormBuilder
         @html_attributes = kwargs
       end
 
-      def html
-        tag.div(class: classes, **@html_attributes) { yield }
+      def html(&block)
+        tag.div(class: classes, **@html_attributes, &block)
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -4,14 +4,15 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
 
       def initialize(builder, inline:, small:, classes:)
-        @builder = builder
+        super(builder, nil, nil)
+
         @inline  = inline
         @small   = small
         @classes = classes
       end
 
-      def html
-        tag.div(**options) { yield }
+      def html(&block)
+        tag.div(**options, &block)
       end
 
     private

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

@@ -6,7 +6,7 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Supplemental
 
-        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method: nil, hint:, legend:, caption:, small:, classes:, form_group:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint:, legend:, caption:, small:, classes:, form_group:, hint_method: nil, &block)
           super(builder, object_name, attribute_name, &block)
 
           @collection   = collection

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

@@ -16,7 +16,7 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           @checkbox.label(for: field_id(link_errors: @link_errors), class: label_classes) do
-            [localised_text(:label), @checkbox.text, @value].compact.first
+            [localised_text(:label), @checkbox.text, @value].compact.first.to_s
           end
         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:, omit_day:, form_group:, wildcards:, date_of_birth: false, &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_message.rb

@@ -5,10 +5,6 @@ module GOVUKDesignSystemFormBuilder
 
       include Traits::Error
 
-      def initialize(builder, object_name, attribute_name)
-        super(builder, object_name, attribute_name)
-      end
-
       def html
         return nil unless has_errors?
 

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -4,8 +4,8 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
 
       def initialize(builder, object_name, title, link_base_errors_to:)
-        @builder             = builder
-        @object_name         = object_name
+        super(builder, object_name, nil)
+
         @title               = title
         @link_base_errors_to = link_base_errors_to
       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

@@ -1,7 +1,9 @@
 module GOVUKDesignSystemFormBuilder
   module Elements
     class Null < Base
-      def initialize; end
+      def initialize
+        super(nil, nil, nil)
+      end
 
       def html
         nil

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

@@ -6,27 +6,28 @@ module GOVUKDesignSystemFormBuilder
         include Traits::Hint
         include Traits::Supplemental
 
-        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method:, hint:, legend:, caption:, inline:, small:, bold_labels:, classes:, form_group:, &block)
+        def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint_method:, hint:, legend:, caption:, inline:, small:, bold_labels:, classes:, form_group:, include_hidden:, &block)
           super(builder, object_name, attribute_name, &block)
 
-          @collection   = collection
-          @value_method = value_method
-          @text_method  = text_method
-          @hint_method  = hint_method
-          @inline       = inline
-          @small        = small
-          @legend       = legend
-          @caption      = caption
-          @hint         = hint
-          @classes      = classes
-          @form_group   = form_group
-          @bold_labels  = hint_method.present? || bold_labels
+          @collection     = collection
+          @value_method   = value_method
+          @text_method    = text_method
+          @hint_method    = hint_method
+          @inline         = inline
+          @small          = small
+          @legend         = legend
+          @caption        = caption
+          @hint           = hint
+          @classes        = classes
+          @form_group     = form_group
+          @include_hidden = include_hidden
+          @bold_labels    = hint_method.present? || bold_labels
         end
 
         def html
           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, radios])
+              safe_join([hidden_field, supplemental_content, hint_element, error_element, radios])
             end
           end
         end
@@ -47,6 +48,12 @@ module GOVUKDesignSystemFormBuilder
           end
         end
 
+        def hidden_field
+          return unless @include_hidden
+
+          @builder.hidden_field(@attribute_name, value: "")
+        end
+
         def collection
           @collection.map.with_index do |item, i|
             Elements::Radios::CollectionRadioButton.new(@builder, @object_name, @attribute_name, item, **collection_options(i)).html

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -6,7 +6,7 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, options: {}, html_options: {}, hint:, label:, caption:, form_group:, &block)
+      def initialize(builder, object_name, attribute_name, collection, value_method:, text_method:, hint:, label:, caption:, form_group:, options: {}, html_options: {}, &block)
         super(builder, object_name, attribute_name, &block)
 
         @collection   = collection
@@ -49,7 +49,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def custom_classes
-        @html_options.dig(:class)
+        @html_options[:class]
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -4,9 +4,10 @@ module GOVUKDesignSystemFormBuilder
       using PrefixableArray
 
       def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, disabled:, &block)
+        super(builder, nil, nil)
+
         fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
 
-        @builder              = builder
         @text                 = text
         @prevent_double_click = prevent_double_click
         @warning              = warning

data/lib/govuk_design_system_formbuilder/traits/collection_item.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         when Symbol, String
           item.send(method)
         when Proc
-          capture { method.call(item) }
+          capture { method.call(item).to_s }
         end
       end
     end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.1.7b2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.7b2
 platform: ruby
 authors:
 - Peter Yates
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-03 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -134,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.24.0
+        version: 3.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.24.0
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +305,7 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/govuk_design_system_formbuilder/GOVUKDesignSystemFormBuilder/Builder
   homepage_uri: https://govuk-form-builder.netlify.app
   source_code_uri: https://github.com/DFE-Digital/govuk_design_system_formbuilder
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -316,12 +316,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: GOV.UK-compliant Rails form builder
 test_files: []