loader 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad3783bf1820c1767808c4f18415a836a3886d1
-  data.tar.gz: e249da6f02da8f4ad0fd54b9d56b5856c6687a06
+  metadata.gz: 02599efb933b64f6bd6b100181f487c1dc7bf78d
+  data.tar.gz: ddd99341ee26528275ab5e833e86557f1c4f28a2
 SHA512:
-  metadata.gz: 985dae6027aec5cd31181e046ccec617a9365e2415af9554b47b2644b8b6344e106968a13ad0c374864b3f803778e784834e55290cc7f38c94b2580e39b2e4b1
-  data.tar.gz: 55d8ebc7f30b4814ae6ea36d361069f6dc230f99720654bb791dcad77640c77b59e5df2bce938612fc101df005eba146fbdef8955d9e7cff7a792c50b55b4c66
+  metadata.gz: fc9b57c5be9f33c5655293f1126233583fca686d63729bd42c5581c8c1b084dfa743bb46605fcd64e4678c74ebe47dddad2f45ab50646121c54c9211052e8d8f
+  data.tar.gz: 530795f8061e254d6507eb4de1d0d086e818e769849ddd80cedaee4799a93aaf029f43548f6495f48d2c4e3143f7dfaef72f2c17ce0523784828bce1336247d7

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.1

data/lib/loader.rb

@@ -1,8 +1,8 @@
 #encoding: UTF-8
-
 module Loader
 end
 
 require 'loader/meta'
+require 'loader/helpers'
 require 'loader/require'
 require 'loader/autoload'

data/lib/loader/autoload.rb

@@ -1,95 +1,7 @@
-module Loader
-
-  module AutoLoad
-    module Support
-      class << self
-
-        def pwd
-          if !!ENV['BUNDLE_GEMFILE']
-            ENV['BUNDLE_GEMFILE'].split(File::Separator)[0..-2].join(File::Separator)
-          elsif defined?(Rails) && Rails.respond_to?(:root) && Rails.root
-            Rails.root.to_s
-          else
-            Dir.pwd
-          end
-        end
-
-        def try_load_by(caller_class,name)
-          levels = generate_levels(caller_class, name)
-          [
-              nil,
-              'lib',
-              File.join('{application,app,api}','*'),
-              File.join('**','*')
-          ].each do |folder|
-            return if load_by_folder(levels,folder)
-          end
-        end
-
-        def load_by_folder(levels,folder=nil)
-
-          desc_ary(levels.map{|str| File.join(*[pwd,folder,"#{underscore(str)}.rb"].compact)}).each do |path_constructor|
-            desc_ary(Dir.glob(path_constructor)).each do |path|
-              return true if File.exist?(path) && require(path)
-            end
-          end
-
-          return false
-
-        end
-
-        def desc_ary(array)
-          array.sort{|a,b| b.length <=> a.length }
-        end
-
-        def generate_levels(klass, name)
-          levels = klass.to_s.split('::').reduce([]) { |m, c|
-            m << [(last_obj = m.last), c].compact.join('::');m
-          }.map { |str| [str, name].join('::') }
-          levels.unshift(name.to_s)
-          return levels
-        end
-
-        def try_fetch_constant(caller_class, name)
-          levels = Support.generate_levels(caller_class, name).map { |str| Regexp.escape(str) }
-          ObjectSpace.each_object(Module) { |obj|
-            if !!(obj.to_s =~ /^(#{levels.join('|')})$/)
-              return obj
-            end
-          };nil
-        end
-
-        # Based on ActiveSupport, removed inflections.
-        # https://github.com/rails/rails/blob/v4.1.0.rc1/activesupport/lib/active_support/inflector/methods.rb
-        def underscore(camel_cased_word)
-          word = camel_cased_word.to_s.gsub('::', '/')
-          word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-          word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-          word.tr!("-", "_")
-          word.downcase!
-          word
-        end
-
-      end
-    end
-
-    def const_missing(name)
-
-      Support.try_load_by(self,name)
-      constant = Support.try_fetch_constant(self, name)
-
-      if constant
-        return constant
-      else
-        super
-      end
-
-    end
-
-  end
-
-  def self.autoload
-    ::Module.__send__(:prepend,Loader::AutoLoad)
-  end
-
+require 'loader'
+module Loader::AutoLoad
+  require 'loader/autoload/module_patch'
+  require 'loader/autoload/loader_patch'
+  require 'loader/autoload/fetcher'
+  Loader.__send__(:extend,Loader::AutoLoad::LoaderPatch)
 end

data/lib/loader/autoload/fetcher.rb

@@ -0,0 +1,55 @@
+module Loader::AutoLoad::Fetcher
+
+  extend self
+  extend ::Loader::Helpers
+
+  def try_load_by(caller_class, name)
+    levels = generate_levels(caller_class, name)
+    [
+        nil,
+        'lib',
+        File.join('{application,app,api}', '*'),
+        File.join('**', '*')
+    ].each do |folder|
+      return if load_by_folder(levels, folder)
+    end
+  end
+
+  def load_by_folder(levels, folder=nil)
+
+    Loader.project_folders.each do |project_folder|
+
+      desc_ary(levels.map { |str| File.join(*[project_folder, folder, "#{underscore(str)}.rb"].compact) }).each do |path_constructor|
+        desc_ary(Dir.glob(path_constructor)).each do |path|
+          return true if File.exist?(path) && require(path)
+        end
+      end
+
+    end
+
+    return false
+
+  end
+
+  def desc_ary(array)
+    array.sort { |a, b| b.length <=> a.length }
+  end
+
+  def generate_levels(klass, name)
+    levels = klass.to_s.split('::').reduce([]) { |m, c|
+      m << [(last_obj = m.last), c].compact.join('::'); m
+    }.map { |str| [str, name].join('::') }
+    levels.unshift(name.to_s)
+    return levels
+  end
+
+  def try_fetch_constant(caller_class, name)
+    levels = generate_levels(caller_class, name).map { |str| Regexp.escape(str) }
+    ObjectSpace.each_object(Module) { |obj|
+      if !!(obj.to_s =~ /^(#{levels.join('|')})$/)
+        return obj
+      end
+    }; nil
+  end
+  
+end

data/lib/loader/autoload/loader_patch.rb

@@ -0,0 +1,12 @@
+module Loader::AutoLoad::LoaderPatch
+
+  def project_folders
+    @project_folders ||= []
+  end
+
+  def autoload(project_folder=Loader::Helpers.pwd)
+    project_folders.push(project_folder)
+    ::Module.__send__(:prepend, Loader::AutoLoad::ModulePatch)
+  end
+
+end

data/lib/loader/autoload/module_patch.rb

@@ -0,0 +1,10 @@
+module Loader::AutoLoad::ModulePatch
+
+  def const_missing(name)
+    c = Loader::AutoLoad::Fetcher
+    c.try_load_by(self,name)
+    constant = c.try_fetch_constant(self, name)
+    constant ? constant : super
+  end
+
+end

data/lib/loader/helpers.rb

@@ -0,0 +1,27 @@
+require 'loader'
+module Loader::Helpers
+
+  extend self
+
+  def pwd
+    if !!ENV['BUNDLE_GEMFILE']
+      ENV['BUNDLE_GEMFILE'].split(File::Separator)[0..-2].join(File::Separator)
+    elsif defined?(Rails) && Rails.respond_to?(:root) && Rails.root
+      Rails.root.to_s
+    else
+      Dir.pwd
+    end
+  end
+
+  # Based on ActiveSupport, removed inflections.
+  # https://github.com/rails/rails/blob/v4.1.0.rc1/activesupport/lib/active_support/inflector/methods.rb
+  def underscore(camel_cased_word)
+    word = camel_cased_word.to_s.gsub('::', '/')
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!("-", "_")
+    word.downcase!
+    word
+  end
+
+end

data/lib/loader/require.rb

@@ -1,76 +1,74 @@
-module Loader
+require 'loader'
+module Loader::ObjectExtension
 
-  module ObjectRequireEXT
+  # require sender relative directory's files
+  # return the directory and the sub directories file names (rb/ru)
+  def require_relative_directory(*args)
 
-    # require sender relative directory's files
-    # return the directory and the sub directories file names (rb/ru)
-    def require_relative_directory *args
+    folder= args.select { |e| (e.class <= ::String) }.join(File::Separator)
+    opts= {}
+    args.select { |e| (e.class <= ::Hash) }.each { |hash| hash.each { |sk, sv| opts[sk]=sv } }
+    args.select! { |e| (e.class <= ::Symbol) }
 
-      folder= args.select{|e|(e.class <= ::String)}.join(File::Separator)
-      opts= {}
-      args.select{|e|(e.class <= ::Hash)}.each{|hash| hash.each{|sk,sv| opts[sk]=sv } }
-      args.select!{|e|(e.class <= ::Symbol)}
+    opts[:recursive] ||= opts.delete(:r) || opts.delete(:R) || !([:recursive, :r, :R,].select { |e| args.include?(e) }.empty?)
+    opts[:recursive] = !!opts[:recursive]
 
-      opts[:recursive]  ||= opts.delete(:r) || opts.delete(:R) || !([:recursive,:r, :R,].select{|e| args.include?(e)}.empty?)
-      opts[:recursive]    = !!opts[:recursive]
+    # inclusion and exclusion
+    [[:exclude, [:ex, :e, :EX, :E]], [:include, [:in, :i, :IN, :I]]].each do |name, aliases|
 
-      # inclusion and exclusion
-      [[:exclude,[:ex,:e,:EX,:E]],[:include,[:in,:i,:IN,:I]]].each do |name,aliases|
-
-        aliases.each do |one_alias|
-          opts[name]    ||= opts.delete(one_alias)
-        end
+      aliases.each do |one_alias|
+        opts[name] ||= opts.delete(one_alias)
+      end
 
-        opts[name] ||= []
+      opts[name] ||= []
 
-        # should be REGEXP collection
-        opts[name] = [*opts[name]].map{|e| !(e.class <= ::Regexp) ? Regexp.new(e.to_s) : e }
+      # should be REGEXP collection
+      opts[name] = [*opts[name]].map { |e| !(e.class <= ::Regexp) ? Regexp.new(e.to_s) : e }
 
-      end
+    end
 
 
-      opts[:caller_folder]  ||= opts.delete(:f) || opts.delete(:folder) || ::Loader.caller_folder
+    opts[:caller_folder] ||= opts.delete(:f) || opts.delete(:folder) || ::Loader.caller_folder
 
-      unless folder.to_s[0] == File::Separator
-        folder= [opts[:caller_folder],folder]
-      end
+    unless folder.to_s[0] == File::Separator
+      folder= [opts[:caller_folder], folder]
+    end
 
-      #> recursive option
-      begin
-        path_parts= [*folder]
-        if opts[:recursive]
-          path_parts.push("**")
-        end
-        path_parts.push("*.{rb,ru}")
+    #> recursive option
+    begin
+      path_parts= [*folder]
+      if opts[:recursive]
+        path_parts.push("**")
       end
+      path_parts.push("*.{rb,ru}")
+    end
 
-      return Dir.glob(File.join(*path_parts)).sort_by{|e| e.split(File::Separator).size }.map { |one_path|
+    return Dir.glob(File.join(*path_parts)).sort_by { |e| e.split(File::Separator).size }.map { |one_path|
 
-        next unless opts[:exclude].select{|regex| one_path =~ regex ? true : false }.empty?
+      next unless opts[:exclude].select { |regex| one_path =~ regex ? true : false }.empty?
 
-        if opts[:include].empty?
-          require(one_path);one_path
-        else
-          opts[:include].each do |regex|
-            if one_path =~ regex
-              require(one_path);one_path
-            end
+      if opts[:include].empty?
+        require(one_path); one_path
+      else
+        opts[:include].each do |regex|
+          if one_path =~ regex
+            require(one_path); one_path
           end
         end
+      end
 
-      }.compact
-
-    end
+    }.compact
 
-    alias :require_directory :require_relative_directory
+  end
 
-    def require_relative_directory_r *args
-      require_relative_directory *args, r: true, f: Loader.caller_folder
-    end
-    alias :require_directory_r :require_relative_directory_r
+  alias :require_directory :require_relative_directory
 
+  def require_relative_directory_r(*args)
+    require_relative_directory *args, r: true, f: Loader.caller_folder
   end
 
+  alias :require_directory_r :require_relative_directory_r
+
 end
 
-Object.__send__ :include, Loader::ObjectRequireEXT
+Object.__send__ :include, Loader::ObjectExtension

data/loader.gemspec

@@ -20,4 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency('rspec')
+  spec.add_development_dependency('rake')
+
 end

data/spec/loader/helpers_spec.rb

@@ -0,0 +1,51 @@
+require_relative '../spec_helper'
+describe Loader::Helpers do
+
+  let(:project_folder) { 'Path/To/Project/Folder' }
+  subject { Loader::Helpers }
+
+  describe '#pwd' do
+
+    before do
+      allow(ENV).to receive(:[]).with('BUNDLE_GEMFILE').and_return(nil)
+    end
+
+    context 'bundler envernioment variable set' do
+
+      before do
+        allow(ENV).to receive(:[]).with('BUNDLE_GEMFILE').and_return(File.join(project_folder,'Gemfile'))
+      end
+
+      it 'should return the project root folder by bundler gemfile env' do
+        expect(subject.pwd).to eq project_folder
+      end
+
+    end
+
+    context 'Rails is present and the root methot return not nil object' do
+
+      let(:rails) { double('rails', root: project_folder) }
+      before { stub_const('Rails', rails) }
+
+      it 'should fetch rails root path' do
+        expect(subject.pwd).to eq project_folder
+      end
+
+    end
+
+    context 'when everything fails, fall back use build in Dir module' do
+
+      it 'should use dir pwd on fallback' do
+
+        expect(Dir).to receive(:pwd).and_return(project_folder)
+        expect(subject.pwd).to eq project_folder
+
+      end
+
+    end
+
+  end
+
+
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift(File.join(__dir__,'..','lib'))
+
+require 'rspec'
+require 'loader'

data/test/manual_test.rb

@@ -0,0 +1,7 @@
+$LOAD_PATH.unshift(File.join(__dir__,'..','lib'))
+require 'loader'
+
+Loader.autoload __dir__
+
+p Cat
+

data/test/test_autoload.rb

@@ -2,7 +2,7 @@ require_relative 'helper'
 describe Loader::AutoLoad do
 
   before do
-    Loader::AutoLoad::Support.__send__(:define_singleton_method,:pwd){ __dir__ }
+    Loader::Helpers.__send__(:define_singleton_method,:pwd){ __dir__ }
   end
 
   it 'should raise an constant missing error than' do

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: loader
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Adam Luzsi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
-dependencies: []
+date: 2015-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: " easy to use File loader that allow directories/project both Lazy Load
   and Eager load for files and constants. The Eager load for relative directory made
   for gems by default "
@@ -21,9 +49,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".idea/.name"
-- ".idea/.rakeTasks"
 - ".idea/encodings.xml"
-- ".idea/loader.iml"
 - ".idea/misc.xml"
 - ".idea/modules.xml"
 - ".idea/scopes/scope_settings.xml"
@@ -44,15 +70,22 @@ files:
 - files.rb
 - lib/loader.rb
 - lib/loader/autoload.rb
+- lib/loader/autoload/fetcher.rb
+- lib/loader/autoload/loader_patch.rb
+- lib/loader/autoload/module_patch.rb
+- lib/loader/helpers.rb
 - lib/loader/meta.rb
 - lib/loader/require.rb
 - loader.gemspec
+- spec/loader/helpers_spec.rb
+- spec/spec_helper.rb
 - test/app/controllers/samples_controller.rb
 - test/helper.rb
 - test/lib/cat.rb
 - test/lib/cat/sup.rb
 - test/lib/cat/tail.rb
 - test/lib/dog.rb
+- test/manual_test.rb
 - test/sub/test2.rb
 - test/test.rb
 - test/test_autoload.rb
@@ -75,19 +108,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: easy to use File loader that allow directories/project both Lazy Load and
   Eager load for files and constants. The Eager load for relative directory made for
   gems by default
 test_files:
+- spec/loader/helpers_spec.rb
+- spec/spec_helper.rb
 - test/app/controllers/samples_controller.rb
 - test/helper.rb
 - test/lib/cat.rb
 - test/lib/cat/sup.rb
 - test/lib/cat/tail.rb
 - test/lib/dog.rb
+- test/manual_test.rb
 - test/sub/test2.rb
 - test/test.rb
 - test/test_autoload.rb

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build loader-1.4.2.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Build and install loader-1.4.2.gem into system gems" fullCmd="install" taksId="install" /><RakeTask description="Create tag v1.4.2 and build and push loader-1.4.2.gem to Rubygems" fullCmd="release" taksId="release" /></RakeGroup></Settings>

data/.idea/loader.iml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="gem" name="Ruby Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="$MODULE_DIR$" />
-        <option name="GEM_APP_TEST_PATH" value="$MODULE_DIR$/test" />
-        <option name="GEM_APP_LIB_PATH" value="$MODULE_DIR$/lib" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.7.12, RVM: ruby-2.1.2) [gem]" level="application" />
-  </component>
-</module>