modules 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eef64fa3eb9871089ea12f2546f30ef11e633724
-  data.tar.gz: 26dfffc9b37bc5cbeafa5d28d816bda2073b813d
+  metadata.gz: ff9bd70ed4bbc3c8462b2a444ee10801aa0794f6
+  data.tar.gz: 5307157838a65581d6599e0e71da499488cd4a79
 SHA512:
-  metadata.gz: efd241f4ed2f94b33398f5d32bfba7bf77ed7030771949ff60833331b747118312b1f64fd194cd8593114d3084d3f7c65e1a60b5e3e501053c57295891079a8c
-  data.tar.gz: e8e416b04f0a16792134a13a08374c47d17d32cd7738bc61138cb8e86f1aac4caef8ea7ccab2694bdda7cd060e3a7076f46201339dc882c57e5d5a08c70f9ce0
+  metadata.gz: cad0b747b3b3c7137b87c2c16d047ca7742030f379bfdd513a3ab6b1661e1b3fae7b5266ed151f60de20cb92a2bc0bf4a01302686d47b084fafc381f1bbc698d
+  data.tar.gz: f98b425cd789c94e867eb9d6d7ebfd3aff4652f032338b33445fcc058d20c0a7d7d8d41e9bff373c634bb728c39969e4a51b33dd19e8d93066f2d3df030454e8

data/bin/modules

@@ -2,8 +2,7 @@
 
 require 'optparse'
 
-require_relative '../lib/global'
-require_relative '../lib/modules'
+require_relative '../lib/modules/modules'
 
 def main
   options = {}
@@ -16,7 +15,7 @@ def main
     end
 
     opts.on('-v', '--version') do
-      puts '1.1.0'
+      puts '1.1.2'
       exit
     end
   end
@@ -25,4 +24,6 @@ def main
   Modules.main(ARGV[0], ARGV[1..-1], options)
 end
 
-main()
+if __FILE__ == $0
+  main
+end

data/lib/modules/callsite.rb

@@ -0,0 +1,9 @@
+module Callsite
+  # Prefer caller_locations since it's faster, but failover to caller
+  # since caller_locations was only introduced in v2.0.0.
+  def self.resolve(idx=1)
+    defined?(caller_locations) ?
+      caller_locations[idx + 1].absolute_path :
+      caller[idx + 1].split(':').first
+  end
+end

data/lib/modules/loader.rb

@@ -1,3 +1,4 @@
+require_relative './callsite'
 require_relative './debug'
 require_relative './interop'
 
@@ -10,18 +11,19 @@ module Loader
   # (Hash) map from module identifier to resolved module
   @cache = {}
 
-  # (String) path to the file currently being loaded
-  @path = nil
+  # (Boolean) Whether or not import has been called at least once.
+  @import_called = false
 
   # (Boolean) whether to purge constants added to global namespace on interop load
   @save_the_environment = false
 
   def self.export(value)
-    if @cache.include?(@path) && value.class == Hash
+    callsite = Callsite.resolve
+    if @cache.include?(callsite) && value.class == Hash
       # Special handling to enable multiple exports
-      @cache[@path] = @cache[@path].merge(value)
+      @cache[callsite] = @cache[callsite].merge(value)
     else
-      @cache[@path] = value
+      @cache[callsite] = value
     end
   end
 
@@ -30,38 +32,30 @@ module Loader
       return Interop.import(id, save_the_environment: @save_the_environment)
     end
 
-    prev = @path
-    if @path.nil?
-      container = @basepath
-      raw = File.join(container, id)
-    else
-      container = File.dirname(@path)
-      raw = File.join(container, id)
-    end
-
-    @path = File.expand_path(raw)
-    filepath = @path.end_with?('.rb') ? @path : "#{@path}.rb"
+    callsite = Callsite.resolve
+    parent = @import_called ? File.dirname(callsite) : @basepath
+    raw = File.join(parent, id)
+    path = File.expand_path(raw)
+    filepath = path.end_with?('.rb') ? path : "#{path}.rb"
     exists = File.exist?(filepath)
+
     if type == 'internal' && !exists
-      raise "Could not resolve local module at #{@path}"
+      raise "Could not resolve local module at #{path}"
     end
 
     if exists
       # Prefer loading local module since we found it.
       begin
-        Kernel.load(filepath, true) unless @cache.include?(@path)
+        Kernel.load(filepath, true) unless @cache.include?(filepath)
       rescue => e
-        raise LoadError, "Could not load #{filepath} from #{container}: #{e}"
+        raise LoadError, "Could not load #{filepath} from #{parent}: #{e}"
       end
 
-      result = @cache[@path]
-    else
-      # Failover to external load.
-      result = Interop.import(id, save_the_environment: @save_the_environment)
+      return @cache[filepath]
     end
 
-    @path = prev
-    result
+    # Failover to external load.
+    return Interop.import(id, save_the_environment: @save_the_environment)
   end
 
   module Api

data/lib/modules/modules.rb

@@ -1,4 +1,5 @@
 require_relative './debug'
+require_relative '../modules'
 require_relative './loader'
 
 module Modules

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modules
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Gareth (Ari) Aye
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-03-03 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby module loader inspired by the semantics of js modules
 email: gareth@alumni.middlebury.edu
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - bin/modules
 - lib/modules.rb
+- lib/modules/callsite.rb
 - lib/modules/debug.rb
 - lib/modules/interop.rb
 - lib/modules/loader.rb
@@ -27,7 +28,7 @@ homepage: https://github.com/lambdabaa/modules
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -42,9 +43,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Port of js module loader to ruby
 test_files: []