onload 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c041fc54820d21453d5f755e87e35c91881e976d0b51b16d757ecfa20b55f4c
-  data.tar.gz: 8d8520e2f427c22df3562c5aa6b0c5ae0b890333a3149a21a1f181a9ec365b0e
+  metadata.gz: 66e3e322ccf2b92d128fb3bf904426cff77ba86e88ec47eb8ba9c5101dd0ae28
+  data.tar.gz: 5495ff350b972c47e6c992f744245d12baa57c0929d7878241f6c9a91922f17c
 SHA512:
-  metadata.gz: fc15ad2aa9f2c17e84b2fdd1110d1ba930bb179dc13a1df827a4ca29ca7a19d4a2b4158fe66ee285ce92b2af8522f787c6f3526e9d068fb62dd4439137bcc0c7
-  data.tar.gz: 6475cd2fae9260661881cf3eb42769c8a25dd3a776a651293ba38094affa21a9520033efc8488f08b6706ef8ab7c92fcf6d0d1641769d695697869009ab70a0f
+  metadata.gz: 1fd824da5c6ee8cd78342b5e0cb945353147970ebe26a4c6e16005bf8245cd5e743223441c76b7ab04216dd1757a8b3925a71b32825402d1f4becf7cbbf488c0
+  data.tar.gz: 8f296f7561c97af7ff6863a87fb73c3ef1c2bccb6379ca4aceb5300c13ccde937d17189de93e877c6016ab76a62f12225ce04e2494e77e229f59172c5dfd0de7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.0.5
+* Fix issues with Zeitwerk v2.7.3 and later.
+* Don't attempt to autoload directories.
+
+## 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

@@ -15,9 +15,19 @@ 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 = Zeitwerk::Registry.loader_for(file)
+      loader = if Zeitwerk::Registry.respond_to?(:loader_for)
+        Zeitwerk::Registry.loader_for(file)
+      else
+        Zeitwerk::Registry.autoloads.registered?(file)
+      end
+
       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/bootsnap/autoload.rb

@@ -3,6 +3,9 @@
 module Onload
   module BootsnapAutoloadPatch
     def autoload(const, path)
+      # only autoload files, not directories
+      return super if ::File.directory?(path)
+
       # Bootsnap monkeypatches Module.autoload in order to leverage its load
       # path cache, which effectively converts a relative path into an absolute
       # one without incurring the cost of searching the load path.

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.5"
 end

data/spec/rails/controllers/home_controller_spec.rb

@@ -38,5 +38,14 @@ describe HomeController, type: :request do
         )
       end
     end
+
+    it "supports file shadowing" do
+      get "/action_list"
+
+      expect(response).to have_http_status(:ok)
+      expect(response.body).to(
+        have_selector("div", text: "LIST ITEM")
+      )
+    end
   end
 end

data/spec/rails/dummy/app/views/home/action_list.html.erb

@@ -0,0 +1 @@
+<div><%= Primer::Alpha::ActionList.new.list %></div>

data/spec/rails/dummy/config/application.rb

@@ -11,5 +11,7 @@ module Onload
     config.autoload_paths << ::File.expand_path(
       ::File.join(*%w[.. .. .. fixtures]), __dir__
     )
+
+    config.autoload_paths << Rails.root.join("lib").to_s
   end
 end

data/spec/rails/dummy/config/routes.rb

@@ -1,3 +1,4 @@
 Rails.application.routes.draw do
-  root to: 'home#index'
+  root to: "home#index"
+  get "/action_list", to: "home#action_list"
 end

data/spec/rails/dummy/lib/primer/alpha/action_list/item.rb

@@ -0,0 +1,11 @@
+module Primer
+  module Alpha
+    class ActionList
+      class Item
+        def item
+          "item".upcase
+        end
+      end
+    end
+  end
+end

data/spec/rails/dummy/lib/primer/alpha/action_list/item.up

@@ -0,0 +1,11 @@
+module Primer
+  module Alpha
+    class ActionList
+      class Item
+        def item
+          "item"
+        end
+      end
+    end
+  end
+end

data/spec/rails/dummy/lib/primer/alpha/action_list.rb

@@ -0,0 +1,9 @@
+module Primer
+  module Alpha
+    class ActionList
+      def list
+        "list ".upcase + Item.new.item
+      end
+    end
+  end
+end

data/spec/rails/dummy/lib/primer/alpha/action_list.up

@@ -0,0 +1,9 @@
+module Primer
+  module Alpha
+    class ActionList
+      def list
+        "list " + Item.new.item
+      end
+    end
+  end
+end