crown_marketplace_utils 0.1.0.beta.3 → 0.1.0.beta.4

data/lib/crown_marketplace_utils/gov_uk_helper/field/file_upload.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require_relative '../field'
+
+module CrownMarketplaceUtils
+  module GovUkHelper
+    module Field
+      # = GOV.UK File Upload
+      #
+      # This helper is used for generating the file upload component from the
+      # {https://design-system.service.gov.uk/components/file-upload GDS - Components - File Upload}
+      #
+      # This is considered a Field module and so makes use of the methods in {CrownMarketplaceUtils::GovUkHelper::Field}
+
+      module FileUpload
+        include Field
+
+        # Generates the HTML for the GOV.UK file upload component
+        #
+        # @param attribute [String, Symbol] the attribute of the file upload
+        # @param error_message [String] the error message to be displayed
+        # @param govuk_file_upload_options [Hash] options that will be used for the parts of the form group, label, hint and file upload
+        #
+        # @option govuk_file_upload_options [Hash] :form_group see {govuk_field}
+        # @option govuk_file_upload_options [Hash] :label see {govuk_field}
+        # @option govuk_file_upload_options [Hash] :hint see {govuk_field}
+        # @option govuk_file_upload_options [Hash] :file_upload ({}) the options that will be used when rendering the file upload.
+        #                                                            See {govuk_file_upload_field} for more details.
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK File Upload
+        #                                     which can then be rendered on the page
+
+        def govuk_file_upload(attribute, error_message = nil, **govuk_file_upload_options)
+          govuk_field(:file_upload, attribute, error_message, **govuk_file_upload_options) do |govuk_field_options|
+            concat(govuk_file_upload_field(attribute, error_message, **govuk_field_options))
+          end
+        end
+
+        # Generates the HTML for the GOV.UK file upload component using an ActiveModel.
+        # Unlike {govuk_file_upload}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param model [ActiveModel] model that will be used to find an error message for the file upload
+        # @param attribute [String, Symbol] the attribute of the file upload
+        # @param govuk_file_upload_options [Hash] options that will be used for the parts of the form group, label, hint and file upload
+        #
+        # @option (see govuk_file_upload)
+        #
+        # @return (see govuk_file_upload)
+
+        def govuk_file_upload_with_model(model, attribute, **govuk_file_upload_options)
+          govuk_field_with_model(:file_upload, model, attribute, **govuk_file_upload_options) do |govuk_field_options, error_message|
+            concat(govuk_file_upload_field(attribute, error_message, **govuk_field_options))
+          end
+        end
+
+        # Generates the HTML for the GOV.UK file upload component using an ActionView::Helpers::FormBuilder.
+        # Unlike {govuk_file_upload}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the file upload input
+        # @param attribute [String, Symbol] the attribute of the file upload
+        # @param govuk_file_upload_options [Hash] options that will be used for the parts of the form group, label, hint and file upload
+        #
+        # @option (see govuk_file_upload)
+        #
+        # @return (see govuk_file_upload)
+
+        def govuk_file_upload_with_form(form, attribute, **govuk_file_upload_options)
+          govuk_field_with_form(:file_upload, form, attribute, **govuk_file_upload_options) do |govuk_field_options, error_message|
+            concat(govuk_file_upload_field_with_form(form, attribute, error_message, **govuk_field_options))
+          end
+        end
+
+        private
+
+        # Generates the file upload HTML for {govuk_file_upload} and {govuk_file_upload_with_model}
+        #
+        # @param attribute [String, Symbol] the attribute of the file upload
+        # @param error_message [String] the error message to be displayed
+        # @param govuk_file_upload_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see set_file_upload_options)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the file upload field which is used in {govuk_file_upload} and {govuk_file_upload_with_model}
+
+        def govuk_file_upload_field(attribute, error_message, **govuk_file_upload_options)
+          set_file_upload_options(error_message, govuk_file_upload_options)
+
+          file_field_tag(attribute, class: govuk_file_upload_options[:classes], **govuk_file_upload_options[:attributes])
+        end
+
+        # Generates the file upload HTML for {govuk_file_upload_with_form}
+        #
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the file upload input
+        # @param attribute [String, Symbol] the attribute of the file upload
+        # @param error_message [String] used to indicate if there is an error which will add an extra classes
+        # @param govuk_file_upload_options [Hash] options that will be used in customising the HTML
+        #
+        # @option (see set_file_upload_options)
+        #
+        # @return [ActiveSupport::SafeBuffer] the HTML for the file upload field which is used in {govuk_file_upload_with_form}
+
+        def govuk_file_upload_field_with_form(form, attribute, error_message, **govuk_file_upload_options)
+          set_file_upload_options(error_message, govuk_file_upload_options)
+
+          form.file_field(attribute, class: govuk_file_upload_options[:classes], **govuk_file_upload_options[:attributes])
+        end
+
+        # Initialises the attributes for the file upload input
+        #
+        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param govuk_file_upload_options [Hash] options that will be used in customising the HTML
+        #
+        # @option govuk_file_upload_options [String] :classes additional CSS classes for the file iupload HTML
+        # @option govuk_file_upload_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
+
+        def set_file_upload_options(error_message, govuk_file_upload_options)
+          govuk_file_upload_options[:classes] = "govuk-file-upload #{govuk_file_upload_options[:classes]}".rstrip
+          govuk_file_upload_options[:classes] << ' govuk-file-upload--error' if error_message
+
+          govuk_file_upload_options[:attributes] ||= {}
+        end
+      end
+    end
+  end
+end

data/lib/crown_marketplace_utils/gov_uk_helper/field/input.rb

@@ -21,11 +21,11 @@ module CrownMarketplaceUtils
         # @param error_message [String] the error message to be displayed
         # @param govuk_input_options [Hash] options that will be used for the parts of the form group, label, hint and input
         #
-        # @option govuk_input_options [Hash] :form_group_options see {govuk_field}
+        # @option govuk_input_options [Hash] :form_group see {govuk_field}
         # @option govuk_input_options [Hash] :label see {govuk_field}
         # @option govuk_input_options [Hash] :hint see {govuk_field}
-        # @option govuk_input_options [Hash] :input_options ({}) the options that will be used when rendering the input.
-        #                                                              See {govuk_input_field} for more details.
+        # @option govuk_input_options [Hash] :input ({}) the options that will be used when rendering the input.
+        #                                                See {govuk_input_field} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Input
         #                                     which can then be rendered on the page
@@ -36,18 +36,33 @@ module CrownMarketplaceUtils
           end
         end
 
+        # Generates the HTML for the GOV.UK input component using an ActiveModel.
+        # Unlike {govuk_input}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param model [ActiveModel] model that will be used to find an error message and the value of the input
+        # @param attribute [String, Symbol] the attribute of the input
+        # @param govuk_input_options [Hash] options that will be used for the parts of the form group, label, hint and input
+        #
+        # @option (see govuk_input)
+        #
+        # @return (see govuk_input)
+
+        def govuk_input_with_model(model, attribute, **govuk_input_options)
+          govuk_field_with_model(:input, model, attribute, **govuk_input_options) do |govuk_field_options, error_message|
+            govuk_field_options[:value] = model.send(attribute)
+
+            concat(govuk_input_field(attribute, error_message, **govuk_field_options))
+          end
+        end
+
         # Generates the HTML for the GOV.UK input component using an ActionView::Helpers::FormBuilder.
         # Unlike {govuk_input}, the method will be able to automatically determine if the error message needs to be shown.
         #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the input
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the input
         # @param attribute [String, Symbol] the attribute of the input
         # @param govuk_input_options [Hash] options that will be used for the parts of the form group, label, hint and input
         #
-        # @option govuk_input_options [Hash] :form_group_options see {govuk_field_with_form}
-        # @option govuk_input_options [Hash] :label see {govuk_field_with_form}
-        # @option govuk_input_options [Hash] :hint see {govuk_field_with_form}
-        # @option govuk_input_options [Hash] :input_options ({}) the options that will be used when rendering the input.
-        #                                                        See {govuk_input_field_with_form} for more details.
+        # @option (see govuk_input)
         #
         # @return (see govuk_input)
 
@@ -59,7 +74,7 @@ module CrownMarketplaceUtils
 
         private
 
-        # Generates the input HTML for {govuk_input}
+        # Generates the input HTML for {govuk_input} and {govuk_input_with_model}
         #
         # @param attribute [String, Symbol] the attribute of the input
         # @param error_message [String] used to indicate if there is an error which will add extra classes
@@ -71,15 +86,17 @@ module CrownMarketplaceUtils
 
         def govuk_input_field(attribute, error_message, **govuk_text_input_options)
           _govuk_input_field(error_message, **govuk_text_input_options) do |govuk_text_input_classes, govuk_text_input_attributes|
-            text_field_tag(attribute, govuk_text_input_options[:value], class: govuk_text_input_classes, **govuk_text_input_attributes)
+            field_type = :"#{get_field_type(govuk_text_input_options[:field_type])}_tag"
+
+            send(field_type, attribute, govuk_text_input_options[:value], class: govuk_text_input_classes, **govuk_text_input_attributes)
           end
         end
 
         # Generates the input HTML for {govuk_input_with_form}
         #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the input
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the input
         # @param attribute [String, Symbol] the attribute of the input
-        # @param error_message [String] used to indicate if there is an error which will add extra classes
+        # @param error_message [String] used to indicate if there is an error which will add an extra classes
         # @param govuk_text_input_options [Hash] options that will be used in customising the HTML
         #
         # @option (see _govuk_input_field)
@@ -88,7 +105,9 @@ module CrownMarketplaceUtils
 
         def govuk_input_field_with_form(form, attribute, error_message, **govuk_text_input_options)
           _govuk_input_field(error_message, **govuk_text_input_options) do |govuk_text_input_classes, govuk_text_input_attributes|
-            form.text_field(attribute, class: govuk_text_input_classes, **govuk_text_input_attributes)
+            field_type = get_field_type(govuk_text_input_options[:field_type])
+
+            form.send(field_type, attribute, class: govuk_text_input_classes, **govuk_text_input_attributes)
           end
         end
 
@@ -99,6 +118,7 @@ module CrownMarketplaceUtils
         #
         # @option govuk_text_input_options [String] :classes additional CSS classes for the input HTML
         # @option govuk_text_input_options [String] :value (nil) the value of the input
+        # @option govuk_text_input_options [Symbol] :field_type the type of the input field, see {get_field_type} for options
         # @option govuk_text_input_options [Hash] :prefix (nil) optional prefix for the input field. See {govuk_fix} for more details.
         # @option govuk_text_input_options [Hash] :suffix (nil) optional suffix for the input field. See {govuk_fix} for more details.
         # @option govuk_text_input_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
@@ -111,9 +131,9 @@ module CrownMarketplaceUtils
         # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {govuk_input_field} or {govuk_input_field_with_form}
 
         def _govuk_input_field(error_message, **govuk_text_input_options)
-          govuk_text_input_classes = ['govuk-input']
-          govuk_text_input_classes += ['govuk-input--error'] if error_message
-          govuk_text_input_classes << govuk_text_input_options[:classes]
+          govuk_text_input_classes = "govuk-input #{govuk_text_input_options[:classes]}".rstrip
+          govuk_text_input_classes << ' govuk-input--error' if error_message
+
           govuk_text_input_options[:attributes] ||= {}
 
           input_html = yield(govuk_text_input_classes, govuk_text_input_options[:attributes])
@@ -152,9 +172,23 @@ module CrownMarketplaceUtils
 
           tag.div(govuk_fix_options[:text], class: govuk_fix_classes, **govuk_fix_options[:attributes])
         end
+
+        # Returns the field type used to create the rails input tag
+        #
+        # @param field_type [Symbol] the type of the field, defaults to text
+        #                            Allowed values are:
+        #                            - +:email+
+        #                            - +:password+
+
+        def get_field_type(field_type)
+          case field_type
+          when :email, :password
+            :"#{field_type}_field"
+          else
+            :text_field
+          end
+        end
       end
     end
   end
 end
-
-ActionView::Base.field_error_proc = proc { |html_tag, _instance| html_tag }

data/lib/crown_marketplace_utils/gov_uk_helper/field/radios.rb

@@ -22,11 +22,11 @@ module CrownMarketplaceUtils
         # @param error_message [String] the error message to be displayed
         # @param govuk_radios_options [Hash] options that will be used for the parts of the fieldset, form group, hint and radio buttons
         #
-        # @option govuk_radios_options [Hash] :form_group_options see {govuk_fields}
-        # @option govuk_radios_options [Hash] :fieldset_options see {govuk_fields}
+        # @option govuk_radios_options [Hash] :form_group see {govuk_fields}
+        # @option govuk_radios_options [Hash] :fieldset see {govuk_fields}
         # @option govuk_radios_options [Hash] :hint see {govuk_field}
-        # @option govuk_radios_options [Hash] :radios_options ({}) the options that will be used when rendering the radio buttons.
-        #                                                          See {govuk_radios_fields} for more details.
+        # @option govuk_radios_options [Hash] :radios ({}) the options that will be used when rendering the radio buttons.
+        #                                                  See {govuk_radios_fields} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Radios
         #                                     which can then be rendered on the page
@@ -37,6 +37,27 @@ module CrownMarketplaceUtils
           end
         end
 
+        # Generates the HTML for the GOV.UK Radios component using an ActiveModel.
+        # Unlike {govuk_radios}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param model [ActiveModel] model that will be used to find an error message and the selected radio button
+        # @param attribute [String, Symbol] the attribute of the raido buttons
+        # @param items [Array] array of radio items, see {_govuk_radios_fields}
+        # @param govuk_radios_options [Hash] options that will be used for the parts of the fieldset, form group, hint and radio buttons
+        #
+        # @option (see govuk_radios)
+        #
+        # @return (see govuk_radios)
+
+        def govuk_radios_with_model(model, attribute, items, **govuk_radios_options)
+          value = model.send(attribute)
+          items.each { |item| item[:checked] = item[:value] == value }
+
+          govuk_fields_with_model(:radios, model, attribute, **govuk_radios_options) do |govuk_field_options|
+            concat(govuk_radios_fields(attribute, items, **govuk_field_options))
+          end
+        end
+
         # Generates the HTML for the GOV.UK Radios component using an ActionView::Helpers::FormBuilder.
         # Unlike {govuk_radios}, the method will be able to automatically determine if the error message needs to be shown.
         #
@@ -45,11 +66,7 @@ module CrownMarketplaceUtils
         # @param items [Array] array of radio items, see {_govuk_radios_fields}
         # @param govuk_radios_options [Hash] options that will be used for the parts of the fieldset, form group, hint and radio buttons
         #
-        # @option govuk_radios_options [Hash] :form_group_options see {govuk_fields_with_form}
-        # @option govuk_radios_options [Hash] :fieldset_options see {govuk_fields_with_form}
-        # @option govuk_radios_options [Hash] :hint see {govuk_fields_with_form}
-        # @option govuk_radios_options [Hash] :radios_options ({}) the options that will be used when rendering the radio buttons.
-        #                                                          See {govuk_radios_fields_with_form} for more details.
+        # @option (see govuk_radios)
         #
         # @return (see govuk_radios)
 
@@ -79,7 +96,7 @@ module CrownMarketplaceUtils
 
         # Generates the radios HTML for {govuk_radios_with_form}
         #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the radio buttons
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the radio buttons
         # @param attribute [String, Symbol] the attribute of the raido buttons
         # @param items [Array] array of radio items, see {_govuk_radios_fields}
         # @param govuk_radios_options [Hash] options that will be used in customising the HTML
@@ -146,7 +163,7 @@ module CrownMarketplaceUtils
             label_attribute = radio_item[:attributes][:id] || "#{attribute}[#{radio_item[:value]}]"
 
             concat(radio_button_tag(attribute, radio_item[:value], radio_item[:checked], class: 'govuk-radios__input', **radio_item[:attributes]))
-            concat(govuk_label(label_attribute, radio_item[:label][:text], **radio_item[:label][:options]))
+            concat(govuk_label(label_attribute, radio_item[:label][:text], **radio_item[:label]))
           end
         end
 
@@ -161,11 +178,11 @@ module CrownMarketplaceUtils
 
         def govuk_radio_item_with_form(form, attribute, radio_item)
           _govuk_radio_item(attribute, radio_item) do
-            (radio_item[:label][:options][:attributes] ||= {})[:value] = radio_item[:value]
-            radio_item[:label][:options][:attributes][:for] = radio_item[:attributes][:id] if radio_item[:attributes][:id]
+            (radio_item[:label][:attributes] ||= {})[:value] = radio_item[:value]
+            radio_item[:label][:attributes][:for] = radio_item[:attributes][:id] if radio_item[:attributes][:id]
 
             concat(form.radio_button(attribute, radio_item[:value], class: 'govuk-radios__input', **radio_item[:attributes]))
-            concat(govuk_label_with_form(form, attribute, radio_item[:label][:text], **radio_item[:label][:options]))
+            concat(govuk_label_with_form(form, attribute, radio_item[:label][:text], **radio_item[:label]))
           end
         end
 
@@ -176,12 +193,9 @@ module CrownMarketplaceUtils
         # @param radio_item [Hash] the options for the radio item
         #
         # @option radio_item [String] :classes additional CSS classes for the radio button HTML
-        # @option radio_item [Hash] :label the parameters that will be used to create the label for the radio button:
-        #                                  - +:text+ (required) - the label text
-        #                                  - +:options+ - default: { } - the options for govuk_label {govuk_label}
-        # @option radio_item [Hash] :hint (nil) the parameters that will be used to create the hint for the field
-        #                                       - +:text+ (required) - the hint text
-        #                                       - +:options+ - default: { } - the options for govuk_hint {govuk_hint}
+        # @option radio_item [Hash] :label the parameters that will be used to create the label for the radio button, see {govuk_label}
+        # @option radio_item [Hash] :hint (nil) the parameters that will be used to create the hint for the radio button, see {govuk_hint}.
+        #                                          If no hint is given then no hint will be rendered
         # @option radio_item [Hash] :attributes ({}) any additional attributes that will be added as part of the radio button HTML
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the radio buttons, label and hint
@@ -189,14 +203,14 @@ module CrownMarketplaceUtils
 
         def _govuk_radio_item(attribute, radio_item)
           radio_item[:attributes] ||= {}
-          radio_item[:label][:options] ||= {}
-          radio_item[:label][:options][:classes] = "govuk-radios__label #{radio_item[:label][:options][:classes]}".rstrip
+          radio_item[:label] ||= {}
+          radio_item[:label][:classes] = "govuk-radios__label #{radio_item[:label][:classes]}".rstrip
 
           set_item_options_for_hint('radios', attribute, radio_item) if radio_item[:hint]
 
           capture do
             yield
-            concat(govuk_hint(radio_item[:hint][:text], **radio_item[:hint][:options])) if radio_item[:hint]
+            concat(govuk_hint(radio_item[:hint][:text], **radio_item[:hint])) if radio_item[:hint]
           end
         end
       end

data/lib/crown_marketplace_utils/gov_uk_helper/field/select.rb

@@ -24,11 +24,11 @@ module CrownMarketplaceUtils
         # @param error_message [String] the error message to be displayed
         # @param govuk_select_options [Hash] options that will be used for the parts of the form group, label, hint and select
         #
-        # @option govuk_select_options [Hash] :form_group_options see {govuk_field}
+        # @option govuk_select_options [Hash] :form_group see {govuk_field}
         # @option govuk_select_options [Hash] :label see {govuk_field}
         # @option govuk_select_options [Hash] :hint see {govuk_field}
-        # @option govuk_select_options [Hash] :select_options ({}) the options that will be used when rendering the select field.
-        #                                                          See {govuk_select_field} for more details.
+        # @option govuk_select_options [Hash] :select ({}) the options that will be used when rendering the select field.
+        #                                                  See {govuk_select_field} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Select
         #                                     which can then be rendered on the page
@@ -39,19 +39,35 @@ module CrownMarketplaceUtils
           end
         end
 
+        # Generates the HTML for the GOV.UK Select component using an ActiveModel.
+        # Unlike {govuk_select}, the method will be able to automatically determine if the error message needs to be shown.
+        #
+        # @param model [ActiveModel] model that will be used to find an error message and the selected options
+        # @param attribute [String, Symbol] the attribute of the select field
+        # @param items [Array] array of option items for the select, see {govuk_map_select_items}
+        # @param govuk_select_options [Hash] options that will be used for the parts of the form group, label, hint and select
+        #
+        # @option see govuk_select)
+        #
+        # @return (see govuk_select)
+
+        def govuk_select_with_model(model, attribute, items, **govuk_select_options)
+          (govuk_select_options[:select] ||= {})[:selected] = model.send(attribute)
+
+          govuk_field_with_model(:select, model, attribute, **govuk_select_options) do |govuk_field_options, error_message|
+            concat(govuk_select_field(attribute, items, error_message, **govuk_field_options))
+          end
+        end
+
         # Generates the HTML for the GOV.UK Select component using an ActionView::Helpers::FormBuilder.
         # Unlike {govuk_select}, the method will be able to automatically determine if the error message needs to be shown.
         #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the select field
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the select field
         # @param attribute [String, Symbol] the attribute of the select field
         # @param items [Array] array of option items for the select, see {govuk_map_select_items}
         # @param govuk_select_options [Hash] options that will be used for the parts of the form group, label, hint and select
         #
-        # @option govuk_select_options [Hash] :form_group_options see {govuk_field_with_form}
-        # @option govuk_select_options [Hash] :label see {govuk_field_with_form}
-        # @option govuk_select_options [Hash] :hint see {govuk_field_with_form}
-        # @option govuk_select_options [Hash] :select_options ({}) the options that will be used when rendering the select field.
-        #                                                          See {govuk_select_field_with_form} for more details.
+        # @option see govuk_select)
         #
         # @return (see govuk_select)
 
@@ -70,49 +86,49 @@ module CrownMarketplaceUtils
         # @param error_message [String] used to indicate if there is an error which will add extra classes
         # @param govuk_select_options [Hash] options that will be used in customising the HTML
         #
-        # @option (see _govuk_select_field)
+        # @option (see set_govuk_select_field_options)
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select}
 
         def govuk_select_field(attribute, items, error_message, **govuk_select_options)
-          _govuk_select_field(error_message, **govuk_select_options) do |govuk_select_classes, govuk_select_attributes|
-            select_tag(
-              attribute,
-              options_for_select(
-                govuk_map_select_items(items),
-                govuk_select_options[:selected]
-              ),
-              class: govuk_select_classes,
-              **govuk_select_attributes
-            )
-          end
+          set_govuk_select_field_options(error_message, govuk_select_options)
+
+          select_tag(
+            attribute,
+            options_for_select(
+              govuk_map_select_items(items),
+              govuk_select_options[:selected]
+            ),
+            class: govuk_select_options[:classes],
+            **govuk_select_options[:attributes]
+          )
         end
 
         # Generates the select HTML for {govuk_select_with_form}
         #
-        # @param form [ActionView::Helpers::FormBuilder] :form the form builder used to create the select field
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the select field
         # @param attribute [String, Symbol] the attribute of the select field
         # @param items [Array] array of option items for the select, see {govuk_map_select_items}
         # @param error_message [String] used to indicate if there is an error which will add extra classes
         # @param govuk_select_options [Hash] options that will be used in customising the HTML
         #
-        # @option (see _govuk_select_field)
+        # @option (see set_govuk_select_field_options)
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select_with_form}
 
         def govuk_select_field_with_form(form, attribute, items, error_message, **govuk_select_options)
-          _govuk_select_field(error_message, **govuk_select_options) do |govuk_select_classes, govuk_select_attributes|
-            form.select(
-              attribute,
-              govuk_map_select_items(items),
-              govuk_select_options[:select_options] || {},
-              class: govuk_select_classes,
-              **govuk_select_attributes
-            )
-          end
+          set_govuk_select_field_options(error_message, govuk_select_options)
+
+          form.select(
+            attribute,
+            govuk_map_select_items(items),
+            govuk_select_options[:select] || {},
+            class: govuk_select_options[:classes],
+            **govuk_select_options[:attributes]
+          )
         end
 
-        # Wrapper method used by {govuk_select_field} and {govuk_select_field_with_form} to generate the select HTML
+        # Initialises the attributes for the select input
         #
         # @param error_message [String] used to indicate if there is an error which will add extra classes
         # @param govuk_select_options [Hash] options that will be used in customising the HTML
@@ -120,21 +136,11 @@ module CrownMarketplaceUtils
         # @option govuk_select_options [String] :classes additional CSS classes for the select HTML
         # @option govuk_select_options [String] :selected (nil) the selected option
         # @option govuk_select_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
-        #
-        # @yield the select HTML generated by {govuk_select_field} or {govuk_select_field_with_form}
-        #
-        # @yieldparam govuk_select_classes [Array] the classes for the select HTML
-        # @yieldparam govuk_select_attributes [Hash] additional attributes that will added as part of the HTML
-        #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the select field which is used in {govuk_select_field} or {govuk_select_field_with_form}
 
-        def _govuk_select_field(error_message, **govuk_select_options)
-          govuk_select_classes = ['govuk-select']
-          govuk_select_classes += ['govuk-select--error'] if error_message
-          govuk_select_classes << govuk_select_options[:classes]
+        def set_govuk_select_field_options(error_message, govuk_select_options)
+          govuk_select_options[:classes] = "govuk-select #{govuk_select_options[:classes]}".rstrip
+          govuk_select_options[:classes] << ' govuk-select--error' if error_message
           govuk_select_options[:attributes] ||= {}
-
-          yield(govuk_select_classes, govuk_select_options[:attributes])
         end
 
         # Maps the items into an array that can be used to generate the options for
@@ -162,5 +168,3 @@ module CrownMarketplaceUtils
     end
   end
 end
-
-ActionView::Base.field_error_proc = proc { |html_tag, _instance| html_tag }