From 245f255318b2a419bec6d02688c617d44f2bbbf4 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Wed, 9 Oct 2019 21:28:35 +0200 Subject: [PATCH] bump Zeitwerk to 2.2 --- Gemfile.lock | 4 ++-- activesupport/activesupport.gemspec | 2 +- guides/source/autoloading_and_reloading_constants.md | 11 +++-------- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 109dab058e..d0cc52bd10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ PATH i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.8) + zeitwerk (~> 2.2) rails (6.1.0.alpha) actioncable (= 6.1.0.alpha) actionmailbox (= 6.1.0.alpha) @@ -534,7 +534,7 @@ GEM websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.1.9) + zeitwerk (2.2.0) PLATFORMS java diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index da295a0d35..5ccb655e06 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -34,5 +34,5 @@ Gem::Specification.new do |s| s.add_dependency "tzinfo", "~> 1.1" s.add_dependency "minitest", "~> 5.1" s.add_dependency "concurrent-ruby", "~> 1.0", ">= 1.0.2" - s.add_dependency "zeitwerk", "~> 2.1", ">= 2.1.8" + s.add_dependency "zeitwerk", "~> 2.2" end diff --git a/guides/source/autoloading_and_reloading_constants.md b/guides/source/autoloading_and_reloading_constants.md index 0c79f444a4..5fb0a1fc32 100644 --- a/guides/source/autoloading_and_reloading_constants.md +++ b/guides/source/autoloading_and_reloading_constants.md @@ -300,18 +300,13 @@ As you see, that still uses `String#camelize` as fallback. If you instead prefer ```ruby # config/initializers/zeitwerk.rb -inflector = Class.new(Zeitwerk::Inflector) do - def camelize(basename, _abspath) - basename == "html_parser" ? "HTMLParser" : super - end -end.new - Rails.autoloaders.each do |autoloader| - autoloader.inflector = inflector + autoloader.inflector = Zeitwerk::Inflector.new + autoloader.inflector.inflect("html_parser" => "HTMLParser") end ``` -Please, check the [Zeitwerk documentation](https://github.com/fxn/zeitwerk#custom-inflector) for further details. +You can even define a custom inflector for full flexibility. Please, check the [Zeitwerk documentation](https://github.com/fxn/zeitwerk#custom-inflector) for further details. Troubleshooting ---------------