requirium 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dd79837d4d7b07b5b43a6e4bdb2b0d9282d3b98
-  data.tar.gz: 13ddcef5f0246ccbfcef8ded2a482d979fc7aedb
+  metadata.gz: 593b6e06dc07239dd7cc9051101bc8f01335cef6
+  data.tar.gz: 2155e503347b54640fe77b3877db80b033ebb9d6
 SHA512:
-  metadata.gz: 09e1b4dd928cdb25678789a5297e2294433a92a5d2a8e4f387cac139a6c9f8f5edca4e6039f24f505f62847f4a70960c885a392cbaf458724a8bf0602b0c6a4c
-  data.tar.gz: 87c1368019c3383bf822180a25054d93bccc5308095b20ddd4565cb096c151b6449964d1a41d7f9555f89216f28f55b7723e054123e045e2dd89bbf5ad9ab5e3
+  metadata.gz: 7a74e063cbb3dd9d070e3041d53d3b3b372991ce0b4d42c82e089e9ca9761fdd2b9fa291a7603808facf3d68ef69dc72577bd88e5d10096b636238480bf95fba
+  data.tar.gz: ab262703c89fbc6e40ae32d288cad96a552354e6c6e22f19e9bcd52f3e059929eb29f2d0bb9c27123b0de1ee4beafbd271b4410327b4eb172f7688acf254457d

data/lib/requirium.rb

@@ -1,6 +1,8 @@
 require 'thread'
 require 'pathname'
 require 'facets/string/snakecase'
+require 'facets/module/home'
+require 'facets/module/ancestor'
 
 #Automatically calls <code>Kernel#load</code> or <code>Kernel#require</code> on first use.
 #Example usage:
@@ -23,23 +25,29 @@ require 'facets/string/snakecase'
 #      autorequire_relative X: nil, Y: ['y', 'y1', 'y2']
 #    end
 module Requirium
-  VERSION = '0.0.1'.freeze
+  VERSION = '0.0.2'.freeze
 
-  EXTENSIONS = "{#{Gem.suffixes.join(',')}}".freeze
+  class Info
+    attr_accessor :sym
+    attr_accessor :mod
+    attr_reader :cond, :mutex
 
-  class CondVar < ConditionVariable
-    def mutex
-      @mutex ||= Mutex.new
+    def initialize(mod, sym)
+      @mod, @sym, @cond, @mutex = mod, sym, ConditionVariable.new, Mutex.new
+    end
+
+    def internal_load
+      self.sym = mod.send(:internal_load, sym)
     end
 
     def ready!
       @ready = true
-      mutex.synchronize { signal }
+      mutex.synchronize { cond.signal }
       nil
     end
 
     def wait_ready
-      mutex.synchronize { until @ready; wait(mutex) end }
+      mutex.synchronize { until @ready; cond.wait(mutex) end }
       nil
     end
   end
@@ -47,15 +55,16 @@ module Requirium
   @queue = Queue.new
   @loader_thread = Thread.new do
       loop do
-        mod, sym, cond = @queue.pop
+        info = @queue.pop
         begin
-          mod.send(:internal_load, sym)
+          info.internal_load
         rescue ScriptError => e
           $stderr.puts e
         rescue => e
           $stderr.puts e
+        ensure
+          info.ready!
         end
-        cond.ready!
       end
   end
 
@@ -84,21 +93,18 @@ module Requirium
   #end
 
   def const_missing(sym)
-    if Thread.current == Requirium.loader_thread
-      internal_load(sym)
-    else
-      cond = CondVar.new
-      Requirium.queue.push [self, sym, cond]
-      cond.wait_ready
-    end
-    const_defined?(sym) ? const_get(sym) : super
+    return internal_load(sym) if Thread.current == Requirium.loader_thread
+
+    Requirium.queue.push(info = Info.new(self, sym))
+    info.wait_ready
+    const_defined?(sym) ? info.sym : super
   end
 
   private
 
   def common_auto(method, args, dirname = nil)
     if args.length == 1 && args.first.is_a?(Hash)
-      args.each { |sym, paths| add_load_item method, sym, paths, dirname }
+      args.first.each { |sym, paths| add_load_item method, sym, paths, dirname }
       return
     end
 
@@ -106,30 +112,58 @@ module Requirium
     add_load_item method, sym, paths, dirname
   end
 
-  def add_load_item(method, sym, paths, dirname = nil)
+  def add_load_item(method, sym, paths, dirname)
     return if const_defined?(sym)
-    paths = [*paths]
+
+    paths = clean_paths(method, sym, paths, dirname)
+
     #puts "auto#{method}#{dirname ? '_relative' : ''} #{sym.inspect}, #{paths.map(&:inspect).join(', ')}"
-    load_list { |l| l[sym.to_s] = [method, paths, dirname] }
+    load_list { |l| l[sym.to_s] = [method, paths] }
     nil
   end
 
-  def internal_load(sym)
-    return if const_defined?(sym)
-    method, paths, dirname = load_list { |l| l[sym.to_s] }
-    return unless method
+  def clean_paths(method, sym, paths, dirname)
+    paths = [*paths]
     paths = [sym.to_s.snakecase] if paths.empty?
-    paths = paths.map { |path| (Pathname(dirname) + path).to_s } if dirname
+
+    if dirname
+      dirname = Pathname(dirname)
+      paths.map! { |path| (dirname + path).to_s }
+    end
+
+    # append possible suffix
+    paths.map! { |p| Dir[*Gem.suffixes.map { |e| p + e }].first }.compact! if method == :load
+
+    paths
+  end
+
+  def internal_load(sym)
+    return const_get(sym) if const_defined?(sym)
+    str_sym = sym.to_s
+    has_sym, method, paths = load_list { |l| [l.has_key?(str_sym), *l[str_sym]] }
+
+    return parent.const_missing(sym) unless has_sym # go to parent
+
+    raise NoMethodError, "invalid method type: #{method.inspect}" unless [:load, :require].include?(method)
+
     paths.each do |filename|
       #puts "#{method} #{sym.inspect}, #{filename.inspect}"
-      raise NoMethodError, "invalid method type: #{method.inspect}" unless [:load, :require].include?(method)
       send(method, filename)
     end
-    load_list { |l| l.delete(sym.to_s) } if const_defined?(sym)
-    nil
+
+    if const_defined?(sym)
+      load_list { |l| l.delete(sym.to_s) }
+      const_get(sym)
+    end
   end
 
   def load_list
-    (@mutex ||= Mutex.new).synchronize { yield(@load_list ||= {}) }
+    @mutex ||= Mutex.new
+    @load_list ||= {}
+    @mutex.synchronize { yield(@load_list) }
+  end
+
+  def parent
+    name.split('::')[0..-2].inject(Object) { |mod, name| mod.const_get(name) }
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirium
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - SilverPhoenix99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -31,8 +31,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
 - lib/requirium.rb
+- README.md
 homepage: https://github.com/SilverPhoenix99/requirium
 licenses:
 - MIT
@@ -61,9 +61,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: An autoload alternative
 test_files: []
-has_rdoc: