govuk_design_system_formbuilder 2.1.7b1 → 2.1.7b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e5e35ed528afbcc521f2ed397a640304289c5f6ae461aa751505a7385e6accd
-  data.tar.gz: 3931158ee0d6bc41043b994a086267e9fe6f4c57b5c46af72654f15c53e30a64
+  metadata.gz: 277961fb349097190b08b5e773ecb48bb28a8d3cf32bf3d006202ad41dc911e1
+  data.tar.gz: b5f74b257afdf3df827e2d44f70055e516a7c74d4d7b4683c408c771f8194d71
 SHA512:
-  metadata.gz: e0dc849509abe135123504ae391255ad1a3cdf0578a1d11087bacccb411821b992b73c08324a5192f2ac1f7c47c6305c2071c9c7ad08ea667c31723c1b303ebb
-  data.tar.gz: 644b0092e9f5338e7f76a268f55272cc557733c474d91f5dc51f44051cdf0d6e4e4b492baa7d539f0c9788dd677d56c840787dcb37bfd882c1e53999877ecbdb
+  metadata.gz: c5aa6eba88a501f7405f1a859bb73b91be9fb00c2da3e38ec6bb65c659637d15b837c696f637bb733416ba551378c53ebf359387f50fdd59f31f441f17e4e59f
+  data.tar.gz: c60364f8f675bd69e6b9cb9d2f22cd9b843c3ddd708ba018c136c87765fc7ea5b4b35a7bc2ed04d24df83ab2053bc518566b5cde65963eca54acc266e5f3d45f

data/README.md

@@ -1,6 +1,6 @@
 # GOV.UK Design System Form Builder for Rails
 
-[![Tests](https://github.com/DFE-Digital/govuk_design_system_formbuilder/workflows/Testing/badge.svg)](https://github.com/DFE-Digital/govuk_design_system_formbuilder/actions)
+[![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)
@@ -8,6 +8,8 @@
 [![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.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/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/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:, wildcards:, &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

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/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/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.7b1'.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.7b1
+  version: 2.1.7b2
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-29 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.25.0
+        version: 3.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.25.0
+        version: 3.26.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement