requirium 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaeb02dd4c979c7c0d610fca588f890f22bbb40d
-  data.tar.gz: d7a7acb203652154316a9f79ad91a380d32493a0
+  metadata.gz: cc6d1b42fef265d9d746f66b27c0c4757e2859bb
+  data.tar.gz: 0e85c2d1df41508261491d1894dc01eb79d41e14
 SHA512:
-  metadata.gz: ff0e9ba46cd44ca282958b86e450d33d3b666c0a7307e96a5ede7290ce8299ca57a6834e452dd051fc142f063a3a45bf01c2d3d5458fdd323b952cdde1dbc7cf
-  data.tar.gz: 2f5b961015812a391151513c79ff687c300f4093da11a34ac79fcd18839c27e3dbe62b005570e58e5ce6b39d9c142f24a5292cf6e82d6ece7fcb9050d2881447
+  metadata.gz: cb6e12b95075241f395a359608dfb8063a4f803d2dadbe140003daff2a7e4ce29a52d25feacb7697d1379979800072e35d4a81ee6109e5a1333b3d54636e5987
+  data.tar.gz: 09bf328c61e8801b0df81bcdc23dee2650317917bd095a82d6ea6338ebaa68526cecab94c1c5c71034587ff1509b825bbf1f99b9a86456442ab1b9fcc8759a3e

data/lib/const_info.rb

@@ -1,28 +1,61 @@
-class Requirium::ConstInfo
-  attr_accessor :mod, :sym, :error, :value
+module Requirium
+  class ConstInfo
+    attr_accessor :mod, :sym, :nesting, :error, :value
 
-  def initialize(mod, sym)
-    @mod, @sym, @cond, @mutex = mod, sym, ConditionVariable.new, Mutex.new
-  end
+    def initialize(mod, sym, nesting)
+      @mod, @sym, @nesting, @cond, @mutex = mod, sym, nesting, ConditionVariable.new, Mutex.new
+    end
 
-  def has_value?
-    !!(defined? @value)
-  end
+    def has_value?
+      !!(defined? @value)
+    end
 
-  def internal_load
-    has, value = mod.send(:internal_load, sym)
-    @value = value if has
-    nil
-  end
+    def internal_load
+      has, value = mod.send(:internal_load, self)
+      @value = value if has
+      nil
+    end
 
-  def ready!
-    @ready = true
-    @mutex.synchronize { @cond.signal }
-    nil
-  end
+    def lookup_list
+      return @nesting | @mod.ancestors if @nesting # always returns for mri
+
+      # hacky fallback for jruby, rubinius, etc...
+
+      # singleton classes don't have a name, but the base class is the first from the ancestors
+
+      case
+        # usual class
+        when @mod.name
+          split(@mod.name) | @mod.ancestors
+
+        # singleton
+        when @mod.ancestors.first != @mod
+          mod = ObjectSpace.each_object(@mod).first
+          split(mod.name) | mod.ancestors
+
+        # anonymous class
+        else
+          mod.ancestors
+      end
+
+    end
+
+    def ready!
+      @ready = true
+      @mutex.synchronize { @cond.signal }
+      nil
+    end
+
+    def wait_ready
+      @mutex.synchronize { until @ready; @cond.wait(@mutex) end }
+      nil
+    end
+
+    private
 
-  def wait_ready
-    @mutex.synchronize { until @ready; @cond.wait(@mutex) end }
-    nil
+    def split(name)
+      return [] unless name
+      name.split('::').reduce([]) { |a, n| a << (a.last || Object).const_get(n) }.reverse!
+    end
   end
 end

data/lib/load_loader.rb

@@ -1,19 +1,21 @@
 require_relative 'require_loader'
 
-class Requirium::LoadLoader < Requirium::RequireLoader
+module Requirium
+  class LoadLoader < RequireLoader
 
-  private
+    private
 
-  def clean_paths(paths, dirname)
-    paths = super
+    def clean_paths(paths, dirname)
+      paths = super
 
-    # append possible suffix
-    paths.map! { |p| Dir[*Gem.suffixes.map { |e| p + e }].first }.compact!
+      # append possible suffix
+      paths.map! { |p| Dir[*Gem.suffixes.map { |e| p + e }].first }.compact!
 
-    paths
-  end
+      paths
+    end
 
-  def method
-    :load
+    def method
+      :load
+    end
   end
 end

data/lib/require_loader.rb

@@ -1,31 +1,33 @@
-class Requirium::RequireLoader
-  attr_reader :sym
+module Requirium
+  class RequireLoader
+    attr_reader :sym
 
-  def initialize(sym, paths, dirname = nil)
-    @sym = sym
-    @paths = clean_paths(paths, dirname)
-  end
+    def initialize(sym, paths, dirname = nil)
+      @sym = sym
+      @paths = clean_paths(paths, dirname)
+    end
 
-  def call(mod)
-    @paths.each { |filename| mod.send(method, filename) }
-    nil
-  end
+    def call(mod)
+      @paths.each { |filename| mod.send(method, filename) }
+      nil
+    end
 
-  private
+    private
 
-  def clean_paths(paths, dirname)
-    paths = [*paths]
-    paths = [sym.to_s.snakecase] if paths.empty?
+    def clean_paths(paths, dirname)
+      paths = [*paths]
+      paths = [sym.to_s.snakecase] if paths.empty?
 
-    if dirname
-      dirname = Pathname(dirname)
-      paths.map! { |path| (dirname + path).to_s }
-    end
+      if dirname
+        dirname = Pathname(dirname)
+        paths.map! { |path| (dirname + path).to_s }
+      end
 
-    paths
-  end
+      paths
+    end
 
-  def method
-    :require
+    def method
+      :require
+    end
   end
 end

data/lib/requirium.rb

@@ -1,3 +1,4 @@
+require 'continuation'
 require 'thread'
 require 'pathname'
 require 'facets/string/snakecase'
@@ -50,20 +51,12 @@ module Requirium
     attr_reader :loader_thread, :queue
   end
 
-  def autoload(*args)
-    add_loader LoadLoader, args
-  end
-
-  def autoload_relative(*args)
-    add_loader LoadLoader, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
-  end
-
-  def autorequire(*args)
-    add_loader RequireLoader, args
-  end
-
-  def autorequire_relative(*args)
-    add_loader RequireLoader, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
+  [:load, :require].each do |name|
+    type = const_get("#{name.capitalize}Loader")
+    define_method("auto#{name}", ->(*args) { add_loader type, args })
+    define_method("auto#{name}_relative", ->(*args) do
+      add_loader type, args, File.dirname(caller_locations(1, 1).first.path)
+    end)
   end
 
   #def const_defined?(*args)
@@ -71,13 +64,21 @@ module Requirium
   #end
 
   def const_missing(sym)
+    # if mri, use binding nesting
+    nesting = nil
+    if Requirium.mri?
+      return unless nesting = caller_nesting
+    end
+
+    info = ConstInfo.new(self, sym, nesting)
+
     if Thread.current == Requirium.loader_thread
       # this avoids deadlocks. it uses the current loading to load the remaining dependencies
-      has, value = internal_load(sym)
+      has, value = internal_load(info)
       return has ? value : super
     end
 
-    Requirium.queue.push(info = ConstInfo.new(self, sym))
+    Requirium.queue.push(info)
     info.wait_ready
     raise info.error if info.error
     info.has_value? ? info.value : super
@@ -85,16 +86,37 @@ module Requirium
 
   private
 
-  def add_loader(method, args, dirname = nil)
+  def add_loader(type, args, dirname = nil)
     with_args(args) do |sym, paths|
-      load_list { |l| l[sym.to_s] = method.new(sym, paths, dirname) }
+      load_list { |l| l[sym.to_s] = type.new(sym, paths, dirname) }
     end
   end
 
-  def internal_load(sym)
-    lookup_list.find do |klass|
-      klass.send(:try_load, sym) if klass.singleton_class.include?(Requirium)
-      return [true, klass.const_get(sym)] if klass.const_defined?(sym)
+  def caller_nesting
+    cc = nil
+    nst = nil
+    count = 0
+
+    t = Thread.current
+
+    set_trace_func(lambda do |event, _, _, _, binding, _|
+      if Thread.current == t
+        if count == 2
+          set_trace_func nil
+          cc.call(nst = eval('Module.nesting', binding))
+        elsif event == 'return'
+          count += 1
+        end
+      end
+    end)
+
+    callcc { |cont| cc = cont } && nst
+  end
+
+  def internal_load(info)
+    info.lookup_list.find do |klass|
+      klass.send(:try_load, info.sym) if klass.singleton_class.include?(Requirium)
+      return [true, klass.const_get(info.sym)] if klass.const_defined?(info.sym)
     end
 
     [false, nil]
@@ -128,11 +150,7 @@ module Requirium
     nil
   end
 
-  def lookup_list
-    list = name.split('::').reduce([Object]) { |a, n| a << a.last.const_get(n) }.reverse!
-    list.push(*ancestors)
-    list.uniq!
-    list
+  def self.mri?
+    (!defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby') && RUBY_DESCRIPTION !~ /Enterprise/
   end
-
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Requirium
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirium
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - SilverPhoenix99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-15 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -31,12 +31,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/const_info.rb
 - lib/load_loader.rb
 - lib/require_loader.rb
 - lib/requirium.rb
 - lib/version.rb
-- README.md
 homepage: https://github.com/SilverPhoenix99/requirium
 licenses:
 - MIT
@@ -46,7 +46,7 @@ post_install_message: |
     Thank you for choosing Requirium.
 
     ==========================================================================
-    If you find any bugs, please report them on
+    If you find any bugs, please report them at
       https://github.com/SilverPhoenix99/requirium/issues
 
   +----------------------------------------------------------------------------+
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: An autoload alternative