Move the default autoloaders inflector to railties

Author: fxn

activesupport/lib/active_support/dependencies/zeitwerk_integration.rb

@@ -1,43 +1,42 @@
 # frozen_string_literal: true
 
 require "zeitwerk"
-require "active_support/dependencies/zeitwerk_integration"
-
-module Rails
-  module Autoloaders # :nodoc:
-    class << self
-      include Enumerable
-
-      def main
-        @main ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.main"
-          loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
-        end
-      end
 
-      def once
-        @once ||= Zeitwerk::Loader.new.tap do |loader|
-          loader.tag = "rails.once"
-          loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
-        end
-      end
+module Rails::Autoloaders # :nodoc:
+  require_relative "autoloaders/inflector"
 
-      def each
-        yield main
-        yield once
-      end
+  class << self
+    include Enumerable
 
-      def logger=(logger)
-        each { |loader| loader.logger = logger }
+    def main
+      @main ||= Zeitwerk::Loader.new.tap do |loader|
+        loader.tag = "rails.main"
+        loader.inflector = Inflector
       end
+    end
 
-      def log!
-        each(&:log!)
+    def once
+      @once ||= Zeitwerk::Loader.new.tap do |loader|
+        loader.tag = "rails.once"
+        loader.inflector = Inflector
       end
+    end
 
-      def zeitwerk_enabled?
-        true
-      end
+    def each
+      yield main
+      yield once
+    end
+
+    def logger=(logger)
+      each { |loader| loader.logger = logger }
+    end
+
+    def log!
+      each(&:log!)
+    end
+
+    def zeitwerk_enabled?
+      true
     end
   end
 end

railties/lib/rails/autoloaders.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+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 = {}
+
+  def self.camelize(basename, _abspath)
+    @overrides[basename] || basename.camelize
+  end
+
+  def self.inflect(overrides)
+    @overrides.merge!(overrides)
+  end
+end

railties/lib/rails/autoloaders/inflector.rb

@@ -1259,8 +1259,8 @@ def index
       assert_instance_of Zeitwerk::Loader, Rails.autoloaders.once
       assert_equal "rails.once", Rails.autoloaders.once.tag
       assert_equal [Rails.autoloaders.main, Rails.autoloaders.once], Rails.autoloaders.to_a
-      assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.main.inflector
-      assert_equal ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector, Rails.autoloaders.once.inflector
+      assert_equal Rails::Autoloaders::Inflector, Rails.autoloaders.main.inflector
+      assert_equal Rails::Autoloaders::Inflector, Rails.autoloaders.once.inflector
     end
 
     test "config.action_view.cache_template_loading with cache_classes default" do

railties/test/application/configuration_test.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require_relative "abstract_unit"
-require "active_support/dependencies/zeitwerk_integration"
+require "abstract_unit"
 
 class ZeitwerkInflectorTest < ActiveSupport::TestCase
-  INFLECTOR = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
+  INFLECTOR = Rails::Autoloaders::Inflector
 
   def reset_overrides
     INFLECTOR.instance_variable_get(:@overrides).clear

activesupport/test/zeitwerk_inflector_test.rb renamed to railties/test/application/zeitwerk_inflector_test.rb

@@ -2,7 +2,6 @@
 
 require "set"
 require "isolation/abstract_unit"
-require "active_support/dependencies/zeitwerk_integration"
 
 class ZeitwerkIntegrationTest < ActiveSupport::TestCase
   include ActiveSupport::Testing::Isolation