named_imports 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97be320b89b4ac114bed6fb578408e92469e03ad329a9039f5cd1f3ede527d7d
-  data.tar.gz: 746036f1c888ea3c5ba714449cbe73619c510c4c0cc9f0813c63376fdad446ef
+  metadata.gz: cfc9a0d0b8e5f11fc766551ff061c718b590fe78c8a0d389731899953a38aadc
+  data.tar.gz: 11e50d338348cc168e96fc314bc41981407c3483a5d78db814ed4bb61cd5543e
 SHA512:
-  metadata.gz: 473f6a20a5a5c2a8a6161750c4137a2ba5ff1b0bed490de4193fe89a0b50216ee7e59a975109f65ebc2113808bc646cc837cb16749a62284a8f06b19ebccdabd
-  data.tar.gz: 915c2555d3e2370d52388b8954bd254c4511f1e05c51e73687f3dacd24ddf19dc77678a53160f80d7e1b0a68c7869bf8663f52fd5e3f93f0208835d115cb3cd6
+  metadata.gz: 01572a85739777dca2eb49050098e9e07ca7c93f7ba7a5716442bc36690e6a6c296b26ed2a1c8b473f68c6ea4097ae67d860a9850a19dadeb58b60b61ef617a7
+  data.tar.gz: 0074367a1fddfb4b935026e0604ca80555d1bcaf6e6cf5c574dfbf9865ccac6e6ac8462271cc27218c30955300cfb80ad4cd08705d5169c34ca43b2860edb80a

data/README.md

@@ -86,8 +86,6 @@ Baz.some_str
 #=> "hi"
 ```
 
-> **Note:** Currently, non-specified constants defined in the imported file _will_ be available _after_ you've used one (or more) of the constants you specified in the import statement. Working on it!
-
 You can import multiple constants as well, by separating them with a semicolon in the `import` block:
 
 ```rb
@@ -124,7 +122,9 @@ Bop.some_hash
 - [x] multiple constant imports
 - [ ] top-level function imports
 - [x] namespace should not be polluted with non-specified constants (before the specified import is referenced/used)
-- [ ] namespace should not be polluted with non-specified constants (after the specified import is referenced/used)
+- [x] namespace should not be polluted with non-specified constants (after the specified import is referenced/used)
+- [ ] namespace of child imports should not be polluted with constants from the parent's scope
+- [ ] cached imports so constants are always reused (as opposed to being redefined in a new anonymous module)
 
 ## Development
 

data/lib/named_imports.rb

@@ -6,19 +6,32 @@ module NamedImports
   class Error < StandardError; end
 
   class << self
-    def from(path, constants)
-      ext = %r{[^/]+\.[^/]+$}.match?(path) ? "" : ".rb"
-      path_with_ext = "#{path}#{ext}"
-      caller_dir = File.dirname(caller(2..2).first)
-      full_path = File.expand_path(path_with_ext, caller_dir)
-
-      constants.each do |constant_name|
-        Object.send(:remove_const, constant_name.to_sym)
-        Object.autoload constant_name.to_sym, full_path
+    def from(path, constants, context = Object)
+      path_where_import_occurs = caller(2..2).first
+      full_path = full_path_for_import(path, path_where_import_occurs)
+
+      File.open(full_path, "r") do |file|
+        file_content = file.read
+        anon_mod = Module.new
+
+        anon_mod.define_singleton_method(:from) do |path, constants|
+          NamedImports.from(path, constants, anon_mod)
+        end
+
+        anon_mod.define_singleton_method(:import) do |&block|
+          NamedImports.import(&block)
+        end
+
+        anon_mod.class_eval(file_content, full_path)
+
+        constants.each do |constant_name|
+          context.send(:remove_const, constant_name) if context.const_defined?(constant_name, false)
+          context.const_set(constant_name, anon_mod.const_get(constant_name))
+        end
       end
     end
 
-    def import
+    def import(context = Object)
       constants = []
 
       begin
@@ -26,12 +39,18 @@ module NamedImports
       rescue NameError => e
         raise e unless /uninitialized constant /.match?(e.message)
 
-        constant_name = e.message.gsub(/uninitialized constant /, '').to_s
+        constant_match = e.message.match(/uninitialized constant (?:#<Module:[^>]+>::)?(\w*(?:::\w+)*)$/)
+        constant_name = constant_match && constant_match[1]
+
+        if constant_name.nil?
+          raise NameError, "unable to import constant: #{e.message.gsub(/uninitialized constant /, '')}"
+        end
+
         already_there = constants.include?(constant_name)
 
         unless already_there
           constants << constant_name
-          Object.const_set(constant_name, nil)
+          context.const_set(constant_name, nil)
         end
 
         retry
@@ -39,13 +58,22 @@ module NamedImports
 
       constants
     end
+
+    private
+
+    def full_path_for_import(imported_path, importer_path)
+      ext = %r{[^/]+\.[^/]+$}.match?(imported_path) ? "" : ".rb"
+      imported_path_with_ext = "#{imported_path}#{ext}"
+      importer_dir = File.dirname(importer_path)
+      File.expand_path(imported_path_with_ext, importer_dir)
+    end
   end
 
-  Kernel.define_method(:from) do |path, constants|
+  Object.define_method(:from) do |path, constants|
     NamedImports.from(path, constants)
   end
 
-  Kernel.define_method(:import) do |&block|
+  Object.define_method(:import) do |&block|
     NamedImports.import(&block)
   end
 end

data/lib/named_imports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NamedImports
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/named_imports.gemspec

@@ -37,4 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rubocop-rake", "~> 0.5"
   spec.add_development_dependency "rubocop-rspec", "~> 2.2"
   spec.add_development_dependency "solargraph"
+  spec.add_development_dependency "pry"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: named_imports
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Keegan Leitz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Stop asking where that thing came from.
 email:
 - kjleitz@gmail.com