govuk_design_system_formbuilder 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c59892549c7150380bda02c9c078026fee857d2e8edacf90e7c4ca4f9be3613f
-  data.tar.gz: 70687f4b813f7b61aa4312e8a7d59ae883cfa4c1bd3d1b3e4a1318b3354d23b2
+  metadata.gz: 73f7852a0c839a3c662b7c5551c2e3e96d37c32fde6af4ad861cfd37f8c0d79f
+  data.tar.gz: 3252d8a1c64a4457de52ad87c2a7c9e5945b7400e7ee279c8e3910ee8f4a0cc4
 SHA512:
-  metadata.gz: 3f868193dc418ed5cebefad1456918b95be96108001b68ddedd523e7df151544e49691f675615ae9617e6a05e35891e7790ea7624cdf50b84a98811162b86660
-  data.tar.gz: c7183ad3f84bef8c71d4f303a4c3637f725b7a851732c777774e301178a24ebaac2f971c26e4ca4c70a34c2829e3f94f431c419e752ba535062be941d8fbc1c2
+  metadata.gz: 9dd6efdac09f58e06bb8241aacc420bfb016960320cbbf4c9496ed163a5f2ff1f63c79d5f5dca381b7da4f5efa5c75997a8a10542755de3f8a67adb19393756e
+  data.tar.gz: b8ea6181c35e29784d8ebcb00bdb1a9d32d5970b26d260336413aaa8b475bee0a7ff085b64e05cb385014563ea7fb8799847c59d2408726a1fdd5b733b55b844

data/README.md

@@ -7,10 +7,10 @@
 [![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.8.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System Version](https://img.shields.io/badge/GOV.UK%20Design%20System-3.8.1-brightgreen)](https://design-system.service.gov.uk)
 
 This gem provides a easy-to-use form builder that generates forms that are
-fully-compliant with version 3.8.0 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
+fully-compliant with version 3.8.1 of the [GOV.UK Design System](https://design-system.service.gov.uk/),
 minimising the amount of markup you need to write.
 
 In addition to the basic markup, the more-advanced functionality of the Design

data/lib/govuk_design_system_formbuilder.rb

@@ -88,7 +88,7 @@ module GOVUKDesignSystemFormBuilder
   end
 
   class FormBuilder < ActionView::Helpers::FormBuilder
-    delegate :content_tag, :tag, :safe_join, :safe_concat, :capture, :link_to, :raw, to: :@template
+    delegate :content_tag, :tag, :safe_join, :link_to, :capture, to: :@template
 
     include GOVUKDesignSystemFormBuilder::Builder
   end

data/lib/govuk_design_system_formbuilder/base.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
   end
 
   class Base
-    delegate :capture, :content_tag, :safe_join, :tag, :raw, :link_to, to: :@builder
+    delegate :content_tag, :safe_join, :tag, :link_to, :capture, to: :@builder
     delegate :config, to: GOVUKDesignSystemFormBuilder
 
     def initialize(builder, object_name, attribute_name, &block)

data/lib/govuk_design_system_formbuilder/containers/character_count.rb

@@ -14,7 +14,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return yield unless limit?
 
-        content_tag('div', **options) { yield }
+        tag.div(**options) { yield }
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/check_boxes.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', **options) { yield }
+        tag.div(**options) { yield }
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('fieldset', **options) do
+        tag.fieldset(**options) do
           safe_join([legend_element, (@block_content || yield)])
         end
       end

data/lib/govuk_design_system_formbuilder/containers/form_group.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', class: classes) { yield }
+        tag.div(class: classes) { yield }
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/radios.rb

@@ -11,7 +11,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        content_tag('div', **options) { yield }
+        tag.div(**options) { yield }
       end
 
     private

data/lib/govuk_design_system_formbuilder/containers/supplemental.rb

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

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
 
@@ -18,7 +16,7 @@ module GOVUKDesignSystemFormBuilder
         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

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

@@ -30,7 +30,7 @@ module GOVUKDesignSystemFormBuilder
       private
 
         def item
-          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

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -35,7 +35,7 @@ module GOVUKDesignSystemFormBuilder
       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
@@ -61,8 +61,8 @@ module GOVUKDesignSystemFormBuilder
       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
+        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

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -12,14 +12,14 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless has_errors?
 
-        content_tag('span', class: %(#{brand}-error-message), id: error_id) do
-          safe_join([prefix, message])
+        tag.span(class: %(#{brand}-error-message), id: error_id) do
+          safe_join([hidden_prefix, message])
         end
       end
 
     private
 
-      def prefix
+      def hidden_prefix
         tag.span('Error: ', class: %(#{brand}-visually-hidden))
       end
 

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -12,7 +12,7 @@ module GOVUKDesignSystemFormBuilder
       def html
         return nil unless object_has_errors?
 
-        content_tag('div', class: summary_class, **summary_options) do
+        tag.div(class: summary_class, **summary_options) do
           safe_join([title, summary])
         end
       end
@@ -24,8 +24,8 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def summary
-        content_tag('div', class: summary_class('body')) do
-          content_tag('ul', class: [%(#{brand}-list), summary_class('list')]) do
+        tag.div(class: summary_class('body')) do
+          tag.ul(class: [%(#{brand}-list), summary_class('list')]) do
             safe_join(list)
           end
         end

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Email < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Number < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Password < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Phone < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class Text < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Inputs
       class URL < Base
-        using PrefixableArray
-
         include Traits::Input
         include Traits::Error
         include Traits::Hint

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -44,10 +44,10 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def retrieve_text(option_text, hidden)
-        text = [option_text, localised_text(:label), @attribute_name.capitalize].compact.first.to_s
+        text = [option_text, localised_text(:label), @attribute_name.capitalize].compact.first
 
         if hidden
-          tag.span(text, class: %w(visually-hidden).prefix(brand))
+          tag.span(text, class: %(#{brand}-visually-hidden))
         else
           text
         end

data/lib/govuk_design_system_formbuilder/elements/legend.rb

@@ -31,7 +31,7 @@ module GOVUKDesignSystemFormBuilder
 
       def content
         if @text.present?
-          content_tag('legend', class: classes) do
+          tag.legend(class: classes) do
             content_tag(@tag, class: heading_classes) do
               safe_join([caption_element, @text])
             end

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

@@ -2,8 +2,6 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     module Radios
       class CollectionRadioButton < Base
-        using PrefixableArray
-
         include Traits::Hint
         include Traits::CollectionItem
 
@@ -23,7 +21,7 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def html
-          content_tag('div', class: %(#{brand}-radios__item)) do
+          tag.div(class: %(#{brand}-radios__item)) do
             safe_join([radio, label_element, hint_element])
           end
         end
@@ -38,7 +36,7 @@ module GOVUKDesignSystemFormBuilder
           {
             id: field_id(link_errors: @link_errors),
             aria: { describedby: hint_id },
-            class: %w(radios__input).prefix(brand)
+            class: %(#{brand}-radios__input)
           }
         end
 

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

@@ -29,7 +29,7 @@ module GOVUKDesignSystemFormBuilder
       private
 
         def radio
-          content_tag('div', class: %(#{brand}-radios__item)) do
+          tag.div(class: %(#{brand}-radios__item)) do
             safe_join([input, label_element, hint_element])
           end
         end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -11,15 +11,15 @@ module GOVUKDesignSystemFormBuilder
       def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, rows:, max_words:, max_chars:, threshold:, form_group_classes:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @label           = label
-        @caption         = caption
-        @hint_text       = hint_text
-        @max_words       = max_words
-        @max_chars       = max_chars
-        @threshold       = threshold
-        @rows            = rows
+        @label              = label
+        @caption            = caption
+        @hint_text          = hint_text
+        @max_words          = max_words
+        @max_chars          = max_chars
+        @threshold          = threshold
+        @rows               = rows
         @form_group_classes = form_group_classes
-        @html_attributes = kwargs
+        @html_attributes    = kwargs
       end
 
       def html
@@ -42,7 +42,7 @@ module GOVUKDesignSystemFormBuilder
 
       def classes
         %w(textarea).prefix(brand).tap do |classes|
-          classes.push(%(#{brand}-textarea--error)) if has_errors?
+          classes.push(%(#{brand}-textarea--error))    if has_errors?
           classes.push(%(#{brand}-js-character-count)) if limit?
         end
       end
@@ -79,7 +79,7 @@ module GOVUKDesignSystemFormBuilder
       def limit_description
         return nil unless limit?
 
-        content_tag('span', id: limit_id, class: limit_description_classes, aria: { live: 'polite' }) do
+        tag.span(id: limit_id, class: limit_description_classes, aria: { live: 'polite' }) do
           "You can enter up to #{limit_quantity} #{limit_type}"
         end
       end

data/lib/govuk_design_system_formbuilder/traits/conditional.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def wrap_conditional(block)
-        content_tag('div', class: conditional_classes, id: conditional_id) do
+        tag.div(class: conditional_classes, id: conditional_id) do
           capture { block.call }
         end
       end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.2.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-29 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.16.0
+        version: 3.17.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.20.0
+        version: 3.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.20.0
+        version: 3.21.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement