govuk_design_system_formbuilder 1.2.0 → 1.2.5

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -8,55 +8,54 @@ module GOVUKDesignSystemFormBuilder
       include Traits::Label
       include Traits::Supplemental
 
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, rows:, max_words:, max_chars:, threshold:, **extra_args, &block)
+      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
-        @extra_args = extra_args
-        @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
       end
 
       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
-            safe_join(
-              [
-                [
-                  label_element,
-                  supplemental_content,
-                  hint_element,
-                  error_element
-                ].map(&:html),
-                @builder.text_area(
-                  @attribute_name,
-                  id: field_id(link_errors: true),
-                  class: govuk_textarea_classes,
-                  aria: {
-                    describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id)
-                  },
-                  **@extra_args.merge(rows: @rows)
-                ),
-                limit_description
-              ].flatten.compact
-            )
+        Containers::CharacterCount.new(@builder, **character_count_options).html do
+          Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+            safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
         end
       end
 
     private
 
-      def govuk_textarea_classes
+      def character_count_options
+        { max_words: @max_words, max_chars: @max_chars, threshold: @threshold }
+      end
+
+      def text_area
+        @builder.text_area(@attribute_name, **options, **@html_attributes)
+      end
+
+      def classes
         %w(textarea).prefix(brand).tap do |classes|
           classes.push(%(#{brand}-textarea--error)) if has_errors?
           classes.push(%(#{brand}-js-character-count)) if limit?
         end
       end
 
+      def options
+        {
+          id: field_id(link_errors: true),
+          class: classes,
+          rows: @rows,
+          aria: { describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id) },
+        }
+      end
+
       # Provides an id for use by the textual description of character and word limits.
       #
       # @note In order for the GOV.UK Frontend JavaScript to pick up this associated field
@@ -66,9 +65,17 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit?
+        limit_quantity.present?
+      end
+
+      def limit_quantity
         @max_words || @max_chars
       end
 
+      def limit_type
+        @max_words.present? ? 'words' : 'characters'
+      end
+
       def limit_description
         return nil unless limit?
 
@@ -81,14 +88,6 @@ module GOVUKDesignSystemFormBuilder
         %w(hint character-count__message).prefix(brand)
       end
 
-      def limit_quantity
-        @max_words || @max_chars
-      end
-
-      def limit_type
-        @max_words.present? ? 'words' : 'characters'
-      end
-
       def limit_description_id
         return nil unless limit?
 

data/lib/govuk_design_system_formbuilder/traits/caption.rb

@@ -4,12 +4,11 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def caption_element
-        @caption_element ||= Elements::Caption.new(
-          @builder,
-          @object_name,
-          @attribute_name,
-          **{ text: nil }.merge({ text: caption_text, size: caption_size }.compact)
-        )
+        @caption_element ||= Elements::Caption.new(@builder, @object_name, @attribute_name, **caption_options)
+      end
+
+      def caption_options
+        { text: nil }.merge({ text: caption_text, size: caption_size }.compact)
       end
 
       def caption_text

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -1,45 +1,37 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module Input
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, **extra_args, &block)
+      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, form_group_classes:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @width          = width
-        @extra_args     = extra_args
-        @label          = label
-        @caption        = caption
-        @hint_text      = hint_text
+        @width              = width
+        @label              = label
+        @caption            = caption
+        @hint_text          = hint_text
+        @html_attributes    = kwargs
+        @form_group_classes = form_group_classes
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
-          safe_join(
-            [
-              label_element.html,
-              supplemental_content.html,
-              hint_element.html,
-              error_element.html,
-              @builder.send(
-                builder_method,
-                @attribute_name,
-                id: field_id(link_errors: true),
-                class: input_classes,
-                aria: {
-                  describedby: described_by(
-                    hint_id,
-                    error_id,
-                    supplemental_id
-                  )
-                },
-                **@extra_args
-              )
-            ]
-          )
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).html do
+          safe_join([label_element, supplemental_content, hint_element, error_element, input])
         end
       end
 
     private
 
+      def input
+        @builder.send(builder_method, @attribute_name, **input_options, **@html_attributes)
+      end
+
+      def input_options
+        {
+          id: field_id(link_errors: true),
+          class: input_classes,
+          aria: { describedby: described_by(hint_id, error_id, supplemental_id) }
+        }
+      end
+
       def input_classes
         [%(#{brand}-input)].push(width_classes, error_classes).compact
       end

data/lib/govuk_design_system_formbuilder/traits/label.rb

@@ -4,10 +4,10 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def label_element
-        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_args)
+        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
       end
 
-      def label_args
+      def label_content
         case @label
         when Hash
           @label

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.2.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-06 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.0
+        version: 3.16.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -84,22 +84,22 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.9.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec-html-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -176,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.0
+        version: 3.20.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.0
+        version: 3.20.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ files:
 - lib/govuk_design_system_formbuilder/elements/inputs/text.rb
 - lib/govuk_design_system_formbuilder/elements/inputs/url.rb
 - lib/govuk_design_system_formbuilder/elements/label.rb
+- lib/govuk_design_system_formbuilder/elements/legend.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection.rb
 - lib/govuk_design_system_formbuilder/elements/radios/collection_radio_button.rb
 - lib/govuk_design_system_formbuilder/elements/radios/fieldset_radio_button.rb
@@ -317,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GOV.UK-compliant Rails form builder