zeitwerk 2.5.0 → 2.6.12

data/lib/zeitwerk/registry.rb

@@ -10,12 +10,11 @@ module Zeitwerk
       # @sig Array[Zeitwerk::Loader]
       attr_reader :loaders
 
-      # Registers loaders created with `for_gem` to make the method idempotent
-      # in case of reload.
+      # Registers gem loaders to let `for_gem` be idempotent in case of reload.
       #
       # @private
       # @sig Hash[String, Zeitwerk::Loader]
-      attr_reader :loaders_managing_gems
+      attr_reader :gem_loaders_by_root_file
 
       # Maps absolute paths to the loaders responsible for them.
       #
@@ -77,7 +76,7 @@ module Zeitwerk
       # @sig (Zeitwerk::Loader) -> void
       def unregister_loader(loader)
         loaders.delete(loader)
-        loaders_managing_gems.delete_if { |_, l| l == loader }
+        gem_loaders_by_root_file.delete_if { |_, l| l == loader }
         autoloads.delete_if { |_, l| l == loader }
         inceptions.delete_if { |_, (_, l)| l == loader }
       end
@@ -87,14 +86,8 @@ module Zeitwerk
       #
       # @private
       # @sig (String) -> Zeitwerk::Loader
-      def loader_for_gem(root_file)
-        loaders_managing_gems[root_file] ||= begin
-          Loader.new.tap do |loader|
-            loader.tag = File.basename(root_file, ".rb")
-            loader.inflector = GemInflector.new(root_file)
-            loader.push_dir(File.dirname(root_file))
-          end
-        end
+      def loader_for_gem(root_file, namespace:, warn_on_extra_files:)
+        gem_loaders_by_root_file[root_file] ||= GemLoader.__new(root_file, namespace: namespace, warn_on_extra_files: warn_on_extra_files)
       end
 
       # @private
@@ -137,9 +130,9 @@ module Zeitwerk
       end
     end
 
-    @loaders               = []
-    @loaders_managing_gems = {}
-    @autoloads             = {}
-    @inceptions            = {}
+    @loaders                  = []
+    @gem_loaders_by_root_file = {}
+    @autoloads                = {}
+    @inceptions               = {}
   end
 end

data/lib/zeitwerk/version.rb

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

data/lib/zeitwerk.rb

@@ -2,8 +2,9 @@
 
 module Zeitwerk
   require_relative "zeitwerk/real_mod_name"
+  require_relative "zeitwerk/internal"
   require_relative "zeitwerk/loader"
-  require_relative "zeitwerk/autoloads"
+  require_relative "zeitwerk/gem_loader"
   require_relative "zeitwerk/registry"
   require_relative "zeitwerk/explicit_namespace"
   require_relative "zeitwerk/inflector"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zeitwerk
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.12
 platform: ruby
 authors:
 - Xavier Noria
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Zeitwerk implements constant autoloading with Ruby semantics. Each gem
@@ -23,15 +23,17 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/zeitwerk.rb
-- lib/zeitwerk/autoloads.rb
 - lib/zeitwerk/error.rb
 - lib/zeitwerk/explicit_namespace.rb
 - lib/zeitwerk/gem_inflector.rb
+- lib/zeitwerk/gem_loader.rb
 - lib/zeitwerk/inflector.rb
+- lib/zeitwerk/internal.rb
 - lib/zeitwerk/kernel.rb
 - lib/zeitwerk/loader.rb
 - lib/zeitwerk/loader/callbacks.rb
 - lib/zeitwerk/loader/config.rb
+- lib/zeitwerk/loader/eager_load.rb
 - lib/zeitwerk/loader/helpers.rb
 - lib/zeitwerk/real_mod_name.rb
 - lib/zeitwerk/registry.rb
@@ -59,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Efficient and thread-safe constant autoloader

data/lib/zeitwerk/autoloads.rb

@@ -1,71 +0,0 @@
-# frozen_string_literal: true
-
-module Zeitwerk
-  # @private
-  class Autoloads
-    # Maps crefs for which an autoload has been defined to the corresponding
-    # absolute path.
-    #
-    #   [Object, :User]  => "/Users/fxn/blog/app/models/user.rb"
-    #   [Object, :Hotel] => "/Users/fxn/blog/app/models/hotel"
-    #   ...
-    #
-    # This colection is transient, callbacks delete its entries as autoloads get
-    # executed.
-    #
-    # @sig Hash[[Module, Symbol], String]
-    attr_reader :c2a
-
-    # This is the inverse of c2a, for inverse lookups.
-    #
-    # @sig Hash[String, [Module, Symbol]]
-    attr_reader :a2c
-
-    # @sig () -> void
-    def initialize
-      @c2a = {}
-      @a2c = {}
-    end
-
-    # @sig (Module, Symbol, String) -> void
-    def define(parent, cname, abspath)
-      parent.autoload(cname, abspath)
-      cref = [parent, cname]
-      c2a[cref] = abspath
-      a2c[abspath] = cref
-    end
-
-    # @sig () { () -> [[Module, Symbol], String] } -> void
-    def each(&block)
-      c2a.each(&block)
-    end
-
-    # @sig (Module, Symbol) -> String?
-    def abspath_for(parent, cname)
-      c2a[[parent, cname]]
-    end
-
-    # @sig (String) -> [Module, Symbol]?
-    def cref_for(abspath)
-      a2c[abspath]
-    end
-
-    # @sig (String) -> [Module, Symbol]?
-    def delete(abspath)
-      cref = a2c.delete(abspath)
-      c2a.delete(cref)
-      cref
-    end
-
-    # @sig () -> void
-    def clear
-      c2a.clear
-      a2c.clear
-    end
-
-    # @sig () -> bool
-    def empty?
-      c2a.empty? && a2c.empty?
-    end
-  end
-end