zeitwerk 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ee62051ec4e4b4a50ab150ee600cf4f39ecece0f072a17ee5984a1a65b2a14
-  data.tar.gz: 605e82704338fa70cc07daa4d8700e03bd84442ba59d8c5b8ed82835b03162e7
+  metadata.gz: 6cb6bd7dd37980b33d67ae3b1a8b5a8228911dd833698617991f6026b06a122c
+  data.tar.gz: 8a9d2438c2008c5c04f21692d1dea9dd0cd7756eb3cd4460262866b1b9eda42f
 SHA512:
-  metadata.gz: 2d65cc6e332f47bc471ee3cc18c54e4b3fe3a1a1b60c2943a075646260fced9ed8cf63709dbd6adf7b71be3544353d38107a8a0eafd48e453729b865bd037017
-  data.tar.gz: db95bb4028025ded4491f16eb10f22c77af5f4245cc67d23d47471ae8491a1f5f58be276e54c37714357d891997caaa398f77a5a70b0b763d9264b77570605d6
+  metadata.gz: aa2bfe23d1b4c3dde4f6df132c0e6bfb908e540cdc76177cc676fdd7d6843bd6b9af4032978f9948c46c1b74e1979ee592028cafba02fa25f3bdd5eaec0a3d67
+  data.tar.gz: ba5301619afb7d13dd1081330826b06c5bf6a8d520f56aa788423f14fcc2854c70cc9e8d5db7abec9733e05bc7ac3f6e8c7852f4563359abbcc46e5171f96371

data/lib/zeitwerk/loader.rb

@@ -227,19 +227,31 @@ module Zeitwerk
     # @return [void]
     def unload
       mutex.synchronize do
-        autoloads.each do |path, (parent, cname)|
+        # We are going to keep track of the files that were required by our
+        # autoloads to later remove them from $LOADED_FEATURES, thus making them
+        # loadable by Kernel#require again.
+        #
+        # Directories are not stored in $LOADED_FEATURES, keeping track of files
+        # is enough.
+        unloaded_files = Set.new
+
+        autoloads.each do |realpath, (parent, cname)|
           if parent.autoload?(cname)
             parent.send(:remove_const, cname)
             log("autoload for #{cpath(parent, cname)} removed") if logger
-          elsif cdef?(parent, cname)
-            parent.send(:remove_const, cname)
-            log("#{cpath(parent, cname)} unloaded") if logger
+          else
+            if cdef?(parent, cname)
+              parent.send(:remove_const, cname)
+              log("#{cpath(parent, cname)} unloaded") if logger
+            else
+              # Already unloaded somehow, that is fine.
+            end
+            unloaded_files.add(realpath) if ruby?(realpath)
           end
+        end
 
-          # Let Kernel#require load the same path later again by removing it
-          # from $LOADED_FEATURES. We check the extension to avoid unnecessary
-          # array lookups, since directories are not stored in $LOADED_FEATURES.
-          $LOADED_FEATURES.delete(path) if ruby?(path)
+        unless unloaded_files.empty?
+          $LOADED_FEATURES.reject! { |file| unloaded_files.member?(file) }
         end
 
         autoloads.clear

data/lib/zeitwerk/version.rb

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

metadata

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