zeitwerk 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7e867060d3bf347938f153335a463ddbb48995f70f3aed8472a6641e2592a71
-  data.tar.gz: af10438f14e119bf184133b1c1734e01fbe61954ce2128805a1ab941125dc4cf
+  metadata.gz: d3e5a11bbda38b569f50eabcaf7dd6e53ce209120b5d1b4f2a933edae9230d14
+  data.tar.gz: 52107af4754d7cc305c1978172920eb7b8c180b4d8660080902143a422287ad2
 SHA512:
-  metadata.gz: a744a32914b0bd02c07842b448770512d6a8aad66b5524bbe9bb6ef854faeea1ce11e2090bc9a968aebb3501d54de54f65f7927f9d26d4f365a13ad806920e38
-  data.tar.gz: 032c50fd06d88be03ee5fae4d7fd6bdbd34780b5dc1f978a8a63a3a9bdda960d417dcb91b40bb82865d3c58b6751cf58506c1bed2454c65c14c6c1d2b5f7bdc7
+  metadata.gz: 8133b49d1231e2f2c797c02151787b0fbb95eba0c9a573ae90ea2e722a736f583876820296536e6206bd711f2d23789fc867e55e34771968a005e74352df43c2
+  data.tar.gz: 243a54e0a4e5c947851271c196617cfd113cdcc2795de00dc9c5d6909351825a92e15f868880584d1ce84d6e0168219c109bad1d83a64b82c25af9a18beeb903

data/README.md

@@ -295,9 +295,9 @@ class MyInflector < Zeitwerk::Inflector
 end
 ```
 
-The first argument, `basename`, is a string with the basename of the file or directory to be inflected. In the case of a file, without extension. The inflector needs to return this basename inflected. Therefore, a simple constant name without colons.
+The first argument, `basename`, is a string with the basename of the file or directory to be inflected. In the case of a file, without extension. In the case of a directory, without trailing slash. The inflector needs to return this basename inflected. Therefore, a simple constant name without colons.
 
-The second argument, `abspath`, is a string with the absolute path to the file or directory in case you need it to decide how to inflect the basename.
+The second argument, `abspath`, is a string with the absolute path to the file or directory in case you need it to decide how to inflect the basename. Paths to directories don't have trailing slashes.
 
 Then, assign the inflector:
 

data/lib/zeitwerk/loader.rb

@@ -113,6 +113,10 @@ module Zeitwerk
     # @return [Mutex]
     attr_reader :mutex
 
+    # @private
+    # @return [Mutex]
+    attr_reader :mutex2
+
     def initialize
       @initialized_at = Time.now
 
@@ -130,7 +134,9 @@ module Zeitwerk
       @shadowed_files        = {}
       @eager_load_exclusions = Set.new
 
+      # TODO: find a better name for these mutexes.
       @mutex        = Mutex.new
+      @mutex2       = Mutex.new
       @setup        = false
       @eager_loaded = false
 

data/lib/zeitwerk/loader/callbacks.rb

@@ -17,13 +17,28 @@ module Zeitwerk::Loader::Callbacks
   # @param dir [String]
   # @return [void]
   def on_dir_autoloaded(dir)
-    parent, cname = autoloads[dir]
+    # Module#autoload does not serialize concurrent requires, and we handle
+    # directories ourselves.
+    #
+    # That introduces a race condition here in which thread t1 autovivifies the
+    # module, and while autoloads are being set on that module object, thread t2
+    # autoloads the same namespace.
+    #
+    # In that situation, t2 resets the constant to store a new module. That not
+    # only sets the constant twice (undesirable per se), but it gets worse,
+    # because the module object created by t2 won't have any of the autoloads
+    # for child constants set, since t1 correctly deleted the lazy_dirs entry,
+    # thus resulting in NameErrors when client code tries to reach them.
+    mutex2.synchronize do
+      parent, cname = autoloads[dir]
+      break if loaded_cpaths.include?(cpath(parent, cname))
 
-    autovivified_module = parent.const_set(cname, Module.new)
-    log("module #{autovivified_module.name} autovivified from directory #{dir}") if logger
+      autovivified_module = parent.const_set(cname, Module.new)
+      log("module #{autovivified_module.name} autovivified from directory #{dir}") if logger
 
-    loaded_cpaths.add(autovivified_module.name)
-    on_namespace_loaded(autovivified_module)
+      loaded_cpaths.add(autovivified_module.name)
+      on_namespace_loaded(autovivified_module)
+    end
   end
 
   # Invoked when a class or module is created or reopened, either from the

data/lib/zeitwerk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Xavier Noria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-19 00:00:00.000000000 Z
+date: 2019-03-23 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Zeitwerk implements constant autoloading with Ruby semantics. Each gem