zeitwerk 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6569d242e6aec3f736aef043e5c949ce12365d8b1647195820512b17185423
-  data.tar.gz: d046e7d1b35242a562ab09b7bea7a865e43a99b3a03c336fac86e2528b3fa2e5
+  metadata.gz: 53e3caf01e7af10f0f12922ebbe41f400a27eee1fa8d47a1d580ba1bb421393b
+  data.tar.gz: 6b76087bdc7abec95aa7a70ee5c5b70cb7567e7b02c8dbb290852a3bda523089
 SHA512:
-  metadata.gz: 3e2c325e9f18a1c81ea64fd6c6078bdba1bdeaed67bbbf316f9294f2b5901d172e7fd0bde3bf256a3049fe7ca363efa0a0d02f246acef53b8e6aed83b43db738
-  data.tar.gz: 321d32b46d05e8eb1e1ce20d7936b0ef42f0f57a89d2f4243d8d2da2421f02b7096e7db88f83e6cc37f9f87e5e7df3c55e74ed7e6ac08c9c27f7a4f251882125
+  metadata.gz: 31aabb9e4c66028674508efa6dad871ece2893a3bb78e9c53d24be6721dbbd1a9f0960348ca5c7b33dc3e16670bd2c8b37eea3d813f6ce045b63410a73033a66
+  data.tar.gz: dc9f42aecb424d7695d48e831ec0ef70159538ded7abf470cc0a26195087aa8a3ce0d3a3a83c8978a88dda8fccb747013db60b0b1b2169e5a6c9ff1b30e94bb8

data/lib/zeitwerk/loader.rb

@@ -53,6 +53,21 @@ module Zeitwerk
     # @return [Set<String>]
     attr_reader :ignored_paths
 
+    # Keeps track of shadowed files.
+    #
+    # A shadowed file is a file managed by this autoloader that is skipped
+    # because its matching constant path has already been seen. Think $LOAD_PATH
+    # + require, only the first occurrence of a given relative name is loaded.
+    #
+    # If the existing occurrence is an autoload, we map the file name to the
+    # shadowing autoload path. If the existing occurrence is an already defined
+    # constant, the file name is mapped to the constant path, meaning it was
+    # loaded elsewhere.
+    #
+    # @private
+    # @return [{String => String}]
+    attr_reader :shadowed
+
     # Maps real absolute paths for which an autoload has been set to their
     # corresponding parent class or module and constant name.
     #
@@ -106,6 +121,7 @@ module Zeitwerk
       @autoloads     = {}
       @loaded        = Set.new
       @lazy_subdirs  = {}
+      @shadowed      = {}
 
       @mutex        = Mutex.new
       @setup        = false
@@ -216,6 +232,7 @@ module Zeitwerk
         autoloads.clear
         loaded.clear
         lazy_subdirs.clear
+        shadowed.clear
 
         Registry.on_unload(self)
         ExplicitNamespace.unregister(self)
@@ -249,7 +266,7 @@ module Zeitwerk
         while dir = queue.shift
           each_abspath(dir) do |abspath|
             if ruby?(abspath)
-              require abspath
+              require abspath unless shadowed.key?(abspath)
             elsif dir?(abspath)
               queue << abspath
             end
@@ -370,7 +387,7 @@ module Zeitwerk
     def autoload_file(parent, cname, file)
       if autoload_path = autoload_for?(parent, cname)
         # First autoload for a Ruby file wins, just ignore subsequent ones.
-        return if ruby?(autoload_path)
+        shadowed[file] = autoload_path and return if ruby?(autoload_path)
 
         # Override autovivification, we want the namespace to become the
         # class/module defined in this file.
@@ -379,7 +396,9 @@ module Zeitwerk
 
         set_autoload(parent, cname, file)
         register_explicit_namespace(cpath(parent, cname))
-      elsif !cdef?(parent, cname)
+      elsif cdef?(parent, cname)
+        shadowed[file] = cpath(parent, cname)
+      else
         set_autoload(parent, cname, file)
       end
     end

data/lib/zeitwerk/version.rb

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

metadata

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