im 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 707475c4bc1ad6a6bf6207ca9f892a92b72a911f2fcb3cf0561e203041ede864
-  data.tar.gz: c4ad0fc4bb0f0da2dc2b31d64ba904db9f8c3f3e87fb97def63dbbdc91cd3cf8
+  metadata.gz: 3ef66ecbb4745e878d911ec789567b204abe1bb174f57cee6b04ca6caddb76d9
+  data.tar.gz: a8cb56445189f2eb3d4fc4b7ff3b49c028b5b43cc7d8e20961481b125171d777
 SHA512:
-  metadata.gz: 4bd14ecfb9804594795da0db412840cc5cb8a11500a335f66dbb88424575e04bfb6b4ead19480edcdf3f68fa957be0665a3c3a317c6c832a043fb645044bfa16
-  data.tar.gz: '0048891c47b3f9bd6785141c71412c10f2ce63d746dbed8ac4e515b968e26dfe26a524ddbf8e9629eb2aa4b8fe11ef9c26ced56fa0ba6fa7d401185036e99aa8'
+  metadata.gz: f4fed0705aca8dfd1eb036ea78c5e5a71f64837134669937a31c04daf97224744d6c881363a688adaf61fa01322c0b462c1d6fa57ac5bf53b2eee72deb633634
+  data.tar.gz: a3e0d1b7e940c0afd22d4415d855964b73a043390fd6538f075affe1eb29964c5b7c3b4cf675a738a6b999ab73cba72ce2ec86af790797866ff97ee685979fb5

data/CHANGELOG.md

@@ -1,11 +1,14 @@
 ## [Unreleased]
 
+## [0.1.6] - 2022-10-03
+- Remove `Object.const_missing` patch (Ruby patch now handles dynamic toplevel
+  references)
+
 ## [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

@@ -6,5 +6,3 @@ source "https://rubygems.org"
 gemspec
 
 gem "rspec", "~> 3.0"
-gem "rails"
-gem "sqlite3"

data/Gemfile.lock

@@ -1,144 +1,12 @@
 PATH
   remote: .
   specs:
-    im (0.1.4)
+    im (0.1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.0.4)
-      actionpack (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activesupport (= 7.0.4)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.4)
-      actionview (= 7.0.4)
-      activesupport (= 7.0.4)
-      rack (~> 2.0, >= 2.2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.4)
-      actionpack (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      globalid (>= 0.6.0)
-      nokogiri (>= 1.8.5)
-    actionview (7.0.4)
-      activesupport (= 7.0.4)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.4)
-      activesupport (= 7.0.4)
-      globalid (>= 0.3.6)
-    activemodel (7.0.4)
-      activesupport (= 7.0.4)
-    activerecord (7.0.4)
-      activemodel (= 7.0.4)
-      activesupport (= 7.0.4)
-    activestorage (7.0.4)
-      actionpack (= 7.0.4)
-      activejob (= 7.0.4)
-      activerecord (= 7.0.4)
-      activesupport (= 7.0.4)
-      marcel (~> 1.0)
-      mini_mime (>= 1.1.0)
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    builder (3.2.4)
-    concurrent-ruby (1.1.10)
-    crass (1.0.6)
     diff-lcs (1.5.0)
-    digest (3.1.0)
-    erubi (1.11.0)
-    globalid (1.0.0)
-      activesupport (>= 5.0)
-    i18n (1.12.0)
-      concurrent-ruby (~> 1.0)
-    loofah (2.19.0)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
-    marcel (1.0.2)
-    method_source (1.0.0)
-    mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
-    minitest (5.16.3)
-    net-imap (0.2.3)
-      digest
-      net-protocol
-      strscan
-    net-pop (0.1.1)
-      digest
-      net-protocol
-      timeout
-    net-protocol (0.1.3)
-      timeout
-    net-smtp (0.3.1)
-      digest
-      net-protocol
-      timeout
-    nio4r (2.5.8)
-    nokogiri (1.13.8)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
-      rack (>= 1.3)
-    rails (7.0.4)
-      actioncable (= 7.0.4)
-      actionmailbox (= 7.0.4)
-      actionmailer (= 7.0.4)
-      actionpack (= 7.0.4)
-      actiontext (= 7.0.4)
-      actionview (= 7.0.4)
-      activejob (= 7.0.4)
-      activemodel (= 7.0.4)
-      activerecord (= 7.0.4)
-      activestorage (= 7.0.4)
-      activesupport (= 7.0.4)
-      bundler (>= 1.15.0)
-      railties (= 7.0.4)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
-    railties (7.0.4)
-      actionpack (= 7.0.4)
-      activesupport (= 7.0.4)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
     rake (13.0.6)
     rake-compiler (1.2.0)
       rake
@@ -155,28 +23,15 @@ 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)
-    tzinfo (2.0.5)
-      concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
   im!
-  rails
   rake (~> 13.0)
   rake-compiler
   rspec (~> 3.0)
-  sqlite3
 
 BUNDLED WITH
-   2.4.0.dev
+   2.3.18

data/README.md

@@ -24,8 +24,8 @@ require "im"
 
 extend Im
 
-mod = import "activemodel"
-#=> #<Im::Import:0x00007f2d34dfd0c8 root: active_model>
+mod = import "active_model"
+#=> <#Im::Import root: active_model>
 ```
 
 Constants in the imported files are under the returned module, not the root namespace:

data/lib/im/version.rb

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

data/lib/im.rb

@@ -1,35 +1,38 @@
 # frozen_string_literal: true
 
 module Im
-  load $LOAD_PATH.resolve_feature_path("im/ruby_version_check")[1], true
+  load $:.resolve_feature_path("im/ruby_version_check")[1], true
 
-  @constants = Object.constants.reject { |c| Kernel.autoload?(c) }.dup
+  @toplevel_constants = Object.constants.reject { |c| Object.autoload?(c) }
   @autoloads = {}
   @registry = {}
+  @current_imports = []
 
   require "im/version"
   require "im/kernel"
 
   class << self
-    attr_reader :current_import, :registry, :autoloads, :constants
+    attr_reader :current_imports, :registry, :autoloads, :toplevel_constants
 
     def with_import(import)
-      original_import = current_import
-      @current_import = import || Im.current_import
+      @current_imports.push(import || current_import)
 
       unless tracer_originally_enabled = @tracer.enabled?
         @tracer.enable
       end
 
-      yield(import)
-
+      yield
     ensure
-      @current_import = original_import
+      @current_imports.pop
       @tracer.disable unless tracer_originally_enabled
     end
 
+    def current_import
+      current_imports.last
+    end
+
     def importing?
-      !!Im.current_import
+      !!current_import
     end
 
     def handle_require(path, caller_path)
@@ -38,7 +41,7 @@ module Im
       return yield unless resolved_path
 
       if autoloaded = autoloads.delete(resolved_path)
-        return with_import(autoloaded) do |_import|
+        return with_import(autoloaded) do
           !!import(path)
         end
       end
@@ -46,7 +49,7 @@ module Im
       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|
+        return with_import(registry[caller_path].import) do
           !!import(resolved_path)
         end
       end
@@ -58,37 +61,43 @@ module Im
           registry[caller_path].requires << required
         end
 
-        required.requires.each { |r| require r.path }
-        import = current_import || Object
+        imports = importing? ? current_imports : [Object]
+        import_constants(required, imports)
+      end
 
-        required.modules.each do |m|
-          name = m.name
+      loaded
+    end
 
+    def handle_autoload(path)
+      if importing? && (resolved_path = resolve_path(path))
+        autoloads[resolved_path] = current_import
+      end
+      yield
+    end
+
+    def resolve_path(path)
+      (resolved = $:.resolve_feature_path(path)) && resolved[1]
+    end
+
+    def import_constants(required, imports)
+      return if imports.empty? || required.nil?
+
+      required.requires.each { |r| require r.path }
+
+      imports.each do |import|
+        required.defined_constants.each do |name, mod|
           # Do not assign constants that are aliased to root namespace
-          root = name.split("::", 2)[0]
+          root = name.to_s.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)
+            import.const_set(name, mod) unless import.const_defined?(name, false)
           rescue NameError
           end
         end
       end
-
-      loaded
-    end
-
-    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
 
@@ -97,7 +106,7 @@ module Im
       @root = root
       super()
       Im.with_import(self) do
-        Im.constants.each do |const|
+        Im.toplevel_constants.each do |const|
           self.const_set(const, Object.const_get(const))
         end
       end
@@ -106,23 +115,31 @@ module Im
     def inspect
       @inspect ||= "<#Im::Import root: #{@root}>"
     end
+
+    def const_added(name)
+      path = const_source_location(name)[0]
+      value = const_get(name, false)
+      Im.registry[path] ||= Require.new(path, self)
+      Im.registry[path].defined_constants[name] ||= value
+      super
+    end
   end
 
-  Require = Struct.new(:path, :import, :modules, :requires) do
-    def initialize(path, import, modules = [], requires = [])
-      super(path, import, modules, requires)
+  Require = Struct.new(:path, :import, :defined_constants, :requires) do
+    def initialize(path, import, defined_constants = {}, requires = [])
+      super
     end
   end
 
   def import(path)
-    if resolved = $LOAD_PATH.resolve_feature_path(path)
+    if resolved = $:.resolve_feature_path(path)
       resolved_path = resolved[1]
       raise LoadError, "import can only import ruby files" unless resolved[0] == :rb
     else
       raise LoadError, "cannot load such file -- #{path}"
     end
 
-    Im.registry.fetch(resolved_path) do
+    required = Im.registry.fetch(resolved_path) do
       # handle autoload within import
       return nil if $LOADED_FEATURES.include?(resolved_path)
 
@@ -134,41 +151,39 @@ module Im
           load resolved_path, import
         end
       end
-    end&.import
-  end
-
-  # This is a hack to catch references to top-level constants (`::Foo`) and, if
-  # the calling line is a key in the Im registry, replace the toplevel constant
-  # reference with its corresponding constant under the import namespace.
-  #
-  # By doing this, a reference to `::Foo` in an imported file will resolve to
-  # `mod::Foo`, where `mod` is the import module. Ideally this should
-  # ultimately happen at the Ruby implementation level.
-  module RootNamespaceRedirect
-    def const_missing(name)
-
-      # Take top five locations to allow for other `const_missing` overrides
-      # in the backtrace. If there are more than five, then this will no longer
-      # work. This is currently very inefficient.
-      if location = caller_locations(1, 5).find { |l| Im.registry.key?(l.path) }
-        Im.registry[location.path].import.const_get(name)
-      else
-        super
-      end
     end
+
+    Im.import_constants(required, Im.current_imports)
+
+    required&.import
   end
 
   @tracer = TracePoint.new(:class) do |event|
-    next unless (name = event.self.name)
-    next if Im.constants.include?(name.to_sym)
-
-    if resolved = $LOAD_PATH.resolve_feature_path(event.path)
+    next unless (name = event.self.name&.to_sym)
+    next if Im.toplevel_constants.include?(name)
+
+    # We don't want to track classes defined under singleton classes, like
+    # this:
+    #
+    #   class Foo
+    #     class << self
+    #       class Bar
+    #       end
+    #     end
+    #   end
+    #
+    # Here, `class Bar` will trigger a TracePoint event, and because of the
+    # Ruby patch `name` will return "Bar", but this is not actually a class we
+    # need to alias in imports, so we can safely skip it. The only way I've
+    # found to do that though is to evaluate `Module.nesting` from the event's
+    # binding. This is weird, but it works!
+    #
+    next if event.binding.eval("Module.nesting").any?(&:singleton_class?)
+
+    if resolved = $:.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] = Require.new(resolved_path, Im.current_import, [event.self])
-      end
+      Im.registry[resolved_path] ||= Require.new(resolved_path, Im.current_import)
+      Im.registry[resolved_path].defined_constants[name] = event.self
     end
   end
 
@@ -176,5 +191,3 @@ module Im
 
   extend self
 end
-
-Object.extend Im::RootNamespaceRedirect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: im
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Chris Salzberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Module import system.