Force frozen string literals ahead of Ruby 4.0

Why not. I'm fairly confident in the test coverage that this won't lead to trouble
Earlopain · Jul 29, 2024 · c891c7e · c891c7e
1 parent 6ffbd91
commit c891c7e
Show file tree

Hide file tree

Showing 173 changed files with 21 additions and 359 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -69,6 +69,9 @@ Style/Documentation:
 Style/EmptyMethod:
   EnforcedStyle: expanded
 
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: never
+
 Style/HashSyntax:
   EnforcedShorthandSyntax: never
 

diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,7 @@ RUN apk --no-cache add \
 
 ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
 ENV RUBY_YJIT_ENABLE=1
+ENV RUBYOPT=--enable=frozen-string-literal
 
 RUN echo "[safe]" > ~/.gitconfig && \
   echo "        directory = /app" >> ~/.gitconfig

diff --git a/Gemfile b/Gemfile
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 
 rails_version = "~> 7.0"

diff --git a/Rakefile b/Rakefile
@@ -1,5 +1,3 @@
-# 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/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ApplicationController < ActionController::Base
   skip_forgery_protection
   before_action :set_start_time

diff --git a/app/controllers/archive_imports_controller.rb b/app/controllers/archive_imports_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ArchiveImportsController < ApplicationController
   def new
   end

diff --git a/app/controllers/artist_urls_controller.rb b/app/controllers/artist_urls_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ArtistUrlsController < ApplicationController
   def index
     @pagy, @artist_urls = ArtistUrl.search(index_search_params).pagy(params)

diff --git a/app/controllers/artists_controller.rb b/app/controllers/artists_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ArtistsController < ApplicationController
   def index
     @pagy, @artists = Artist.includes(:artist_urls).search(index_search_params).pagy(params)

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

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

diff --git a/app/controllers/log_events_controller.rb b/app/controllers/log_events_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class LogEventsController < ApplicationController
   def index
     @pagy, @log_events = LogEvent.search(search_params).pagy_and_decorate(params)

diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class StatsController < ApplicationController
   def index
     @original_size = sum_for("original", "SubmissionFile")

diff --git a/app/controllers/submission_files_controller.rb b/app/controllers/submission_files_controller.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class SubmissionFilesController < ApplicationController
   def index
     @search_params = search_params

diff --git a/app/decorators/application_decorator.rb b/app/decorators/application_decorator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ApplicationDecorator
   include ActiveModel::Serialization
   include ActiveModel::Serializers::JSON

diff --git a/app/decorators/log_event_decorator.rb b/app/decorators/log_event_decorator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class LogEventDecorator < ApplicationDecorator
   def preview
     case action

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module ApplicationHelper
   include Pagy::Frontend
 

diff --git a/app/helpers/artist_helper.rb b/app/helpers/artist_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module ArtistHelper
   def active_artist_urls_collection(artist)
     scraping_enabled = artist.artist_urls.select(&:scraper?)

diff --git a/app/helpers/artist_url_helper.rb b/app/helpers/artist_url_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module ArtistUrlHelper
   def gallery_url(artist_url)
     artist_url.site.gallery_url(artist_url.unescaped_url_identifier)

diff --git a/app/helpers/config_helper.rb b/app/helpers/config_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module ConfigHelper
   def strip_config_prefix(definition, key)
     key.to_s.delete_prefix("#{definition.site_type}_")

diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module NavHelper
   def nav_link_to(text, url, **)
     link = link_to(text, url, class: nav_link_class(url), **)

diff --git a/app/helpers/submission_file_helper.rb b/app/helpers/submission_file_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module SubmissionFileHelper
   def display_artist_name?(submission_file)
     s1 = submission_file.artist_url.url_identifier.downcase

diff --git a/app/inputs/boolean_input.rb b/app/inputs/boolean_input.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class BooleanInput < SimpleForm::Inputs::BooleanInput
   # Fix styling because the input appears before the label
   def label_input(wrapper_options = nil)

diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ApplicationJob < ActiveJob::Base
   retry_on StandardError, wait: :polynomially_longer, attempts: 25 do |_job, exception|
     log_exception(exception)

diff --git a/app/jobs/archive_blob_import_job.rb b/app/jobs/archive_blob_import_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ArchiveBlobImportJob < ConcurrencyControlledJob
   queue_as :submission_download
   retry_on StandardError, attempts: 5

diff --git a/app/jobs/concurrency_controlled_job.rb b/app/jobs/concurrency_controlled_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ConcurrencyControlledJob < ApplicationJob
   include GoodJob::ActiveJobExtensions::Concurrency
   # Automatically scope keys to the job/queue.

diff --git a/app/jobs/create_submission_file_job.rb b/app/jobs/create_submission_file_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CreateSubmissionFileJob < ConcurrencyControlledJob
   queue_as :submission_download
   good_job_control_concurrency_with(total_limit: 1, key: -> { "#{arguments.first.id}-#{arguments.second[:identifier]}" })

diff --git a/app/jobs/e6_iqdb_query_job.rb b/app/jobs/e6_iqdb_query_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class E6IqdbQueryJob < ConcurrencyControlledJob
   queue_as :e6_iqdb
   good_job_control_concurrency_with(total_limit: 1, key: -> { arguments.first.id })

diff --git a/app/jobs/purge_log_events_job.rb b/app/jobs/purge_log_events_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PurgeLogEventsJob < ApplicationJob
   def perform
     LogEvent.where(created_at: ..1.month.ago).delete_all

diff --git a/app/jobs/purge_unattached_blobs_job.rb b/app/jobs/purge_unattached_blobs_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PurgeUnattachedBlobsJob < ApplicationJob
   def perform
     ActiveStorage::Blob.unattached.where(created_at: ..2.days.ago).find_each(&:purge)

diff --git a/app/jobs/scrape_artist_url_job.rb b/app/jobs/scrape_artist_url_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ScrapeArtistUrlJob < ConcurrencyControlledJob
   queue_as :scraping
   good_job_control_concurrency_with(total_limit: 1, key: -> { arguments.first.id })

diff --git a/app/jobs/submission_file_update_job.rb b/app/jobs/submission_file_update_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class SubmissionFileUpdateJob < ApplicationJob
   queue_as :variant_generation
 

diff --git a/app/jobs/update_matching_e6_posts_job.rb b/app/jobs/update_matching_e6_posts_job.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class UpdateMatchingE6PostsJob < ConcurrencyControlledJob
   good_job_control_concurrency_with(total_limit: 1, key: -> { arguments.first.to_s })
 

diff --git a/app/logical/archives.rb b/app/logical/archives.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Archives
   ALL = [
     Archives::Tumblr,

diff --git a/app/logical/archives/base.rb b/app/logical/archives/base.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Archives
   class Base
     attr_accessor :imported_files, :already_imported_count, :failed_imports, :error

diff --git a/app/logical/archives/manual.rb b/app/logical/archives/manual.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Archives
   class Manual < Base
     def import_submission_files(artist_id, source_url)

diff --git a/app/logical/archives/tumblr.rb b/app/logical/archives/tumblr.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Archives
   # Archive Structure
   #

diff --git a/app/logical/config.rb b/app/logical/config.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Config
   module_function
 

diff --git a/app/logical/docker_env.rb b/app/logical/docker_env.rb
@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module DockerEnv
-  NEEDED_PG_VERSION = "16"
+  NEEDED_PG_VERSION = "16".freeze
 
   module_function
 

diff --git a/app/logical/e6_api_client.rb b/app/logical/e6_api_client.rb
@@ -1,7 +1,5 @@
-# frozen_string_literal: true
-
 module E6ApiClient
-  ORIGIN = "https://e621.net"
+  ORIGIN = "https://e621.net".freeze
   extend self
 
   def iqdb_query(file)

diff --git a/app/logical/esbuild_manifest.rb b/app/logical/esbuild_manifest.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module EsbuildManifest
   FILE_LOCATION = Rails.public_path.join("build/manifest.json")
 

diff --git a/app/logical/git_helper.rb b/app/logical/git_helper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module GitHelper
   REPO = begin
     Rugged::Repository.new(Rails.root)

diff --git a/app/logical/hideable_search_form_builder.rb b/app/logical/hideable_search_form_builder.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class HideableSearchFormBuilder < SimpleForm::FormBuilder
   def input(attribute_name, options = {}, &)
     value = @options[:search_params][attribute_name]

diff --git a/app/logical/icon_generator.rb b/app/logical/icon_generator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module IconGenerator
   module_function
 

diff --git a/app/logical/iqdb_proxy.rb b/app/logical/iqdb_proxy.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Contains functions to interact with the iqdb server
 module IqdbProxy
   class Error < RuntimeError; end

diff --git a/app/logical/job_stats.rb b/app/logical/job_stats.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class JobStats
   def active_urls
     (e6_iqdb_queued.keys + submission_download_queued.keys + scraping_queued.keys + scraping_now).uniq

diff --git a/app/logical/pg_version_mismatch_handler.rb b/app/logical/pg_version_mismatch_handler.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PgVersionMismatchHandler
   def initialize(app)
     @app = app

diff --git a/app/logical/printable_string_validator.rb b/app/logical/printable_string_validator.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PrintableStringValidator < ActiveModel::EachValidator
   REGEX = /^[0-9a-zA-Z_.+()-]*$/
 

diff --git a/app/logical/scraper/artconomy.rb b/app/logical/scraper/artconomy.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Artconomy < Base
     STATE = :page

diff --git a/app/logical/scraper/artfight.rb b/app/logical/scraper/artfight.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Artfight < BufferedScraper
     STATE = :page

diff --git a/app/logical/scraper/artstation.rb b/app/logical/scraper/artstation.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Artstation < BufferedScraper
     STATE = :page

diff --git a/app/logical/scraper/baraag.rb b/app/logical/scraper/baraag.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Baraag < MastodonV1
     def domain

diff --git a/app/logical/scraper/base.rb b/app/logical/scraper/base.rb
@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 module Scraper
   class Base
-    FRIENDLY_USER_AGENT = "FoxTrove/0.1 (by earlopain)"
+    FRIENDLY_USER_AGENT = "FoxTrove/0.1 (by earlopain)".freeze
 
     delegate :url_identifier, :api_identifier, to: :@artist_url
     attr_accessor :client

diff --git a/app/logical/scraper/bluesky.rb b/app/logical/scraper/bluesky.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Bluesky < Base
     STATE = :cursor

diff --git a/app/logical/scraper/buffered_scraper.rb b/app/logical/scraper/buffered_scraper.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   # Some sites return many entries per page but fetching full data for these takes a long time.
   # Loading all entries just to see if something is new is bad. Buffer it instead, so that

diff --git a/app/logical/scraper/cohost.rb b/app/logical/scraper/cohost.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Cohost < Base
     STATE = :page

diff --git a/app/logical/scraper/commishes.rb b/app/logical/scraper/commishes.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Commishes < BufferedScraper
     STATE = :until

diff --git a/app/logical/scraper/deviantart.rb b/app/logical/scraper/deviantart.rb
@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
 module Scraper
   # https://www.deviantart.com/developers/http/v1/20210526
   # https://www.deviantart.com/developers/console
   class Deviantart < Base
     STATE = :next_offset
-    API_PREFIX = "https://www.deviantart.com/api/v1/oauth2"
+    API_PREFIX = "https://www.deviantart.com/api/v1/oauth2".freeze
 
     def initialize(artist_url)
       super

diff --git a/app/logical/scraper/furaffinity.rb b/app/logical/scraper/furaffinity.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   class Furaffinity < BufferedScraper
     STATE = :page

diff --git a/app/logical/scraper/furrynetwork.rb b/app/logical/scraper/furrynetwork.rb
@@ -1,11 +1,9 @@
-# frozen_string_literal: true
-
 module Scraper
   class Furrynetwork < Base
     STATE = :offset
 
     PER_REQUEST = 72
-    API_PREFIX = "https://furrynetwork.com/api"
+    API_PREFIX = "https://furrynetwork.com/api".freeze
 
     def initialize(artist_url)
       super

diff --git a/app/logical/scraper/httpx_plugin.rb b/app/logical/scraper/httpx_plugin.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   module HttpxPlugin
     module InstanceMethods

diff --git a/app/logical/scraper/inkbunny.rb b/app/logical/scraper/inkbunny.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Scraper
   # https://wiki.inkbunny.net/wiki/API
   class Inkbunny < Base