ccs-frontend_helpers 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 294fb84084e25efd871cf66bf4513023648669964b1fbc026aece725bcd64c78
-  data.tar.gz: cd55ae750739c51a9561871d5d2c782a067ace1b04f7014e3b41d05349db6f68
+  metadata.gz: fca2cbae35b1e0e0845af49145d1c9141bdcf235dea294ab305acbbeb301f781
+  data.tar.gz: 3e874c9bc894b40c56efefd54397f134b697ad717ce5b4ab9a3247fe36160d67
 SHA512:
-  metadata.gz: d64eb288f9595343e58ec37eec080a925928b908273c1880efd409a3cde6f9015567221838496084c03d3799dd54ea7ae10328e4c545d446d0f876b0892efb9c
-  data.tar.gz: d1c288ab82c3c78b1049a1bf8d580b515d213d52758aedf378799262efa854880eab99e69251e0cf74502bb29af8da7fa965adf6275f8755672896dc49787a43
+  metadata.gz: 6109e7f5c6a7bb6d210c47b07ce9e88f83ccb81a6c76fba097bf9ce467423aca549230686f78ec6fcabfe8e48443f9cfe9c41f8cb947181631ce33895ee7ccf6
+  data.tar.gz: c6cd26aedc098f409ecb4a625daef8236f3eabe9a071dfb611d6352f9c5e6595034de5b3a9d5b260c724cec5b1be41bd1e974153e43d6b1e9a8e6b47cfeae662

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.4.0] - 2024-05-20
+
+Update components to be compatible with GOV.UK Frontend v5.4
+
+## [0.3.0] - 2024-04-12
+
+Update components to be compatible with GOV.UK Frontend v5.3
+
+### 🆕 New features
+
+The following GOV.UK helpers have been added:
+
+- Password input
+
 ## [0.2.0] - 2024-03-13
 
 ### 💥 Breaking changes

data/Gemfile

@@ -7,7 +7,7 @@ gemspec
 
 # Gems for building the package
 gem 'bundler', '~> 2.3'
-gem 'rake', '~> 13.1'
+gem 'rake', '~> 13.2'
 
 # Gems for testing the package
 gem 'capybara', '~> 3.40.0'
@@ -16,10 +16,10 @@ gem 'simplecov', '~> 0.21'
 gem 'nokogiri-diff', '~> 0.3.0'
 
 # Gems for linting/formatting the package
-gem 'rubocop', '~> 1.62'
-gem 'rubocop-rails', '~> 2.24'
+gem 'rubocop', '~> 1.63'
+gem 'rubocop-rails', '~> 2.25'
 gem 'rubocop-rake', '~> 0.6'
-gem 'rubocop-rspec', '~> 2.27'
+gem 'rubocop-rspec', '~> 2.29'
 
 # Gems for documenting the package
 gem 'yard', '~> 0.9'

data/Gemfile.lock

@@ -1,41 +1,41 @@
 PATH
   remote: .
   specs:
-    ccs-frontend_helpers (0.2.0)
+    ccs-frontend_helpers (0.4.0)
       rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actioncable (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailbox (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionmailer (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.2)
-      actionview (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionpack (7.1.3.3)
+      actionview (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -43,35 +43,35 @@ GEM
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actiontext (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    actionview (7.1.3.3)
+      activesupport (= 7.1.3.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activejob (7.1.3.3)
+      activesupport (= 7.1.3.3)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.2)
-      activesupport (= 7.1.3.2)
-    activerecord (7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activemodel (7.1.3.3)
+      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       timeout (>= 0.4.0)
-    activestorage (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    activestorage (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       marcel (~> 1.0)
-    activesupport (7.1.3.2)
+    activesupport (7.1.3.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -85,7 +85,7 @@ GEM
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.6)
+    bigdecimal (3.1.8)
     builder (3.2.4)
     capybara (3.40.0)
       addressable
@@ -106,13 +106,13 @@ GEM
     erubi (1.12.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.4)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.11.2)
-      rdoc
+    irb (1.13.1)
+      rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
     loofah (2.22.0)
       crass (~> 1.0.2)
@@ -122,37 +122,37 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     matrix (0.4.2)
     mini_mime (1.1.5)
-    minitest (5.22.2)
+    minitest (5.23.0)
     mutex_m (0.2.0)
-    net-imap (0.4.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.2-x86_64-darwin)
+    nio4r (2.7.3)
+    nokogiri (1.16.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.5-x86_64-linux)
       racc (~> 1.4)
     nokogiri-diff (0.3.0)
       nokogiri (~> 1.5)
       tdiff (~> 0.4)
     parallel (1.24.0)
-    parser (3.3.0.5)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
     psych (5.1.2)
       stringio
     public_suffix (5.0.4)
-    racc (1.7.3)
-    rack (3.0.9.1)
+    racc (1.8.0)
+    rack (3.0.11)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -160,20 +160,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.3.2)
-      actioncable (= 7.1.3.2)
-      actionmailbox (= 7.1.3.2)
-      actionmailer (= 7.1.3.2)
-      actionpack (= 7.1.3.2)
-      actiontext (= 7.1.3.2)
-      actionview (= 7.1.3.2)
-      activejob (= 7.1.3.2)
-      activemodel (= 7.1.3.2)
-      activerecord (= 7.1.3.2)
-      activestorage (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    rails (7.1.3.3)
+      actioncable (= 7.1.3.3)
+      actionmailbox (= 7.1.3.3)
+      actionmailer (= 7.1.3.3)
+      actionpack (= 7.1.3.3)
+      actiontext (= 7.1.3.3)
+      actionview (= 7.1.3.3)
+      activejob (= 7.1.3.3)
+      activemodel (= 7.1.3.3)
+      activerecord (= 7.1.3.3)
+      activestorage (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.2)
+      railties (= 7.1.3.3)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -181,22 +181,23 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.3.2)
-      actionpack (= 7.1.3.2)
-      activesupport (= 7.1.3.2)
+    railties (7.1.3.3)
+      actionpack (= 7.1.3.3)
+      activesupport (= 7.1.3.3)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
-    rake (13.1.0)
-    rdoc (6.6.2)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    regexp_parser (2.9.0)
-    reline (0.4.2)
+    regexp_parser (2.9.2)
+    reline (0.5.7)
       io-console (~> 0.5)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -210,7 +211,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)
-    rubocop (1.62.1)
+    rubocop (1.63.5)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -221,23 +222,26 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rails (2.24.0)
+    rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.27.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -246,8 +250,9 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringio (3.1.0)
+    strscan (3.1.0)
     tdiff (0.4.0)
-    thor (1.3.0)
+    thor (1.3.1)
     timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
@@ -259,7 +264,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   x86_64-darwin-19
@@ -271,12 +276,12 @@ DEPENDENCIES
   capybara (~> 3.40.0)
   ccs-frontend_helpers!
   nokogiri-diff (~> 0.3.0)
-  rake (~> 13.1)
+  rake (~> 13.2)
   rspec (~> 3.13)
-  rubocop (~> 1.62)
-  rubocop-rails (~> 2.24)
+  rubocop (~> 1.63)
+  rubocop-rails (~> 2.25)
   rubocop-rake (~> 0.6)
-  rubocop-rspec (~> 2.27)
+  rubocop-rspec (~> 2.29)
   simplecov (~> 0.21)
   yard (~> 0.9)
 

data/README.md

@@ -14,6 +14,8 @@ The following table shows the version of CCS Frontend Helpers that you should us
 
 | CCS Frontend Helpers Version | Target GOV.UK Frontend Version |
 | ----------------------------- | ------------------------------ |
+| [0.4.0](https://github.com/tim-s-ccs/ccs-frontend_helpers/releases/tag/v0.4.0) | [5.4.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.4.0) |
+| [0.3.0](https://github.com/tim-s-ccs/ccs-frontend_helpers/releases/tag/v0.3.0) | [5.3.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.3.0) |
 | [0.2.0](https://github.com/tim-s-ccs/ccs-frontend_helpers/releases/tag/v0.2.0) | [5.2.0](https://github.com/alphagov/govuk-frontend/releases/tag/v5.2.0) |
 | [0.1.2](https://github.com/tim-s-ccs/ccs-frontend_helpers/releases/tag/v0.1.2) | [4.7.0](https://github.com/alphagov/govuk-frontend/releases/tag/v4.7.0) |
 

data/lib/ccs/components/ccs/footer.rb

@@ -37,7 +37,6 @@ module CCS
         def initialize(navigation: nil, meta: nil, **options)
           super(**options)
 
-          @options[:attributes][:role] = 'contentinfo'
           @options[:copyright] ||= '© Crown copyright'
 
           @navigation = navigation&.map { |navigation_item| Navigation.new(context: @context, **navigation_item) }

data/lib/ccs/components/ccs/header.rb

@@ -45,7 +45,6 @@ module CCS
         def initialize(service_authentication_items: nil, navigation: nil, menu_button: nil, service: nil, **options)
           super(**options)
 
-          @options[:attributes][:role] = 'banner'
           @options[:container_classes] ||= 'govuk-width-container'
           @options[:homepage_url] ||= 'https://www.crowncommercial.gov.uk'
 

data/lib/ccs/components/govuk/error_summary.rb

@@ -31,7 +31,7 @@ module CCS
         # @option options [String] :classes additional CSS classes for the error summary HTML
         # @option options [Hash] :attributes ({}) any additional attributes that will be added as part of the HTML
 
-        def initialize(title:, error_summary_items:, description: nil, **options)
+        def initialize(title:, error_summary_items: [], description: nil, **options)
           super(**options)
 
           @title = title
@@ -51,9 +51,11 @@ module CCS
               concat(tag.h2(title, class: 'govuk-error-summary__title'))
               concat(tag.div(class: 'govuk-error-summary__body') do
                 concat(tag.p(description)) if description
-                concat(tag.ul(class: 'govuk-list govuk-error-summary__list') do
-                  error_summary_items.each { |error_summary_item| concat(error_summary_item.render) }
-                end)
+                if error_summary_items.any?
+                  concat(tag.ul(class: 'govuk-list govuk-error-summary__list') do
+                    error_summary_items.each { |error_summary_item| concat(error_summary_item.render) }
+                  end)
+                end
               end)
             end
           end

data/lib/ccs/components/govuk/field/input/character_count/count_message.rb

@@ -0,0 +1,62 @@
+module CCS
+  module Components
+    module GovUK
+      class Field < Base
+        class Input < Field
+          class CharacterCount
+            # = GOV.UK Character count message
+            #
+            # This is used to generate the character count message
+            #
+            # @!attribute [r] count_message
+            #   @return [Hint] Hint with the count message
+            # @!attribute [r] after_input
+            #   @return [String] Text or HTML for after the textarea input
+
+            class CountMessage
+              include ActionView::Context
+              include ActionView::Helpers
+
+              private
+
+              attr_reader :count_message, :after_input
+
+              public
+
+              # @param character_count_attribute [String] the name of the field as it will appear in the textarea
+              # @param context [ActionView::Base] the view context
+              # @param character_count_options (see CCS::Components::GovUK::Field::Input::CharacterCount.get_character_count_from_group_options)
+              # @param after_input [String] Text or HTML that goes after the input
+              #
+              # @option (see CCS::Components::GovUK::Field::Input::CharacterCount.get_character_count_from_group_options)
+
+              def initialize(character_count_attribute:, context:, character_count_options:, after_input: nil)
+                count_message = character_count_options[:textarea_description] || {}
+
+                count_message_length = character_count_options[:maxwords] || character_count_options[:maxlength]
+                count_message_default = "You can enter up to %<count>s #{character_count_options[:maxwords] ? 'words' : 'characters'}"
+
+                text = count_message_length ? format(count_message[:count_message] || count_message_default, count: count_message_length) : ''
+                classes = "govuk-character-count__message #{count_message[:classes]}".rstrip
+
+                @count_message = Hint.new(text: text, classes: classes, attributes: { id: "#{character_count_attribute}-info" }, context: context)
+                @after_input = after_input
+              end
+
+              # Generates the HTML for the GOV.UK Character count message
+              #
+              # @return [ActiveSupport::SafeBuffer]
+
+              def render
+                capture do
+                  concat(count_message.render)
+                  concat(after_input) if after_input
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ccs/components/govuk/field/input/character_count.rb

@@ -1,5 +1,5 @@
 require_relative 'textarea'
-require_relative '../../hint'
+require_relative 'character_count/count_message'
 
 module CCS
   module Components
@@ -21,12 +21,9 @@ module CCS
           #   @return [Hash] HTML options for the character count
 
           class CharacterCount
-            include ActionView::Context
-            include ActionView::Helpers
-
             private
 
-            attr_reader :textarea, :textarea_description, :character_count_html_options
+            attr_reader :textarea, :textarea_description
 
             public
 
@@ -41,21 +38,10 @@ module CCS
             def initialize(attribute:, context:, character_count_options: {}, **options)
               character_count_attribute = options[:form] ? "#{options[:form].object_name}_#{attribute}" : attribute
 
-              initialise_textarea(attribute, character_count_attribute, context, options)
-              initialise_character_count_html_options(character_count_options)
-              initialise_textarea_description(character_count_attribute, context, character_count_options)
+              initialise_textarea(attribute, character_count_attribute, character_count_options, context, options)
             end
 
-            # Generates the HTML for the GOV.UK Character count component
-            #
-            # @return [ActiveSupport::SafeBuffer]
-
-            def render
-              tag.div(**character_count_html_options) do
-                concat(textarea.render)
-                concat(textarea_description.render)
-              end
-            end
+            delegate :render, to: :textarea
 
             private
 
@@ -63,19 +49,23 @@ module CCS
             #
             # @param attribute [Symbol] the attribute of the field
             # @param character_count_attribute [String] the name of the field as it will appear in the textarea
+            # @param character_count_options [Hash] options for the character count
             # @param context [ActionView::Base] the view context
             # @param options [Hash] options that will be used for the textarea
             #
             # @option (see CCS::Components::GovUK::Field::Input::Textarea#initialize)
 
-            def initialise_textarea(attribute, character_count_attribute, context, options)
+            def initialise_textarea(attribute, character_count_attribute, character_count_options, context, options)
+              set_character_count_from_group_options(character_count_options, options)
+
               ((options[:attributes] ||= {})[:aria] ||= {})[:describedby] = [options.dig(:attributes, :aria, :describedby), "#{character_count_attribute}-info"].compact.join(' ')
               options[:classes] = "govuk-js-character-count #{options[:classes]}".rstrip
 
-              @textarea = Textarea.new(attribute: attribute, context: context, **options)
+              count_message = CountMessage.new(character_count_attribute: character_count_attribute, context: context, character_count_options: character_count_options, after_input: options.delete(:after_input))
+              @textarea = Textarea.new(attribute: attribute, context: context, after_input: count_message.render, **options)
             end
 
-            # Initialises the charcter count options
+            # Sets the charcter count form group options
             #
             # @param character_count_options [Hash] options for the charcter count
             #
@@ -91,50 +81,29 @@ module CCS
             #                                                            - +:count_message+ replaced the default text for the count message.
             #                                                                               If you want the count number to appear, put %<count>s in the string and it will be replaced with the number
             #                                                            - +classes+ additional CSS classes for the textarea description HTML
-            # @option character_count_options [Hash] :characters_under_limit Message displayed when the number of characters is under the configured maximum, maxlength
+            # @option character_count_options [String] :characters_under_limit Message displayed when the number of characters is under the configured maximum, maxlength
             # @option character_count_options [String] :characters_at_limit_text Message displayed when the number of characters reaches the configured maximum, maxlength
-            # @option character_count_options [Hash] :characters_over_limit Message displayed when the number of characters is over the configured maximum, maxlength
-            # @option character_count_options [Hash] :words_under_limit Message displayed when the number of words is under the configured maximum, maxwords
+            # @option character_count_options [String] :characters_over_limit Message displayed when the number of characters is over the configured maximum, maxlength
+            # @option character_count_options [String] :words_under_limit Message displayed when the number of words is under the configured maximum, maxwords
             # @option character_count_options [String] :words_at_limit_text Message displayed when the number of words reaches the configured maximum, maxwords
-            # @option character_count_options [Hash] :words_over_limit Message displayed when the number of words is over the configured maximum, maxwords
+            # @option character_count_options [String] :words_over_limit Message displayed when the number of words is over the configured maximum, maxwords
 
-            def initialise_character_count_html_options(character_count_options)
-              character_count_html_options = { class: 'govuk-character-count', data: { module: 'govuk-character-count' } }
+            def set_character_count_from_group_options(character_count_options, options)
+              (options[:form_group] ||= {})[:classes] = "govuk-character-count #{options.dig(:form_group, :classes)}".rstrip
+              ((options[:form_group][:attributes] ||= {})[:data] ||= {})[:module] = 'govuk-character-count'
 
               %i[maxlength threshold maxwords].each do |data_attribute|
-                character_count_html_options[:data][data_attribute] = character_count_options[data_attribute].to_s if character_count_options[data_attribute]
+                options[:form_group][:attributes][:data][data_attribute] = character_count_options[data_attribute].to_s if character_count_options[data_attribute]
               end
 
-              get_chacrter_count_translations(character_count_options).each do |data_attribute, value|
-                character_count_html_options[:data][data_attribute] = value
+              get_chacrter_count_translations(character_count_options) do |data_attribute, value|
+                options[:form_group][:attributes][:data][data_attribute] = value
               end
-
-              @character_count_html_options = character_count_html_options
-            end
-
-            # Initialises the charcter count textarea description
-            #
-            # @param character_count_attribute [String] the name of the field as it will appear in the textarea
-            # @param context [ActionView::Base] the view context
-            # @param (see initialise_character_count_html_options)
-            #
-            # @option (see initialise_character_count_html_options)
-
-            def initialise_textarea_description(character_count_attribute, context, character_count_options)
-              textarea_description = character_count_options[:textarea_description] || {}
-
-              textarea_description_length = character_count_options[:maxwords] || character_count_options[:maxlength]
-              textarea_description_default = "You can enter up to %<count>s #{character_count_options[:maxwords] ? 'words' : 'characters'}"
-
-              text = textarea_description_length ? format(textarea_description[:count_message] || textarea_description_default, count: textarea_description_length) : ''
-              classes = "govuk-character-count__message #{textarea_description[:classes]}".rstrip
-
-              @textarea_description = Hint.new(text: text, classes: classes, attributes: { id: "#{character_count_attribute}-info" }, context: context)
             end
 
             # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
-            # Returns the translation options for character count
+            # Generator for the translation options for character count
             #
             # @param (see initialise_character_count_html_options)
             #
@@ -143,24 +112,25 @@ module CCS
             # @return [Hash]
 
             def get_chacrter_count_translations(character_count_options)
-              character_count_data_options = {}
-
               %i[characters_at_limit words_at_limit].each do |data_attribute|
                 data_attribute_name = :"#{data_attribute}_text"
-                character_count_data_options[:"i18n.#{data_attribute.to_s.gsub('_', '-')}"] = character_count_options[data_attribute_name] if character_count_options[data_attribute_name]
+
+                next unless character_count_options[data_attribute_name]
+
+                yield :"i18n.#{data_attribute.to_s.gsub('_', '-')}", character_count_options[data_attribute_name]
               end
 
               %i[characters_under_limit characters_over_limit words_under_limit words_over_limit].each do |data_attribute|
                 next unless character_count_options[data_attribute]
 
                 %i[other one].each do |plural_rule|
-                  character_count_data_options[:"i18n.#{data_attribute.to_s.gsub('_', '-')}.#{plural_rule}"] = character_count_options[data_attribute][plural_rule] if character_count_options[data_attribute][plural_rule]
+                  next unless character_count_options[data_attribute][plural_rule]
+
+                  yield :"i18n.#{data_attribute.to_s.gsub('_', '-')}.#{plural_rule}", character_count_options[data_attribute][plural_rule]
                 end
               end
 
-              character_count_data_options[:'i18n.textarea-description.other'] = character_count_options[:textarea_description][:count_message] if character_count_options.dig(:textarea_description, :count_message) && !(character_count_options[:maxwords] || character_count_options[:maxlength])
-
-              character_count_data_options
+              yield :'i18n.textarea-description.other', character_count_options[:textarea_description][:count_message] if character_count_options.dig(:textarea_description, :count_message) && !(character_count_options[:maxwords] || character_count_options[:maxlength])
             end
 
             # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity