im 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99d5cc6d355489148cd6f39fee0e50ce1a25d0e770e4f06c4918fdd41b05935b
-  data.tar.gz: ec2372445636beac68c84c0249b68e7e454dda3b0c49293bea4e8f14bfa52053
+  metadata.gz: 707475c4bc1ad6a6bf6207ca9f892a92b72a911f2fcb3cf0561e203041ede864
+  data.tar.gz: c4ad0fc4bb0f0da2dc2b31d64ba904db9f8c3f3e87fb97def63dbbdc91cd3cf8
 SHA512:
-  metadata.gz: f9099a8d43b9772952916c21bd84da42da3eeac2541c0b4fe675fd7c373988d00a9522fc7dc2ce662ea7d0f3231ec4aec11941ab8f079350529d6476e535a19f
-  data.tar.gz: 764b1d2454d0158deba3cd4244453aab0d194036b0fe4104c0cb40bced64d5a0bdb6099db3f5c0b9d98cf75c1417707949f353524b8061c5db18ef96ea0aad2d
+  metadata.gz: 4bd14ecfb9804594795da0db412840cc5cb8a11500a335f66dbb88424575e04bfb6b4ead19480edcdf3f68fa957be0665a3c3a317c6c832a043fb645044bfa16
+  data.tar.gz: '0048891c47b3f9bd6785141c71412c10f2ce63d746dbed8ac4e515b968e26dfe26a524ddbf8e9629eb2aa4b8fe11ef9c26ced56fa0ba6fa7d401185036e99aa8'

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.1.5] - 2022-09-22
+- Rename Im::Dependency -> Im::Require
+- Handle dynamic requires (require called from method body after file has been imported)
+- Refactor: move require/autoload patch logic to Im handler methods
+
+
 ## [0.1.4] - 2022-09-19
 - Correctly assign constants imported via recursive requires
 

data/Gemfile

@@ -7,3 +7,4 @@ gemspec
 
 gem "rspec", "~> 3.0"
 gem "rails"
+gem "sqlite3"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    im (0.1.3)
+    im (0.1.4)
 
 GEM
   remote: https://rubygems.org/
@@ -155,6 +155,8 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
+    sqlite3 (1.5.0)
+      mini_portile2 (~> 2.8.0)
     strscan (3.0.4)
     thor (1.2.1)
     timeout (0.3.0)
@@ -174,6 +176,7 @@ DEPENDENCIES
   rake (~> 13.0)
   rake-compiler
   rspec (~> 3.0)
+  sqlite3
 
 BUNDLED WITH
    2.4.0.dev

data/lib/im/kernel.rb

@@ -4,42 +4,16 @@ module Kernel
   alias_method :im_original_require, :require
 
   def require(path)
-    if Im.autoloads.key?(path)
-      return Im.with_import(Im.autoloads.delete(path)) do |_context|
-        !!Im.import(path)
-      end
+    Im.handle_require(path, caller_locations(1, 1).first.path) do
+      im_original_require(path)
     end
+  end
 
-    if Im.importing? && (resolved = $LOAD_PATH.resolve_feature_path(path))
-      resolved_path = resolved[1]
-      Im.registry[resolved_path] ||= Im::Dependency.new(resolved_path, Im.current_import)
-    end
-
-    loaded = im_original_require(path)
-    return loaded unless Im.importing?
-
-    if resolved
-      dependency = Im.registry[resolved_path]
-
-      if loaded && Im.registry.key?(location = caller_locations(1, 1).first.path)
-        Im.registry[location].dependencies << dependency
-      end
-
-      dependency.dependencies.each { |d| require d.path }
-
-      dependency.modules.each do |m|
-        name = m.name
-
-        # Do not assign constants that are aliased to root namespace
-        root = name.split("::", 2)[0]
-        next if Object.const_defined?(root) &&
-          Im.current_import.const_defined?(root, false) &&
-          Object.const_get(root) == Im.current_import.const_get(root)
+  alias_method :im_original_autoload, :autoload
 
-        Im.current_import.const_set(name, m) unless Im.current_import.const_defined?(name, false)
-      end
+  def autoload(name, path)
+    Im.handle_autoload(path) do
+      im_original_autoload(name, path)
     end
-
-    return loaded
   end
 end

data/lib/im/module.rb

@@ -2,7 +2,8 @@ class Module
   alias_method :im_original_autoload, :autoload
 
   def autoload(name, path)
-    Im.autoloads[path] = Im.current_import if Im.importing?
-    im_original_autoload(name, path)
+    Im.handle_autoload(path) do
+      im_original_autoload(name, path)
+    end
   end
 end

data/lib/im/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Im
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/im.rb

@@ -2,15 +2,20 @@
 
 module Im
   load $LOAD_PATH.resolve_feature_path("im/ruby_version_check")[1], true
+
+  @constants = Object.constants.reject { |c| Kernel.autoload?(c) }.dup
+  @autoloads = {}
+  @registry = {}
+
   require "im/version"
   require "im/kernel"
 
   class << self
-    attr_reader :current_import
+    attr_reader :current_import, :registry, :autoloads, :constants
 
     def with_import(import)
       original_import = current_import
-      @current_import = import
+      @current_import = import || Im.current_import
 
       unless tracer_originally_enabled = @tracer.enabled?
         @tracer.enable
@@ -23,16 +28,67 @@ module Im
       @tracer.disable unless tracer_originally_enabled
     end
 
-    def registry
-      @registry ||= {}
+    def importing?
+      !!Im.current_import
     end
 
-    def autoloads
-      @autoloads ||= {}
+    def handle_require(path, caller_path)
+      resolved_path = resolve_path(path)
+
+      return yield unless resolved_path
+
+      if autoloaded = autoloads.delete(resolved_path)
+        return with_import(autoloaded) do |_import|
+          !!import(path)
+        end
+      end
+
+      if importing?
+        registry[resolved_path] ||= Require.new(resolved_path, current_import)
+      elsif registry.key?(caller_path)
+        return with_import(registry[caller_path].import) do |_import|
+          !!import(resolved_path)
+        end
+      end
+
+      loaded = yield # super
+
+      if required = registry[resolved_path]
+        if loaded && registry.key?(caller_path)
+          registry[caller_path].requires << required
+        end
+
+        required.requires.each { |r| require r.path }
+        import = current_import || Object
+
+        required.modules.each do |m|
+          name = m.name
+
+          # Do not assign constants that are aliased to root namespace
+          root = name.split("::", 2)[0]
+          next if Object.const_defined?(root) &&
+            import.const_defined?(root, false) &&
+            Object.const_get(root) == import.const_get(root)
+
+          begin
+            import.const_set(name, m) unless import.const_defined?(name, false)
+          rescue NameError
+          end
+        end
+      end
+
+      loaded
     end
 
-    def importing?
-      !!Im.current_import
+    def handle_autoload(path)
+      if resolved_path = resolve_path(path)
+        Im.autoloads[resolved_path] = Im.current_import
+      end
+      yield
+    end
+
+    def resolve_path(path)
+      (resolved = $LOAD_PATH.resolve_feature_path(path)) && resolved[1]
     end
   end
 
@@ -40,8 +96,10 @@ module Im
     def initialize(root)
       @root = root
       super()
-      Im::CONSTANTS.each do |const|
-        self.const_set(const, Object.const_get(const))
+      Im.with_import(self) do
+        Im.constants.each do |const|
+          self.const_set(const, Object.const_get(const))
+        end
       end
     end
 
@@ -50,9 +108,9 @@ module Im
     end
   end
 
-  Dependency = Struct.new(:path, :import, :modules, :dependencies) do
-    def initialize(path, import, modules = [], dependencies = [])
-      super(path, import, modules, dependencies)
+  Require = Struct.new(:path, :import, :modules, :requires) do
+    def initialize(path, import, modules = [], requires = [])
+      super(path, import, modules, requires)
     end
   end
 
@@ -71,7 +129,7 @@ module Im
       $LOADED_FEATURES << resolved_path
 
       import = Im.current_import || Import.new(path)
-      (Im.registry[resolved_path] ||= Dependency.new(resolved_path, import)).tap do
+      (Im.registry[resolved_path] ||= Require.new(resolved_path, import)).tap do
         Im.with_import(import) do
           load resolved_path, import
         end
@@ -102,21 +160,19 @@ module Im
 
   @tracer = TracePoint.new(:class) do |event|
     next unless (name = event.self.name)
-    next if Im::CONSTANTS.include?(name.to_sym)
+    next if Im.constants.include?(name.to_sym)
 
     if resolved = $LOAD_PATH.resolve_feature_path(event.path)
       resolved_path = resolved[1]
       if Im.registry.key?(resolved_path)
         (Im.registry[resolved_path].modules << event.self).uniq!
       else
-        Im.registry[resolved_path] = Dependency.new(resolved_path, Im.current_import, [event.self])
+        Im.registry[resolved_path] = Require.new(resolved_path, Im.current_import, [event.self])
       end
     end
   end
 
   require "im/module"
-  require "im/autoload"
-  require "im/constants"
 
   extend self
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: im
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-19 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,8 +66,6 @@ files:
 - README.md
 - Rakefile
 - lib/im.rb
-- lib/im/autoload.rb
-- lib/im/constants.rb
 - lib/im/kernel.rb
 - lib/im/module.rb
 - lib/im/ruby_version_check.rb

data/lib/im/autoload.rb

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-module Im
-  module Autoload
-    def autoload(name, path)
-      Im.autoloads[path] = Im.current_import if Im.importing?
-      super(name, path)
-    end
-  end
-end

data/lib/im/constants.rb

@@ -1,104 +0,0 @@
-module Im
-  # It's faster to just hard-code constants than to introspect them at runtime
-  CONSTANTS = [
-    :ArgumentError,
-    :Array,
-    :BasicObject,
-    :Binding,
-    :Class,
-    :ClosedQueueError,
-    :Comparable,
-    :Complex,
-    :ConditionVariable,
-    :DidYouMean,
-    :Dir,
-    :Encoding,
-    :EncodingError,
-    :Enumerable,
-    :Enumerator,
-    :EOFError,
-    :Errno,
-    :ErrorHighlight,
-    :Exception,
-    :FalseClass,
-    :Fiber,
-    :FiberError,
-    :File,
-    :FileTest,
-    :Float,
-    :FloatDomainError,
-    :FrozenError,
-    :GC,
-    :Gem,
-    :Hash,
-    :IndexError,
-    :Integer,
-    :Interrupt,
-    :IO,
-    :IOError,
-    :Kernel,
-    :KeyError,
-    :LoadError,
-    :LocalJumpError,
-    :Marshal,
-    :MatchData,
-    :Math,
-    :Method,
-    :Module,
-    :Monitor,
-    :MonitorMixin,
-    :Mutex,
-    :NameError,
-    :NilClass,
-    :NoMatchingPatternError,
-    :NoMatchingPatternKeyError,
-    :NoMemoryError,
-    :NoMethodError,
-    :NotImplementedError,
-    :Numeric,
-    :Object,
-    :ObjectSpace,
-    :Proc,
-    :Process,
-    :Queue,
-    :Ractor,
-    :Random,
-    :Range,
-    :RangeError,
-    :Rational,
-    :RbConfig,
-    :Refinement,
-    :Regexp,
-    :RegexpError,
-    :RubyVM,
-    :RuntimeError,
-    :ScriptError,
-    :SecurityError,
-    :Set,
-    :Signal,
-    :SignalException,
-    :SizedQueue,
-    :StandardError,
-    :StopIteration,
-    :String,
-    :Struct,
-    :Symbol,
-    :SyntaxError,
-    :SystemCallError,
-    :SystemExit,
-    :SystemStackError,
-    :Thread,
-    :ThreadError,
-    :ThreadGroup,
-    :Time,
-    :TracePoint,
-    :TrueClass,
-    :TypeError,
-    :UnboundMethod,
-    :UncaughtThrowError,
-    :UnicodeNormalize,
-    :URI,
-    :Warning,
-    :ZeroDivisionError,
-  ]
-end