govuk_design_system_formbuilder 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e5af4cfd336ab70886054fa8b6dc83ac646e9f4fb9006025ecc6138cdb4604
-  data.tar.gz: ac67744826513c36b483444de6e5ab71ea58ce63259f628c89245c677b42a680
+  metadata.gz: 34191822b2322a27884781b5fdc5d494385f0386b349c8253c213f76cef55600
+  data.tar.gz: dc0d69655c5d8bcbeaa967b852566abec1b821ad9ef43a6f0a4bc65afafc841a
 SHA512:
-  metadata.gz: c05a5ecfb4c14e61498cb22b78fc93668dae12113e35a653ba56b0e70aedcb1fa4de4297de1d54a71e0e4375dc32c276e90aedf14e8f352362ba871673eeff31
-  data.tar.gz: 0000e348e1f846431398d16b6d1364062f2d6442a83f39d94293ad84a27436e80d063381d5c5765c5ad1af7ca5e6179b6785290199d7cbf221588ab7ea521738
+  metadata.gz: 21f8a1d3f15d4de5f01bb54804fbb700ca902f6cb7dee40ab686b500d3d9133f2c3983b48fb4ee040ffcb24c19d03c5511736dc9ca732d3204caeb45ad185e20
+  data.tar.gz: 154333ebb09be62fd38a1d4c0b3449d0a140d2c732e1010f2a164b095f93cd1d67c6870fbf6908729cc8a78cc02ea131f67677f685cef680a276611706b1b2b6

data/README.md

@@ -7,7 +7,7 @@
 [![Netlify Status](https://api.netlify.com/api/v1/badges/d4c50b8d-6ca3-4797-9ab3-6e0731c72b44/deploy-status)](https://app.netlify.com/sites/govuk-form-builder/deploys)
 
 This gem provides a easy-to-use form builder that generates forms that are
-fully-compliant with version 3.2.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
+fully-compliant with version 3.3.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
 minimising the amount of markup you need to write.
 
 The latest version of this gem that supports GOV.UK Design System version 2 is

data/lib/govuk_design_system_formbuilder/base.rb

@@ -1,10 +1,12 @@
 module GOVUKDesignSystemFormBuilder
   class Base
+    delegate :capture, :content_tag, :safe_join, :tag, :raw, :link_to, to: :@builder
+
     def initialize(builder, object_name, attribute_name, &block)
       @builder = builder
       @object_name = object_name
       @attribute_name = attribute_name
-      @block_content = @builder.capture { block.call } if block_given?
+      @block_content = capture { block.call } if block_given?
     end
 
     def hint_element
@@ -72,8 +74,8 @@ module GOVUKDesignSystemFormBuilder
     end
 
     def wrap_conditional(block)
-      @builder.content_tag('div', class: conditional_classes, id: conditional_id) do
-        @builder.capture { block.call }
+      content_tag('div', class: conditional_classes, id: conditional_id) do
+        capture { block.call }
       end
     end
 

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -465,6 +465,7 @@ module GOVUKDesignSystemFormBuilder
     # @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+
     # @option legend tag [Symbol,String] the tag used for the fieldset's header, defaults to +h1+
+    # @param omit_day [Boolean] do not render a day input, only capture month and year
     # @param block [Block] arbitrary HTML that will be rendered between the hint and the input group
     # @param date_of_birth [Boolean] if +true+ {https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/autocomplete#Values birth date auto completion attributes}
     #   will be added to the inputs
@@ -476,8 +477,8 @@ module GOVUKDesignSystemFormBuilder
     #   = f.govuk_date_field :starts_on,
     #     legend: { 'When does your event start?' },
     #     hint_text: 'Leave this field blank if you don't know exactly' }
-    def govuk_date_field(attribute_name, hint_text: nil, legend: {}, date_of_birth: false, &block)
-      Elements::Date.new(self, object_name, attribute_name, hint_text: hint_text, legend: legend, date_of_birth: date_of_birth, &block).html
+    def govuk_date_field(attribute_name, hint_text: nil, legend: {}, date_of_birth: false, omit_day: false, &block)
+      Elements::Date.new(self, object_name, attribute_name, hint_text: hint_text, legend: legend, date_of_birth: date_of_birth, omit_day: omit_day, &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

@@ -14,7 +14,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return yield unless limit?
 
-        @builder.content_tag(
+        content_tag(
           'div',
           class: 'govuk-character-count',
           data: { module: 'govuk-character-count' }.merge(**limit, **threshold).compact

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -7,7 +7,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: check_boxes_classes, data: { module: 'govuk-checkboxes' }) do
+        content_tag('div', class: check_boxes_classes, data: { module: 'govuk-checkboxes' }) do
           yield
         end
       end

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -7,13 +7,13 @@ module GOVUKDesignSystemFormBuilder
         @legend        = legend
         @hint_text     = hint_text
         @small         = small
-        @block_content = @builder.capture { block.call }
+        @block_content = capture { block.call }
       end
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
           Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
-            @builder.safe_join(
+            safe_join(
               [
                 hint_element.html,
                 error_element.html,

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -11,8 +11,8 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
-          @builder.safe_join([build_legend, yield])
+        content_tag('fieldset', class: fieldset_classes, aria: { describedby: @described_by }) do
+          safe_join([build_legend, yield])
         end
       end
 
@@ -20,8 +20,8 @@ module GOVUKDesignSystemFormBuilder
 
       def build_legend
         if @legend.dig(:text).present?
-          @builder.content_tag('legend', class: legend_classes) do
-            @builder.tag.send(@legend.dig(:tag), @legend.dig(:text), class: legend_heading_classes)
+          content_tag('legend', class: legend_classes) do
+            tag.send(@legend.dig(:tag), @legend.dig(:text), class: legend_heading_classes)
           end
         end
       end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -6,7 +6,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: form_group_classes) do
+        content_tag('div', class: form_group_classes) do
           yield
         end
       end

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -8,13 +8,13 @@ module GOVUKDesignSystemFormBuilder
         @small         = small
         @legend        = legend
         @hint_text     = hint_text
-        @block_content = @builder.capture { block.call }
+        @block_content = capture { block.call }
       end
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
           Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_element.error_id, hint_element.hint_id]).html do
-            @builder.safe_join(
+            safe_join(
               [
                 hint_element.html,
                 error_element.html,

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @builder.content_tag('div', class: radios_classes, data: { module: 'govuk-radios' }) do
+        content_tag('div', class: radios_classes, data: { module: 'govuk-radios' }) do
           yield
         end
       end

data/lib/govuk_design_system_formbuilder/containers/supplemental.rb

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless @content.present?
 
-        @builder.content_tag('div', id: supplemental_id) do
+        content_tag('div', id: supplemental_id) do
           @content
         end
       end

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

@@ -17,7 +17,7 @@ module GOVUKDesignSystemFormBuilder
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
             Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_id, hint_id, supplemental_id]).html do
-              @builder.safe_join(
+              safe_join(
                 [
                   hint_element.html,
                   error_element.html,

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

@@ -12,8 +12,8 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          @builder.content_tag('div', class: 'govuk-checkboxes__item') do
-            @builder.safe_join(
+          content_tag('div', class: 'govuk-checkboxes__item') do
+            safe_join(
               [
                 @checkbox.check_box(
                   id: field_id(link_errors: @link_errors),

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

@@ -18,10 +18,10 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          @builder.safe_join(
+          safe_join(
             [
-              @builder.content_tag('div', class: 'govuk-checkboxes__item') do
-                @builder.safe_join(
+              content_tag('div', class: 'govuk-checkboxes__item') do
+                safe_join(
                   [
                     input,
                     label_element.html,

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

@@ -12,7 +12,7 @@ module GOVUKDesignSystemFormBuilder
         def html
           return nil if @hint_text.blank?
 
-          @builder.tag.span(@hint_text, class: hint_classes, id: id)
+          tag.span(@hint_text, class: hint_classes, id: id)
         end
 
         def id

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -3,29 +3,25 @@ module GOVUKDesignSystemFormBuilder
     class Date < GOVUKDesignSystemFormBuilder::Base
       SEGMENTS = { day: '3i', month: '2i', year: '1i' }.freeze
 
-      def initialize(builder, object_name, attribute_name, legend:, hint_text:, date_of_birth: false, &block)
+      def initialize(builder, object_name, attribute_name, legend:, hint_text:, date_of_birth: false, omit_day:, &block)
         super(builder, object_name, attribute_name, &block)
-        @legend = legend
-        @hint_text = hint_text
+
+        @legend        = legend
+        @hint_text     = hint_text
         @date_of_birth = date_of_birth
+        @omit_day      = omit_day
       end
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
           Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_id, hint_id, supplemental_id]).html do
-            @builder.safe_join(
+            safe_join(
               [
                 hint_element.html,
                 error_element.html,
                 supplemental_content.html,
-                @builder.content_tag('div', class: 'govuk-date-input') do
-                  @builder.safe_join(
-                    [
-                      date_input_item(:day, link_errors: true),
-                      date_input_item(:month),
-                      date_input_item(:year, width: 4)
-                    ]
-                  )
+                content_tag('div', class: 'govuk-date-input') do
+                  safe_join([day, month, year])
                 end
               ]
             )
@@ -35,20 +31,38 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def omit_day?
+        @omit_day
+      end
+
+      def day
+        return nil if omit_day?
+
+        date_input_item(:day, link_errors: true)
+      end
+
+      def month
+        date_input_item(:month, link_errors: omit_day?)
+      end
+
+      def year
+        date_input_item(:year, width: 4)
+      end
+
       def date_input_item(segment, width: 2, link_errors: false)
         value = @builder.object.try(@attribute_name).try(segment)
 
-        @builder.content_tag('div', class: %w(govuk-date-input__item)) do
-          @builder.content_tag('div', class: %w(govuk-form-group)) do
-            @builder.safe_join(
+        content_tag('div', class: %w(govuk-date-input__item)) do
+          content_tag('div', class: %w(govuk-form-group)) do
+            safe_join(
               [
-                @builder.tag.label(
+                tag.label(
                   segment.capitalize,
                   class: date_input_label_classes,
                   for: date_attribute_id(segment, link_errors)
                 ),
 
-                @builder.tag.input(
+                tag.input(
                   id: date_attribute_id(segment, link_errors),
                   class: date_input_classes(width),
                   name: date_attribute_name(segment),

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -8,10 +8,10 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless has_errors?
 
-        @builder.content_tag('span', class: 'govuk-error-message', id: error_id) do
-          @builder.safe_join(
+        content_tag('span', class: 'govuk-error-message', id: error_id) do
+          safe_join(
             [
-              @builder.tag.span('Error: ', class: 'govuk-visually-hidden'),
+              tag.span('Error: ', class: 'govuk-visually-hidden'),
               message
             ]
           )

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -10,13 +10,13 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless object_has_errors?
 
-        @builder.content_tag('div', class: summary_class, **error_summary_attributes) do
-          @builder.safe_join(
+        content_tag('div', class: summary_class, **error_summary_attributes) do
+          safe_join(
             [
-              @builder.tag.h2(@title, id: error_summary_title_id, class: summary_class('title')),
-              @builder.content_tag('div', class: summary_class('body')) do
-                @builder.content_tag('ul', class: ['govuk-list', summary_class('list')]) do
-                  @builder.safe_join(
+              tag.h2(@title, id: error_summary_title_id, class: summary_class('title')),
+              content_tag('div', class: summary_class('body')) do
+                content_tag('ul', class: ['govuk-list', summary_class('list')]) do
+                  safe_join(
                     @builder.object.errors.messages.map do |attribute, messages|
                       error_list_item(attribute, messages.first)
                     end
@@ -31,8 +31,8 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def error_list_item(attribute, message)
-        @builder.content_tag('li') do
-          @builder.link_to(
+        content_tag('li') do
+          link_to(
             message,
             same_page_link(field_id(attribute)),
             data: {

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          @builder.safe_join(
+          safe_join(
             [
               label_element.html,
               hint_element.html,

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -13,7 +13,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil if @hint_text.blank?
 
-        @builder.tag.span(@hint_text, class: hint_classes, id: hint_id)
+        tag.span(@hint_text, class: hint_classes, id: hint_id)
       end
 
     private

data/lib/govuk_design_system_formbuilder/elements/inputs/base.rb

@@ -13,7 +13,7 @@ module GOVUKDesignSystemFormBuilder
 
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            @builder.safe_join(
+            safe_join(
               [
                 label_element.html,
                 hint_element.html,

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -17,7 +17,7 @@ module GOVUKDesignSystemFormBuilder
         return nil if @text.blank?
 
         if @tag.present?
-          @builder.content_tag(@tag, class: 'govuk-label-wrapper') { build_label }
+          content_tag(@tag, class: 'govuk-label-wrapper') { build_label }
         else
           build_label
         end
@@ -40,9 +40,9 @@ module GOVUKDesignSystemFormBuilder
         text = [option_text, @value, @attribute_name.capitalize].compact.first
 
         if hidden
-          @builder.tag.span(text, class: %w(govuk-visually-hidden))
+          tag.span(text, class: %w(govuk-visually-hidden))
         else
-          @builder.raw(text)
+          raw(text)
         end
       end
 

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

@@ -19,13 +19,13 @@ module GOVUKDesignSystemFormBuilder
         def html
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
             Containers::Fieldset.new(@builder, legend: @legend, described_by: [error_id, hint_id, supplemental_id]).html do
-              @builder.safe_join(
+              safe_join(
                 [
                   hint_element.html,
                   error_element.html,
                   supplemental_content.html,
                   Containers::Radios.new(@builder, inline: @inline, small: @small).html do
-                    @builder.safe_join(build_collection)
+                    safe_join(build_collection)
                   end
                 ]
               )

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

@@ -17,8 +17,8 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          @builder.content_tag('div', class: 'govuk-radios__item') do
-            @builder.safe_join(
+          content_tag('div', class: 'govuk-radios__item') do
+            safe_join(
               [
                 @builder.radio_button(
                   @attribute_name,

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

@@ -17,10 +17,10 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          @builder.safe_join(
+          safe_join(
             [
-              @builder.content_tag('div', class: 'govuk-radios__item') do
-                @builder.safe_join(
+              content_tag('div', class: 'govuk-radios__item') do
+                safe_join(
                   [
                     input,
                     label_element.html,

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          @builder.safe_join(
+          safe_join(
             [
               label_element.html,
               hint_element.html,

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -10,12 +10,12 @@ module GOVUKDesignSystemFormBuilder
         @warning              = warning
         @secondary            = secondary
         @validate             = validate
-        @block_content        = @builder.capture { block.call } if block_given?
+        @block_content        = capture { block.call } if block_given?
       end
 
       def html
-        @builder.content_tag('div', class: %w(govuk-form-group)) do
-          @builder.safe_join(
+        content_tag('div', class: %w(govuk-form-group)) do
+          safe_join(
             [
               @builder.submit(
                 @text,

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         Containers::CharacterCount.new(@builder, max_words: @max_words, max_chars: @max_chars, threshold: @threshold).html do
           Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-            @builder.safe_join(
+            safe_join(
               [
                 [label_element, hint_element, error_element, supplemental_content].map(&:html),
                 @builder.text_area(

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '0.9.7'.freeze
+  VERSION = '0.9.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview