zeitwerk 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6f3971296735d2ad5ae2d2621b5f26d6f480e7b69fde7e6eb21679a2b0c795c
-  data.tar.gz: 41ce43ff32412f63d21fb5bd9f45dc070e48e96f03be1e49eb2a5c6c5ef107ba
+  metadata.gz: bc67ff7496feaaf2e3598809e67733b9be0f92f69820736e3471ae0487c39d85
+  data.tar.gz: cecf1045923045d9d11d4f5e6c214a9e6dd14abd742fc1065c6f23a8aec82e13
 SHA512:
-  metadata.gz: 2b543e2a0db16c3dcdf8318faeaae7e1a72b0001b6116fa0081fa991266fbcc75da8ebdecaf9cf17568d9b169688810f411fb5d578a6ce7f5fad60a5fea37380
-  data.tar.gz: 021343c474a12a015071b20eaff22c53fdf9d0a49e606ee460be809fd731be065e72573ffb082bfab19b14f432000b309cc3e8e44e75669b97d91fa5b275519a
+  metadata.gz: 739fe00bce3542defa99e3c7a9014d7c4e00d0aa5a062e996c00dc2c9139e26de055e5aee806807c6da614504275bf2c790904d323d47213c031c291713daad6
+  data.tar.gz: 85acfebcb1de71e4c54e94803fb3be1c804960d3ba3754cdb6903a32a61e52f139cc06f7672f2cdcabb189dc9d66975479fc20a6733152e58e3131797fc151e4

data/lib/zeitwerk/loader/config.rb

@@ -7,6 +7,9 @@ module Zeitwerk::Loader::Config
   extend Zeitwerk::Internal
   include Zeitwerk::RealModName
 
+  UNDEFINED = Object.new.freeze
+  private_constant :UNDEFINED
+
   #: camelize(String, String) -> String
   attr_accessor :inflector
 
@@ -276,12 +279,19 @@ module Zeitwerk::Loader::Config
   #     # ...
   #   end
   #
-  #: (String?) { (top, String) -> void } -> void ! TypeError
-  def on_load(cpath = :ANY, &block)
-    raise TypeError, 'on_load only accepts strings' unless cpath.is_a?(String) || cpath == :ANY
+  #: (String) { (top, String) -> void } -> void ! TypeError | NameError
+  #| { (String, top, String) -> void } -> void
+  def on_load(cpath = UNDEFINED, &block)
+    key = if cpath.equal?(UNDEFINED)
+      :ANY
+    elsif !cpath.is_a?(String)
+      raise TypeError, 'on_load only accepts strings'
+    else
+      @cpv.validate!(cpath)
+    end
 
     mutex.synchronize do
-      (on_load_callbacks[cpath] ||= []) << block
+      (on_load_callbacks[key] ||= []) << block
     end
   end
 
@@ -299,12 +309,19 @@ module Zeitwerk::Loader::Config
   #     # ...
   #   end
   #
-  #: (String?) { (top, String) -> void } -> void ! TypeError
-  def on_unload(cpath = :ANY, &block)
-    raise TypeError, 'on_unload only accepts strings' unless cpath.is_a?(String) || cpath == :ANY
+  #: (String) { (top, String) -> void } -> void ! TypeError | NameError
+  #| { (String, top, String) -> void } -> void
+  def on_unload(cpath = UNDEFINED, &block)
+    key = if cpath.equal?(UNDEFINED)
+      :ANY
+    elsif !cpath.is_a?(String)
+      raise TypeError, 'on_unload only accepts strings'
+    else
+      @cpv.validate!(cpath)
+    end
 
     mutex.synchronize do
-      (on_unload_callbacks[cpath] ||= []) << block
+      (on_unload_callbacks[key] ||= []) << block
     end
   end
 

data/lib/zeitwerk/loader/constant_path_validator.rb

@@ -0,0 +1,17 @@
+# @private
+class Zeitwerk::Loader::ConstantPathValidator # :nodoc
+  CNAME_VALIDATOR = Module.new.freeze #: Module
+  private_constant :CNAME_VALIDATOR
+
+  # Technically, this validation works with symbols, but API boundary restricts
+  # input to strings, so we assume strings, and we test strings.
+  #
+  #: (String) -> String ! NameError
+  def validate!(possible_cpath)
+    # We do this before validating because as of this writing, TruffleRuby
+    # raises TypeError if the argument has leading colons.
+    possible_cpath = possible_cpath.delete_prefix('::')
+    CNAME_VALIDATOR.const_defined?(possible_cpath, false)
+    possible_cpath
+  end
+end

data/lib/zeitwerk/loader/helpers.rb

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 module Zeitwerk::Loader::Helpers
-  CNAME_VALIDATOR = Module.new #: Module
-  private_constant :CNAME_VALIDATOR
-
   #: (String, String) -> Symbol ! Zeitwerk::NameError
   private def cname_for(basename, abspath)
     cname = inflector.camelize(basename, abspath)
@@ -23,7 +20,7 @@ module Zeitwerk::Loader::Helpers
     end
 
     begin
-      CNAME_VALIDATOR.const_defined?(cname, false)
+      @cpv.validate!(cname)
     rescue ::NameError => error
       path_type = @fs.rb_extension?(abspath) ? 'file' : 'directory'
 

data/lib/zeitwerk/loader.rb

@@ -10,6 +10,7 @@ module Zeitwerk
     require_relative 'loader/config'
     require_relative 'loader/eager_load'
     require_relative 'loader/file_system'
+    require_relative 'loader/constant_path_validator'
 
     extend Internal
 
@@ -115,6 +116,7 @@ module Zeitwerk
       @setup           = false
       @eager_loaded    = false
       @fs              = FileSystem.new(self)
+      @cpv             = ConstantPathValidator.new
 
       @mutex = Mutex.new
       @dirs_autoload_monitor = Monitor.new

data/lib/zeitwerk/version.rb

@@ -2,5 +2,5 @@
 
 module Zeitwerk
   #: String
-  VERSION = '2.8.1'
+  VERSION = '2.8.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Xavier Noria
@@ -34,6 +34,7 @@ files:
 - lib/zeitwerk/loader.rb
 - lib/zeitwerk/loader/callbacks.rb
 - lib/zeitwerk/loader/config.rb
+- lib/zeitwerk/loader/constant_path_validator.rb
 - lib/zeitwerk/loader/eager_load.rb
 - lib/zeitwerk/loader/file_system.rb
 - lib/zeitwerk/loader/helpers.rb