zeitwerk 2.6.9 → 2.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1de024fb1ddb2f4bc64ced5aacf898f01b6336d5d8b85701d0757e256d062fb
-  data.tar.gz: d3f06cb22aad419d5c1778fc4a13e1cc036cd062b5ac1fcece5eb4fa3ba1ce00
+  metadata.gz: 0dd43924a88fceee915258e119a02df8fb173199576f52cf18c8298aab091361
+  data.tar.gz: 6aeeced1ce99e28238ebd1488a543da6ba4fb885e283f999cec30a49db3a0ccf
 SHA512:
-  metadata.gz: 3b49724afa7c8097eb6014264faa50f6320c7686760fc5677f6c648f6f4c482b2aa6efb8f78621721c6b00ed424a0a77864cdf8fafb2a481a0ddd1c333115d04
-  data.tar.gz: 01b7782fea2affe16c5241f9325649e90f3beb3150f168cecf6d710fdfffb66a9bfa853ca4ce562ddbdca3133718b7b2bdb2b1260cf997724d668d6639a5199b
+  metadata.gz: ca6b895667327b79fe51d504de760150aeceba5edb64400a6976962c1241bb8061f5c29e4d8584ba888694a0b1b30cf2f149f66f52181089fda262dde541d902
+  data.tar.gz: 8393b41bda4187ce0195ce5b1192455a2bc574291188b0eba86f31af88fc66e3d441717823ac07407f8c7be4e4a97de06cb5bc1922a133e66ed51cc91f6eb1c7

data/README.md

@@ -1296,7 +1296,7 @@ If the argument corresponds to an [ignored file or directory](#ignoring-parts-of
 loader.cpath_expected_at("non_existing_file.rb") # => Zeitwerk::Error
 ```
 
-`Zeitwer::NameError` is raised if a constant path cannot be derived from it:
+`Zeitwerk::NameError` is raised if a constant path cannot be derived from it:
 
 ```ruby
 loader.cpath_expected_at("8.rb") # => Zeitwerk::NameError

data/lib/zeitwerk/loader/callbacks.rb

@@ -32,8 +32,9 @@ module Zeitwerk::Loader::Callbacks
   # @private
   # @sig (String) -> void
   def on_dir_autoloaded(dir)
-    # Module#autoload does not serialize concurrent requires, and we handle
-    # directories ourselves, so the callback needs to account for concurrency.
+    # Module#autoload does not serialize concurrent requires in CRuby < 3.2, and
+    # we handle directories ourselves without going through Kernel#require, so
+    # the callback needs to account for concurrency.
     #
     # Multi-threading would introduce a race condition here in which thread t1
     # autovivifies the module, and while autoloads for its children are being
@@ -43,7 +44,7 @@ module Zeitwerk::Loader::Callbacks
     # That not only would reassign the constant (undesirable per se) but, worse,
     # the module object created by t2 wouldn't have any of the autoloads for its
     # children, since t1 would have correctly deleted its namespace_dirs entry.
-    mutex2.synchronize do
+    dirs_autoload_monitor.synchronize do
       if cref = autoloads.delete(dir)
         autovivified_module = cref[0].const_set(cref[1], Module.new)
         cpath = autovivified_module.name

data/lib/zeitwerk/loader/helpers.rb

@@ -140,4 +140,48 @@ module Zeitwerk::Loader::Helpers
   private def crem(parent, cname)
     parent.__send__(:remove_const, cname)
   end
+
+  CNAME_VALIDATOR = Module.new
+  private_constant :CNAME_VALIDATOR
+
+  # @raise [Zeitwerk::NameError]
+  # @sig (String, String) -> Symbol
+  private def cname_for(basename, abspath)
+    cname = inflector.camelize(basename, abspath)
+
+    unless cname.is_a?(String)
+      raise TypeError, "#{inflector.class}#camelize must return a String, received #{cname.inspect}"
+    end
+
+    if cname.include?("::")
+      raise Zeitwerk::NameError.new(<<~MESSAGE, cname)
+        wrong constant name #{cname} inferred by #{inflector.class} from
+
+          #{abspath}
+
+        #{inflector.class}#camelize should return a simple constant name without "::"
+      MESSAGE
+    end
+
+    begin
+      CNAME_VALIDATOR.const_defined?(cname, false)
+    rescue ::NameError => error
+      path_type = ruby?(abspath) ? "file" : "directory"
+
+      raise Zeitwerk::NameError.new(<<~MESSAGE, error.name)
+        #{error.message} inferred by #{inflector.class} from #{path_type}
+
+          #{abspath}
+
+        Possible ways to address this:
+
+          * Tell Zeitwerk to ignore this particular #{path_type}.
+          * Tell Zeitwerk to ignore one of its parent directories.
+          * Rename the #{path_type} to comply with the naming conventions.
+          * Modify the inflector to handle this case.
+      MESSAGE
+    end
+
+    cname.to_sym
+  end
 end

data/lib/zeitwerk/loader.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "monitor"
 require "set"
 
 module Zeitwerk
@@ -91,9 +92,9 @@ module Zeitwerk
     attr_reader :mutex
     private :mutex
 
-    # @sig Mutex
-    attr_reader :mutex2
-    private :mutex2
+    # @sig Monitor
+    attr_reader :dirs_autoload_monitor
+    private :dirs_autoload_monitor
 
     def initialize
       super
@@ -103,11 +104,12 @@ module Zeitwerk
       @to_unload       = {}
       @namespace_dirs  = Hash.new { |h, cpath| h[cpath] = [] }
       @shadowed_files  = Set.new
-      @mutex           = Mutex.new
-      @mutex2          = Mutex.new
       @setup           = false
       @eager_loaded    = false
 
+      @mutex = Mutex.new
+      @dirs_autoload_monitor = Monitor.new
+
       Registry.register_loader(self)
     end
 
@@ -237,15 +239,13 @@ module Zeitwerk
     return unless dir?(abspath) || ruby?(abspath)
     return if ignored_path?(abspath)
 
-    cnames = []
-    abspaths = []
+    paths = []
 
     if ruby?(abspath)
       basename = File.basename(abspath, ".rb")
       return if hidden?(basename)
 
-      cnames << inflector.camelize(basename, abspath).to_sym
-      abspaths << abspath
+      paths << [basename, abspath]
       walk_up_from = File.dirname(abspath)
     else
       walk_up_from = abspath
@@ -260,28 +260,15 @@ module Zeitwerk
       basename = File.basename(dir)
       return if hidden?(basename)
 
-      unless collapse?(dir)
-        cnames << inflector.camelize(basename, dir).to_sym
-        abspaths << dir
-      end
+      paths << [basename, abspath] unless collapse?(dir)
     end
 
     return unless root_namespace
 
-    if cnames.empty?
+    if paths.empty?
       real_mod_name(root_namespace)
     else
-      # We reverse before validating the segments to report the leftmost
-      # problematic one, if any.
-      cnames.reverse!
-
-      cname_validator = Module.new
-      cnames.each_with_index do |cname, i|
-        cname_validator.const_defined?(cname, false)
-      rescue ::NameError
-        j = -(i + 1)
-        raise Zeitwerk::NameError.new("cannot derive a constant name from #{abspaths[j]}")
-      end
+      cnames = paths.reverse_each.map { |b, a| cname_for(b, a) }
 
       if root_namespace == Object
         cnames.join("::")
@@ -422,34 +409,15 @@ module Zeitwerk
     # @sig (String, Module) -> void
     private def set_autoloads_in_dir(dir, parent)
       ls(dir) do |basename, abspath|
-        begin
-          if ruby?(basename)
-            basename.delete_suffix!(".rb")
-            cname = inflector.camelize(basename, abspath).to_sym
-            autoload_file(parent, cname, abspath)
+        if ruby?(basename)
+          basename.delete_suffix!(".rb")
+          autoload_file(parent, cname_for(basename, abspath), abspath)
+        else
+          if collapse?(abspath)
+            set_autoloads_in_dir(abspath, parent)
           else
-            if collapse?(abspath)
-              set_autoloads_in_dir(abspath, parent)
-            else
-              cname = inflector.camelize(basename, abspath).to_sym
-              autoload_subdir(parent, cname, abspath)
-            end
+            autoload_subdir(parent, cname_for(basename, abspath), abspath)
           end
-        rescue ::NameError => error
-          path_type = ruby?(abspath) ? "file" : "directory"
-
-          raise NameError.new(<<~MESSAGE, error.name)
-            #{error.message} inferred by #{inflector.class} from #{path_type}
-
-              #{abspath}
-
-            Possible ways to address this:
-
-              * Tell Zeitwerk to ignore this particular #{path_type}.
-              * Tell Zeitwerk to ignore one of its parent directories.
-              * Rename the #{path_type} to comply with the naming conventions.
-              * Modify the inflector to handle this case.
-          MESSAGE
         end
       end
     end

data/lib/zeitwerk/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zeitwerk
-  VERSION = "2.6.9"
+  VERSION = "2.6.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 2.6.9
+  version: 2.6.11
 platform: ruby
 authors:
 - Xavier Noria
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-25 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Zeitwerk implements constant autoloading with Ruby semantics. Each gem