onload 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c041fc54820d21453d5f755e87e35c91881e976d0b51b16d757ecfa20b55f4c
-  data.tar.gz: 8d8520e2f427c22df3562c5aa6b0c5ae0b890333a3149a21a1f181a9ec365b0e
+  metadata.gz: f9da25e881992956871df8379241638cc78561b87d09b9040390b9e7e1331b47
+  data.tar.gz: bd7eed8c12d1557af7cfa02c29f3e99e3c60d803980f5f5342ee226f98491fc0
 SHA512:
-  metadata.gz: fc15ad2aa9f2c17e84b2fdd1110d1ba930bb179dc13a1df827a4ca29ca7a19d4a2b4158fe66ee285ce92b2af8522f787c6f3526e9d068fb62dd4439137bcc0c7
-  data.tar.gz: 6475cd2fae9260661881cf3eb42769c8a25dd3a776a651293ba38094affa21a9520033efc8488f08b6706ef8ab7c92fcf6d0d1641769d695697869009ab70a0f
+  metadata.gz: 5cd23e59b466a20c66c7cc2bfcffe0f43363ff677d282adc31b5b897edb41b47af83322cfaa821e965d39a3ed563b0a9923acda00525771a763d725137b39a88
+  data.tar.gz: 5fa4b2f9e471429675ad855c9e945aeae6fa516e5c1abfd3295e298b3c6929baed89b0e66f8e2b61ad07af05e97ff78ea542195ff7dcdb2adc1e323c3feebe58

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.4
+* Fix issues with Zeitwerk v2.6.13 and later.
+  - Zeitwerk introduced the `Cref` class, which encapsulates a `mod` and `cname`. A number of internal methods used to return both of these things individually; now they are wrapped in `Cref`s.
+
 ## 1.0.3
 * Fix Bootsnap issue causing `NoMethodError`.
   - Onload started out using `alias_method` to override certain Zeitwerk and Bootsnap methods. When it was extracted into a gem, I chose to use `Module#prepend` instead. I forgot to convert one of the method calls to `super`, hence the error.

data/lib/onload/core_ext/kernel_zeitwerk.rb

@@ -17,7 +17,12 @@ module Kernel
       # uninitialized, that's why I'm loading this file. Whatevs.
       loader = Zeitwerk::Registry.loader_for(file)
       parent, cname = loader.send(:autoloads)[file]
-      parent.send(:remove_const, cname)
+
+      if defined?(Zeitwerk::Cref) && parent.is_a?(Zeitwerk::Cref)
+        parent.remove
+      else
+        parent.send(:remove_const, cname)
+      end
 
       return onload_orig_load(f.outfile, *args)
     end

data/lib/onload/ext/zeitwerk/loader.rb

@@ -11,26 +11,38 @@ module Onload
       super || Onload.process?(path)
     end
 
-    def autoload_file(parent, cname, file)
-      if Onload.process?(file)
-        # Some older versions of Zeitwerk very naïvely try to remove only the
-        # last 3 characters in an attempt to strip off the .rb file extension,
-        # while newer ones only remove it if it's actually there. This line is
-        # necessary to remove the trailing leftover period for older versions,
-        # and remove the entire extension for newer versions. Although cname
-        # means "constant name," we use Onload.basename to remove all residual
-        # file extensions that were left over from the conversion from a file
-        # name to a cname.
-        cname = Onload.basename(cname.to_s).to_sym
-      else
-        # if there is a corresponding unprocessed file, autoload it instead of
-        # the .rb file
-        if (unprocessed_file = Onload.unprocessed_file_for(file))
-          file = unprocessed_file
+    if Zeitwerk::Loader.instance_method(:autoload_file).arity == 2
+      def autoload_file(cref, file)
+        if !Onload.process?(file)
+          if (unprocessed_file = Onload.unprocessed_file_for(file))
+            file = unprocessed_file
+          end
         end
+
+        super
       end
+    else
+      def autoload_file(parent, cname, file)
+        if Onload.process?(file)
+          # Some older versions of Zeitwerk very naïvely try to remove only the
+          # last 3 characters in an attempt to strip off the .rb file extension,
+          # while newer ones only remove it if it's actually there. This line is
+          # necessary to remove the trailing leftover period for older versions,
+          # and remove the entire extension for newer versions. Although cname
+          # means "constant name," we use Onload.basename to remove all residual
+          # file extensions that were left over from the conversion from a file
+          # name to a cname.
+          cname = Onload.basename(cname.to_s).to_sym
+        else
+          # if there is a corresponding unprocessed file, autoload it instead of
+          # the .rb file
+          if (unprocessed_file = Onload.unprocessed_file_for(file))
+            file = unprocessed_file
+          end
+        end
 
-      super
+        super
+      end
     end
 
     # introduced in Zeitwerk v2.6.10

data/lib/onload/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onload
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end