loader 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84891db4ba04cd329d4d4854e4710f0fae6550ec
-  data.tar.gz: 545485c09c897c892ff7c01aede32ce373acd45b
+  metadata.gz: a48991f7574e0edb6ebb66e64f6bd2a2b4539ba0
+  data.tar.gz: 944699615e07f4e287508c5c6e9cc04f4e02405f
 SHA512:
-  metadata.gz: 61527b300012bd07351b95c88696e4f65e30c4e965f313e4b659a694651b4c759df6257f2ebb0e9a1e8a262c1c48faaaba9cbcdc11f82c1364e2b13d4d1f3c4e
-  data.tar.gz: bd498932c03a0c31ec07496efd48c7d8aa49389d83c1b9f747a015dd8d2bfdfed9d066a7b410a21a4cbd150d920da73b538f8018c58d01e02a234e0fc3a750a9
+  metadata.gz: 6b517e00542d4afd3137cae02d35180ef5681b1a1586301890b4501fac0faa4f99b7bf52152d253443096cafed138078f1177f1d72f3684e1c9809a675cc2aff
+  data.tar.gz: 6bf26893454cd997b505be9d8f4ac3628444366859c542037672ea265394f290828fa79eb56c57eb044f10e61acbbc538334ff04c48fc01979105920905005c7

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.0

data/lib/loader/fetcher.rb

@@ -19,39 +19,72 @@ module Loader::Fetcher
   end
 
   def load(caller_class, name)
-    folder_path = get_folder_path(caller_class)
-    file_name = Loader::Utils.underscore(name)
-
     Loader.project_root_folders.each do |project_root|
-      Dir.glob(File.join(project_root, '**', [folder_path, "#{file_name}.{rb,ru}"].compact)).each do |ruby_file_path|
-        if Loader::Utils.require(ruby_file_path)
-          c = fetch_constant(caller_class, name)
+      lookup_and_load_file_in(project_root, caller_class, name)
 
-          return c unless c.nil?
-        end
-      end
+      constant = fetch_constant(caller_class, name)
+
+      return constant unless constant.nil?
     end
 
     return load_gem(caller_class, name)
   end
 
+  def lookup_and_load_file_in(project_root, caller_class, name)
+    file_name = Loader::Utils.underscore(name)
+
+    get_folder_paths(caller_class).each do |folder_path|
+      Dir.glob(File.join(project_root, '**', folder_path, "#{file_name}.{rb,ru}")).each do |ruby_file_path|
+        return if Loader::Utils.require(ruby_file_path)
+      end
+    end
+  end
+
 
   protected
 
-  def get_folder_path(caller_class)
-    return if caller_class == ::Object
-    caller_class.to_s.split('::').map { |camel_case| Loader::Utils.underscore(camel_case) }.join(File::Separator)
+  def get_folder_paths(caller_class)
+
+    elements = caller_class.to_s.split('::').map do |camel_case|
+      Loader::Utils.underscore(camel_case)
+    end
+
+    elements.shift if elements[0] == 'object'
+
+    return elements.reverse.reduce(['**']) { |constant_paths, name_part|
+      last_element = constant_paths.last
+      constant_paths.push(File.join([last_element, name_part].compact.reverse))
+      constant_paths
+    }.reverse
+
   end
 
   def fetch_constant(caller_class, name)
-    class_name = ([caller_class, name] - [Object]).join('::')
-    rgx = /^#{Regexp.escape(class_name)}$/
+    constant_paths = get_constant_paths(caller_class, name)
+
+    constant_paths.each do |constant_path|
+
+      rgx = /^#{Regexp.escape(constant_path)}$/
+
+      ObjectSpace.each_object(Module) do |obj|
+        return obj if !!(obj.to_s =~ rgx)
+      end
 
-    ObjectSpace.each_object(Module) do |obj|
-      return obj if !!(obj.to_s =~ rgx)
     end
 
+
     return nil
   end
 
+  def get_constant_paths(caller_class, name)
+    elements = [caller_class.to_s.split('::'), name.to_s].flatten
+    elements.shift if elements[0] == 'Object'
+    return elements.reverse.reduce([]) { |constant_paths, name_part|
+      last_element = constant_paths.last
+
+      constant_paths.push(File.join([last_element, name_part].compact.reverse.join('::')))
+      constant_paths
+    }.reverse
+  end
+
 end

data/lib/loader/utils.rb

@@ -4,6 +4,7 @@ module Loader::Utils
   extend self
 
   def require(file_path)
+    return false unless File.exist?(file_path)
     Kernel.require(file_path)
   rescue LoadError
     Kernel.load(file_path)

data/spec/fixtures/autoload/some_class.rb

@@ -0,0 +1,3 @@
+class SomeClass
+
+end

data/spec/fixtures/autoload/top_constant.rb

@@ -0,0 +1,3 @@
+module TopConstant
+
+end

data/spec/fixtures/autoload/top_level.rb

@@ -0,0 +1,3 @@
+module TopLevel
+
+end

data/spec/fixtures/autoload/top_level_too.rb

@@ -0,0 +1,3 @@
+module TopLevelToo
+
+end

data/spec/loader_spec.rb

@@ -12,6 +12,14 @@ describe Loader do
       expect { Sample::Cat::Paw }.to_not raise_error
     end
 
+    it 'should be able to fetch constant even during in an another namespace' do
+      expect { SomeClass.class_eval { TopConstant } }.to_not raise_error
+    end
+
+    it "should able to fetch the constant even if it's referenced through not the main namespace" do
+      expect { TopLevel::TopLevelToo }.to_not raise_error
+    end
+
     it 'should require unrequired gems' do
       expect { YAML }.to_not raise_error
     end
@@ -31,7 +39,7 @@ describe Loader do
     it 'should require the given relative folder content recursively like this' do
       require_relative_directory 'fixtures/require_relative_directory/relative_folder_recursive/**'
 
-      expect{ TestConstant2::Stuff2 }.to_not raise_error
+      expect { TestConstant2::Stuff2 }.to_not raise_error
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loader
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -76,6 +76,10 @@ files:
 - spec/fixtures/autoload/lib/sample/dog.rb
 - spec/fixtures/autoload/lib/sample/dog/tail.rb
 - spec/fixtures/autoload/sample.rb
+- spec/fixtures/autoload/some_class.rb
+- spec/fixtures/autoload/top_constant.rb
+- spec/fixtures/autoload/top_level.rb
+- spec/fixtures/autoload/top_level_too.rb
 - spec/fixtures/require_relative_directory/relative_folder/test_constant.rb
 - spec/fixtures/require_relative_directory/relative_folder/test_constant/stuff.ru
 - spec/fixtures/require_relative_directory/relative_folder_recursive/test_constant2.rb
@@ -114,6 +118,10 @@ test_files:
 - spec/fixtures/autoload/lib/sample/dog.rb
 - spec/fixtures/autoload/lib/sample/dog/tail.rb
 - spec/fixtures/autoload/sample.rb
+- spec/fixtures/autoload/some_class.rb
+- spec/fixtures/autoload/top_constant.rb
+- spec/fixtures/autoload/top_level.rb
+- spec/fixtures/autoload/top_level_too.rb
 - spec/fixtures/require_relative_directory/relative_folder/test_constant.rb
 - spec/fixtures/require_relative_directory/relative_folder/test_constant/stuff.ru
 - spec/fixtures/require_relative_directory/relative_folder_recursive/test_constant2.rb