From 9a92e40906d6fbb363d18cdbd850adeadcb0c7a3 Mon Sep 17 00:00:00 2001
From: Jacob Briggs <jacob.briggs@ackama.com>
Date: Thu, 9 Jan 2025 11:58:37 +1300
Subject: [PATCH] Upgrade rubocop, and auto correct, before we upgrade ruby

---
 Gemfile.lock                               | 33 ++++++++++++----------
 app/controllers/items_controller.rb        |  2 +-
 app/helpers/vocab_sheet_helper.rb          |  2 +-
 app/services/pdf_rendering_service.rb      |  2 +-
 config/initializers/backtrace_silencers.rb |  1 +
 config/initializers/inflections.rb         |  1 +
 config/initializers/mime_types.rb          |  1 +
 7 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1e03a3627..0ef19385a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -196,7 +196,8 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.5.1)
+    json (2.9.1)
+    language_server-protocol (3.17.0.3)
     launchy (2.5.0)
       addressable (~> 2.7)
     letter_opener (1.7.0)
@@ -258,9 +259,10 @@ GEM
       mime-types
       mimemagic (~> 0.3.0)
       terrapin (~> 0.6.0)
-    parallel (1.22.1)
-    parser (3.1.3.0)
+    parallel (1.26.3)
+    parser (3.3.6.0)
       ast (~> 2.4.1)
+      racc
     percy-capybara (4.3.3)
     pg (1.2.3)
     pry (0.13.1)
@@ -324,7 +326,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    regexp_parser (2.6.1)
+    regexp_parser (2.10.0)
     request_store (1.5.0)
       rack (>= 1.4)
     rerun (0.13.1)
@@ -332,7 +334,6 @@ GEM
     responders (3.1.0)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
     rspec-expectations (3.10.1)
@@ -350,18 +351,18 @@ GEM
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
     rspec-support (3.10.2)
-    rubocop (1.41.1)
+    rubocop (1.69.2)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.36.2, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.24.0)
-      parser (>= 3.1.1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.37.0)
+      parser (>= 3.3.1.0)
     rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
@@ -369,7 +370,7 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.0)
     sass (3.7.4)
@@ -418,7 +419,9 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (3.1.3)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
     videojs_rails (4.12.15)
     warden (1.2.9)
       rack (>= 2.0.9)
diff --git a/app/controllers/items_controller.rb b/app/controllers/items_controller.rb
index 16e048cf3..fa873df9b 100644
--- a/app/controllers/items_controller.rb
+++ b/app/controllers/items_controller.rb
@@ -47,7 +47,7 @@ def destroy
     @item = @sheet.destroy_item(params[:id])
 
     if @item
-      flash[:vocab_bar_notice] = if @sheet.items.length.zero?
+      flash[:vocab_bar_notice] = if @sheet.items.empty?
                                    t('vocab_sheet.delete_success')
                                  else
                                    t('vocab_sheet.item.remove_success')
diff --git a/app/helpers/vocab_sheet_helper.rb b/app/helpers/vocab_sheet_helper.rb
index 76cea6569..e8792e8b4 100644
--- a/app/helpers/vocab_sheet_helper.rb
+++ b/app/helpers/vocab_sheet_helper.rb
@@ -3,7 +3,7 @@
 module VocabSheetHelper
   def vocab_sheet?
     return nil if @sheet.blank? # rubocop:disable Rails/HelperInstanceVariable
-    return nil if @sheet.items.length.zero? # rubocop:disable Rails/HelperInstanceVariable
+    return nil if @sheet.items.empty? # rubocop:disable Rails/HelperInstanceVariable
     return nil if params[:controller] == 'vocab_sheets'
 
     'vocab_sheet_background'
diff --git a/app/services/pdf_rendering_service.rb b/app/services/pdf_rendering_service.rb
index 3bf0bd69e..36ca22181 100644
--- a/app/services/pdf_rendering_service.rb
+++ b/app/services/pdf_rendering_service.rb
@@ -115,7 +115,7 @@ def mutate_html_by_inserting_base_tag
     #
     # We add the <base ... /> tag just after <head> - it must be added before
     # any <style> or <script></script> tags.
-    @html.sub!(/#{Regexp.quote("<head>")}/, "<head>#{base_tag}")
+    @html.sub!(/#{Regexp.quote('<head>')}/, "<head>#{base_tag}")
   end
 
   def base_tag
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index d0f0d3b5d..4b63f2893 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index aa7435fbc..dc8474221 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format. Inflections
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index 6e1d16f02..be6fedc53 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks: