crown_marketplace_utils 0.1.0.beta.4 → 0.1.0.beta.5

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/field/input.rb

@@ -2,7 +2,7 @@
 
 require_relative '../field'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     module Field
       # = GOV.UK Input
@@ -18,100 +18,66 @@ module CrownMarketplaceUtils
         # Generates the HTML for the GOV.UK input component
         #
         # @param attribute [String, Symbol] the attribute of the input
-        # @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 [String] :error_message (nil) the error message to be displayed
+        # @option govuk_input_options [ActiveModel] :model (nil) optional model that can be used to find an error message
+        # @option govuk_label_options [ActionView::Helpers::FormBuilder] :form (nil) optional form builder used to create
+        #                                                                      the input tag and find the error message
         # @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 ({}) the options that will be used when rendering the input.
-        #                                                See {govuk_input_field} for more details.
+        #                                                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
 
-        def govuk_input(attribute, error_message = nil, **govuk_input_options)
-          govuk_field(:input, attribute, error_message, **govuk_input_options) do |govuk_field_options|
-            concat(govuk_input_field(attribute, error_message, **govuk_field_options))
-          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] 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 (see govuk_input)
-        #
-        # @return (see govuk_input)
+        def govuk_input(attribute, **govuk_input_options)
+          govuk_field(:input, attribute, **govuk_input_options) do |govuk_field_options, error_message|
+            concat(_govuk_input_field(error_message, **govuk_field_options) do
+              field_type = get_field_type(govuk_field_options[:field_type])
+              govuk_field_options[:value] = govuk_input_options[:model].send(attribute) if govuk_input_options[:model]
 
-        def govuk_input_with_form(form, attribute, **govuk_input_options)
-          govuk_field_with_form(:input, form, attribute, **govuk_input_options) do |govuk_field_options, error_message|
-            concat(govuk_input_field_with_form(form, attribute, error_message, **govuk_field_options))
+              if govuk_input_options[:form]
+                govuk_input_form(govuk_input_options[:form], field_type, attribute, **govuk_field_options)
+              else
+                govuk_input_tag(field_type, attribute, **govuk_field_options)
+              end
+            end)
           end
         end
 
         private
 
-        # Generates the input HTML for {govuk_input} and {govuk_input_with_model}
+        # Generates the input HTML for {govuk_input}
         #
+        # @param field_type [String] the inout field type
         # @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 govuk_text_input_options [Hash] options that will be used in customising the HTML
         #
         # @option (see _govuk_input_field)
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {govuk_input}
 
-        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|
-            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
+        def govuk_input_tag(field_type, attribute, **govuk_text_input_options)
+          send("#{field_type}_tag", attribute, govuk_text_input_options[:value], **govuk_text_input_options[:attributes])
         end
 
-        # Generates the input HTML for {govuk_input_with_form}
+        # Generates the input HTML for {govuk_input} when there is a ActionView::Helpers::FormBuilder
         #
-        # @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 an extra classes
-        # @param govuk_text_input_options [Hash] options that will be used in customising the HTML
+        # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the input tag
+        # @param (see govuk_input_tag)
         #
         # @option (see _govuk_input_field)
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {govuk_input_with_form}
-
-        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|
-            field_type = get_field_type(govuk_text_input_options[:field_type])
+        # @return (see govuk_input_tag)
 
-            form.send(field_type, attribute, class: govuk_text_input_classes, **govuk_text_input_attributes)
-          end
+        def govuk_input_form(form, field_type, attribute, **govuk_text_input_options)
+          form.send(field_type, attribute, **govuk_text_input_options[:attributes])
         end
 
-        # Wrapper method used by {govuk_input_field} and {govuk_input_field_with_form} to generate the Input HTML
+        # Wrapper method used by {govuk_input} to generate the Input HTML
         #
         # @param error_message [String] used to indicate if there is an error which will add extra classes
         # @param govuk_text_input_options [Hash] options that will be used in customising the HTML
@@ -123,20 +89,16 @@ module CrownMarketplaceUtils
         # @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
         #
-        # @yield the input HTML generated by {govuk_input_field} or {govuk_input_field_with_form}
-        #
-        # @yieldparam govuk_text_input_classes [Array] the classes for the input HTML
-        # @yieldparam govuk_text_input_attributes [Hash] additional attributes that will added as part of the HTML
+        # @yield the input HTML generated by {govuk_input_tag} or {govuk_input_form}
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {govuk_input_field} or {govuk_input_field_with_form}
+        # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used by {govuk_input}
 
         def _govuk_input_field(error_message, **govuk_text_input_options)
-          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] ||= {}
+          govuk_text_input_options[:attributes][:class] = "govuk-input #{govuk_text_input_options[:classes]}".rstrip
+          govuk_text_input_options[:attributes][:class] << ' govuk-input--error' if error_message
 
-          input_html = yield(govuk_text_input_classes, govuk_text_input_options[:attributes])
+          input_html = yield
 
           prefix = govuk_text_input_options[:prefix]
           suffix = govuk_text_input_options[:suffix]
@@ -162,7 +124,7 @@ module CrownMarketplaceUtils
         # @option govuk_fix_options [String] :classes additional CSS classes for the input HTML
         # @option govuk_text_input_options [Hash] :attributes ({ aria: { hidden: true } }) any additional attributes that will added as part of the HTML
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {govuk_input_field} or {govuk_input_field_with_form}
+        # @return [ActiveSupport::SafeBuffer] the HTML for the input field which is used in {_govuk_input_field}
 
         def govuk_fix(fix, govuk_fix_options)
           govuk_fix_classes = ["govuk-input__#{fix}fix"]

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/field/radios.rb

@@ -2,7 +2,7 @@
 
 require_relative '../field'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     module Field
       # = GOV.UK Radios
@@ -19,60 +19,35 @@ module CrownMarketplaceUtils
         #
         # @param attribute [String, Symbol] the attribute of the raido buttons
         # @param items [Array] array of radio items, see {_govuk_radios_fields}
-        # @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 [String] :error_message (nil) the error message to be displayed
+        # @option govuk_radios_options [ActiveModel] :model (nil) optional model that can be used to find an error message
+        # @option govuk_radios_options [ActionView::Helpers::FormBuilder] :form (nil) optional form builder used to create
+        #                                                                       the radio tags and find the error message
         # @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 ({}) the options that will be used when rendering the radio buttons.
-        #                                                  See {govuk_radios_fields} for more details.
+        #                                                  See {govuk_radio_fields_tag} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Radios
         #                                     which can then be rendered on the page
 
-        def govuk_radios(attribute, items, error_message = nil, **govuk_radios_options)
-          govuk_fields(:radios, attribute, error_message, **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 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.
-        #
-        # @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 for the parts of the fieldset, form group, hint and radio buttons
-        #
-        # @option (see govuk_radios)
-        #
-        # @return (see govuk_radios)
+        def govuk_radios(attribute, items, **govuk_radios_options)
+          govuk_fields(:radios, attribute, **govuk_radios_options) do |govuk_field_options|
+            if govuk_radios_options[:model] || govuk_radios_options[:form]
+              value = (govuk_radios_options[:model] || govuk_radios_options[:form].object).send(attribute)
+              items.each { |item| item[:checked] = item[:value] == value }
+            end
 
-        def govuk_radios_with_form(form, attribute, items, **govuk_radios_options)
-          govuk_fields_with_form(:radios, form, attribute, **govuk_radios_options) do |govuk_field_options|
-            concat(govuk_radios_fields_with_form(form, attribute, items, **govuk_field_options))
+            concat(
+              if govuk_radios_options[:form]
+                govuk_radio_fields_form(govuk_radios_options[:form], attribute, items, **govuk_field_options)
+              else
+                govuk_radio_fields_tag(attribute, items, **govuk_field_options)
+              end
+            )
           end
         end
 
@@ -88,30 +63,28 @@ module CrownMarketplaceUtils
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the radio buttons which is used in {govuk_radios}
 
-        def govuk_radios_fields(attribute, items, **govuk_radios_options)
+        def govuk_radio_fields_tag(attribute, items, **govuk_radios_options)
           _govuk_radios_fields(items, **govuk_radios_options) do |radio_item|
-            govuk_radio_item(attribute, radio_item)
+            govuk_radio_item_tag(attribute, radio_item)
           end
         end
 
-        # Generates the radios HTML for {govuk_radios_with_form}
+        # Generates the radios HTML for {govuk_radios} when there is a ActionView::Helpers::FormBuilder
         #
         # @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
+        # @param (see govuk_radio_fields_tag)
         #
         # @option (see _govuk_radios_fields)
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the radio buttons which is used in {govuk_radios_with_form}
+        # @return (see govuk_radio_fields_tag)
 
-        def govuk_radios_fields_with_form(form, attribute, items, **govuk_radios_options)
+        def govuk_radio_fields_form(form, attribute, items, **govuk_radios_options)
           _govuk_radios_fields(items, **govuk_radios_options) do |radio_item|
-            govuk_radio_item_with_form(form, attribute, radio_item)
+            govuk_radio_item_form(form, attribute, radio_item)
           end
         end
 
-        # Wrapper method used by {govuk_radios_fields} and {govuk_radios_fields_with_form} to generate the radios HTML
+        # Wrapper method used by {govuk_radio_fields_tag} and {govuk_radio_fields_form} to generate the radios HTML
         #
         # @param items [Array] array of radio items.
         #                      Each item is a hash which can be:
@@ -122,18 +95,18 @@ module CrownMarketplaceUtils
         # @option govuk_radios_options [String] :classes additional CSS classes for the radios HTML
         # @option govuk_radios_options [Hash] :attributes ({ module: 'govuk-radios' }) any additional attributes that will added as part of the HTML
         #
-        # @yield the radio item HTML generated by {govuk_radios_fields} or {govuk_radios_fields_with_form}
+        # @yield the radio item HTML generated by {govuk_radio_fields_tag} or {govuk_radio_fields_form}
         #
         # @yieldparam radio_item [Hash] the current radio item to be rendered
         #
-        # @return [ActiveSupport::SafeBuffer] the HTML for the radio buttons which is used in {govuk_radios_fields} or {govuk_radios_fields_with_form}
+        # @return [ActiveSupport::SafeBuffer] the HTML for the radio buttons which is used in {govuk_radio_fields_tag} or {govuk_radio_fields_form}
 
         def _govuk_radios_fields(items, **govuk_radios_options)
-          govuk_radios_classes = ['govuk-radios']
-          govuk_radios_classes << govuk_radios_options[:classes]
-          ((govuk_radios_options[:attributes] ||= {})[:data] ||= {}).merge!({ module: 'govuk-radios' })
+          govuk_radios_options[:attributes] ||= {}
+          govuk_radios_options[:attributes][:class] = "govuk-radios #{govuk_radios_options[:classes]}".rstrip
+          (govuk_radios_options[:attributes][:data] ||= {}).merge!({ module: 'govuk-radios' })
 
-          tag.div(class: govuk_radios_classes, **govuk_radios_options[:attributes]) do
+          tag.div(**govuk_radios_options[:attributes]) do
             capture do
               items.each do |radio_item|
                 concat(
@@ -150,7 +123,7 @@ module CrownMarketplaceUtils
           end
         end
 
-        # Generates the HTML for a radio button for {govuk_radios_fields_with_form}
+        # Generates the HTML for a radio button for {govuk_radio_fields_form}
         #
         # @param (see _govuk_radio_item)
         #
@@ -158,7 +131,7 @@ module CrownMarketplaceUtils
         #
         # @return (see _govuk_radio_item)
 
-        def govuk_radio_item(attribute, radio_item)
+        def govuk_radio_item_tag(attribute, radio_item)
           _govuk_radio_item(attribute, radio_item) do
             label_attribute = radio_item[:attributes][:id] || "#{attribute}[#{radio_item[:value]}]"
 
@@ -167,7 +140,7 @@ module CrownMarketplaceUtils
           end
         end
 
-        # Generates the HTML for a radio button for {govuk_radios_fields}
+        # Generates the HTML for a radio button for {govuk_radio_fields_tag}
         #
         # @param (see _govuk_radio_item)
         # @param form [ActionView::Helpers::FormBuilder] the form builder used to create the radio buttons
@@ -176,17 +149,19 @@ module CrownMarketplaceUtils
         #
         # @return (see _govuk_radio_item)
 
-        def govuk_radio_item_with_form(form, attribute, radio_item)
+        def govuk_radio_item_form(form, attribute, radio_item)
           _govuk_radio_item(attribute, radio_item) do
             (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]))
+            concat(govuk_label(attribute, radio_item[:label][:text], form: form, **radio_item[:label]))
           end
         end
 
-        # Wrapper method used by {govuk_radio_item} and {govuk_radio_item_with_form} to generate the radios HTML
+        # rubocop:disable Metrics/AbcSize
+
+        # Wrapper method used by {govuk_radio_item_tag} and {govuk_radio_item_form} to generate the radios HTML
         # including the label and hint, if there is one.
         #
         # @param attribute [String, Symbol] the attribute of the raido buttons
@@ -196,23 +171,32 @@ module CrownMarketplaceUtils
         # @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] :conditional (nil) content that will appear when the radio button is checked.
+        #                                              It can have the following options:
+        #                                              - +[:content]+ the content that will be shown
+        #                                              - +[:attributes][:id]+ the id of the conditional section
+        #                                              If no conditional is given then no conditional content 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
-        #                                     which is used in {govuk_radio_item} and {govuk_radio_item_with_form}
+        #                                     which is used in {govuk_radio_item_tag} and {govuk_radio_item_form}
 
         def _govuk_radio_item(attribute, radio_item)
           radio_item[:attributes] ||= {}
           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]
+          set_item_options_for_hint('radios', attribute, radio_item)
+          set_conditional_item_options('radios', attribute, radio_item)
 
           capture do
             yield
             concat(govuk_hint(radio_item[:hint][:text], **radio_item[:hint])) if radio_item[:hint]
+            concat(tag.div(radio_item[:conditional][:content], class: radio_item[:conditional][:attributes][:class], id: radio_item[:conditional][:attributes][:id])) if radio_item[:conditional]
           end
         end
+
+        # rubocop:enable Metrics/AbcSize
       end
     end
   end

data/lib/crown_marketplace_utils/{gov_uk_helper → helpers/gov_uk_helper}/field/select.rb

@@ -3,7 +3,7 @@
 require 'action_view'
 require_relative '../field'
 
-module CrownMarketplaceUtils
+module CrownMarketplaceUtils::Helpers
   module GovUkHelper
     module Field
       # = GOV.UK Select
@@ -21,59 +21,33 @@ module CrownMarketplaceUtils
         #
         # @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] 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 [String] :error_message (nil) the error message to be displayed
+        # @option govuk_select_options [ActiveModel] :model (nil) optional model that can be used to find an error message
+        # @option govuk_select_options [ActionView::Helpers::FormBuilder] :form (nil) optional form builder used to create
+        #                                                                       the select tag and find the error message
         # @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 ({}) the options that will be used when rendering the select field.
-        #                                                  See {govuk_select_field} for more details.
+        #                                                  See {set_govuk_select_field_options} for more details.
         #
         # @return [ActiveSupport::SafeBuffer] the HTML for the GOV.UK Select
         #                                     which can then be rendered on the page
 
-        def govuk_select(attribute, items, error_message = nil, **govuk_select_options)
-          govuk_field(:select, attribute, error_message, **govuk_select_options) do |govuk_field_options|
-            concat(govuk_select_field(attribute, items, error_message, **govuk_field_options))
-          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] 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 see govuk_select)
-        #
-        # @return (see govuk_select)
-
-        def govuk_select_with_form(form, attribute, items, **govuk_select_options)
-          govuk_field_with_form(:select, form, attribute, **govuk_select_options) do |govuk_field_options, error_message|
-            concat(govuk_select_field_with_form(form, attribute, items, error_message, **govuk_field_options))
+        def govuk_select(attribute, items, **govuk_select_options)
+          govuk_field(:select, attribute, **govuk_select_options) do |govuk_field_options, error_message|
+            set_govuk_select_field_options(error_message, govuk_field_options)
+            (govuk_select_options[:select] ||= {})[:selected] = govuk_select_options[:model].send(attribute) if govuk_select_options[:model]
+
+            concat(
+              if govuk_select_options[:form]
+                govuk_select_form(govuk_select_options[:form], attribute, items, **govuk_field_options)
+              else
+                govuk_select_tag(attribute, items, **govuk_field_options)
+              end
+            )
           end
         end
 
@@ -83,47 +57,37 @@ module CrownMarketplaceUtils
         #
         # @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 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)
-          set_govuk_select_field_options(error_message, govuk_select_options)
-
+        def govuk_select_tag(attribute, items, **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}
+        # Generates the select HTML for {govuk_select} when there is a ActionView::Helpers::FormBuilder
         #
         # @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
+        # @param (see govuk_select_tag)
         #
         # @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)
-          set_govuk_select_field_options(error_message, govuk_select_options)
+        # @return (see govuk_select_tag)
 
+        def govuk_select_form(form, attribute, items, **govuk_select_options)
           form.select(
             attribute,
             govuk_map_select_items(items),
-            govuk_select_options[:select] || {},
-            class: govuk_select_options[:classes],
+            govuk_select_options[:select_options] || {},
             **govuk_select_options[:attributes]
           )
         end
@@ -138,13 +102,13 @@ module CrownMarketplaceUtils
         # @option govuk_select_options [Hash] :attributes ({}) any additional attributes that will added as part of the HTML
 
         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] ||= {}
+          govuk_select_options[:attributes][:class] = "govuk-select #{govuk_select_options[:classes]}".rstrip
+          govuk_select_options[:attributes][:class] << ' govuk-select--error' if error_message
         end
 
         # Maps the items into an array that can be used to generate the options for
-        # {govuk_select_field} and {govuk_select_field_with_form}
+        # {govuk_select_tag} and {govuk_select_form}
         #
         # @param items [Array] array of option items for the select
         #
@@ -153,7 +117,7 @@ module CrownMarketplaceUtils
         # @option items [String] :value the value of the option item
         # @option items [Hash] :attributes ({}) any additional attributes that will added as part of the option HTML
         #
-        # @return [Array] array of option params that are used in {govuk_select_field} and {govuk_select_field_with_form}
+        # @return [Array] array of option params that are used in {govuk_select_tag} and {govuk_select_form}
 
         def govuk_map_select_items(items)
           items.map do |item|