modules 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f01db94c8f224ccc34c29f46d5162323176f527e
-  data.tar.gz: 0a8132753316ea571e714bdef63ff3f12d3040ea
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmNjMjU5YTk0YjRjNWE4ZDY3ZTJjNTNkZWUxNThjODk3MWM1MGZlZg==
+  data.tar.gz: !binary |-
+    YTE2OWIyNmUwNjk2YmIxMDIxMDM4ZDdhYmI0ODlhOGFiZGQxNGIyZQ==
 SHA512:
-  metadata.gz: 12a947436ab67b46aa4decf773a1286eee0fc7c5506b1fc6c9df0fdc59f7eea8d253a6c1b2683df6baad558adc289f8b9c4d35a748541e6e02e7dca346201540
-  data.tar.gz: 25e1419b2970e4625bd64025a335d2bf7d0bf93cf5dcfa930f6aa2d54f9263812a3a5461d7e4da6bc33a87f1415e3418349322d31e260d79ea5be8cf8598c006
+  metadata.gz: !binary |-
+    YmQzYTIyZjI3MDM5YzdmZjJmNGFhYmVmNGYxM2RjOWM5YWRmYTgzMTEzNTY1
+    MDcxMjhkMTdiNDNkZWM1MTkzZmI2NTU5NTg4NWNjMDk3YjA3NjdkYTg2ZTMw
+    ZDFjZjBiZWI0NTVjNTYwNTZjMGJmMWU1YTg3MzdhNWVjMjNhMjU=
+  data.tar.gz: !binary |-
+    ODhiZTFkZDUxMjExMWMxYmJjNmQ1ZTM3OTI2Zjc5NGU0YzI5OTdhZmYyNmUx
+    ODk5ZmJkNjExNWYyOWYwMjJkMjAxZTE2ZjNhYzEwM2E1ZjQ0YzQzYTc3YmE3
+    MTg0NjM3OGUxYzBjZjBjNDQyNmQ5OGM4MGQ4M2M0NTY2MTI4ODI=

data/lib/debug.rb

@@ -0,0 +1,13 @@
+module Debug
+  @enabled = false
+
+  def self.enable(value)
+    @enabled = !!value
+  end
+
+  def self.debug(topic)
+    lambda do |msg|
+      puts "[#{topic}] #{msg}" if @enabled
+    end
+  end
+end

data/lib/global.rb

@@ -1,8 +1,13 @@
 require_relative './loader'
 
 class Object
-  def export
-    value = yield
+  def export(name=nil, value=nil)
+    if name.nil?
+      value = yield
+    else
+      value = {name => value}
+    end
+
     Loader.export(value)
   end
 

data/lib/interop.rb

@@ -1,20 +1,27 @@
+require 'set'
+
+require_relative './debug'
+
 module Interop
+  DEBUG = Debug.debug(File.basename(__FILE__))
+
+  # (Hash) map from module identifier to resolved module
   @cache = {}
 
   def self.import(id)
     if @cache.include?(id)
-      puts "Cache hit #{id}"
+      DEBUG.call "Cache hit #{id}"
       return @cache[id]
     end
 
-    puts "Load #{id}"
+    DEBUG.call "Load #{id}"
     snapshot = Module.constants
     require id
     cleanly_load(Module.constants - snapshot)
   end
 
   def self.cleanly_load(targets)
-    puts "Package definitions #{targets}"
+    DEBUG.call "Package definitions #{targets}"
     result = wrap_constants(targets)
     result.each_pair do |key, value|
       Object.send(:remove_const, key.to_sym) unless key.include?('::')
@@ -23,7 +30,7 @@ module Interop
     result
   end
 
-  def self.wrap_constants(new, result={})
+  def self.wrap_constants(new, result={}, visited=Set.new)
     if new.length == 0
       return result
     end
@@ -35,12 +42,18 @@ module Interop
     end
 
     if const.respond_to? :constants
-      # TODO(ari): Handle circular references!
-      children = const.constants.map {|child| "#{str}::#{child.to_s}"}
+      children = const
+        .constants
+        .reject {|element| visited.include?(element)}
+        .map {|child|
+          visited.add(child)
+          "#{str}::#{child.to_s}"
+        }
+
       new += children
     end
 
     result[str] = const.class == Module ? Class.new.extend(const) : const
-    return wrap_constants(new, result)
+    return wrap_constants(new, result, visited)
   end
 end

data/lib/loader.rb

@@ -1,6 +1,9 @@
+require_relative './debug'
 require_relative './interop'
 
 module Loader
+  DEBUG = Debug.debug(File.basename(__FILE__))
+
   # (String) root path for module resolution
   @basepath = '/'
 
@@ -11,12 +14,17 @@ module Loader
   @path = nil
 
   def self.export(value)
-    @cache[@path] = value
+    if @cache.include?(@path) && value.class == Hash
+      # Special handling to enable multiple exports
+      @cache[@path] = @cache[@path].merge(value)
+    else
+      @cache[@path] = value
+    end
   end
 
   def self.import(id, type=nil)
     chr = id[0]
-    if type == 'interop' || (type != 'internal' && !['/', '.'].include?(chr))
+    if type == 'interop'
       return Interop.import(id)
     end
 
@@ -29,18 +37,27 @@ module Loader
     end
 
     @path = File.expand_path(raw)
-    if !@cache.include?(@path)
-      id = @path.end_with?('.rb') ? @path : "#{@path}.rb"
-      Kernel.load(id, true)
+    filepath = @path.end_with?('.rb') ? @path : "#{@path}.rb"
+    exists = File.exist?(filepath)
+    if type == 'internal' && !exists
+      raise "Could not resolve local module at #{@path}"
+    end
+
+    if exists
+      # Prefer loading local module since we found it.
+      Kernel.load(filepath, true) unless @cache.include?(@path)
+      result = @cache[@path]
+    else
+      # Failover to external load.
+      result = Interop.import(id)
     end
 
-    result = @cache[@path]
     @path = prev
     result
   end
 
   def self.set_basepath(basepath)
-    puts "Set basepath to #{basepath}"
+    DEBUG.call "Set basepath to #{basepath}"
     @basepath = basepath
   end
 end

data/lib/modules.rb

@@ -1,7 +1,12 @@
+require_relative './debug'
 require_relative './loader'
 
 module Modules
   def self.run(args, opts)
+    if opts.include?('debug')
+      Debug.enable(opts['debug'])
+    end
+
     file = args[0]
     abs = "#{Dir.pwd}/#{file}"
     Loader.set_basepath(File.dirname(abs))

metadata

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