unsafe corrections

Stanislav Katkov · Stanislav Katkov · commit 67ea1cf9a0be · 2024-01-03T23:44:26.000+01:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -15,7 +15,7 @@ AllCops:
     # These have been copied from the Rails repo
     - test/unit/behaviors/*
     # Don't second guess the generated schemas
-    - test/dummy/db/*schema.rb
+    - test/dummy/*
 
 Performance:
   Exclude:
diff --git a/Appraisals b/Appraisals
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 appraise "rails-7" do
   gem "rails", github: "rails/rails", branch: "7-0-stable"
 end
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/setup"
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
diff --git a/app/jobs/solid_cache/expiry_job.rb b/app/jobs/solid_cache/expiry_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class ExpiryJob < ActiveJob::Base
     def perform(count, shard: nil, max_age:, max_entries:)
diff --git a/app/models/solid_cache/entry.rb b/app/models/solid_cache/entry.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Entry < Record
     # This is all quite awkward but it achieves a couple of performance aims
diff --git a/app/models/solid_cache/record.rb b/app/models/solid_cache/record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Record < ActiveRecord::Base
     NULL_INSTRUMENTER = ActiveSupport::Notifications::Instrumenter.new(ActiveSupport::Notifications::Fanout.new)
diff --git a/bin/irb b/bin/irb
@@ -13,7 +13,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
diff --git a/bin/rails b/bin/rails
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
diff --git a/bin/rake b/bin/rake
@@ -13,7 +13,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
diff --git a/bin/rdbg b/bin/rdbg
@@ -13,7 +13,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
diff --git a/bin/rubocop b/bin/rubocop
@@ -13,7 +13,7 @@ ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 bundle_binstub = File.expand_path("bundle", __dir__)
 
 if File.file?(bundle_binstub)
-  if /This file was generated by Bundler/.match?(File.read(bundle_binstub, 300))
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
     load(bundle_binstub)
   else
     abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
diff --git a/db/migrate/20230724121448_create_solid_cache_entries.rb b/db/migrate/20230724121448_create_solid_cache_entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateSolidCacheEntries < ActiveRecord::Migration[7.0]
   def change
     create_table :solid_cache_entries do |t|
diff --git a/gemfiles/rails_7.gemfile b/gemfiles/rails_7.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/gemfiles/rails_7_1.gemfile b/gemfiles/rails_7_1.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/gemfiles/rails_main.gemfile b/gemfiles/rails_main.gemfile
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"
diff --git a/lib/active_support/cache/solid_cache_store.rb b/lib/active_support/cache/solid_cache_store.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveSupport
   module Cache
     SolidCacheStore = SolidCache::Store
diff --git a/lib/generators/solid_cache/install/install_generator.rb b/lib/generators/solid_cache/install/install_generator.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SolidCache::InstallGenerator < Rails::Generators::Base
   class_option :skip_migrations,    type: :boolean, default: nil,
                                     desc: "Skip migrations"
diff --git a/lib/solid_cache.rb b/lib/solid_cache.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "zeitwerk"
 require "solid_cache/engine"
 
diff --git a/lib/solid_cache/cluster.rb b/lib/solid_cache/cluster.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Cluster
     include Connections, Execution, Expiry, Stats
diff --git a/lib/solid_cache/cluster/connections.rb b/lib/solid_cache/cluster/connections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Cluster
     module Connections
diff --git a/lib/solid_cache/cluster/execution.rb b/lib/solid_cache/cluster/execution.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Cluster
     module Execution
diff --git a/lib/solid_cache/cluster/expiry.rb b/lib/solid_cache/cluster/expiry.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "concurrent/atomic/atomic_fixnum"
 
 module SolidCache
diff --git a/lib/solid_cache/cluster/stats.rb b/lib/solid_cache/cluster/stats.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Cluster
     module Stats
@@ -6,7 +8,7 @@ def initialize(options = {})
       end
 
       def stats
-        stats = {
+        {
           connections: connections.count,
           connection_stats: connections_stats
         }
diff --git a/lib/solid_cache/connections.rb b/lib/solid_cache/connections.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   module Connections
     def self.from_config(options)
diff --git a/lib/solid_cache/connections/sharded.rb b/lib/solid_cache/connections/sharded.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   module Connections
     class Sharded
diff --git a/lib/solid_cache/connections/single.rb b/lib/solid_cache/connections/single.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   module Connections
     class Single
diff --git a/lib/solid_cache/connections/unmanaged.rb b/lib/solid_cache/connections/unmanaged.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   module Connections
     class Unmanaged
diff --git a/lib/solid_cache/engine.rb b/lib/solid_cache/engine.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support"
 
 module SolidCache
diff --git a/lib/solid_cache/maglev_hash.rb b/lib/solid_cache/maglev_hash.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # See https://static.googleusercontent.com/media/research.google.com/en//pubs/archive/44824.pdf
 
 module SolidCache
diff --git a/lib/solid_cache/store.rb b/lib/solid_cache/store.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Store < ActiveSupport::Cache::Store
     include Api, Clusters, Entries, Failsafe
diff --git a/lib/solid_cache/store/api.rb b/lib/solid_cache/store/api.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Store
     module Api
diff --git a/lib/solid_cache/store/clusters.rb b/lib/solid_cache/store/clusters.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Store
     module Clusters
diff --git a/lib/solid_cache/store/entries.rb b/lib/solid_cache/store/entries.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Store
     module Entries
diff --git a/lib/solid_cache/store/failsafe.rb b/lib/solid_cache/store/failsafe.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   class Store
     module Failsafe
diff --git a/lib/solid_cache/version.rb b/lib/solid_cache/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SolidCache
   VERSION = "0.2.0"
 end
diff --git a/lib/tasks/solid_cache_tasks.rake b/lib/tasks/solid_cache_tasks.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc "Copy over the migration, and set cache"
 namespace :solid_cache do
   task :install do
diff --git a/solid_cache.gemspec b/solid_cache.gemspec
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "lib/solid_cache/version"
 
 Gem::Specification.new do |spec|
diff --git a/test/dummy/Rakefile b/test/dummy/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/test/dummy/app/channels/application_cable/channel.rb b/test/dummy/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/test/dummy/app/channels/application_cable/connection.rb b/test/dummy/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/test/dummy/app/controllers/application_controller.rb b/test/dummy/app/controllers/application_controller.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
 end
diff --git a/test/dummy/app/helpers/application_helper.rb b/test/dummy/app/helpers/application_helper.rb
@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end
diff --git a/test/dummy/app/jobs/application_job.rb b/test/dummy/app/jobs/application_job.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationJob < ActiveJob::Base
   # Automatically retry jobs that encountered a deadlock
   # retry_on ActiveRecord::Deadlocked
diff --git a/test/dummy/app/mailers/application_mailer.rb b/test/dummy/app/mailers/application_mailer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationMailer < ActionMailer::Base
   default from: "from@example.com"
   layout "mailer"
diff --git a/test/dummy/app/models/application_record.rb b/test/dummy/app/models/application_record.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationRecord < ActiveRecord::Base
   primary_abstract_class
 end
diff --git a/test/dummy/bin/rails b/test/dummy/bin/rails
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 APP_PATH = File.expand_path("../config/application", __dir__)
 require_relative "../config/boot"
 require "rails/commands"
diff --git a/test/dummy/bin/rake b/test/dummy/bin/rake
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require_relative "../config/boot"
 require "rake"
 Rake.application.run
diff --git a/test/dummy/bin/setup b/test/dummy/bin/setup
@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 require "fileutils"
 
 # path to your application root.
diff --git a/test/dummy/config.ru b/test/dummy/config.ru
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require_relative "config/environment"
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "boot"
 
 require "rails/all"
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Set up gems listed in the Gemfile.
 ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../Gemfile", __dir__)
 
diff --git a/test/dummy/config/environment.rb b/test/dummy/config/environment.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the Rails application.
 require_relative "application"
 
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/integer/time"
 
 Rails.application.configure do
diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/integer/time"
 
 Rails.application.configure do
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support/core_ext/integer/time"
 
 # The test environment is used exclusively to run your application's
diff --git a/test/dummy/config/initializers/assets.rb b/test/dummy/config/initializers/assets.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
diff --git a/test/dummy/config/initializers/content_security_policy.rb b/test/dummy/config/initializers/content_security_policy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Be sure to restart your server when you modify this file.
 
 # Define an application-wide content security policy.
diff --git a/test/dummy/config/initializers/filter_parameter_logging.rb b/test/dummy/config/initializers/filter_parameter_logging.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Configure parameters to be filtered from the log file. Use this to limit dissemination of
diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/config/initializers/inflections.rb
@@ -1,3 +1,4 @@
+# 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/test/dummy/config/initializers/permissions_policy.rb b/test/dummy/config/initializers/permissions_policy.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Define an application-wide HTTP permissions policy. For further
 # information see https://developers.google.com/web/updates/2018/06/feature-policy
 #
diff --git a/test/dummy/config/puma.rb b/test/dummy/config/puma.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Puma can serve each request in a thread from an internal thread pool.
 # The `threads` method setting takes two numbers: a minimum and maximum.
 # Any libraries that use thread pools should be configured to match
diff --git a/test/dummy/config/routes.rb b/test/dummy/config/routes.rb
diff --git a/test/dummy/db/primary_shard_one_schema.rb b/test/dummy/db/primary_shard_one_schema.rb
diff --git a/test/dummy/db/primary_shard_two_schema.rb b/test/dummy/db/primary_shard_two_schema.rb
diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb
diff --git a/test/dummy/db/secondary_shard_one_schema.rb b/test/dummy/db/secondary_shard_one_schema.rb
diff --git a/test/dummy/db/secondary_shard_two_schema.rb b/test/dummy/db/secondary_shard_two_schema.rb
diff --git a/test/fixtures/generators/dummy_app/config/environments/development.rb b/test/fixtures/generators/dummy_app/config/environments/development.rb
diff --git a/test/fixtures/generators/dummy_app/config/environments/production.rb b/test/fixtures/generators/dummy_app/config/environments/production.rb
diff --git a/test/fixtures/generators/dummy_app/config/environments/test.rb b/test/fixtures/generators/dummy_app/config/environments/test.rb
diff --git a/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb b/test/lib/generators/solid_cache/solid_cache/install_generator_test.rb
diff --git a/test/models/solid_cache/entry_test.rb b/test/models/solid_cache/entry_test.rb
diff --git a/test/test_helper.rb b/test/test_helper.rb
diff --git a/test/unit/clear_test.rb b/test/unit/clear_test.rb
diff --git a/test/unit/cluster_test.rb b/test/unit/cluster_test.rb
diff --git a/test/unit/delete_matched_test.rb b/test/unit/delete_matched_test.rb
diff --git a/test/unit/execution_test.rb b/test/unit/execution_test.rb
diff --git a/test/unit/expiry_test.rb b/test/unit/expiry_test.rb
diff --git a/test/unit/maglev_hash_test.rb b/test/unit/maglev_hash_test.rb
diff --git a/test/unit/query_cache_test.rb b/test/unit/query_cache_test.rb
diff --git a/test/unit/solid_cache_test.rb b/test/unit/solid_cache_test.rb
diff --git a/test/unit/stats_test.rb b/test/unit/stats_test.rb

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`appraise "rails-7" do`
`2`	`4`	`gem "rails", github: "rails/rails", branch: "7-0-stable"`
`3`	`5`	`end`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`source "https://rubygems.org"`
`2`	`4`	`git_source(:github) { \|repo\| "https://github.com/#{repo}.git" }`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require "bundler/setup"`
`2`	`4`
`3`	`5`	`APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module SolidCache`
`2`	`4`	`class ExpiryJob < ActiveJob::Base`
`3`	`5`	`def perform(count, shard: nil, max_age:, max_entries:)`