requirium 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dea42646908a945fb4fa22ca909c6fe0c51bb28c
-  data.tar.gz: 29f6c119d45605fce3f7505abc1b07ad122b4c92
+  metadata.gz: eaeb02dd4c979c7c0d610fca588f890f22bbb40d
+  data.tar.gz: d7a7acb203652154316a9f79ad91a380d32493a0
 SHA512:
-  metadata.gz: 24549e4c742ece2fc12efe9dc5d10f890074c92c6a1896a9fb2f3845bd0e3c2fede558d9e1dd2dc0c4a7dbe5754e6118d864d460eadc7ad85ce6e74d043e3f30
-  data.tar.gz: 49c6ad6a458f7eb484e58f53c4c6c35a572458c6a21c1e71536e4c9242b4d1841365a86e407d251ab37dd87d5e602056a8e592aab37db226962a5d68b9c96c8f
+  metadata.gz: ff0e9ba46cd44ca282958b86e450d33d3b666c0a7307e96a5ede7290ce8299ca57a6834e452dd051fc142f063a3a45bf01c2d3d5458fdd323b952cdde1dbc7cf
+  data.tar.gz: 2f5b961015812a391151513c79ff687c300f4093da11a34ac79fcd18839c27e3dbe62b005570e58e5ce6b39d9c142f24a5292cf6e82d6ece7fcb9050d2881447

data/lib/const_info.rb

@@ -1,12 +1,18 @@
 class Requirium::ConstInfo
-  attr_accessor :mod, :sym
+  attr_accessor :mod, :sym, :error, :value
 
   def initialize(mod, sym)
     @mod, @sym, @cond, @mutex = mod, sym, ConditionVariable.new, Mutex.new
   end
 
+  def has_value?
+    !!(defined? @value)
+  end
+
   def internal_load
-    mod.send(:internal_load, sym)
+    has, value = mod.send(:internal_load, sym)
+    @value = value if has
+    nil
   end
 
   def ready!

data/lib/requirium.rb

@@ -37,9 +37,9 @@ module Requirium
         begin
           info.internal_load
         rescue ScriptError => e
-          $stderr.puts e
+          info.error = e
         rescue => e
-          $stderr.puts e
+          info.error = e
         ensure
           info.ready!
         end
@@ -71,11 +71,16 @@ module Requirium
   #end
 
   def const_missing(sym)
-    return internal_load(sym) if Thread.current == Requirium.loader_thread
+    if Thread.current == Requirium.loader_thread
+      # this avoids deadlocks. it uses the current loading to load the remaining dependencies
+      has, value = internal_load(sym)
+      return has ? value : super
+    end
 
     Requirium.queue.push(info = ConstInfo.new(self, sym))
     info.wait_ready
-    const_defined?(sym) ? const_get(sym) : super
+    raise info.error if info.error
+    info.has_value? ? info.value : super
   end
 
   private
@@ -87,18 +92,12 @@ module Requirium
   end
 
   def internal_load(sym)
-    return const_get(sym) if const_defined?(sym)
-    str_sym = sym.to_s
-    loader = load_list { |l| l[str_sym] }
-
-    return home.const_missing(sym) unless loader # go to parent
-
-    loader.call(self)
-
-    if const_defined?(sym)
-      load_list { |l| l.delete(sym.to_s) }
-      const_get(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)
     end
+
+    [false, nil]
   end
 
   def load_list
@@ -107,6 +106,15 @@ module Requirium
     @mutex.synchronize { yield(@load_list) }
   end
 
+  def try_load(sym)
+    str_sym = sym.to_s
+    loader = load_list { |l| l[str_sym] }
+    return unless loader
+    loader.call(self)
+    load_list { |l| l.delete(sym.to_s) }
+    nil
+  end
+
   def with_args(args)
     if args.length == 1 && args.first.is_a?(Hash)
       args.first.each do |sym, paths|
@@ -119,4 +127,12 @@ 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
+  end
+
 end

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: requirium
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - SilverPhoenix99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets