Fix further

Signed-off-by: David A. Wheeler <[email protected]>

Author: david-a-wheeler

.rubocop.yml

@@ -33,7 +33,7 @@ plugins:
 
 AllCops:
   EnabledByDefault: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.3
   DisplayCopNames: true
   DisplayStyleGuide: true
   Include:

app/controllers/application_controller.rb

@@ -101,7 +101,7 @@ def append_info_to_payload(payload)
 
   # Combined cache control header value for CDN surrogate control
   BADGE_CACHE_SURROGATE_CONTROL =
-    "max-age=#{BADGE_CACHE_MAX_AGE}, stale-if-error=#{BADGE_CACHE_STALE_AGE}"
+    "max-age=#{BADGE_CACHE_MAX_AGE}, stale-if-error=#{BADGE_CACHE_STALE_AGE}".freeze
 
   # Set default cache control - don't externally cache.
   # This is the safe behavior, so we make it the default.

app/controllers/projects_controller.rb

@@ -6,6 +6,7 @@
 
 require 'addressable/uri'
 require 'net/http'
+require 'set'
 
 # rubocop:disable Metrics/ClassLength
 class ProjectsController < ApplicationController
@@ -53,7 +54,7 @@ class ProjectsController < ApplicationController
   ).freeze
 
   # Used to validate deletion rationale.
-  AT_LEAST_15_NON_WHITESPACE = /\A\s*(\S\s*){15}.*/.freeze
+  AT_LEAST_15_NON_WHITESPACE = /\A\s*(\S\s*){15}.*/
 
   # as= values, which redirect to alternative views
   ALLOWED_AS = %w[badge entry].freeze
@@ -428,7 +429,7 @@ def reminders_summary
 
   # Regex pattern for validating repository rights changes.
   # Rights changes, if provided, must match this pattern.
-  VALID_ADD_RIGHTS_CHANGES = /\A *[+-] *\d+ *(, *\d+)*\z/.freeze
+  VALID_ADD_RIGHTS_CHANGES = /\A *[+-] *\d+ *(, *\d+)*\z/
 
   # Number of days before a user may change repo_url.
   # NOTE: If you change this value, you may also need to change
@@ -590,7 +591,7 @@ def require_adequate_deletion_rationale
   # rubocop:disable Metrics/MethodLength
   def update_additional_rights_forced(id, new_additional_rights)
     command = new_additional_rights.first
-    new_list = new_additional_rights[1..-1].split(',').map(&:to_i).uniq.sort
+    new_list = new_additional_rights.drop(1).split(',').map(&:to_i).uniq.sort
     if command == '-'
       AdditionalRight.where(project_id: id, user_id: new_list).destroy_all
     else # '+'
@@ -769,7 +770,7 @@ def repo_data(github = nil)
 
     repos.map do |repo|
       [repo.full_name, repo.fork, repo.homepage, repo.html_url]
-    end.compact
+    end
   end
   # rubocop:enable Metrics/AbcSize
   # rubocop:enable Style/MethodCalledOnDoEndBlock, Metrics/MethodLength

app/helpers/projects_helper.rb

@@ -165,7 +165,7 @@ def tiered_percent_as_string(value)
   # rubocop:enable Metrics/MethodLength
 
   # We sometimes insert <wbr> after sequences of these characters.
-  WORD_BREAK_DIVIDERS = /([,_\-.]+)/.freeze
+  WORD_BREAK_DIVIDERS = /([,_\-.]+)/
 
   # This text is considered safe, so we can directly mark it as such.
   # rubocop:disable Rails/OutputSafety

app/helpers/sessions_helper.rb

@@ -10,7 +10,7 @@ module SessionsHelper
   RESET_SESSION_TIMER = 1.hour # Active sessions older than this reset timer
   GITHUB_PATTERN = %r{
     \Ahttps://github.com/([A-Za-z0-9_.-]+)/([A-Za-z0-9_.-]+)/?\Z
-  }x.freeze
+  }x
   require 'uri'
 
   # Remove the "locale=value", if any, from the url_query provided

app/lib/hardened_sites_detective.rb

@@ -6,6 +6,8 @@
 
 # Determine if project sites support HTTPS
 
+require 'set'
+
 class HardenedSitesDetective < Detective
   # All of the security-hardening headers that need to be present to pass.
   # They're listed in the same order as the criteria text.

app/lib/how_access_repo_files_detective.rb

@@ -13,7 +13,7 @@ class HowAccessRepoFilesDetective < Detective
   INPUTS = [:repo_url].freeze
   OUTPUTS = [:repo_files].freeze # Ask :repo_files.get("FILENAME") for files.
 
-  GITHUB_REPO = %r{https?://github.com/([\w\.-]*)/([\w\.-]*)(.git|/)?}.freeze
+  GITHUB_REPO = %r{https?://github.com/([\w\.-]*)/([\w\.-]*)(.git|/)?}
   def analyze(_evidence, current)
     repo_url = current[:repo_url]
     return {} if repo_url.blank?

app/models/project.rb

@@ -48,7 +48,7 @@ class Project < ApplicationRecord
 
   # All badge levels as IDs. Useful for enumerating "all levels" as:
   # Project::LEVEL_IDS.each do |level| ... end
-  LEVEL_ID_NUMBERS = (0..(COMPLETED_BADGE_LEVELS.length - 1)).freeze
+  LEVEL_ID_NUMBERS = (0..(COMPLETED_BADGE_LEVELS.length - 1))
   LEVEL_IDS = LEVEL_ID_NUMBERS.map(&:to_s)
 
   PROJECT_OTHER_FIELDS = %i[
@@ -173,7 +173,7 @@ class Project < ApplicationRecord
   # We have to allow embedded spaces, e.g., "Jupyter Notebook".
   VALID_LANGUAGE_LIST =
     %r{\A(|-| ([A-Za-z0-9!\#$%'()*+.\/\:;=?@\[\]^~ -]+
-        (,\ ?[A-Za-z0-9!\#$%'()*+.\/\:;=?@\[\]^~ -]+)*))\Z}x.freeze
+        (,\ ?[A-Za-z0-9!\#$%'()*+.\/\:;=?@\[\]^~ -]+)*))\Z}x
   validates :implementation_languages,
             length: { maximum: MAX_SHORT_STRING_LENGTH },
             format: {
@@ -536,8 +536,7 @@ def self.projects_to_remind
       .where('badge_percentage_0 < 100')
       .where('lost_passing_at IS NULL OR lost_passing_at < ?',
              LOST_PASSING_REMINDER.days.ago)
-      .where('projects.updated_at < ?',
-             LAST_UPDATED_REMINDER.days.ago)
+      .where('projects.updated_at < ?', LAST_UPDATED_REMINDER.days.ago)
       .where('last_reminder_at IS NULL OR last_reminder_at < ?',
              LAST_SENT_REMINDER.days.ago)
       .joins(:user).references(:user) # Need this to check email address
@@ -576,7 +575,7 @@ def self.recently_reminded
       .select('projects.*, users.encrypted_email as user_encrypted_email')
       .joins(:user).references(:user) # Need this to check email address
       .where('last_reminder_at IS NOT NULL')
-      .where('last_reminder_at >= ?', 14.days.ago)
+      .where(last_reminder_at: 14.days.ago..)
       .reorder('last_reminder_at')
   end
 

app/models/project_stat.rb

@@ -44,15 +44,9 @@ def stamp
         next if completion.to_i.zero? # Don't record percentage "0" > level 0
 
         public_send :"percent_1_ge_#{completion}=",
-                    Project.where(
-                      'badge_percentage_1 >= ?',
-                      completion.to_i
-                    ).count
+                    Project.where(badge_percentage_1: completion.to_i..).count
         public_send :"percent_2_ge_#{completion}=",
-                    Project.where(
-                      'badge_percentage_2 >= ?',
-                      completion.to_i
-                    ).count
+                    Project.where(badge_percentage_2: completion.to_i..).count
       end
       self.projects_edited = Project.where('created_at < updated_at').count
 
@@ -142,8 +136,8 @@ def stamp
   # Note that created_at is an index, so this should be extremely fast.
   def self.last_in_month(query_date)
     ProjectStat
-      .where('created_at >= ?', query_date.beginning_of_month)
-      .where('created_at <= ?', query_date.end_of_month)
+      .where(created_at: query_date.beginning_of_month..)
+      .where(created_at: ..query_date.end_of_month)
       .reorder(:created_at).last
   end
 

app/validators/text_validator.rb

@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: MIT
 
 class TextValidator < ActiveModel::EachValidator
-  INVALID_CONTROL = /[\x01-\x08\x0b\x0c\x0e-\x1f]/.freeze
+  INVALID_CONTROL = /[\x01-\x08\x0b\x0c\x0e-\x1f]/
   def text_acceptable?(value)
     return true if value.nil?
     return false unless value.valid_encoding?