edgi-govdata-archiving · Mr0grog · Nov 13, 2025 · Nov 3, 2025 · Nov 13, 2025
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -152,6 +152,9 @@ Style/ExponentialNotation:
 Style/FormatStringToken:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: always_true
+
 Style/GuardClause:
   Enabled: false
 

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -49,13 +49,6 @@ Style/OptionalBooleanParameter:
     - 'app/jobs/analyze_change_job.rb'
     - 'app/models/application_record.rb'
 
-# Offense count: 67
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: when_needed, always, never
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.

diff --git a/Gemfile b/Gemfile
@@ -35,6 +35,9 @@ gem 'hiredis'
 gem 'sentry-ruby', '~> 5.26.0'
 gem 'sentry-rails', '~> 5.26.0'
 
+# We don't make direct use of this; it's really here to suppress a warning about upcoming changes to bundled gems.
+gem "pstore", "~> 0.2.0"
+
 # See https://github.com/rails/execjs#readme for more supported runtimes
 # gem 'therubyracer', platforms: :ruby
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -268,6 +268,7 @@ GEM
       method_source (~> 1.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
+    pstore (0.2.0)
     psych (5.2.6)
       date
       stringio
@@ -468,6 +469,7 @@ DEPENDENCIES
   pg (~> 1.6)
   postmark-rails
   pry-rails
+  pstore (~> 0.2.0)
   puma (~> 7.1)
   pundit (~> 2.5.2)
   rack-brotli

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Admin
   class UsersController < ApplicationController
     before_action :authenticate_user!

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdminController < ApplicationController
   protect_from_forgery with: :exception
 

diff --git a/app/controllers/api/v0/annotations_controller.rb b/app/controllers/api/v0/annotations_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::AnnotationsController < Api::V0::ApiController
   include SortingConcern
   include BlockedParamsConcern

diff --git a/app/controllers/api/v0/api_controller.rb b/app/controllers/api/v0/api_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::ApiController < ApplicationController
   skip_forgery_protection
 

diff --git a/app/controllers/api/v0/changes_controller.rb b/app/controllers/api/v0/changes_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::ChangesController < Api::V0::ApiController
   include SortingConcern
   include BlockedParamsConcern

diff --git a/app/controllers/api/v0/diff_controller.rb b/app/controllers/api/v0/diff_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::DiffController < Api::V0::ApiController
   def show
     ensure_diffable

diff --git a/app/controllers/api/v0/imports_controller.rb b/app/controllers/api/v0/imports_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::ImportsController < Api::V0::ApiController
   before_action { authorize :api, :import? }
 

diff --git a/app/controllers/api/v0/maintainers_controller.rb b/app/controllers/api/v0/maintainers_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::MaintainersController < Api::V0::ApiController
   include SortingConcern
 

diff --git a/app/controllers/api/v0/pages_controller.rb b/app/controllers/api/v0/pages_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::PagesController < Api::V0::ApiController
   include SortingConcern
   include BlockedParamsConcern

diff --git a/app/controllers/api/v0/tags_controller.rb b/app/controllers/api/v0/tags_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::TagsController < Api::V0::ApiController
   include SortingConcern
 

diff --git a/app/controllers/api/v0/urls_controller.rb b/app/controllers/api/v0/urls_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::UrlsController < Api::V0::ApiController
   before_action(except: [:index, :show]) { authorize(:api, :import?) }
 

diff --git a/app/controllers/api/v0/versions_controller.rb b/app/controllers/api/v0/versions_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Api::V0::VersionsController < Api::V0::ApiController
   include SortingConcern
   include BlockedParamsConcern

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   include Pundit::Authorization
   include SameOriginSessionsConcern

diff --git a/app/controllers/concerns/blocked_params_concern.rb b/app/controllers/concerns/blocked_params_concern.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Block unauthenticated requests that use certain params with a 403 (Forbidden)
 # error. This can be used to prevent abuse of options that may cause expensive
 # operations.

diff --git a/app/controllers/concerns/paging_concern.rb b/app/controllers/concerns/paging_concern.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module PagingConcern
   extend ActiveSupport::Concern
 

diff --git a/app/controllers/concerns/same_origin_sessions_concern.rb b/app/controllers/concerns/same_origin_sessions_concern.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Make sessions available only to requests from the same host as the server.
 #
 # This means sessions work for people browsing this site directly, but not for

diff --git a/app/controllers/concerns/sorting_concern.rb b/app/controllers/concerns/sorting_concern.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SortingConcern
   extend ActiveSupport::Concern
 

diff --git a/app/controllers/healthcheck_controller.rb b/app/controllers/healthcheck_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HealthcheckController < ApplicationController
   def index
     # Succeed if the app is running, but provide additional

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class HomeController < ApplicationController
   def index
     render

diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]

diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Users::SessionsController < Devise::SessionsController
   skip_forgery_protection
 

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end
diff --git a/app/jobs/analyze_change_job.rb b/app/jobs/analyze_change_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE: THIS JOB IS NOT IN ACTIVE USE.
 # The use cases it served were better solved by the task-sheets project
 # (https://github.com/edgi-govdata-archiving/web-monitoring-task-sheets).

diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
 end
diff --git a/app/jobs/import_versions_job.rb b/app/jobs/import_versions_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ImportVersionsJob < ApplicationJob
   queue_as :import
 

diff --git a/app/lib/data_helpers.rb b/app/lib/data_helpers.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Tools for working with database data. These are mostly used in rake tasks and migrations.
 module DataHelpers
   class ProgressLogger

diff --git a/app/lib/numeric_interval.rb b/app/lib/numeric_interval.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class NumericInterval
   attr_reader :start, :start_open
   attr_reader :end, :end_open

diff --git a/app/lib/surt.rb b/app/lib/surt.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 
 # Tools for canonicalizing and formatting URLs according to the Internet

diff --git a/app/lib/surt/canonicalize.rb b/app/lib/surt/canonicalize.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'addressable/uri'
 
 module Surt::Canonicalize
@@ -83,7 +85,7 @@ module Surt::Canonicalize
   #  test fails if we just use Addressable's standard set. Maybe drop this?
   #  Also validate against the original Java version:
   #  https://github.com/iipc/webarchive-commons/blob/5fb641b7ff3c63ade0eb39782fc8b1982ea27330/src/main/java/org/archive/url/BasicURLCanonicalizer.java#L219-L275
-  URL_SPECIAL_CHARACTERS = '!"$&\'()*+,-./:;<=>?@[\]^_`{|}~'.freeze
+  URL_SPECIAL_CHARACTERS = '!"$&\'()*+,-./:;<=>?@[\]^_`{|}~'
   SAFE_CHARACTERS = "0-9a-zA-Z#{Regexp.escape(URL_SPECIAL_CHARACTERS)}".freeze
 
   # Canonicalize a URL. This is the normal entrypoint to this module.

diff --git a/app/lib/surt/format.rb b/app/lib/surt/format.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Surt::Format
   DEFAULT_OPTIONS = {
     include_scheme: false,

diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: '[email protected]'
   layout 'mailer'

diff --git a/app/mailers/invitation_mailer.rb b/app/mailers/invitation_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class InvitationMailer < ApplicationMailer
   def invitation_email(invitation)
     @invitation = invitation

diff --git a/app/models/annotation.rb b/app/models/annotation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Annotation < ApplicationRecord
   include UuidPrimaryKey
 

diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 

diff --git a/app/models/change.rb b/app/models/change.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Change < ApplicationRecord
   include UuidPrimaryKey
 

diff --git a/app/models/concerns/simple_title.rb b/app/models/concerns/simple_title.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleTitle
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/taggable.rb b/app/models/concerns/taggable.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Taggable
   extend ActiveSupport::Concern
 

diff --git a/app/models/concerns/uuid_primary_key.rb b/app/models/concerns/uuid_primary_key.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UuidPrimaryKey
   extend ActiveSupport::Concern
 

diff --git a/app/models/import.rb b/app/models/import.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Import < ApplicationRecord
   belongs_to :user
   enum :status, [:pending, :processing, :complete]

diff --git a/app/models/invitation.rb b/app/models/invitation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Invitation < ApplicationRecord
   EXPIRATION_DAYS = 14
 

diff --git a/app/models/maintainer.rb b/app/models/maintainer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Maintainer represents an organization that maintains some web pages. It has
 # a name and an optional link to a parent maintainer so there can be a
 # hierarchical relationship (e.g. an office of a department of an organization)

diff --git a/app/models/maintainership.rb b/app/models/maintainership.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Maintainership < ApplicationRecord
   belongs_to :maintainer, foreign_key: :maintainer_uuid
   belongs_to :page, foreign_key: :page_uuid

diff --git a/app/models/merged_page.rb b/app/models/merged_page.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # MergedPage keeps track of pages that were merged into others so we can
 # support old links by redirecting to the page they were merged into.
 # - The primary key is the ID of the page that was merged and removed

diff --git a/app/models/page.rb b/app/models/page.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Page < ApplicationRecord
   include UuidPrimaryKey
   include Taggable

diff --git a/app/models/page_url.rb b/app/models/page_url.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # PageUrl is a critical part of each Page model. Pages do not represent a
 # single URL -- pages are often reachable from multiple URLs (sometimes at
 # the same time; sometimes because a page moves over time) and different

diff --git a/app/models/tag.rb b/app/models/tag.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tag < ApplicationRecord
   include UuidPrimaryKey
 

diff --git a/app/models/tagging.rb b/app/models/tagging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tagging < ApplicationRecord
   belongs_to :taggable, polymorphic: true, foreign_key: :taggable_uuid
   belongs_to :tag, inverse_of: :taggings, foreign_key: :tag_uuid

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class User < ApplicationRecord
   PERMISSIONS = [
-    VIEW_PERMISSION = 'view'.freeze,
-    ANNOTATE_PERMISSION = 'annotate'.freeze,
-    IMPORT_PERMISSION = 'import'.freeze,
-    MANAGE_USERS_PERMISSION = 'manage_users'.freeze
+    VIEW_PERMISSION = 'view',
+    ANNOTATE_PERMISSION = 'annotate',
+    IMPORT_PERMISSION = 'import',
+    MANAGE_USERS_PERMISSION = 'manage_users'
   ].freeze
 
   PERMISSION_DESCRIPTIONS = {

diff --git a/app/models/version.rb b/app/models/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Version < ApplicationRecord
   include UuidPrimaryKey
   include SimpleTitle

diff --git a/app/policies/admin_policy.rb b/app/policies/admin_policy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AdminPolicy < ApplicationPolicy
   def any?
     user.can_manage_users?

diff --git a/app/policies/api_policy.rb b/app/policies/api_policy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApiPolicy < ApplicationPolicy
   def view?
     Rails.configuration.allow_public_view || (user.present? && user.can_view?)

diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationPolicy
   attr_reader :user, :record