govuk_design_system_formbuilder 6.4.0 → 6.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 630a9d4d9a938e084e977d7a538621b94c0e1a65622a1055223b746510698893
-  data.tar.gz: c284ee18297c356f5051952f79a8f8b1eaf3a4b9c189a936f62f270280dfa2d2
+  metadata.gz: 29036297bb5e5295a95e24f83df755b524f49200fd0d57761a42f5852f4f3fbe
+  data.tar.gz: 4264b4e448571d9353104bfceace861527cb1a5b454cbfd319ad569343c274b7
 SHA512:
-  metadata.gz: 23fca31ffd58c4a0913ffc06e838fc248d2b74db900149e02a50a0c20bf975cab4087a1f8519d1f815ddaba63f5418ea18a9bee3f0fba2280abf0b68c16f2ca2
-  data.tar.gz: b240b075033a4f736041324cd3b6c3c6a901e1163e10986bc6b76151cb0ca668e98ba66f604029f8c556c5ed58af3f911a3623150dc08b6fb2869281f33c0b67
+  metadata.gz: d3b8f99daf733c5f9f2b7d4cb053818b2c1b6ecf223ce5f756ce7627aa181a68e0d1aaf9a615645e361a810e82230cb28ecc3158090e2e36cbaa7c6684541061
+  data.tar.gz: b8f20bf97d58571571e8f541be72214971fc78242dd3cb3b29600173a3e5b85a0cb404a74037c698ebcd9a125cfd78a35058307176c39dd7db907b1be78b895c

data/README.md

@@ -4,7 +4,7 @@
 [![Gem version](https://badge.fury.io/rb/govuk_design_system_formbuilder.svg)](https://badge.fury.io/rb/govuk_design_system_formbuilder)
 [![Gem](https://img.shields.io/gem/dt/govuk_design_system_formbuilder?logo=rubygems)](https://rubygems.org/gems/govuk_design_system_formbuilder)
 ![GitHub license](https://img.shields.io/github/license/x-govuk/govuk-form-builder)
-[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.4.0-brightgreen)](https://design-system.service.gov.uk)
+[![GOV.UK Design System version](https://img.shields.io/badge/GOV.UK%20Design%20System-6.6.0-brightgreen)](https://design-system.service.gov.uk)
 [![Rails](https://img.shields.io/badge/Rails-7.2.3%20%E2%95%B1%208.0.1%20%E2%95%B1%208.1.2-E16D6D)](https://weblog.rubyonrails.org/releases/)
 [![Ruby](https://img.shields.io/badge/Ruby-3.2.10%20%20%E2%95%B1%203.4.8%20%20%E2%95%B1%204.0.1-E16D6D)](https://www.ruby-lang.org/en/downloads/)
 

data/lib/govuk_design_system_formbuilder/builder.rb

@@ -421,6 +421,8 @@ module GOVUKDesignSystemFormBuilder
       caption: {},
       max_words: nil,
       max_chars: nil,
+      max_length: nil,
+      count_type: :length,
       rows: 5,
       threshold: nil,
       form_group: {},
@@ -442,8 +444,10 @@ module GOVUKDesignSystemFormBuilder
         caption:,
         max_words:,
         max_chars:,
-        rows:,
+        max_length:,
+        count_type:,
         threshold:,
+        rows:,
         form_group:,
         description_other_text:,
         under_limit_other_text:,

data/lib/govuk_design_system_formbuilder/elements/text_area.rb

@@ -21,6 +21,8 @@ module GOVUKDesignSystemFormBuilder
         rows:,
         max_words:,
         max_chars:,
+        max_length:,
+        count_type:,
         threshold:,
         form_group:,
         description_other_text:,
@@ -39,13 +41,31 @@ module GOVUKDesignSystemFormBuilder
         @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
 
+        case
+        when max_length
+          @max_length = max_length
+          @count_type = count_type.to_sym
+        when max_words
+          @max_length = max_words
+          @count_type = :words
+
+          warn("max_words is deprecated, use { max_length: #{@max_length}, count_type: :#{@count_type} }")
+        when max_chars
+          @max_length = max_chars
+          @count_type = :length
+
+          warn("max_chars is deprecated, use { max_length: #{@max_length} }")
+        end
+
+        if @count_type && !@count_type.in?(%i(length words))
+          fail(ArgumentError, "count_type (#{@count_type}) must be :length or :words if present")
+        end
+
         @description_other_text = description_other_text
         @under_limit_other_text = under_limit_other_text
         @under_limit_one_text   = under_limit_one_text
@@ -88,22 +108,18 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit?
-        limit_quantity.present?
-      end
-
-      def limit_quantity
-        @max_words || @max_chars
+        @max_length.present?
       end
 
       def limit_type
-        @max_words.present? ? 'words' : 'characters'
+        @count_type == :words ? 'words' : 'characters'
       end
 
       def limit_description
         return unless limit?
 
         tag.span(id: limit_id, class: limit_description_classes) do
-          "You can enter up to #{limit_quantity} #{limit_type}"
+          "You can enter up to #{@max_length} #{limit_type}"
         end
       end
 
@@ -127,11 +143,9 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def limit_max_options
-        if @max_words
-          { maxwords: @max_words }
-        elsif @max_chars
-          { maxlength: @max_chars }
-        end
+        return { maxlength: @max_length, 'count-type' => 'words' } if @count_type == :words
+
+        { maxlength: @max_length }
       end
 
       def limit_threshold_options
@@ -139,10 +153,10 @@ module GOVUKDesignSystemFormBuilder
       end
 
       def i18n_data
-        return {} unless limit_quantity
+        return {} unless @max_length
 
-        attrs = case limit_type
-                when 'characters'
+        attrs = case @count_type
+                when :length
                   [
                     I18nAttr.new('data-i18n.characters-under-limit.other', @under_limit_other_text, :default_text_area_characters_under_limit_other_text),
                     I18nAttr.new('data-i18n.characters-under-limit.one',   @under_limit_one_text,   :default_text_area_characters_under_limit_one_text),
@@ -150,7 +164,7 @@ module GOVUKDesignSystemFormBuilder
                     I18nAttr.new('data-i18n.characters-over-limit.other',  @over_limit_other_text,  :default_text_area_characters_over_limit_other_text),
                     I18nAttr.new('data-i18n.characters-over-limit.one',    @over_limit_one_text,    :default_text_area_characters_over_limit_one_text),
                   ]
-                when 'words'
+                when :words
                   [
                     I18nAttr.new('data-i18n.words-under-limit.other', @under_limit_other_text, :default_text_area_words_under_limit_other_text),
                     I18nAttr.new('data-i18n.words-under-limit.one',   @under_limit_one_text,   :default_text_area_words_under_limit_one_text),

data/lib/govuk_design_system_formbuilder/version.rb

@@ -1,3 +1,3 @@
 module GOVUKDesignSystemFormBuilder
-  VERSION = '6.4.0'.freeze
+  VERSION = '6.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_design_system_formbuilder
 version: !ruby/object:Gem::Version
-  version: 6.4.0
+  version: 6.6.0
 platform: ruby
 authors:
 - Peter Yates
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-16 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-attributes-utils
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: rubypants
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.37.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.37.0
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement