govuk_design_system_formbuilder 2.1.9 → 2.5.0

data/lib/govuk_design_system_formbuilder/elements/select.rb

@@ -4,52 +4,42 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Error
       include Traits::Label
       include Traits::Hint
-      include Traits::Supplemental
-
-      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
-        @value_method = value_method
-        @text_method  = text_method
-        @options      = options
-        @html_options = html_options
-        @label        = label
-        @caption      = caption
-        @hint         = hint
-        @form_group   = form_group
+      include Traits::HTMLAttributes
+      include Traits::Select
+
+      def initialize(builder, object_name, attribute_name, choices, options:, form_group:, label:, hint:, caption:, **kwargs, &block)
+        # assign the block to an variable rather than passing to super so
+        # we can send it through to #select
+        super(builder, object_name, attribute_name)
+        @block           = block
+
+        @form_group      = form_group
+        @hint            = hint
+        @label           = label
+        @caption         = caption
+        @choices         = choices
+        @options         = options
+        @html_attributes = kwargs
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-          safe_join([label_element, supplemental_content, hint_element, error_element, select])
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          safe_join([label_element, hint_element, error_element, select])
         end
       end
 
     private
 
       def select
-        @builder.collection_select(@attribute_name, @collection, @value_method, @text_method, @options, **options)
+        @builder.select(@attribute_name, @choices, @options, attributes(@html_attributes), &@block)
       end
 
       def options
-        @html_options.deep_merge(
+        {
           id: field_id(link_errors: true),
           class: classes,
-          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
-        )
-      end
-
-      def classes
-        [%(#{brand}-select), error_class, custom_classes].flatten.compact
-      end
-
-      def error_class
-        %(#{brand}-select--error) if has_errors?
-      end
-
-      def custom_classes
-        @html_options[:class]
+          aria: { describedby: described_by(hint_id, error_id) }
+        }
       end
     end
   end

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -2,8 +2,9 @@ module GOVUKDesignSystemFormBuilder
   module Elements
     class Submit < Base
       using PrefixableArray
+      include Traits::HTMLAttributes
 
-      def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, disabled:, &block)
+      def initialize(builder, text, warning:, secondary:, classes:, prevent_double_click:, validate:, disabled:, **kwargs, &block)
         super(builder, nil, nil)
 
         fail ArgumentError, 'buttons can be warning or secondary' if warning && secondary
@@ -15,39 +16,33 @@ module GOVUKDesignSystemFormBuilder
         @classes              = classes
         @validate             = validate
         @disabled             = disabled
+        @html_attributes      = kwargs
         @block_content        = capture { block.call } if block_given?
       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 submit
-        @builder.submit(@text, class: classes, **options)
+      def buttons
+        safe_join([submit, @block_content])
       end
 
-      def classes
-        %w(button)
-          .prefix(brand)
-          .push(warning_class, secondary_class, disabled_class, custom_classes)
-          .flatten
-          .compact
+      def submit
+        @builder.submit(@text, **attributes(@html_attributes))
       end
 
       def options
         {
           formnovalidate: !@validate,
           disabled: @disabled,
+          class: classes,
           data: {
             module: %(#{brand}-button),
             'prevent-double-click': @prevent_double_click
@@ -55,6 +50,14 @@ module GOVUKDesignSystemFormBuilder
         }
       end
 
+      def classes
+        %w(button)
+          .prefix(brand)
+          .push(warning_class, secondary_class, disabled_class, custom_classes)
+          .flatten
+          .compact
+      end
+
       def warning_class
         %(#{brand}-button--warning) if @warning
       end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -7,6 +7,7 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Hint
       include Traits::Label
       include Traits::Supplemental
+      include Traits::HTMLAttributes
 
       def initialize(builder, object_name, attribute_name, hint:, label:, caption:, rows:, max_words:, max_chars:, threshold:, form_group:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
@@ -24,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
@@ -37,7 +38,7 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def text_area
-        @builder.text_area(@attribute_name, **options, **@html_attributes)
+        @builder.text_area(@attribute_name, **attributes(@html_attributes))
       end
 
       def classes
@@ -77,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}"
@@ -89,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/html_attributes.rb

@@ -0,0 +1,51 @@
+module GOVUKDesignSystemFormBuilder
+  module Traits
+    module HTMLAttributes
+      # Attributes eases working with default and custom attributes by
+      # * deeply merging them so both the default (required) attributes are
+      #   present
+      # * joins the arrays into strings to maintain Rails 6.0.3 compatibility
+      class Attributes
+        def initialize(defaults, custom)
+          @merged = defaults.deeper_merge(deep_split_values(custom))
+        end
+
+        def to_h
+          deep_join_values(@merged)
+        end
+
+      private
+
+        def deep_split_values(hash)
+          hash.each.with_object({}) do |(key, value), result|
+            result[key] = case value
+                          when Hash
+                            deep_split_values(value)
+                          when String
+                            value.split
+                          else
+                            value
+                          end
+          end
+        end
+
+        def deep_join_values(hash)
+          hash.each.with_object({}) do |(key, value), result|
+            result[key] = case value
+                          when Hash
+                            deep_join_values(value)
+                          when Array
+                            value.uniq.join(' ').presence
+                          else
+                            value
+                          end
+          end
+        end
+      end
+
+      def attributes(html_attributes = {})
+        Attributes.new(options, html_attributes).to_h
+      end
+    end
+  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,13 +31,13 @@ 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
 
       def input
-        @builder.send(builder_method, @attribute_name, **options, **@html_attributes)
+        @builder.send(builder_method, @attribute_name, **attributes(@html_attributes))
       end
 
       def affixed?
@@ -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/select.rb

@@ -0,0 +1,15 @@
+module GOVUKDesignSystemFormBuilder
+  module Traits
+    module Select
+    private
+
+      def classes
+        [%(#{brand}-select), error_class].flatten.compact
+      end
+
+      def error_class
+        %(#{brand}-select--error) if has_errors?
+      end
+    end
+  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.1.9'.freeze
+  VERSION = '2.5.0'.freeze
 end

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.5.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rubocop-govuk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.2
+        version: 4.0.0.pre.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.17.2
+        version: 4.0.0.pre.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -240,6 +254,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.1.0
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: A Rails form builder that generates form inputs adhering to the GOV.UK
   Design System
 email:
@@ -248,6 +276,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - lib/govuk_design_system_formbuilder.rb
 - lib/govuk_design_system_formbuilder/base.rb
@@ -266,6 +295,7 @@ files:
 - lib/govuk_design_system_formbuilder/elements/check_boxes/collection_check_box.rb
 - lib/govuk_design_system_formbuilder/elements/check_boxes/fieldset_check_box.rb
 - lib/govuk_design_system_formbuilder/elements/check_boxes/label.rb
+- lib/govuk_design_system_formbuilder/elements/collection_select.rb
 - lib/govuk_design_system_formbuilder/elements/date.rb
 - lib/govuk_design_system_formbuilder/elements/error_message.rb
 - lib/govuk_design_system_formbuilder/elements/error_summary.rb
@@ -292,9 +322,11 @@ files:
 - lib/govuk_design_system_formbuilder/traits/error.rb
 - lib/govuk_design_system_formbuilder/traits/fieldset_item.rb
 - lib/govuk_design_system_formbuilder/traits/hint.rb
+- lib/govuk_design_system_formbuilder/traits/html_attributes.rb
 - lib/govuk_design_system_formbuilder/traits/input.rb
 - lib/govuk_design_system_formbuilder/traits/label.rb
 - lib/govuk_design_system_formbuilder/traits/localisation.rb
+- lib/govuk_design_system_formbuilder/traits/select.rb
 - lib/govuk_design_system_formbuilder/traits/supplemental.rb
 - lib/govuk_design_system_formbuilder/version.rb
 homepage: https://govuk-form-builder.netlify.app
@@ -321,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: GOV.UK-compliant Rails form builder