github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-29 05:44:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Ensure ActiveSupport::Inflector is used by Zeitwerk (#16341)

Browse Source 
We want our autoloading to respect custom inflections registered with ActiveSupport::Inflector. `Zeitwek::Inflector` does not call out to ActiveSupport.

Instead, we can define our own DiscourseInflector based on the super-simple Inflector in rails core.

Follow-up to 5743a6ec
This commit is contained in:
David Taylor 2022-03-31 14:43:12 +01:00 committed by GitHub
parent e66933ead4
commit ddf9bac094
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/initializers/000-zeitwerk.rb
View File

@ -3,16 +3,25 @@
# This custom inflector is needed because of our jobs directory structure. # This custom inflector is needed because of our jobs directory structure.
# Ideally, we should not prefix our jobs with a `Jobs` namespace but instead # Ideally, we should not prefix our jobs with a `Jobs` namespace but instead
# have a `Job` suffix to follow the Rails conventions on naming. # have a `Job` suffix to follow the Rails conventions on naming.
class DiscourseInflector < Zeitwerk::Inflector #
def camelize(basename, abspath) # Based on:
# https://github.com/rails/rails/blob/75e6c0ac/railties/lib/rails/autoloaders/inflector.rb#L7-L19
module DiscourseInflector
@overrides = {}
def self.camelize(basename, abspath)
return basename.camelize if abspath.ends_with?("onceoff.rb") return basename.camelize if abspath.ends_with?("onceoff.rb")
return 'Jobs' if abspath.ends_with?("jobs/base.rb") return 'Jobs' if abspath.ends_with?("jobs/base.rb")
super @overrides[basename] || basename.camelize
end
def self.inflect(overrides)
@overrides.merge!(overrides)
end end
end end
Rails.autoloaders.each do |autoloader| Rails.autoloaders.each do |autoloader|
autoloader.inflector = DiscourseInflector.new autoloader.inflector = DiscourseInflector
# We have filenames that do not follow Zeitwerk's camelization convention. Maintain an inflections for these files # We have filenames that do not follow Zeitwerk's camelization convention. Maintain an inflections for these files
# for now until we decide to fix them one day. # for now until we decide to fix them one day.