govuk_design_system_formbuilder 1.2.7 → 2.0.0b1

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -8,23 +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:, form_group_classes:, **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
-        @max_words          = max_words
-        @max_chars          = max_chars
-        @threshold          = threshold
-        @rows               = rows
-        @form_group_classes = form_group_classes
-        @html_attributes    = kwargs
+        @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, **character_count_options).html do
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, classes: @form_group_classes).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

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/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,19 +1,19 @@
 module GOVUKDesignSystemFormBuilder
   module Traits
     module Input
-      def initialize(builder, object_name, attribute_name, hint_text:, label:, caption:, width:, form_group_classes:, **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
-        @label              = label
-        @caption            = caption
-        @hint_text          = hint_text
-        @html_attributes    = kwargs
-        @form_group_classes = form_group_classes
+        @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, classes: @form_group_classes).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

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '1.2.7'.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.7
+  version: 2.0.0b1
 platform: ruby
 authors:
 - Peter Yates
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionview
@@ -314,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: