requirium 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593b6e06dc07239dd7cc9051101bc8f01335cef6
-  data.tar.gz: 2155e503347b54640fe77b3877db80b033ebb9d6
+  metadata.gz: dea42646908a945fb4fa22ca909c6fe0c51bb28c
+  data.tar.gz: 29f6c119d45605fce3f7505abc1b07ad122b4c92
 SHA512:
-  metadata.gz: 7a74e063cbb3dd9d070e3041d53d3b3b372991ce0b4d42c82e089e9ca9761fdd2b9fa291a7603808facf3d68ef69dc72577bd88e5d10096b636238480bf95fba
-  data.tar.gz: ab262703c89fbc6e40ae32d288cad96a552354e6c6e22f19e9bcd52f3e059929eb29f2d0bb9c27123b0de1ee4beafbd271b4410327b4eb172f7688acf254457d
+  metadata.gz: 24549e4c742ece2fc12efe9dc5d10f890074c92c6a1896a9fb2f3845bd0e3c2fede558d9e1dd2dc0c4a7dbe5754e6118d864d460eadc7ad85ce6e74d043e3f30
+  data.tar.gz: 49c6ad6a458f7eb484e58f53c4c6c35a572458c6a21c1e71536e4c9242b4d1841365a86e407d251ab37dd87d5e602056a8e592aab37db226962a5d68b9c96c8f

data/lib/const_info.rb

@@ -0,0 +1,22 @@
+class Requirium::ConstInfo
+  attr_accessor :mod, :sym
+
+  def initialize(mod, sym)
+    @mod, @sym, @cond, @mutex = mod, sym, ConditionVariable.new, Mutex.new
+  end
+
+  def internal_load
+    mod.send(:internal_load, sym)
+  end
+
+  def ready!
+    @ready = true
+    @mutex.synchronize { @cond.signal }
+    nil
+  end
+
+  def wait_ready
+    @mutex.synchronize { until @ready; @cond.wait(@mutex) end }
+    nil
+  end
+end

data/lib/load_loader.rb

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

data/lib/require_loader.rb

@@ -0,0 +1,31 @@
+class Requirium::RequireLoader
+  attr_reader :sym
+
+  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
+
+  private
+
+  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
+
+    paths
+  end
+
+  def method
+    :require
+  end
+end

data/lib/requirium.rb

@@ -4,6 +4,11 @@ require 'facets/string/snakecase'
 require 'facets/module/home'
 require 'facets/module/ancestor'
 
+require_relative 'version'
+require_relative 'const_info'
+require_relative 'require_loader'
+require_relative 'load_loader'
+
 #Automatically calls <code>Kernel#load</code> or <code>Kernel#require</code> on first use.
 #Example usage:
 #
@@ -25,33 +30,6 @@ require 'facets/module/ancestor'
 #      autorequire_relative X: nil, Y: ['y', 'y1', 'y2']
 #    end
 module Requirium
-  VERSION = '0.0.2'.freeze
-
-  class Info
-    attr_accessor :sym
-    attr_accessor :mod
-    attr_reader :cond, :mutex
-
-    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 { cond.signal }
-      nil
-    end
-
-    def wait_ready
-      mutex.synchronize { until @ready; cond.wait(mutex) end }
-      nil
-    end
-  end
-
   @queue = Queue.new
   @loader_thread = Thread.new do
       loop do
@@ -72,20 +50,20 @@ module Requirium
     attr_reader :loader_thread, :queue
   end
 
-  def autoload(*args) #TODO sync const_defined? ?
-    common_auto :load, args
+  def autoload(*args)
+    add_loader LoadLoader, args
   end
 
-  def autoload_relative(*args) #TODO sync const_defined? ?
-    common_auto :load, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
+  def autoload_relative(*args)
+    add_loader LoadLoader, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
   end
 
-  def autorequire(*args) #TODO sync const_defined? ?
-    common_auto :require, args
+  def autorequire(*args)
+    add_loader RequireLoader, args
   end
 
-  def autorequire_relative(*args) #TODO sync const_defined? ?
-    common_auto :require, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
+  def autorequire_relative(*args)
+    add_loader RequireLoader, args, File.dirname(caller(1, 1)[0][/^(.+):\d+:in `.+'$/, 1])
   end
 
   #def const_defined?(*args)
@@ -95,61 +73,27 @@ module Requirium
   def const_missing(sym)
     return internal_load(sym) if Thread.current == Requirium.loader_thread
 
-    Requirium.queue.push(info = Info.new(self, sym))
+    Requirium.queue.push(info = ConstInfo.new(self, sym))
     info.wait_ready
-    const_defined?(sym) ? info.sym : super
+    const_defined?(sym) ? const_get(sym) : super
   end
 
   private
 
-  def common_auto(method, args, dirname = nil)
-    if args.length == 1 && args.first.is_a?(Hash)
-      args.first.each { |sym, paths| add_load_item method, sym, paths, dirname }
-      return
-    end
-
-    sym, paths = args
-    add_load_item method, sym, paths, dirname
-  end
-
-  def add_load_item(method, sym, paths, dirname)
-    return if const_defined?(sym)
-
-    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] }
-    nil
-  end
-
-  def clean_paths(method, sym, paths, dirname)
-    paths = [*paths]
-    paths = [sym.to_s.snakecase] if paths.empty?
-
-    if dirname
-      dirname = Pathname(dirname)
-      paths.map! { |path| (dirname + path).to_s }
+  def add_loader(method, args, dirname = nil)
+    with_args(args) do |sym, paths|
+      load_list { |l| l[sym.to_s] = method.new(sym, paths, dirname) }
     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
+    loader = load_list { |l| l[str_sym] }
 
-    raise NoMethodError, "invalid method type: #{method.inspect}" unless [:load, :require].include?(method)
+    return home.const_missing(sym) unless loader # go to parent
 
-    paths.each do |filename|
-      #puts "#{method} #{sym.inspect}, #{filename.inspect}"
-      send(method, filename)
-    end
+    loader.call(self)
 
     if const_defined?(sym)
       load_list { |l| l.delete(sym.to_s) }
@@ -163,7 +107,16 @@ module Requirium
     @mutex.synchronize { yield(@load_list) }
   end
 
-  def parent
-    name.split('::')[0..-2].inject(Object) { |mod, name| mod.const_get(name) }
+  def with_args(args)
+    if args.length == 1 && args.first.is_a?(Hash)
+      args.first.each do |sym, paths|
+        next if const_defined?(sym)
+        yield sym, paths
+      end
+    elsif !const_defined?(args.first)
+      yield args.first, args[1..-1]
+    end
+
+    nil
   end
 end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: requirium
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - SilverPhoenix99
@@ -31,7 +31,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- 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: