From a4dcaef53b97c58fd153de6f151b6fada40f3442 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Mar 2021 02:42:43 +0100
Subject: [PATCH] Prepare Mastodon for zeitwerk autoloader (#15917)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Prepare Mastodon for zeitwerk autoloader (Rails 6)
Add inflections and rename/move a few classes.
In particular, app/lib/exceptions.rb and app/lib/sanitize_config.rb
were manually loaded while still in autoload paths.
* Add inflection for Url → URL
---
app/lib/formatter.rb | 1 -
app/validators/url_validator.rb | 2 +-
config/application.rb | 3 ++-
config/initializers/inflections.rb | 4 ++++
db/migrate/20160223165723_add_url_to_statuses.rb | 2 +-
db/migrate/20160223165855_add_url_to_accounts.rb | 2 +-
.../20160322193748_add_avatar_remote_url_to_accounts.rb | 2 +-
.../20170318214217_add_header_remote_url_to_accounts.rb | 2 +-
db/migrate/20171130000000_add_embed_url_to_preview_cards.rb | 2 +-
.../20180304013859_add_featured_collection_url_to_accounts.rb | 2 +-
db/migrate/20200529214050_add_devices_url_to_accounts.rb | 2 +-
{app/lib => lib}/exceptions.rb | 0
{app/lib => lib/sanitize_ext}/sanitize_config.rb | 0
spec/lib/sanitize_config_spec.rb | 1 -
spec/validators/url_validator_spec.rb | 2 +-
15 files changed, 15 insertions(+), 12 deletions(-)
rename {app/lib => lib}/exceptions.rb (100%)
rename {app/lib => lib/sanitize_ext}/sanitize_config.rb (100%)
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb
index 6fb5d5419..2611bcbae 100644
--- a/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'singleton'
-require_relative './sanitize_config'
class Formatter
include Singleton
diff --git a/app/validators/url_validator.rb b/app/validators/url_validator.rb
index d95a03fbf..f50abbe24 100644
--- a/app/validators/url_validator.rb
+++ b/app/validators/url_validator.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-class UrlValidator < ActiveModel::EachValidator
+class URLValidator < ActiveModel::EachValidator
def validate_each(record, attribute, value)
record.errors.add(attribute, I18n.t('applications.invalid_url')) unless compliant?(value)
end
diff --git a/config/application.rb b/config/application.rb
index 116eaf29d..0960247b3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,8 +6,9 @@ require 'rails/all'
# you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups)
-require_relative '../app/lib/exceptions'
+require_relative '../lib/exceptions'
require_relative '../lib/enumerable'
+require_relative '../lib/sanitize_ext/sanitize_config'
require_relative '../lib/redis/namespace_extensions'
require_relative '../lib/paperclip/url_generator_extensions'
require_relative '../lib/paperclip/attachment_extensions'
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ebb7541eb..9bc9a54b2 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -20,6 +20,10 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
inflect.acronym 'JsonLd'
inflect.acronym 'NodeInfo'
inflect.acronym 'Ed25519'
+ inflect.acronym 'TOC'
+ inflect.acronym 'RSS'
+ inflect.acronym 'REST'
+ inflect.acronym 'URL'
inflect.singular 'data', 'data'
end
diff --git a/db/migrate/20160223165723_add_url_to_statuses.rb b/db/migrate/20160223165723_add_url_to_statuses.rb
index 80f4b3289..fee7f9c59 100644
--- a/db/migrate/20160223165723_add_url_to_statuses.rb
+++ b/db/migrate/20160223165723_add_url_to_statuses.rb
@@ -1,4 +1,4 @@
-class AddUrlToStatuses < ActiveRecord::Migration[4.2]
+class AddURLToStatuses < ActiveRecord::Migration[4.2]
def change
add_column :statuses, :url, :string, null: true, default: nil
end
diff --git a/db/migrate/20160223165855_add_url_to_accounts.rb b/db/migrate/20160223165855_add_url_to_accounts.rb
index c81b1c64f..a4db8814a 100644
--- a/db/migrate/20160223165855_add_url_to_accounts.rb
+++ b/db/migrate/20160223165855_add_url_to_accounts.rb
@@ -1,4 +1,4 @@
-class AddUrlToAccounts < ActiveRecord::Migration[4.2]
+class AddURLToAccounts < ActiveRecord::Migration[4.2]
def change
add_column :accounts, :url, :string, null: true, default: nil
end
diff --git a/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb b/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
index f9c213d9b..0792863a3 100644
--- a/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
+++ b/db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
@@ -1,4 +1,4 @@
-class AddAvatarRemoteUrlToAccounts < ActiveRecord::Migration[4.2]
+class AddAvatarRemoteURLToAccounts < ActiveRecord::Migration[4.2]
def change
add_column :accounts, :avatar_remote_url, :string, null: true, default: nil
end
diff --git a/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb b/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
index 0ba38d3e0..20c965988 100644
--- a/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
+++ b/db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
@@ -1,4 +1,4 @@
-class AddHeaderRemoteUrlToAccounts < ActiveRecord::Migration[5.0]
+class AddHeaderRemoteURLToAccounts < ActiveRecord::Migration[5.0]
def change
add_column :accounts, :header_remote_url, :string, null: false, default: ''
end
diff --git a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
index d19c0091b..8fcabef9f 100644
--- a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
+++ b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
@@ -1,6 +1,6 @@
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
-class AddEmbedUrlToPreviewCards < ActiveRecord::Migration[5.1]
+class AddEmbedURLToPreviewCards < ActiveRecord::Migration[5.1]
include Mastodon::MigrationHelpers
disable_ddl_transaction!
diff --git a/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb b/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
index e0b8ed5cc..1964b5121 100644
--- a/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
+++ b/db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
@@ -1,4 +1,4 @@
-class AddFeaturedCollectionUrlToAccounts < ActiveRecord::Migration[5.1]
+class AddFeaturedCollectionURLToAccounts < ActiveRecord::Migration[5.1]
def change
add_column :accounts, :featured_collection_url, :string
end
diff --git a/db/migrate/20200529214050_add_devices_url_to_accounts.rb b/db/migrate/20200529214050_add_devices_url_to_accounts.rb
index 564877e5d..1323f8df7 100644
--- a/db/migrate/20200529214050_add_devices_url_to_accounts.rb
+++ b/db/migrate/20200529214050_add_devices_url_to_accounts.rb
@@ -1,4 +1,4 @@
-class AddDevicesUrlToAccounts < ActiveRecord::Migration[5.2]
+class AddDevicesURLToAccounts < ActiveRecord::Migration[5.2]
def change
add_column :accounts, :devices_url, :string
end
diff --git a/app/lib/exceptions.rb b/lib/exceptions.rb
similarity index 100%
rename from app/lib/exceptions.rb
rename to lib/exceptions.rb
diff --git a/app/lib/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
similarity index 100%
rename from app/lib/sanitize_config.rb
rename to lib/sanitize_ext/sanitize_config.rb
diff --git a/spec/lib/sanitize_config_spec.rb b/spec/lib/sanitize_config_spec.rb
index d66302e64..747d81158 100644
--- a/spec/lib/sanitize_config_spec.rb
+++ b/spec/lib/sanitize_config_spec.rb
@@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'rails_helper'
-require Rails.root.join('app', 'lib', 'sanitize_config.rb')
describe Sanitize::Config do
describe '::MASTODON_STRICT' do
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
index e8d0e6494..a44878a44 100644
--- a/spec/validators/url_validator_spec.rb
+++ b/spec/validators/url_validator_spec.rb
@@ -2,7 +2,7 @@
require 'rails_helper'
-RSpec.describe UrlValidator, type: :validator do
+RSpec.describe URLValidator, type: :validator do
describe '#validate_each' do
before do
allow(validator).to receive(:compliant?).with(value) { compliant }
--
GitLab