onload 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b85b579c018d6457e7bfe46bf77af3c275edff7393131711c49b4cf16c76e4
-  data.tar.gz: 744b42532004241a66de3c6cabf0a7d0013e3924c82c16ae2b7e31b0d8dc3d83
+  metadata.gz: f174cf5ba8b7da4a2a70310c1adffc4a5e4b15c7f2c37cfba8a28e341b6c2c77
+  data.tar.gz: d3c95deea100141f9cb797c805361cbadc8803a3d129fdae08d4a755e5cee713
 SHA512:
-  metadata.gz: '09dcca366074cce184242321ead06ab87cf46eac0adfb1af585486d1e162bac051f87d323c26b8501bd57ef211f95e4074f29b5a11986541ff1791cdc4ff05dc'
-  data.tar.gz: c61baba2a8de0daf0461643d28f1b3d978898e3104024dc63f6deff37583bc9a02fbb5f1fa4a0b8b92f3f15f61dbd3eed75917d42030300a761d91816f6530be
+  metadata.gz: c5ffdbe3816eb9c410cdb9749feb160d67a16da6be7fa7fff77a11f1a16091eb7b47e6dbd1bdd0613cb2d6524b0579cd1c0ece2b19a1ab8e33177857caa3a8fe
+  data.tar.gz: 744a1ace552ca478f69fc24cc68dbdbd42ea13e3368bf633f1c0c56b14358f5cbc7343c23d017dfee9e01808fb424655c286c3b7768dc97dbc84594578d496fc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1
+* Fix issues with Zeitwerk v2.8 and later.
+* Add support for Rails 8.1.
+
 ## 1.1.0
 * Automatically add generated files to the specified ignore file, eg. `.gitignore`, when they are written.
   - Specify an ignore file by setting `Onload.config.ignore_path` to the path to the ignore file you'd like to use.

data/lib/onload/core_ext/kernel_zeitwerk.rb

@@ -15,18 +15,34 @@ module Kernel
       # in order to load the resulting file. Otherwise you get an error about
       # an uninitialized constant, and it's like... yeah, I _know_ it's
       # uninitialized, that's why I'm loading this file. Whatevs.
-      loader = if Zeitwerk::Registry.respond_to?(:loader_for)
+      loader = if Zeitwerk::Registry.respond_to?(:autoloads)
+        autoloads = Zeitwerk::Registry.autoloads
+
+        if autoloads.respond_to?(:registered?)
+          autoloads.registered?(file)
+        else
+          autoloads[file]
+        end
+      elsif Zeitwerk::Registry.respond_to?(:loader_for)
         Zeitwerk::Registry.loader_for(file)
-      else
-        Zeitwerk::Registry.autoloads.registered?(file)
       end
 
-      parent, cname = loader.send(:autoloads)[file]
+      autoload_entry = if loader && loader.respond_to?(:autoloads, true)
+        loader.send(:autoloads)[file]
+      end
 
-      if defined?(Zeitwerk::Cref) && parent.is_a?(Zeitwerk::Cref)
-        parent.remove
-      else
-        parent.send(:remove_const, cname)
+      if autoload_entry
+        if defined?(Zeitwerk::Cref) && autoload_entry.is_a?(Zeitwerk::Cref)
+          autoload_entry.remove
+        else
+          parent, cname = autoload_entry
+
+          if defined?(Zeitwerk::Cref) && parent.is_a?(Zeitwerk::Cref)
+            parent.remove
+          else
+            parent.send(:remove_const, cname)
+          end
+        end
       end
 
       return onload_orig_load(f.outfile, *args)

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

@@ -4,40 +4,63 @@ require "zeitwerk"
 require "zeitwerk/loader"
 
 module Onload
+  module ZeitwerkLoaderHelpers
+    class << self
+      def method_exists?(method_name)
+        Zeitwerk::Loader.method_defined?(method_name) ||
+          Zeitwerk::Loader.private_method_defined?(method_name)
+      end
+    end
+  end
+
   module ZeitwerkLoaderPatch
     private
 
-    def ruby?(path)
-      super || Onload.process?(path)
+    if Onload::ZeitwerkLoaderHelpers.method_exists?(:ruby?)
+      def ruby?(path)
+        super || Onload.process?(path)
+      end
     end
 
-    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
+    if Onload::ZeitwerkLoaderHelpers.method_exists?(:autoload_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 naively 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
-    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
+    elsif Onload::ZeitwerkLoaderHelpers.method_exists?(:define_autoload)
+      def define_autoload(cref, abspath)
+        if !::File.directory?(abspath) && !Onload.process?(abspath)
+          if (unprocessed_file = Onload.unprocessed_file_for(abspath))
+            abspath = unprocessed_file
           end
         end
 
@@ -45,15 +68,23 @@ module Onload
       end
     end
 
-    # introduced in Zeitwerk v2.6.10
-    def cname_for(basename, abspath)
-      super(Onload.basename(basename), abspath)
+    if Onload::ZeitwerkLoaderHelpers.method_exists?(:cname_for)
+      # introduced in Zeitwerk v2.6.10
+      def cname_for(basename, abspath)
+        super(Onload.basename(basename), abspath)
+      end
     end
   end
-end
 
-module Zeitwerk
-  class Loader
-    prepend Onload::ZeitwerkLoaderPatch
+  module ZeitwerkFileSystemPatch
+    def rb_extension?(path)
+      super || Onload.process?(path)
+    end
   end
 end
+
+Zeitwerk::Loader.prepend(Onload::ZeitwerkLoaderPatch)
+
+if defined?(Zeitwerk::Loader::FileSystem)
+  Zeitwerk::Loader::FileSystem.prepend(Onload::ZeitwerkFileSystemPatch)
+end

data/lib/onload/version.rb

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

data/lib/onload.rb

@@ -11,6 +11,9 @@ module Onload
     attr_accessor :enabled
     alias enabled? enabled
 
+    attr_reader :installed
+    alias installed? installed
+
     def register(extension, processor_klass)
       processors[extension] = processor_klass
     end
@@ -43,6 +46,8 @@ module Onload
       else
         require "onload/ext/bootsnap/autoload"
       end
+
+      @installed = true
     end
 
     def process?(path)
@@ -136,6 +141,7 @@ module Onload
   end
 
   self.enabled = true
+  @installed = false
 end
 
 if Kernel.const_defined?(:Rails)