Browse Source

Prepare Mastodon for zeitwerk autoloader (#15917)

* 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
closed-social-v3
Claire 7 months ago
committed by GitHub
parent
commit
a4dcaef53b
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 15 additions and 12 deletions
  1. +0
    -1
      app/lib/formatter.rb
  2. +1
    -1
      app/validators/url_validator.rb
  3. +2
    -1
      config/application.rb
  4. +4
    -0
      config/initializers/inflections.rb
  5. +1
    -1
      db/migrate/20160223165723_add_url_to_statuses.rb
  6. +1
    -1
      db/migrate/20160223165855_add_url_to_accounts.rb
  7. +1
    -1
      db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb
  8. +1
    -1
      db/migrate/20170318214217_add_header_remote_url_to_accounts.rb
  9. +1
    -1
      db/migrate/20171130000000_add_embed_url_to_preview_cards.rb
  10. +1
    -1
      db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb
  11. +1
    -1
      db/migrate/20200529214050_add_devices_url_to_accounts.rb
  12. +0
    -0
      lib/exceptions.rb
  13. +0
    -0
      lib/sanitize_ext/sanitize_config.rb
  14. +0
    -1
      spec/lib/sanitize_config_spec.rb
  15. +1
    -1
      spec/validators/url_validator_spec.rb

+ 0
- 1
app/lib/formatter.rb View File

@ -1,7 +1,6 @@
# frozen_string_literal: true
require 'singleton'
require_relative './sanitize_config'
class Formatter
include Singleton

+ 1
- 1
app/validators/url_validator.rb View File

@ -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

+ 2
- 1
config/application.rb View File

@ -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'

+ 4
- 0
config/initializers/inflections.rb View File

@ -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

+ 1
- 1
db/migrate/20160223165723_add_url_to_statuses.rb View File

@ -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

+ 1
- 1
db/migrate/20160223165855_add_url_to_accounts.rb View File

@ -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

+ 1
- 1
db/migrate/20160322193748_add_avatar_remote_url_to_accounts.rb View File

@ -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

+ 1
- 1
db/migrate/20170318214217_add_header_remote_url_to_accounts.rb View File

@ -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

+ 1
- 1
db/migrate/20171130000000_add_embed_url_to_preview_cards.rb View File

@ -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!

+ 1
- 1
db/migrate/20180304013859_add_featured_collection_url_to_accounts.rb View File

@ -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

+ 1
- 1
db/migrate/20200529214050_add_devices_url_to_accounts.rb View File

@ -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

app/lib/exceptions.rb → lib/exceptions.rb View File


app/lib/sanitize_config.rb → lib/sanitize_ext/sanitize_config.rb View File


+ 0
- 1
spec/lib/sanitize_config_spec.rb View File

@ -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

+ 1
- 1
spec/validators/url_validator_spec.rb View File

@ -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 }

Loading…
Cancel
Save