Merge pull request #269 from unboxed/tidy-up-configuration

Tidy up configuration
unboxed · Nov 19, 2024 · acc9bb3 · acc9bb3
2 parents 5286156 + 0acb46f
commit acc9bb3
Show file tree

Hide file tree

Showing 28 changed files with 130 additions and 164 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/Dockerfile.production b/Dockerfile.production
@@ -1,5 +1,5 @@
 # Base image for all other build stages
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 
 FROM ruby:$RUBY_VERSION-slim-bullseye AS base_image
 

diff --git a/Gemfile b/Gemfile
@@ -3,16 +3,18 @@
 source "https://rubygems.org"
 
 # Load environment variables
-gem "dotenv-rails", require: "dotenv/rails-now"
+gem "dotenv-rails", require: "dotenv/load"
 
 gem "appsignal"
 gem "bootsnap", ">= 1.4.4", require: false
+gem "csv", require: false
 gem "dartsass-rails"
 gem "faraday"
 gem "govuk_design_system_formbuilder"
 gem "httparty"
 gem "jsbundling-rails"
 gem "lograge", "~> 0.14.0"
+gem "ostruct"
 gem "pg"
 gem "puma", ">= 5.3.1"
 gem "rails", "~> 7.2"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,29 +1,29 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actioncable (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionmailbox (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       mail (>= 2.8.0)
-    actionmailer (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      actionview (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionmailer (7.2.2)
+      actionpack (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activesupport (= 7.2.2)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.1.1)
-      actionview (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionpack (7.2.2)
+      actionview (= 7.2.2)
+      activesupport (= 7.2.2)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4, < 3.2)
@@ -32,36 +32,37 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actiontext (7.2.2)
+      actionpack (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.1.1)
-      activesupport (= 7.2.1.1)
+    actionview (7.2.2)
+      activesupport (= 7.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activejob (7.2.2)
+      activesupport (= 7.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.2.1.1)
-      activesupport (= 7.2.1.1)
-    activerecord (7.2.1.1)
-      activemodel (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activemodel (7.2.2)
+      activesupport (= 7.2.2)
+    activerecord (7.2.2)
+      activemodel (= 7.2.2)
+      activesupport (= 7.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    activestorage (7.2.2)
+      actionpack (= 7.2.2)
+      activejob (= 7.2.2)
+      activerecord (= 7.2.2)
+      activesupport (= 7.2.2)
       marcel (~> 1.0)
-    activesupport (7.2.1.1)
+    activesupport (7.2.2)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -77,6 +78,7 @@ GEM
       rack
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     bootsnap (1.18.4)
       msgpack (~> 1.2)
@@ -102,14 +104,15 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
+    csv (3.2.8)
     dartsass-rails (0.5.1)
       railties (>= 6.0.0)
       sass-embedded (~> 1.63)
-    date (3.3.4)
+    date (3.4.0)
     diff-lcs (1.5.0)
-    dotenv (3.1.2)
-    dotenv-rails (3.1.2)
-      dotenv (= 3.1.2)
+    dotenv (3.1.4)
+    dotenv-rails (3.1.4)
+      dotenv (= 3.1.4)
       railties (>= 6.1)
     drb (2.2.1)
     erubi (1.13.0)
@@ -150,7 +153,7 @@ GEM
     i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
-    irb (1.14.0)
+    irb (1.14.1)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jsbundling-rails (1.3.1)
@@ -167,7 +170,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.22.0)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -177,15 +180,15 @@ GEM
       net-smtp
     marcel (1.0.4)
     matrix (0.4.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.7)
+    mini_portile2 (2.8.8)
     minitest (5.25.1)
     msgpack (1.7.2)
     multi_xml (0.6.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.14)
+    net-imap (0.5.1)
       date
       net-protocol
     net-pop (0.1.2)
@@ -194,16 +197,17 @@ GEM
       timeout
     net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.3)
+    nio4r (2.7.4)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.16.7-x86_64-darwin)
       racc (~> 1.4)
+    ostruct (0.6.0)
     parallel (1.26.3)
-    parser (3.3.4.2)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.4)
@@ -213,7 +217,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    psych (5.1.2)
+    psych (5.2.0)
       stringio
     public_suffix (4.0.7)
     puma (6.4.3)
@@ -226,23 +230,22 @@ GEM
       rack (>= 3.0.0)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rackup (2.1.0)
+    rackup (2.2.1)
       rack (>= 3)
-      webrick (~> 1.8)
-    rails (7.2.1.1)
-      actioncable (= 7.2.1.1)
-      actionmailbox (= 7.2.1.1)
-      actionmailer (= 7.2.1.1)
-      actionpack (= 7.2.1.1)
-      actiontext (= 7.2.1.1)
-      actionview (= 7.2.1.1)
-      activejob (= 7.2.1.1)
-      activemodel (= 7.2.1.1)
-      activerecord (= 7.2.1.1)
-      activestorage (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    rails (7.2.2)
+      actioncable (= 7.2.2)
+      actionmailbox (= 7.2.2)
+      actionmailer (= 7.2.2)
+      actionpack (= 7.2.2)
+      actiontext (= 7.2.2)
+      actionview (= 7.2.2)
+      activejob (= 7.2.2)
+      activemodel (= 7.2.2)
+      activerecord (= 7.2.2)
+      activestorage (= 7.2.2)
+      activesupport (= 7.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.2.1.1)
+      railties (= 7.2.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -252,9 +255,9 @@ GEM
       nokogiri (~> 1.14)
     rails_autolink (1.1.7)
       rails (> 3.1)
-    railties (7.2.1.1)
-      actionpack (= 7.2.1.1)
-      activesupport (= 7.2.1.1)
+    railties (7.2.2)
+      actionpack (= 7.2.2)
+      activesupport (= 7.2.2)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -265,10 +268,10 @@ GEM
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.7.0)
+    rdoc (6.8.1)
       psych (>= 4.0.0)
     regexp_parser (2.9.2)
-    reline (0.5.9)
+    reline (0.5.11)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
@@ -320,7 +323,7 @@ GEM
       google-protobuf (~> 4.26)
     sass-embedded (1.77.8-x86_64-darwin)
       google-protobuf (~> 4.26)
-    securerandom (0.3.1)
+    securerandom (0.3.2)
     selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -349,9 +352,9 @@ GEM
       rubocop-rails (~> 2.25.0)
     stimulus-rails (1.2.2)
       railties (>= 6.0.0)
-    stringio (3.1.1)
-    thor (1.3.1)
-    timeout (0.4.1)
+    stringio (3.1.2)
+    thor (1.3.2)
+    timeout (0.4.2)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -368,14 +371,13 @@ GEM
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.8.2)
     websocket (1.2.10)
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.17)
+    zeitwerk (2.7.1)
 
 PLATFORMS
   aarch64-linux
@@ -388,6 +390,7 @@ DEPENDENCIES
   brakeman
   bundler-audit
   capybara
+  csv
   dartsass-rails
   dotenv-rails
   factory_bot_rails
@@ -398,6 +401,7 @@ DEPENDENCIES
   jsbundling-rails
   listen (~> 3.3)
   lograge (~> 0.14.0)
+  ostruct
   pg
   pry-byebug
   puma (>= 5.3.1)

diff --git a/app/views/additional_document_validation_requests/edit.html.erb b/app/views/additional_document_validation_requests/edit.html.erb
@@ -9,8 +9,7 @@
 
       <%= form_with scope: :additional_document_validation_request,
         url: additional_document_validation_request_path(@validation_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]),
-        method: :patch,
-        builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
+        method: :patch do |form| %>
 
         <% if @additional_document_validation_request.errors.any? %>
           <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">

diff --git a/app/views/description_change_validation_requests/_form.html.erb b/app/views/description_change_validation_requests/_form.html.erb
@@ -1,7 +1,6 @@
 <%= form_with scope: :description_change_validation_request,
     url: description_change_validation_request_path(@validation_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]),
-    method: :patch,
-    builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
+    method: :patch do |form| %>
 
   <% if @description_change_validation_request.errors.any? %>
     <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">

diff --git a/app/views/fee_change_validation_requests/_form.html.erb b/app/views/fee_change_validation_requests/_form.html.erb
@@ -1,7 +1,6 @@
 <%= form_with scope: :fee_change_validation_request,
   url: fee_change_validation_request_path(@validation_request["id"], planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]),
-  method: :patch,
-  builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
+  method: :patch do |form| %>
 
   <% if @fee_change_validation_request.errors.any? %>
     <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">

diff --git a/app/views/heads_of_term_validation_requests/_form.html.erb b/app/views/heads_of_term_validation_requests/_form.html.erb
@@ -1,7 +1,6 @@
 <%= form_with scope: :heads_of_term_validation_request,
   url: heads_of_term_validation_request_path(planning_application_id: params["planning_application_id"], change_access_id: params["change_access_id"]),
-  method: :patch,
-  builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
+  method: :patch do |form| %>
 
   <% if @heads_of_term_validation_request.errors.any? %>
     <div class="govuk-error-summary" aria-labelledby="error-summary-title" role="alert" tabindex="-1" data-module="govuk-error-summary">

diff --git a/app/views/land_owners/new.html.erb b/app/views/land_owners/new.html.erb
@@ -10,11 +10,10 @@
 
     <p class="govuk-body-s govuk-!-margin-bottom-1">Planning application reference number</p>
     <p class="govuk-body"><%= @planning_application["reference"] %></p>
-    
+
     <h3 class="govuk-heading-s">Details of owner</h3>
     <%= form_for @land_owner,
-      url: planning_application_ownership_certificate_land_owners_path(@planning_application["id"], @ownership_certificate),
-      builder: GOVUKDesignSystemFormBuilder::FormBuilder do |form| %>
+      url: planning_application_ownership_certificate_land_owners_path(@planning_application["id"], @ownership_certificate) do |form| %>
       <%= form.govuk_text_field :name, label: { text: "Owner name" } %>
       <%= form.govuk_text_field :address_1, label: { text: "Address line 1" } %>
       <%= form.govuk_text_field :address_2, label: { text:  "Address line 2 (optional)" } %>