Stop repeatedly listing all three bound objects

Instead add a #bound method to GOVUKDesignSystemFormBuilder::Base that returns them.
x-govuk · Mar 14, 2021 · e5e38fd · e5e38fd
1 parent 111de21
commit e5e38fd
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 27 deletions.
diff --git a/lib/govuk_design_system_formbuilder/base.rb b/lib/govuk_design_system_formbuilder/base.rb
@@ -25,6 +25,15 @@ def to_s
 
   private
 
+    # returns the attributes bound to the object that are
+    # required to build all contained elements
+    #
+    # @return [GOVUKDesignSystemFormBuilder::FormBuilder, Symbol, Symbol] an array containing the
+    #   builder, object name and attribute name
+    def bound
+      [@builder, @object_name, @attribute_name]
+    end
+
     def brand(override = nil)
       override || config.brand
     end

diff --git a/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb b/lib/govuk_design_system_formbuilder/containers/check_boxes_fieldset.rb
@@ -18,8 +18,8 @@ def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, s
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([hint_element, error_element, hidden_field, checkboxes])
           end
         end

diff --git a/lib/govuk_design_system_formbuilder/containers/fieldset.rb b/lib/govuk_design_system_formbuilder/containers/fieldset.rb
@@ -33,7 +33,7 @@ def legend_element
         @legend_element ||= if @legend.nil?
                               Elements::Null.new
                             else
-                              Elements::Legend.new(@builder, @object_name, @attribute_name, **legend_options)
+                              Elements::Legend.new(*bound, **legend_options)
                             end
       end
 

diff --git a/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb b/lib/govuk_design_system_formbuilder/containers/radio_buttons_fieldset.rb
@@ -18,8 +18,8 @@ def initialize(builder, object_name, attribute_name, hint:, legend:, caption:, i
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([hint_element, error_element, radios])
           end
         end

diff --git a/lib/govuk_design_system_formbuilder/elements/check_boxes/collection.rb b/lib/govuk_design_system_formbuilder/elements/check_boxes/collection.rb
@@ -23,8 +23,8 @@ def initialize(builder, object_name, attribute_name, collection, value_method:,
         end
 
         def html
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-            Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+          Containers::FormGroup.new(*bound, **@form_group).html do
+            Containers::Fieldset.new(*bound, **fieldset_options).html do
               safe_join([supplemental_content, hint_element, error_element, check_boxes])
             end
           end

diff --git a/lib/govuk_design_system_formbuilder/elements/check_boxes/collection_check_box.rb b/lib/govuk_design_system_formbuilder/elements/check_boxes/collection_check_box.rb
@@ -36,11 +36,11 @@ def options
         end
 
         def label_element
-          @label_element ||= Label.new(@builder, @object_name, @attribute_name, @checkbox, value: @value, link_errors: @link_errors)
+          @label_element ||= Label.new(*bound, @checkbox, value: @value, link_errors: @link_errors)
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+          @hint_element ||= Elements::Hint.new(*bound, **hint_options, **hint_content)
         end
 
         def hint_options

diff --git a/lib/govuk_design_system_formbuilder/elements/date.rb b/lib/govuk_design_system_formbuilder/elements/date.rb
@@ -22,8 +22,8 @@ def initialize(builder, object_name, attribute_name, legend:, caption:, hint:, o
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-          Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
+          Containers::Fieldset.new(*bound, **fieldset_options).html do
             safe_join([supplemental_content, hint_element, error_element, date])
           end
         end

diff --git a/lib/govuk_design_system_formbuilder/elements/file.rb b/lib/govuk_design_system_formbuilder/elements/file.rb
@@ -19,7 +19,7 @@ def initialize(builder, object_name, attribute_name, hint:, label:, caption:, fo
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, file])
         end
       end

diff --git a/lib/govuk_design_system_formbuilder/elements/radios/collection.rb b/lib/govuk_design_system_formbuilder/elements/radios/collection.rb
@@ -25,8 +25,8 @@ def initialize(builder, object_name, attribute_name, collection, value_method:,
         end
 
         def html
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
-            Containers::Fieldset.new(@builder, @object_name, @attribute_name, **fieldset_options).html do
+          Containers::FormGroup.new(*bound, **@form_group).html do
+            Containers::Fieldset.new(*bound, **fieldset_options).html do
               safe_join([hidden_field, supplemental_content, hint_element, error_element, radios])
             end
           end
@@ -56,7 +56,7 @@ def hidden_field
 
         def collection
           @collection.map.with_index do |item, i|
-            Elements::Radios::CollectionRadioButton.new(@builder, @object_name, @attribute_name, item, **collection_options(i)).html
+            Elements::Radios::CollectionRadioButton.new(*bound, item, **collection_options(i)).html
           end
         end
 

diff --git a/lib/govuk_design_system_formbuilder/elements/radios/collection_radio_button.rb b/lib/govuk_design_system_formbuilder/elements/radios/collection_radio_button.rb
@@ -41,7 +41,7 @@ def options
         end
 
         def hint_element
-          @hint_element ||= Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+          @hint_element ||= Elements::Hint.new(*bound, **hint_options, **hint_content)
         end
 
         def hint_content
@@ -53,7 +53,7 @@ def hint_options
         end
 
         def label_element
-          @label_element ||= Elements::Label.new(@builder, @object_name, @attribute_name, **label_options)
+          @label_element ||= Elements::Label.new(*bound, **label_options)
         end
 
         def label_options

diff --git a/lib/govuk_design_system_formbuilder/elements/select.rb b/lib/govuk_design_system_formbuilder/elements/select.rb
@@ -21,7 +21,7 @@ def initialize(builder, object_name, attribute_name, collection, value_method:,
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, select])
         end
       end

diff --git a/lib/govuk_design_system_formbuilder/elements/text_area.rb b/lib/govuk_design_system_formbuilder/elements/text_area.rb
@@ -24,7 +24,7 @@ def initialize(builder, object_name, attribute_name, hint:, label:, caption:, ro
 
       def html
         Containers::CharacterCount.new(@builder, **character_count_options).html do
-          Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+          Containers::FormGroup.new(*bound, **@form_group).html do
             safe_join([label_element, supplemental_content, hint_element, error_element, text_area, limit_description])
           end
         end

diff --git a/lib/govuk_design_system_formbuilder/traits/caption.rb b/lib/govuk_design_system_formbuilder/traits/caption.rb
@@ -7,7 +7,7 @@ def caption_element
         @caption_element ||= if @caption.nil?
                                Elements::Null.new
                              else
-                               Elements::Caption.new(@builder, @object_name, @attribute_name, **@caption)
+                               Elements::Caption.new(*bound, **@caption)
                              end
       end
     end

diff --git a/lib/govuk_design_system_formbuilder/traits/error.rb b/lib/govuk_design_system_formbuilder/traits/error.rb
@@ -10,7 +10,7 @@ def error_id
     private
 
       def error_element
-        @error_element ||= Elements::ErrorMessage.new(@builder, @object_name, @attribute_name)
+        @error_element ||= Elements::ErrorMessage.new(*bound)
       end
     end
   end

diff --git a/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb b/lib/govuk_design_system_formbuilder/traits/fieldset_item.rb
@@ -7,7 +7,7 @@ def label_element
         @label_element ||= if @label.nil?
                              Elements::Null.new
                            else
-                             Elements::Label.new(@builder, @object_name, @attribute_name, **label_content, **label_options)
+                             Elements::Label.new(*bound, **label_content, **label_options)
                            end
       end
 
@@ -19,7 +19,7 @@ def hint_element
         @hint_element ||= if @hint.nil?
                             Elements::Null.new
                           else
-                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_options, **hint_content)
+                            Elements::Hint.new(*bound, **hint_options, **hint_content)
                           end
       end
 

diff --git a/lib/govuk_design_system_formbuilder/traits/hint.rb b/lib/govuk_design_system_formbuilder/traits/hint.rb
@@ -13,7 +13,7 @@ def hint_element
         @hint_element ||= if @hint.nil?
                             Elements::Null.new
                           else
-                            Elements::Hint.new(@builder, @object_name, @attribute_name, **hint_content)
+                            Elements::Hint.new(*bound, **hint_content)
                           end
       end
 

diff --git a/lib/govuk_design_system_formbuilder/traits/input.rb b/lib/govuk_design_system_formbuilder/traits/input.rb
@@ -15,7 +15,7 @@ def initialize(builder, object_name, attribute_name, hint:, label:, caption:, pr
       end
 
       def html
-        Containers::FormGroup.new(@builder, @object_name, @attribute_name, **@form_group).html do
+        Containers::FormGroup.new(*bound, **@form_group).html do
           safe_join([label_element, supplemental_content, hint_element, error_element, content])
         end
       end

diff --git a/lib/govuk_design_system_formbuilder/traits/label.rb b/lib/govuk_design_system_formbuilder/traits/label.rb
@@ -7,7 +7,7 @@ def label_element
         @label_element ||= if @label.nil?
                              Elements::Null.new
                            else
-                             Elements::Label.new(@builder, @object_name, @attribute_name, caption: @caption, **label_content)
+                             Elements::Label.new(*bound, caption: @caption, **label_content)
                            end
       end
 

diff --git a/lib/govuk_design_system_formbuilder/traits/supplemental.rb b/lib/govuk_design_system_formbuilder/traits/supplemental.rb
@@ -10,7 +10,7 @@ def supplemental_id
     private
 
       def supplemental_content
-        @supplemental_content ||= Containers::Supplemental.new(@builder, @object_name, @attribute_name, @block_content)
+        @supplemental_content ||= Containers::Supplemental.new(*bound, @block_content)
       end
     end
   end