onload 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9da25e881992956871df8379241638cc78561b87d09b9040390b9e7e1331b47
-  data.tar.gz: bd7eed8c12d1557af7cfa02c29f3e99e3c60d803980f5f5342ee226f98491fc0
+  metadata.gz: 66e3e322ccf2b92d128fb3bf904426cff77ba86e88ec47eb8ba9c5101dd0ae28
+  data.tar.gz: 5495ff350b972c47e6c992f744245d12baa57c0929d7878241f6c9a91922f17c
 SHA512:
-  metadata.gz: 5cd23e59b466a20c66c7cc2bfcffe0f43363ff677d282adc31b5b897edb41b47af83322cfaa821e965d39a3ed563b0a9923acda00525771a763d725137b39a88
-  data.tar.gz: 5fa4b2f9e471429675ad855c9e945aeae6fa516e5c1abfd3295e298b3c6929baed89b0e66f8e2b61ad07af05e97ff78ea542195ff7dcdb2adc1e323c3feebe58
+  metadata.gz: 1fd824da5c6ee8cd78342b5e0cb945353147970ebe26a4c6e16005bf8245cd5e743223441c76b7ab04216dd1757a8b3925a71b32825402d1f4becf7cbbf488c0
+  data.tar.gz: 8f296f7561c97af7ff6863a87fb73c3ef1c2bccb6379ca4aceb5300c13ccde937d17189de93e877c6016ab76a62f12225ce04e2494e77e229f59172c5dfd0de7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 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.

data/lib/onload/core_ext/kernel_zeitwerk.rb

@@ -15,7 +15,12 @@ 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]
 
       if defined?(Zeitwerk::Cref) && parent.is_a?(Zeitwerk::Cref)

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/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onload
-  VERSION = "1.0.4"
+  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