From b9be4e1e3185ec382a29c109ff1e269989b5097d Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 8 Sep 2021 18:06:36 +0200 Subject: [PATCH] Revise style --- railties/lib/rails/autoloaders.rb | 54 +++++++++++---------- railties/lib/rails/autoloaders/inflector.rb | 22 +++++---- 2 files changed, 41 insertions(+), 35 deletions(-) diff --git a/railties/lib/rails/autoloaders.rb b/railties/lib/rails/autoloaders.rb index 9d87a69de1..c7c6550469 100644 --- a/railties/lib/rails/autoloaders.rb +++ b/railties/lib/rails/autoloaders.rb @@ -2,41 +2,43 @@ require "zeitwerk" -module Rails::Autoloaders # :nodoc: - require_relative "autoloaders/inflector" +module Rails + module Autoloaders # :nodoc: + require_relative "autoloaders/inflector" - class << self - include Enumerable + class << self + include Enumerable - def main - @main ||= Zeitwerk::Loader.new.tap do |loader| - loader.tag = "rails.main" - loader.inflector = Inflector + def main + @main ||= Zeitwerk::Loader.new.tap do |loader| + loader.tag = "rails.main" + loader.inflector = Inflector + end end - end - def once - @once ||= Zeitwerk::Loader.new.tap do |loader| - loader.tag = "rails.once" - loader.inflector = Inflector + def once + @once ||= Zeitwerk::Loader.new.tap do |loader| + loader.tag = "rails.once" + loader.inflector = Inflector + end end - end - def each - yield main - yield once - end + def each + yield main + yield once + end - def logger=(logger) - each { |loader| loader.logger = logger } - end + def logger=(logger) + each { |loader| loader.logger = logger } + end - def log! - each(&:log!) - end + def log! + each(&:log!) + end - def zeitwerk_enabled? - true + def zeitwerk_enabled? + true + end end end end diff --git a/railties/lib/rails/autoloaders/inflector.rb b/railties/lib/rails/autoloaders/inflector.rb index 6c89757034..c79c1bac66 100644 --- a/railties/lib/rails/autoloaders/inflector.rb +++ b/railties/lib/rails/autoloaders/inflector.rb @@ -2,16 +2,20 @@ require "active_support/inflector" -module Rails::Autoloaders::Inflector # :nodoc: - # Concurrent::Map is not needed. This is a private class, and overrides - # must be defined while the application boots. - @overrides = {} +module Rails + module Autoloaders + module Inflector # :nodoc: + # Concurrent::Map is not needed. This is a private class, and overrides + # must be defined while the application boots. + @overrides = {} - def self.camelize(basename, _abspath) - @overrides[basename] || basename.camelize - end + def self.camelize(basename, _abspath) + @overrides[basename] || basename.camelize + end - def self.inflect(overrides) - @overrides.merge!(overrides) + def self.inflect(overrides) + @overrides.merge!(overrides) + end + end end end