govuk_design_system_formbuilder 2.3.0b1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641fbc9fbd19bc333cd0872da36c9286c7f956cdfe41ef5b9b234dbe264bc03a
-  data.tar.gz: 30a0000fa3868e7f7f6bf67347a025cf8f85e5e02a77bff4026d343088c3fb3f
+  metadata.gz: 2f56b92f232ffd2b98c38637c49b2e4255f3be12cab3825f795a735cbfae0107
+  data.tar.gz: 0f4dfd572130559b3140a838310ce471a4adee41f46fed32ca5046cfa29ed9d0
 SHA512:
-  metadata.gz: 53d6df89df5401b05190709bbad01273d0a2491484792d82307a1ffd6a054ef9de69f8d7d5ab7ae028c677603628bf203439959e70c8e2776504172c41fc2939
-  data.tar.gz: 5fa7f1475a37d063bab13dc27e4238ca6a7429abbe805b51436a6d3a1310c98df7defe60ad51ff376968d4ae8de8f828611daf79fc75a4602a6dbfeef3ae47f7
+  metadata.gz: 67861fee01f6a14cac7bbf9db87d1633dcf13e569aaa2179f5e16d21f8aed5e7b7d553a5bd96e601ab5b4181e6c27c905fa5fd6d7e80c811a2cff28d42b1f83f
+  data.tar.gz: a889d6d02fd1978e73aa2328debc5b6268993eca88755b3cf31889dfe4c973d28e09dfb9d13bbe462347aeea74a1f46dfb8ba8f4f7c20ad3da5c2c8d1d6aa114

data/lib/govuk_design_system_formbuilder/base.rb

@@ -25,6 +25,15 @@ module GOVUKDesignSystemFormBuilder
 
   private
 
+    # returns the attributes bound to the object that are
+    # required to build all contained elements
+    #
+    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
+    #   builder, object name and attribute name
+    def bound
+      [@builder, @object_name, @attribute_name]
+    end
+
     def brand(override = nil)
       override || config.brand
     end

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -387,7 +387,6 @@ module GOVUKDesignSystemFormBuilder
     # @option label hidden [Boolean] control the visability of the label. Hidden labels will stil be read by screenreaders
     # @option label kwargs [Hash] additional arguments are applied as attributes on the +label+ element
     # @param options [Hash] Options hash passed through to Rails' +collection_select+ helper
-    # @param html_options [Hash] HTML Options hash passed through to Rails' +collection_select+ helper
     # @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

data/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb

@@ -18,8 +18,8 @@ module GOVUKDesignSystemFormBuilder
       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
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([hint_element, error_element, hidden_field, checkboxes])
           end
         end

data/lib/govuk_design_system_formbuilder/containers/fieldset.rb

@@ -36,7 +36,7 @@ module GOVUKDesignSystemFormBuilder
         @legend_element ||= if @legend.nil?
                               Elements::Null.new
                             else
-                              Elements::Legend.new(@builder, @object_name, @attribute_name, **legend_options)
+                              Elements::Legend.new(*bound, **legend_options)
                             end
       end
 

data/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb

@@ -18,8 +18,8 @@ module GOVUKDesignSystemFormBuilder
       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
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([hint_element, error_element, radios])
           end
         end

data/lib/govuk_design_system_formbuilder/containers/supplemental.rb

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

data/lib/govuk_design_system_formbuilder/elements/caption.rb

@@ -3,7 +3,7 @@ module GOVUKDesignSystemFormBuilder
     class Caption < Base
       include Traits::Localisation
 
-      def initialize(builder, object_name, attribute_name, text: nil, size: nil, **kwargs)
+      def initialize(builder, object_name, attribute_name, text: nil, size: config.default_caption_size, **kwargs)
         super(builder, object_name, attribute_name)
 
         @text            = text(text)
@@ -12,7 +12,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        return nil unless active?
+        return unless active?
 
         tag.span(@text, class: @size_class, **@html_attributes)
       end
@@ -28,7 +28,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def size_class(size)
-        case size || config.default_caption_size
+        case size
         when 'xl' then %(#{brand}-caption-xl)
         when 'l'  then %(#{brand}-caption-l)
         when 'm'  then %(#{brand}-caption-m)

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

@@ -23,8 +23,8 @@ module GOVUKDesignSystemFormBuilder
         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
+          Containers::FormGroup.new(*bound, **@form_group).html do
+            Containers::Fieldset.new(*bound, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, check_boxes])
             end
           end

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

@@ -36,11 +36,11 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Label.new(@builder, @object_name, @attribute_name, @checkbox, value: @value, link_errors: @link_errors)
+          @label_element ||= Label.new(*bound, @checkbox, value: @value, link_errors: @link_errors)
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+          @hint_element ||= Elements::Hint.new(*bound, **hint_options, **hint_content)
         end
 
         def hint_options

data/lib/govuk_design_system_formbuilder/elements/date.rb

@@ -23,8 +23,8 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group, **@html_attributes).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+        Containers::FormGroup.new(*bound, **@form_group, **@html_attributes).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([supplemental_content, hint_element, error_element, date])
           end
         end
@@ -47,7 +47,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def day
-        return nil if omit_day?
+        return if omit_day?
 
         date_part(:day, width: 2, link_errors: true)
       end
@@ -125,7 +125,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def date_of_birth_autocomplete_value(segment)
-        return nil unless @date_of_birth
+        return unless @date_of_birth
 
         { day: 'bday-day', month: 'bday-month', year: 'bday-year' }.fetch(segment)
       end

data/lib/govuk_design_system_formbuilder/elements/error_message.rb

@@ -6,7 +6,7 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
 
       def html
-        return nil unless has_errors?
+        return unless has_errors?
 
         tag.span(class: %(#{brand}-error-message), id: error_id) do
           safe_join([hidden_prefix, message])

data/lib/govuk_design_system_formbuilder/elements/error_summary.rb

@@ -13,7 +13,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        return nil unless object_has_errors?
+        return unless object_has_errors?
 
         tag.div(**attributes(@html_attributes)) do
           safe_join([title, summary])

data/lib/govuk_design_system_formbuilder/elements/file.rb

@@ -20,7 +20,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, file])
         end
       end

data/lib/govuk_design_system_formbuilder/elements/hint.rb

@@ -31,7 +31,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def hint_id
-        return nil unless active?
+        return unless active?
 
         build_id('hint')
       end

data/lib/govuk_design_system_formbuilder/elements/label.rb

@@ -28,7 +28,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        return nil unless active?
+        return unless active?
 
         if @tag.present?
           content_tag(@tag, class: %(#{brand}-label-wrapper)) { label }
@@ -72,13 +72,13 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def radio_class
-        return nil unless @radio
+        return unless @radio
 
         %(#{brand}-radios__label)
       end
 
       def checkbox_class
-        return nil unless @checkbox
+        return unless @checkbox
 
         %(#{brand}-checkboxes__label)
       end

data/lib/govuk_design_system_formbuilder/elements/legend.rb

@@ -39,11 +39,9 @@ module GOVUKDesignSystemFormBuilder
       def legend_content
         caption_and_text = safe_join([caption_element, @text])
 
-        if @tag.present?
-          content_tag(@tag, class: heading_classes) { caption_and_text }
-        else
-          caption_and_text
-        end
+        return caption_and_text if @tag.blank?
+
+        content_tag(@tag, class: heading_classes) { caption_and_text }
       end
 
       def retrieve_text(supplied_text)

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

@@ -25,8 +25,8 @@ module GOVUKDesignSystemFormBuilder
         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
+          Containers::FormGroup.new(*bound, **@form_group).html do
+            Containers::Fieldset.new(*bound, **fieldset_options).html do
               safe_join([hidden_field, supplemental_content, hint_element, error_element, radios])
             end
           end
@@ -56,7 +56,7 @@ module GOVUKDesignSystemFormBuilder
 
         def collection
           @collection.map.with_index do |item, i|
-            Elements::Radios::CollectionRadioButton.new(@builder, @object_name, @attribute_name, item, **collection_options(i)).html
+            Elements::Radios::CollectionRadioButton.new(*bound, item, **collection_options(i)).html
           end
         end
 

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

@@ -41,7 +41,7 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+          @hint_element ||= Elements::Hint.new(*bound, **hint_options, **hint_content)
         end
 
         def hint_content
@@ -53,7 +53,7 @@ module GOVUKDesignSystemFormBuilder
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_options)
+          @label_element ||= Elements::Label.new(*bound, **label_options)
         end
 
         def label_options

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -28,7 +28,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, select])
         end
       end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -21,19 +21,19 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        @block_content.present? ? button_group : buttons
+        @block_content.present? ? button_group : submit
       end
 
     private
 
-      def buttons
-        safe_join([submit, @block_content])
-      end
-
       def button_group
         Containers::ButtonGroup.new(@builder, buttons).html
       end
 
+      def buttons
+        safe_join([submit, @block_content])
+      end
+
       def submit
         @builder.submit(@text, **attributes(@html_attributes))
       end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -25,7 +25,7 @@ module GOVUKDesignSystemFormBuilder
 
       def html
         Containers::CharacterCount.new(@builder, **character_count_options).html do
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+          Containers::FormGroup.new(*bound, **@form_group).html do
             safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
         end
@@ -78,7 +78,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit_description
-        return nil unless limit?
+        return unless limit?
 
         tag.span(id: limit_id, class: limit_description_classes, aria: { live: 'polite' }) do
           "You can enter up to #{limit_quantity} #{limit_type}"
@@ -90,7 +90,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit_description_id
-        return nil unless limit?
+        return unless limit?
 
         limit_id
       end

data/lib/govuk_design_system_formbuilder/traits/caption.rb

@@ -7,7 +7,7 @@ module GOVUKDesignSystemFormBuilder
         @caption_element ||= if @caption.nil?
                                Elements::Null.new
                              else
-                               Elements::Caption.new(@builder, @object_name, @attribute_name, **@caption)
+                               Elements::Caption.new(*bound, **@caption)
                              end
       end
     end

data/lib/govuk_design_system_formbuilder/traits/error.rb

@@ -2,7 +2,7 @@ module GOVUKDesignSystemFormBuilder
   module Traits
     module Error
       def error_id
-        return nil unless has_errors?
+        return unless has_errors?
 
         build_id('error')
       end
@@ -10,7 +10,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def error_element
-        @error_element ||= Elements::ErrorMessage.new(@builder, @object_name, @attribute_name)
+        @error_element ||= Elements::ErrorMessage.new(*bound)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb

@@ -7,7 +7,7 @@ module GOVUKDesignSystemFormBuilder
         @label_element ||= if @label.nil?
                              Elements::Null.new
                            else
-                             Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+                             Elements::Label.new(*bound, **label_content, **label_options)
                            end
       end
 
@@ -19,7 +19,7 @@ module GOVUKDesignSystemFormBuilder
         @hint_element ||= if @hint.nil?
                             Elements::Null.new
                           else
-                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+                            Elements::Hint.new(*bound, **hint_options, **hint_content)
                           end
       end
 

data/lib/govuk_design_system_formbuilder/traits/hint.rb

@@ -2,7 +2,7 @@ module GOVUKDesignSystemFormBuilder
   module Traits
     module Hint
       def hint_id
-        return nil unless hint_element.active?
+        return unless hint_element.active?
 
         build_id('hint')
       end
@@ -13,7 +13,7 @@ module GOVUKDesignSystemFormBuilder
         @hint_element ||= if @hint.nil?
                             Elements::Null.new
                           else
-                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_content)
+                            Elements::Hint.new(*bound, **hint_content)
                           end
       end
 

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -15,7 +15,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, content])
         end
       end
@@ -31,7 +31,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def affixed_input
-        content_tag('div', class: %(#{brand}-input__wrapper)) do
+        tag.div(class: %(#{brand}-input__wrapper)) do
           safe_join([prefix, input, suffix])
         end
       end
@@ -86,13 +86,13 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def prefix
-        return nil if @prefix_text.blank?
+        return if @prefix_text.blank?
 
         tag.span(@prefix_text, class: %(#{brand}-input__prefix), **affix_options)
       end
 
       def suffix
-        return nil if @suffix_text.blank?
+        return if @suffix_text.blank?
 
         tag.span(@suffix_text, class: %(#{brand}-input__suffix), **affix_options)
       end

data/lib/govuk_design_system_formbuilder/traits/label.rb

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

data/lib/govuk_design_system_formbuilder/traits/supplemental.rb

@@ -2,7 +2,7 @@ module GOVUKDesignSystemFormBuilder
   module Traits
     module Supplemental
       def supplemental_id
-        return nil if @block_content.blank?
+        return if @block_content.blank?
 
         build_id('supplemental')
       end
@@ -10,7 +10,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def supplemental_content
-        @supplemental_content ||= Containers::Supplemental.new(@builder, @object_name, @attribute_name, @block_content)
+        @supplemental_content ||= Containers::Supplemental.new(*bound, @block_content)
       end
     end
   end

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '2.3.0b1'.freeze
+  VERSION = '2.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.3.0b1
+  version: 2.3.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -347,9 +347,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: