Set rubocop TargetRubyVersion to 3.2 and autocorrect

Author: corylown

.rubocop.yml

@@ -6,7 +6,7 @@ require:
   - rubocop-performance
 
 AllCops:
-  TargetRubyVersion: 3.0
+  TargetRubyVersion: 3.2
   DisplayCopNames: true
   Exclude:
     - 'config.ru'

Gemfile.lock

@@ -272,6 +272,8 @@ GEM
       net-protocol
     net-ssh (7.2.3)
     nio4r (2.7.1)
+    nokogiri (1.16.4-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.16.4-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.16.4-x86_64-linux)
@@ -427,6 +429,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
+    sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
     sshkit (1.22.1)
@@ -476,6 +479,7 @@ GEM
     zeitwerk (2.6.13)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-19
   x86_64-darwin-22
   x86_64-linux

app/analyzers/marc_analyzer.rb

@@ -8,10 +8,10 @@ def self.accept?(blob)
   end
 
   def metadata
-    metadata = { analyzer: self.class.to_s, count: count, type: type }
+    metadata = { analyzer: self.class.to_s, count:, type: }
     return metadata.merge(valid: false, error: 'No MARC records found') if count.zero?
 
-    MarcProfilingJob.perform_later(blob, count: count)
+    MarcProfilingJob.perform_later(blob, count:)
 
     metadata
   rescue MARC::XMLParseError, MARC::Exception => e

app/controllers/concerns/oai_concern.rb

@@ -71,7 +71,7 @@ def self.decode(string)
       set, page, from_date, until_date, version = Base64.urlsafe_decode64(string).split(';')
       raise BadResumptionToken unless version == ResumptionToken.version
 
-      token = ResumptionToken.new(set: set, page: page, from_date: from_date, until_date: until_date)
+      token = ResumptionToken.new(set:, page:, from_date:, until_date:)
       raise BadResumptionToken unless token.valid?
 
       token

app/controllers/oai_controller.rb

@@ -15,7 +15,7 @@ def show
     raise OaiConcern::BadVerb
   end
 
-  def method_missing(method, *_args, &_block)
+  def method_missing(method, *_args, &)
     raise OaiConcern::BadVerb if method.to_s.start_with?('render_')
 
     super
@@ -265,7 +265,7 @@ def build_list_metadata_formats_response
   def build_error_response(code, message, params = {})
     Nokogiri::XML::Builder.new do |xml|
       build_oai_response xml, params do
-        xml.error(code: code) do
+        xml.error(code:) do
           xml.text message
         end
       end

app/controllers/uploads_controller.rb

@@ -73,7 +73,7 @@ def current_stream
       if params[:stream].present?
         slug = @organization.default_stream.normalize_friendly_id(params[:stream])
 
-        @organization.streams.find_or_create_by(slug: slug) do |stream|
+        @organization.streams.find_or_create_by(slug:) do |stream|
           stream.name = params[:stream]
         end
       else

app/helpers/dashboard_helper.rb

@@ -36,11 +36,11 @@ def files_status(upload)
   end
 
   def any_successes?(statuses)
-    (%i[deletes success] & statuses).any?
+    %i[deletes success].intersect?(statuses)
   end
 
   def any_failures?(statuses)
-    (%i[invalid not_marc] & statuses).any?
+    %i[invalid not_marc].intersect?(statuses)
   end
 
   def count_roles(users)

app/jobs/application_job.rb

@@ -19,7 +19,7 @@ def self.with_job_tracking
   private
 
   def find_or_initialize_job_tracker
-    JobTracker.find_or_create_by(job_id: job_id) do |tracker|
+    JobTracker.find_or_create_by(job_id:) do |tracker|
       tracker.job_class = self.class.name
       tracker.provider_job_id = provider_job_id
       update_job_tracker_properties(tracker)
@@ -31,6 +31,6 @@ def update_job_tracker_properties(tracker)
   end
 
   def cleanup_job_tracker
-    JobTracker.where(job_id: job_id).delete_all
+    JobTracker.where(job_id:).delete_all
   end
 end

app/jobs/attach_remote_file_to_upload_job.rb

@@ -8,7 +8,7 @@ class AttachRemoteFileToUploadJob < ApplicationJob
 
   def perform(upload)
     io = URI.parse(upload.url).open
-    upload.files.attach(io: io, filename: filename_from_io(io) || filename_from_url(upload.url) || upload.name)
+    upload.files.attach(io:, filename: filename_from_io(io) || filename_from_url(upload.url) || upload.name)
     upload.update(status: 'active')
   rescue SocketError, OpenURI::HTTPError => e
     error = "Error opening #{upload.url}: #{e}"

app/jobs/extract_files_job.rb

@@ -42,7 +42,7 @@ def extract_multifile_attachment(src, upload)
   end
 
   def each_file(attachment, limit: 1000)
-    return to_enum(:each_file, attachment, limit: limit) unless block_given?
+    return to_enum(:each_file, attachment, limit:) unless block_given?
 
     counter = 0
 

app/models/allowlisted_jwt.rb

@@ -12,8 +12,8 @@ def encoded_token
 
   def jwt_attributes
     {
-      jti: jti,
-      scope: scope,
+      jti:,
+      scope:,
       iss: 'POD',
       name: label
     }.compact_blank

app/models/job_tracker.rb

@@ -57,8 +57,8 @@ def total?
 
   private
 
-  def number_with_delimiter(*args)
-    ActiveSupport::NumberHelper.number_to_delimited(*args)
+  def number_with_delimiter(*)
+    ActiveSupport::NumberHelper.number_to_delimited(*)
   end
 
   def in_sidekiq_set?(set)

app/models/stream.rb

@@ -87,7 +87,7 @@ def current_dump_ids(from_date: nil, until_date: nil)
     return if full_dump_id.blank?
 
     dumps_query = NormalizedDump.where(id: full_dump_id)
-                                .or(NormalizedDump.where(full_dump_id: full_dump_id))
+                                .or(NormalizedDump.where(full_dump_id:))
                                 .published
                                 .order(created_at: :asc)
     dumps_query = dumps_query.where('created_at >= ?', Time.zone.parse(from_date).beginning_of_day) if from_date.present?

app/models/upload.rb

@@ -42,7 +42,7 @@ def archive
     files.find_each(&:purge_later)
   end
 
-  # rubocop:disable Metrics/MethodLength
+  # rubocop:disable Metrics/MethodLength, Style/ArgumentsForwarding
   def read_marc_record_metadata(**options, &block)
     return to_enum(:read_marc_record_metadata, **options) unless block
 
@@ -64,7 +64,7 @@ def read_marc_record_metadata(**options, &block)
       raise if e.instance_of?(ActiveStorage::FileNotFoundError)
     end
   end
-  # rubocop:enable Metrics/MethodLength
+  # rubocop:enable Metrics/MethodLength, Style/ArgumentsForwarding
 
   private
 
@@ -97,7 +97,7 @@ def extract_marc_record_delete_metadata(file)
       tmpfile.each_line do |line|
         yield MarcRecord.new(
           marc001: line.strip,
-          file: file,
+          file:,
           upload: self,
           status: 'delete'
         )
@@ -106,12 +106,12 @@ def extract_marc_record_delete_metadata(file)
   end
 
   def extract_marc_record_metadata(file, service, checksum: true)
-    return to_enum(:extract_marc_record_metadata, file, service, checksum: checksum) unless block_given?
+    return to_enum(:extract_marc_record_metadata, file, service, checksum:) unless block_given?
 
     service.each_with_metadata do |record, metadata|
       out = MarcRecord.new(
         **metadata,
-        file: file,
+        file:,
         marc: record,
         upload: self
       )

app/services/marc_record_service.rb

@@ -97,7 +97,7 @@ def each_raw_record(reader)
     return to_enum(:each_raw_record, reader) unless block_given?
 
     reader.each_with_index do |record, index|
-      with_honeybadger_context(index: index, marc001: record['001']&.value) do
+      with_honeybadger_context(index:, marc001: record['001']&.value) do
         yield record
       end
     end
@@ -140,10 +140,10 @@ def at_bytes(range, merge: false)
                          else identify
                          end
 
-        from_bytes(io.read(range.size), extracted_type, merge: merge)
+        from_bytes(io.read(range.size), extracted_type, merge:)
       end
     else
-      from_bytes(download_chunk(range), merge: merge)
+      from_bytes(download_chunk(range), merge:)
     end
   end
 
@@ -186,7 +186,7 @@ def each_with_metadata(&block)
 
     return each_with_metadata_for_marc21(&block) if marc21?
 
-    each.with_index { |record, index| yield record, extract_record_metadata(record).merge(index: index) }
+    each.with_index { |record, index| yield record, extract_record_metadata(record).merge(index:) }
   end
 
   private
@@ -227,7 +227,7 @@ def each_with_metadata_for_marc21
 
         yield record, {
           **records_to_combine.first.except(:marc, :marc_bytes),
-          index: index,
+          index:,
           length: bytes.length,
           checksum: Digest::MD5.hexdigest(bytes)
         }
@@ -241,15 +241,15 @@ def each_raw_record_with_metadata_for_marc21
     with_reader do |reader|
       bytecount = 0
       reader.each_raw.with_index do |bytes, index|
-        with_honeybadger_context(bytecount: bytecount, index: index) do
+        with_honeybadger_context(bytecount:, index:) do
           length = bytes[0...5].to_i
           record = MARC::Reader.decode(bytes, external_encoding: 'UTF-8', invalid: :replace)
-          with_honeybadger_context(marc001: record['001']&.value, bytecount: bytecount, index: index) do
+          with_honeybadger_context(marc001: record['001']&.value, bytecount:, index:) do
             yield(
               extract_record_metadata(record).merge(
-                bytecount: bytecount,
-                length: length,
-                index: index,
+                bytecount:,
+                length:,
+                index:,
                 checksum: Digest::MD5.hexdigest(bytes),
                 marc_bytes: bytes,
                 marc: record

app/views/organizations/index.xml.builder

@@ -13,7 +13,7 @@ xml.sitemapindex(
            resourcesync_capabilitylist_url
          end
 
-  xml.tag!('rs:ln', rel: 'up', href: href)
+  xml.tag!('rs:ln', rel: 'up', href:)
   xml.tag!('rs:md', capability: 'resourcelist', at: Time.zone.now.iso8601)
   @organizations.each do |org|
     xml.sitemap do

lib/tasks/admin_tasks.rake

@@ -63,7 +63,7 @@ namespace :agg do
           puts "Uploading file #{file['filename']} (#{file['download_url']})"
           uri = URI.parse(file['download_url'])
           io = uri.open('Authorization' => "Bearer #{Settings.marc_fixture_seeds.token}")
-          upload.files.attach(io: io, filename: file['filename'])
+          upload.files.attach(io:, filename: file['filename'])
 
           upload_file_count += 1
           break if upload_file_count >= Settings.marc_fixture_seeds.file_count

spec/active_storage_blob_extensions/active_storage_blob_content_types_spec.rb

@@ -18,7 +18,7 @@ def initialize(content_type, analyzer)
 
       def extract_metadata_via_analyzer
         {
-          content_type: content_type
+          content_type:
         }
       end
 

spec/factories/stream.rb

@@ -5,7 +5,7 @@
     sequence(:name) { |n| "stream-#{n}" }
     factory :stream_with_uploads do
       after(:create) do |stream, options = { count: 1 }|
-        create_list(:upload, options[:count], :binary_marc, stream: stream)
+        create_list(:upload, options[:count], :binary_marc, stream:)
       end
     end
 

spec/features/normalized_download_spec.rb

@@ -4,15 +4,15 @@
 
 RSpec.describe 'Downloading normalized files from POD' do
   let(:organization) { create(:organization, code: 'best-org') }
-  let(:stream) { create(:stream, organization: organization, default: true) }
+  let(:stream) { create(:stream, organization:, default: true) }
   let(:user) { create(:user) }
 
   before do
     user.add_role :member, organization
     login_as(user, scope: :user)
 
-    create_list(:upload, 2, :binary_marc, organization: organization, stream: stream)
-    create_list(:upload, 2, :binary_marc_gz, organization: organization, stream: stream)
+    create_list(:upload, 2, :binary_marc, organization:, stream:)
+    create_list(:upload, 2, :binary_marc_gz, organization:, stream:)
   end
 
   describe 'Full dumps' do

spec/features/providers_spec.rb

@@ -8,7 +8,7 @@
 
   before do
     login_as(user, scope: :user)
-    create_list(:upload, 2, :binary_marc, organization: organization, stream: organization.default_stream)
+    create_list(:upload, 2, :binary_marc, organization:, stream: organization.default_stream)
   end
 
   describe 'Providers overview page as an unprivileged user' do

spec/features/unprivileged_user_spec.rb

@@ -9,7 +9,7 @@
   before do
     login_as(user, scope: :user)
 
-    create_list(:upload, 2, :binary_marc, organization: organization, stream: organization.default_stream)
+    create_list(:upload, 2, :binary_marc, organization:, stream: organization.default_stream)
   end
 
   it 'lists organizations' do

spec/features/upload_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe 'uploading files to POD' do
   context 'with an organization user' do
     let(:organization) { create(:organization, name: 'Best University') }
-    let(:stream) { create(:stream, organization: organization) }
+    let(:stream) { create(:stream, organization:) }
     let(:user) { create(:user) }
 
     before do

spec/jobs/cleanup_and_remove_data_job_spec.rb

@@ -9,7 +9,7 @@
     before do
       organization.default_stream
       Timecop.travel(4.months.ago)
-      create_list(:stream, 4, organization: organization)
+      create_list(:stream, 4, organization:)
       Timecop.return
     end
 
@@ -22,7 +22,7 @@
     before do
       organization.default_stream
       Timecop.travel(7.months.ago)
-      create_list(:stream, 4, organization: organization, status: 'archived')
+      create_list(:stream, 4, organization:, status: 'archived')
       Timecop.return
     end
 

spec/jobs/generate_interstream_delta_job_spec.rb

@@ -20,7 +20,7 @@
   it 'Does not create an interstream delta if the current stream is missing a full dump' do
     GenerateFullDumpJob.perform_now(organization)
 
-    stream = create(:stream, organization: organization, default: true)
+    stream = create(:stream, organization:, default: true)
     stream.make_default
 
     described_class.perform_now(organization.default_stream)
@@ -31,7 +31,7 @@
   it 'Creates an interstream delta with proper additions and deletes' do
     GenerateFullDumpJob.perform_now(organization)
 
-    stream = create(:stream, organization: organization, default: false)
+    stream = create(:stream, organization:, default: false)
     organization.default_stream.default = false
     organization.default_stream.save
 

spec/mailers/contact_emails_mailer_spec.rb

@@ -6,7 +6,7 @@
   let(:contact_email) { build(:contact_email) }
 
   describe 'confirm_email' do
-    subject(:mail) { described_class.with(contact_email: contact_email).confirm_email }
+    subject(:mail) { described_class.with(contact_email:).confirm_email }
 
     it 'renders the headers' do
       expect(mail.subject).to eq('Confirm email')