zeitwerk 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40e2919df324c67a85e00ac31349b96349b1a74a39e97e3f41c513258f108542
-  data.tar.gz: 17c8c31d6a89e4ead544d1bc35143f548331923106decb05be67ebf57daf1bce
+  metadata.gz: ed6569d242e6aec3f736aef043e5c949ce12365d8b1647195820512b17185423
+  data.tar.gz: d046e7d1b35242a562ab09b7bea7a865e43a99b3a03c336fac86e2528b3fa2e5
 SHA512:
-  metadata.gz: 455ff00c99726bb3003cebfcd4d264a4288a84d3d6d5bc7e8005ed4f0e7d66eff2abf3670b474bbeb5ca0a5517e1e7e316df64ccc065775b60e9b1822e5664cc
-  data.tar.gz: 4971b4baec41fcffa1075248dbb714e456b2a0c37e193bd4ad47f81c658751dcf9de687ed023d4b0e00a67e57c4fa219ff7db6fe82437901774c6a0e59861dbf
+  metadata.gz: 3e2c325e9f18a1c81ea64fd6c6078bdba1bdeaed67bbbf316f9294f2b5901d172e7fd0bde3bf256a3049fe7ca363efa0a0d02f246acef53b8e6aed83b43db738
+  data.tar.gz: 321d32b46d05e8eb1e1ce20d7936b0ef42f0f57a89d2f4243d8d2da2421f02b7096e7db88f83e6cc37f9f87e5e7df3c55e74ed7e6ac08c9c27f7a4f251882125

data/lib/zeitwerk/explicit_namespace.rb

@@ -47,15 +47,6 @@ module Zeitwerk
         disable_tracer_if_unneeded
       end
 
-      # Utility for the test suite
-      #
-      # @private
-      # @return [void]
-      def teardown
-        cpaths.clear
-        tracer.disable
-      end
-
       def disable_tracer_if_unneeded
         mutex.synchronize do
           tracer.disable if cpaths.empty?
@@ -67,7 +58,7 @@ module Zeitwerk
     @mutex  = Mutex.new
     @tracer = TracePoint.new(:class) do |event|
       # Note that it makes sense to compute the hash code unconditionally,
-      # because if cpaths was empty the trace point would be disabled.
+      # because the trace point is disabled if cpaths is empty.
       if loader = cpaths.delete(event.self.name)
         loader.on_namespace_loaded(event.self)
         disable_tracer_if_unneeded

data/lib/zeitwerk/loader.rb

@@ -415,7 +415,37 @@ module Zeitwerk
     # @param cname [String]
     # @return [String, nil]
     def autoload_for?(parent, cname)
-      parent.autoload?(cname) || Registry.inception?(cpath(parent, cname))
+      strict_autoload_path(parent, cname) || Registry.inception?(cpath(parent, cname))
+    end
+
+    # The autoload? predicate takes into account the ancestor chain of the
+    # receiver, like const_defined? and other methods in the constants API do.
+    #
+    # For example, given
+    #
+    #   class A
+    #     autoload :X, "x.rb"
+    #   end
+    #
+    #   class B < A
+    #   end
+    #
+    # B.autoload?(:X) returns "x.rb".
+    #
+    # We need a way to strictly check in parent ignoring ancestors.
+    #
+    # @param parent [Module]
+    # @param cname [String]
+    # @return [String, nil]
+    def strict_autoload_path(parent, cname)
+      if autoload_path = parent.autoload?(cname)
+        # Due to the use cases we have, we are done if parent is a Module.
+        return autoload_path unless parent.is_a?(Class)
+        # Since file and constant names match, if both parent and one of its
+        # ancestors have an autoload for the same cname, their autoload paths
+        # cannot be equal.
+        return autoload_path unless parent.superclass.autoload?(cname) == autoload_path
+      end
     end
 
     # This method is called this way because I prefer `preload` to be the method

data/lib/zeitwerk/registry.rb

@@ -137,16 +137,6 @@ module Zeitwerk
         autoloads.delete_if { |_path, object| object == loader }
         inceptions.delete_if { |_cpath, (_path, object)| object == loader }
       end
-
-      # Utility for the test suite
-      #
-      # @private
-      # @return [void]
-      def teardown
-        loaders.each(&:unload)
-        loaders.clear
-        loaders_managing_gems.clear
-      end
     end
 
     @loaders               = []

data/lib/zeitwerk/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Xavier Noria
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-06 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Zeitwerk implements constant autoloading with Ruby semantics. Each gem
@@ -29,7 +29,6 @@ files:
 - lib/zeitwerk/kernel.rb
 - lib/zeitwerk/loader.rb
 - lib/zeitwerk/loader/callbacks.rb
-- lib/zeitwerk/ordered_set.rb
 - lib/zeitwerk/registry.rb
 - lib/zeitwerk/version.rb
 homepage: https://github.com/fxn/zeitwerk

data/lib/zeitwerk/ordered_set.rb

@@ -1,21 +0,0 @@
-module Zeitwerk
-  class OrderedSet
-    def initialize
-      @set = {}
-    end
-
-    def add(object)
-      @set[object] = true
-    end
-
-    def del(object)
-      @set.delete(object)
-    end
-
-    def each
-      @set.each_key do |key|
-        yield key
-      end
-    end
-  end
-end