require_all 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bff4ed09b77b7126ccec6e78b790db78c0bb2963
-  data.tar.gz: f50a415e910319cd6882a65232a1ffbc03f606b9
+  metadata.gz: d0acf6c3cfe3c05348dc4f39a44862b3ff9e1588
+  data.tar.gz: dfd83ec51fd0c052866242da84e23ee677baa107
 SHA512:
-  metadata.gz: 7096790f47739b0c2409ee5b0b01482dfd89154842aed4c4ca0e4e7d905a1f5994308e0d79845cf7cd524ead2d5ec1642f9a95234254323833efc75806d007da
-  data.tar.gz: b43aba2d1d0954229d21f3c8980aa9c019b8acea1fa6325098442b1b9799981cffcab3e92fca4d5581929372cc1ddbfb5f25783294e0d49de611f411089a558e
+  metadata.gz: 5cf536e611f4a5d089be5890d01775628b564051d7c60d9f1827abea02b0b4b9eafad8270be8951000612f02d8f4ba0713ce396bc4190a712a9cddf30bcb4b0d
+  data.tar.gz: 9108afdd13f81ad242b5e9824ef6eb2477326d4979f1d51bae39739c256eaaa64046f3c1f777a08bde1fc6eacb974bcd70847a316adfde8c5198acb565d426cf

data/CHANGES

@@ -1,3 +1,8 @@
+1.5.0:
+
+* Merged PR #13 (https://github.com/jarmo/require_all/pull/13).
+* Merged PR #18 (https://github.com/jarmo/require_all/pull/18).
+
 1.4.0:
 
 * License is now correctly as MIT. Thanks to Eric Kessler for pull request #16.

data/lib/require_all.rb

@@ -72,7 +72,7 @@ module RequireAll
         # Maybe it's an .rb file and the .rb was omitted
         if File.file?(arg + '.rb')
           file = arg + '.rb'
-          options[:method] != :autoload ? Kernel.send(options[:method], file) : __autoload(file, file, options)
+          options[:method] != :autoload ? __require(options[:method], file) : __autoload(file, file, options)
           return true
         end
 
@@ -105,7 +105,7 @@ module RequireAll
       # files can be loaded, indicating unresolvable dependencies.
       files.each do |file_|
         begin
-          Kernel.send(options[:method], file_)
+          __require(options[:method], file_)
         rescue NameError => ex
           failed << file_
           first_name_error ||= ex
@@ -239,6 +239,10 @@ module RequireAll
 
   private
 
+  def __require(method, file)
+    Kernel.send(method, file)
+  end
+
   def __autoload(file, full_path, options)
     last_module = "Object" # default constant where namespaces are created into
     begin
@@ -259,15 +263,16 @@ module RequireAll
       without_ext = entry.basename(entry.extname).to_s
       const = without_ext.split("_").map {|word| word.capitalize}.join
 
-      if entry.directory?
-        mod.class_eval "module #{const} end"
-        last_module += "::#{const}"
-      else
+      if entry.file? || (entry.directory? && entry.sub_ext('.rb').file?)
         mod.class_eval do
           puts "autoloading #{mod}::#{const} from #{full_path}" if $DEBUG
           autoload const, full_path
         end
+      else
+        mod.class_eval "module #{const} end" if entry.directory?
       end
+
+      last_module += "::#{const}" if entry.directory?
     end
   end
 

data/require_all.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "require_all"
-  s.version = "1.4.0"
+  s.version = "1.5.0"
   s.authors = ["Jarmo Pertman", "Tony Arcieri"]
   s.email = "jarmo.p@gmail.com"
   s.summary = "A wonderfully simple way to load your code"

data/spec/autoload_spec.rb

@@ -16,6 +16,14 @@ describe "autoload_all" do
     is_expected.not_to be_loaded("Autoloaded::WrongModule::WithWrongModule", "WrongModule::WithWrongModule")
   end
 
+  it "autoloads class nested into another class" do
+    is_expected.not_to be_loaded("Autoloaded::Class1", "Autoloaded::Class1::C")
+    autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded"
+    is_expected.to be_loaded("Autoloaded::Class1")
+    expect(Autoloaded::Class1).to be_a Class
+    is_expected.to be_loaded("Autoloaded::Class1::C")
+  end
+
   it "needs to specify base_dir for autoloading if loading something from under top-level module directory" do
     is_expected.not_to be_loaded("Autoloaded::Module1::A", "Autoloaded::Module2::LongerName", "Autoloaded::Module2::Module3::B")
     autoload_all File.dirname(__FILE__) + "/fixtures/autoloaded/module1"

data/spec/fixtures/autoloaded/class1.rb

@@ -0,0 +1,4 @@
+module Autoloaded
+  class Class1
+  end
+end

data/spec/fixtures/autoloaded/class1/c.rb

@@ -0,0 +1,6 @@
+module Autoloaded
+  class Class1
+    class C
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: require_all
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Jarmo Pertman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,8 @@ files:
 - require_all.gemspec
 - spec/autoload_shared.rb
 - spec/autoload_spec.rb
+- spec/fixtures/autoloaded/class1.rb
+- spec/fixtures/autoloaded/class1/c.rb
 - spec/fixtures/autoloaded/module1/a.rb
 - spec/fixtures/autoloaded/module2/longer_name.rb
 - spec/fixtures/autoloaded/module2/module3/b.rb
@@ -121,13 +123,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A wonderfully simple way to load your code
 test_files:
 - spec/autoload_shared.rb
 - spec/autoload_spec.rb
+- spec/fixtures/autoloaded/class1.rb
+- spec/fixtures/autoloaded/class1/c.rb
 - spec/fixtures/autoloaded/module1/a.rb
 - spec/fixtures/autoloaded/module2/longer_name.rb
 - spec/fixtures/autoloaded/module2/module3/b.rb