govuk_design_system_formbuilder 1.2.3 → 2.0.0b1

data/lib/govuk_design_system_formbuilder/elements/submit.rb

@@ -24,17 +24,18 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def submit
-        @builder.submit(@text, class: submit_classes, **submit_options)
+        @builder.submit(@text, class: classes, **options)
       end
 
-      def submit_classes
+      def classes
         %w(button)
           .prefix(brand)
-          .push(warning_class, secondary_class, disabled_class, @classes, padding_class(@block_content.present?))
+          .push(warning_class, secondary_class, disabled_class, padding_class, custom_classes)
+          .flatten
           .compact
       end
 
-      def submit_options
+      def options
         {
           formnovalidate: !@validate,
           disabled: @disabled,
@@ -53,13 +54,17 @@ module GOVUKDesignSystemFormBuilder
         %(#{brand}-button--secondary) if @secondary
       end
 
-      def padding_class(content_present)
-        %(#{brand}-!-margin-right-1) if content_present
+      def padding_class
+        %(#{brand}-!-margin-right-1) if @block_content
       end
 
       def disabled_class
         %(#{brand}-button--disabled) if @disabled
       end
+
+      def custom_classes
+        Array.wrap(@classes)
+      end
     end
   end
 end

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -8,22 +8,23 @@ 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:, **kwargs, &block)
+      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)
 
-        @label      = label
-        @caption    = caption
-        @hint_text  = hint_text
-        @attributes = kwargs
-        @max_words  = max_words
-        @max_chars  = max_chars
-        @threshold  = threshold
-        @rows       = rows
+        @label           = label
+        @caption         = caption
+        @hint            = hint
+        @max_words       = max_words
+        @max_chars       = max_chars
+        @threshold       = threshold
+        @rows            = rows
+        @form_group      = form_group
+        @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
+        Containers::CharacterCount.new(@builder, **character_count_options).html do
+          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
             safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
         end
@@ -31,21 +32,26 @@ module GOVUKDesignSystemFormBuilder
 
     private
 
+      def character_count_options
+        { max_words: @max_words, max_chars: @max_chars, threshold: @threshold }
+      end
+
       def text_area
-        @builder.text_area(@attribute_name, **text_area_options, **@attributes.merge(rows: @rows))
+        @builder.text_area(@attribute_name, **options, **@html_attributes)
       end
 
-      def text_area_classes
+      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
 
-      def text_area_options
+      def options
         {
           id: field_id(link_errors: true),
-          class: text_area_classes,
+          class: classes,
+          rows: @rows,
           aria: { describedby: described_by(hint_id, error_id, supplemental_id, limit_description_id) },
         }
       end
@@ -59,13 +65,21 @@ 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?
 
-        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
@@ -74,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/collection_item.rb

@@ -8,7 +8,7 @@ module GOVUKDesignSystemFormBuilder
         when Symbol, String
           item.send(method)
         when Proc
-          method.call(item)
+          capture { method.call(item) }
         end
       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/traits/hint.rb

@@ -2,7 +2,7 @@ module GOVUKDesignSystemFormBuilder
   module Traits
     module Hint
       def hint_id
-        return nil if @hint_text.blank?
+        return nil unless hint_element.active?
 
         build_id('hint')
       end
@@ -10,7 +10,20 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def hint_element
-        @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, @hint_text)
+        @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_content)
+      end
+
+      def hint_content
+        case @hint
+        when NilClass
+          {}
+        when Hash
+          @hint
+        when Proc
+          { content: @hint }
+        else
+          fail(ArgumentError, %(hint must be a Proc or Hash))
+        end
       end
     end
   end

data/lib/govuk_design_system_formbuilder/traits/input.rb

@@ -1,18 +1,19 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module Input
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, **kwargs, &block)
+      def initialize(builder, object_name, attribute_name, hint:, label:, caption:, width:, form_group:, **kwargs, &block)
         super(builder, object_name, attribute_name, &block)
 
-        @width      = width
-        @attributes = kwargs
-        @label      = label
-        @caption    = caption
-        @hint_text  = hint_text
+        @width           = width
+        @label           = label
+        @caption         = caption
+        @hint            = hint
+        @html_attributes = kwargs
+        @form_group      = form_group
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name).html do
+        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, input])
         end
       end
@@ -20,7 +21,7 @@ module GOVUKDesignSystemFormBuilder
     private
 
       def input
-        @builder.send(builder_method, @attribute_name, **input_options.merge(@attributes))
+        @builder.send(builder_method, @attribute_name, **input_options, **@html_attributes)
       end
 
       def input_options

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_options)
+        @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
       end
 
-      def label_options
+      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.3'.freeze
+  VERSION = '2.0.0b1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 2.0.0b1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-27 00:00:00.000000000 Z
+date: 2020-08-27 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.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.14.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.19.0
+        version: 3.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.19.0
+        version: 3.21.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
@@ -313,9 +314,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key: