Let Zeitwerk autoloaders inflect with Active Support

[Harry Brundage & Xavier Noria]

2 files changed, 32 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
index 297bde5534..ca4385b7c2 100644
--- a/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
+++ b/activesupport/lib/active_support/dependencies/zeitwerk_integration.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/string/inflections"
+
 module ActiveSupport
   module Dependencies
     module ZeitwerkIntegration # :nodoc: all
@@ -11,11 +13,11 @@ module ActiveSupport
         end
 
         def constantize(cpath)
-          Inflector.constantize(cpath)
+          ActiveSupport::Inflector.constantize(cpath)
         end
 
         def safe_constantize(cpath)
-          Inflector.safe_constantize(cpath)
+          ActiveSupport::Inflector.safe_constantize(cpath)
         end
 
         def autoloaded_constants
@@ -37,6 +39,12 @@ module ActiveSupport
         end
       end
 
+      module Inflector
+        def self.camelize(basename, _abspath)
+          basename.camelize
+        end
+      end
+
       class << self
         def take_over
           setup_autoloaders
@@ -47,6 +55,10 @@ module ActiveSupport
         private
 
           def setup_autoloaders
+            Rails.autoloaders.each do |autoloader|
+              autoloader.inflector = Inflector
+            end
+
             Dependencies.autoload_paths.each do |autoload_path|
               # Zeitwerk only accepts existing directories in `push_dir` to
               # prevent misconfigurations.
diff --git a/railties/test/application/zeitwerk_integration_test.rb b/railties/test/application/zeitwerk_integration_test.rb
index 18e53f88b7..db6c7816c7 100644
--- a/railties/test/application/zeitwerk_integration_test.rb
+++ b/railties/test/application/zeitwerk_integration_test.rb
@@ -47,6 +47,24 @@ class ZeitwerkIntegrationTest < ActiveSupport::TestCase
     assert_equal 0, Rails.autoloaders.count
   end
 
+  test "autoloaders inflect with Active Support" do
+    app_file "config/initializers/inflections.rb", <<-RUBY
+      ActiveSupport::Inflector.inflections(:en) do |inflect|
+        inflect.acronym 'RESTful'
+      end
+    RUBY
+
+    boot
+
+    basename  = "restful_controller"
+    abspath   = "#{Rails.root}/app/controllers/#{basename}.rb"
+    camelized = "RESTfulController"
+
+    Rails.autoloaders.each do |autoloader|
+      assert_equal camelized, autoloader.inflector.camelize(basename, abspath)
+    end
+  end
+
   test "constantize returns the value stored in the constant" do
     app_file "app/models/admin/user.rb", "class Admin::User; end"
     boot