autoloaded 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87da530be678da00a0d6d8df5ef7d6ca2c773f04
-  data.tar.gz: a97be0b94d97e9a251cab40509e61c49e65f97e1
+  metadata.gz: b7221b689c0211923b999e3da078512a464179c5
+  data.tar.gz: f15a23ea558e0064748939779f3d4c3891bfc455
 SHA512:
-  metadata.gz: 5ae33778e6eb8560c101c5a44f995e321b3963e96721fc22b69c55eaa69b6648d9921080e44842f7c6f9460e151376ee8bc39dda02541630a938eb9c426e2d52
-  data.tar.gz: c745087aa0cd848990c3c222d475559e4d27fe86c9f86eeffd50941df790d75dfd15dd0cb15b2b91a4270d5112bd5cae32de78024a27f9c0af9d9ced11609cbb
+  metadata.gz: b9d88de3898d6351c0367c76cde73ed73661b8753ed17b60d9ba592c2c306585c1f79f4875713b3351dd12c0a450e721f51b359087af90c178beb93bada66975
+  data.tar.gz: 975e195c4b69254dc9a47945af0e78ec696b5f784f3e6f613cece9343da983944912af173f7fb8ad02aa5f95a50a3b063a42bce6e30dc9bf6571758f3c52c3a9

data/.yardopts

@@ -1 +1 @@
---file License.md --no-private --protected --title "Autoloaded"
+--file History.md --file License.md --no-private --protected --title "Autoloaded"

data/History.md

@@ -0,0 +1,25 @@
+# Version history for the _Autoloaded_ project
+
+## <a name="v1.1.0"></a>v1.1.0, Tue 11/04/2013
+
+* Correct/improve autoload behavior
+  * Instead of returning the source **directory** path from
+    [_Module#autoload?_][Ruby-Core-Module-autoload], return one or more matching
+    source **file** path(s)
+  * Use Ruby load path (`$:`) to handle relative source file paths
+  * Explain _Module#autoload?_ and
+    [_Module#constants_][Ruby-Core-Module-constants] in the [readme][readme] and
+    in [inline documentation][inline-documentation]
+
+## <a name="v1.0.0"></a>v1.0.0, Wed 10/29/2013
+
+* Add support for Ruby v2.0
+
+## <a name="v0.0.3"></a>v0.0.3, Fri 10/24/2014
+
+(First release)
+
+[Ruby-Core-Module-autoload]:  http://ruby-doc.org/core/Module.html#method-i-autoload-3F   "‘Module#autoload’ method in the Ruby Core Library"
+[Ruby-Core-Module-constants]: http://ruby-doc.org/core/Module.html#method-i-constants     "‘Module#constants’ method in the Ruby Core Library"
+[readme]:                     http://github.com/njonsson/autoloaded/blob/master/README.md "Autoloaded readme"
+[inline-documentation]:       http://www.rubydoc.info/github/njonsson/autoloaded          "Autoloaded inline documentation"

data/License.md

@@ -1,4 +1,4 @@
-# The MIT License
+# The MIT License
 
 Source code for _Autoloaded_ is Copyright © 2014 [Nils Jonsson][mail] and
 [contributors][contributors].

data/README.md

@@ -1,4 +1,4 @@
-[![Autoloaded graphic]][spider-gear-image]
+[![Autoloaded graphic]][spider-gear-image]
 
 # Autoloaded
 
@@ -70,12 +70,27 @@ module MyAwesomeGem
 end
 ```
 
-Note that your preferred casing of constants is accommodated automatically:
+Note that your preferred casing of constants is accommodated automatically.
 
 ```ruby
-MyAwesomeGem::DB::MySQL.new
-MyAwesomeGem::DB::PostgreSQL.new
-MyAwesomeGem::DB::SQLServer.new
+# Unlike Kernel#autoload and Module#autoload, Autoloaded is not clairvoyant about
+# what constants will be autoloaded.
+MyAwesomeGem::DB.constants  # => []
+
+# But like Kernel#autoload and Module#autoload, Autoloaded does tell you which
+# source files will be autoloaded. (The difference is that it may return an array
+# of potential matches instead of just one filename.)
+MyAwesomeGem::DB.autoload? :MySQL        # => 'db/mysql'
+MyAwesomeGem::DB.autoload? :PostgreSQL   # => 'db/postgresql'
+MyAwesomeGem::DB.autoload? :SQLServer    # => 'db/sql_server'
+MyAwesomeGem::DB.autoload? :Nonexistent  # => nil
+
+MyAwesomeGem::DB::MySQL
+MyAwesomeGem::DB.constants    # => [:MySQL]
+MyAwesomeGem::DB::PostgreSQL
+MyAwesomeGem::DB.constants    # => [:MySQL, :PostgreSQL]
+MyAwesomeGem::DB::SQLServer
+MyAwesomeGem::DB.constants    # => [:MySQL, :PostgreSQL, :SQLServer]
 ```
 
 _Autoloaded_ does not perform deep autoloading of nested namespaces and
@@ -99,7 +114,7 @@ module MyAwesomeGem; end
 # lib/my_awesome_gem/db.rb
 module MyAwesomeGem
 
-  # WRONG! Autoloading will not occur.
+  # WRONG!
   extend Autoloaded
 
   module DB
@@ -109,6 +124,10 @@ module MyAwesomeGem
   end
 
 end
+
+# some_other_file.rb
+require 'my_awesome_gem'
+MyAwesomeGem::DB  # NameError is raised!
 ```
 
 ## Contributing

data/autoloaded.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
                          snake_case correspondence between the names of constants
                          and source files.
                        end_description
-  spec.homepage      = 'https://github.com/njonsson/autoloaded'
+  spec.homepage      = 'http://njonsson.github.io/autoloaded'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")

data/lib/autoloaded.rb

@@ -1,3 +1,92 @@
+# coding: utf-8
+#
+# When used to extend a module, the _Autoloaded_ module dynamically loads
+# constants into that module from source files contained in its filesystem path.
+#
+# @note You must extend a namespace with _Autoloaded_ from within the file in
+#   which the namespace is defined. This is because _Autoloaded_ utilizes the
+#   source file path of the namespace to establish which directory will be
+#   autoloaded. That path is discoverable only via the stack trace of `extend
+#   Autoloaded`.
+#
+# Suppose you have the following source files:
+#
+# * lib/
+#   * my_awesome_gem/
+#     * db/
+#       * mysql.rb
+#       * postgresql.rb
+#       * sql_server.rb
+#     * db.rb
+#   * my_awesome_gem.rb
+#
+# The following statements establish autoloading — one statement per namespace:
+#
+#   # lib/my_awesome_gem.rb
+#   module MyAwesomeGem
+#
+#     extend Autoloaded
+#
+#   end
+#
+#   # lib/my_awesome_gem/db.rb
+#   module MyAwesomeGem
+#
+#     module DB
+#
+#       extend Autoloaded
+#
+#     end
+#
+#   end
+#
+# Note that your preferred casing of constants is accommodated automatically.
+#
+#   # Unlike Kernel#autoload and Module#autoload, Autoloaded is not clairvoyant about
+#   # what constants will be autoloaded.
+#   MyAwesomeGem::DB.constants  # => []
+#
+#   # But like Kernel#autoload and Module#autoload, Autoloaded does tell you which
+#   # source files will be autoloaded. (The difference is that it may return an array
+#   # of potential matches instead of just one filename.)
+#   MyAwesomeGem::DB.autoload? :MySQL        # => 'db/mysql'
+#   MyAwesomeGem::DB.autoload? :PostgreSQL   # => 'db/postgresql'
+#   MyAwesomeGem::DB.autoload? :SQLServer    # => 'db/sql_server'
+#   MyAwesomeGem::DB.autoload? :Nonexistent  # => nil
+#
+#   MyAwesomeGem::DB::MySQL
+#   MyAwesomeGem::DB.constants    # => [:MySQL]
+#   MyAwesomeGem::DB::PostgreSQL
+#   MyAwesomeGem::DB.constants    # => [:MySQL, :PostgreSQL]
+#   MyAwesomeGem::DB::SQLServer
+#   MyAwesomeGem::DB.constants    # => [:MySQL, :PostgreSQL, :SQLServer]
+#
+# _Autoloaded_ does not perform deep autoloading of nested namespaces and
+# directories. This is by design.
+#
+# In the following example, autoloading of the _MyAwesomeGem_ namespace will not occur because the name of the source file in which the `extend` statement is invoked does not match the name of the namespace.
+#
+#   # lib/my_awesome_gem.rb
+#   module MyAwesomeGem; end
+#
+#   # lib/my_awesome_gem/db.rb
+#   module MyAwesomeGem
+#
+#     # WRONG!
+#     extend Autoloaded
+#
+#     module DB
+#
+#       extend Autoloaded
+#
+#     end
+#
+#   end
+#
+#   # some_other_file.rb
+#   require 'my_awesome_gem'
+#   MyAwesomeGem::DB  # NameError is raised!
+#
 module Autoloaded
 
   def self.extended(other_module)
@@ -5,14 +94,22 @@ module Autoloaded
     dir_path = "#{::File.dirname caller_file_path}/#{::File.basename caller_file_path, '.rb'}"
     other_module.module_eval <<-end_module_eval, __FILE__, __LINE__
       def self.autoload?(symbol)
-        #{dir_path.inspect}
+        if (old_school = super)
+          return old_school
+        end
+
+        require 'autoloaded/constant'
+        filenames = []
+        ::Autoloaded::Constant.new(symbol).each_matching_filename_in #{dir_path.inspect} do |filename|
+          filenames << filename
+        end
+        (filenames.length <= 1) ? filenames.first : filenames
       end
 
       def self.const_missing(symbol)
         require 'autoloaded/constant'
         ::Autoloaded::Constant.new(symbol).each_matching_filename_in #{dir_path.inspect} do |filename|
-          without_ext = "\#{::File.dirname filename}/\#{::File.basename filename}"
-          require without_ext
+          require filename
           if const_defined?(symbol)
             begin
               return const_get(symbol)
@@ -21,7 +118,7 @@ module Autoloaded
           end
         end
 
-        super symbol
+        super
       end
     end_module_eval
   end

data/lib/autoloaded/constant.rb

@@ -5,6 +5,7 @@ using ::Autoloaded::Refine::String::ToSourceFilename
 
 module Autoloaded; end
 
+# @private
 class Autoloaded::Constant
 
   attr_reader :name
@@ -28,6 +29,25 @@ private
     '.rb'
   end
 
+  def filename_without_extension(filename)
+    "#{::File.dirname filename}/#{::File.basename filename, extension}"
+  end
+
+  def filename_without_load_path_prefix(filename)
+    first_applicable_load_path = $:.detect do |path|
+      filename.start_with? path
+    end
+    if first_applicable_load_path
+      regexp = /^#{::Regexp.escape first_applicable_load_path}\/?/
+      filename = filename.gsub(regexp, '')
+    end
+    filename
+  end
+
+  def format_filename(filename)
+    filename_without_load_path_prefix filename_without_extension(filename)
+  end
+
   def name_signature
     @name_signature ||= signature(name)
   end
@@ -52,7 +72,7 @@ private
       filename_signature = signature(::File.basename(filename, extension))
       if (filename_signature == name_signature) &&
          unless_in.add?(::File.basename(filename))
-        block.call filename
+        block.call format_filename(filename)
       end
     end
   end
@@ -63,7 +83,7 @@ private
     end
     qualified = ::File.join(directory, name_source_filename)
     if ::File.file?(qualified) && unless_in.add?(name_source_filename)
-      block.call qualified
+      block.call format_filename(qualified)
     end
   end
 

data/lib/autoloaded/refine.rb

@@ -1,5 +1,6 @@
 module Autoloaded
 
+  # @private
   module Refine; end
 
 end

data/lib/autoloaded/version.rb

@@ -1,5 +1,6 @@
 module Autoloaded
 
-  VERSION = '1.0.0'
+  # The current version of the _Autoloaded_ project.
+  VERSION = '1.1.0'
 
 end

data/spec/autoloaded/constant_spec.rb

@@ -3,8 +3,16 @@ require 'autoloaded/constant'
 RSpec.describe Autoloaded::Constant do
   let(:constant_class) { described_class }
 
+  specify("sanity check: load path includes our 'spec' directory") {
+    expect($:).to include(File.expand_path('../..', __FILE__))
+  }
+
   describe 'for' do
-    let(:directory) { 'spec/fixtures/filenames' }
+    let(:directory) { File.expand_path '../../fixtures/filenames', __FILE__ }
+
+    let(:load_pathed_directory) {
+      directory.gsub(/^#{File.expand_path '../..', __FILE__}\/?/, '')
+    }
 
     {AFilename:  %w(a_filename  a-file-name a-filename a_file_name             afile_name afile-name AFilename),
      A_FILENAME: %w(a_filename  a-file-name a-filename a_file_name             afile_name afile-name AFilename),
@@ -14,9 +22,9 @@ RSpec.describe Autoloaded::Constant do
       describe constant_name.inspect do
         let(:constant) { constant_class.new constant_name }
 
-        let(:full_filenames) {
+        let(:load_pathed_filenames) {
           filenames.collect do |filename|
-            "#{directory}/#{filename}.rb"
+            "#{load_pathed_directory}/#{filename}"
           end
         }
 
@@ -32,13 +40,13 @@ RSpec.describe Autoloaded::Constant do
           describe 'first yielded argument' do
             subject(:first_yielded_argument) { yielded_args.first }
 
-            it { is_expected.to eq(full_filenames.first) }
+            it { is_expected.to eq(load_pathed_filenames.first) }
           end
 
           describe 'subsequent yielded arguments' do
             subject(:subsequent_yielded_arguments) { yielded_args[1..-1] }
 
-            it { is_expected.to match_array(full_filenames[1..-1]) }
+            it { is_expected.to match_array(load_pathed_filenames[1..-1]) }
           end
         end
       end

data/spec/autoloaded_spec.rb

@@ -2,47 +2,131 @@ require 'autoloaded'
 require 'matchers'
 
 RSpec.describe Autoloaded do
+  before :each do
+    class << self
+      alias_method :define_constant, :define_constants
+    end
+  end
+
   describe 'not extending a namespace' do
-    let(:source_file) { 'spec/fixtures/namespace_that_is_not_autoloaded.rb' }
+    subject(:source_file) { 'spec/fixtures/not_autoloaded.rb' }
+
+    it { is_expected.to define_constant(:NotAutoloaded) }
+
+    it { is_expected.to define_constant('NotAutoloaded::OldSchoolAutoload') }
 
-    specify('does not dynamically define a nested constant') {
-      expect(source_file).not_to autoload_a_constant_named('NamespaceThatIsNotAutoloaded::Nested')
+    it { is_expected.not_to define_constant('NotAutoloaded::Nested') }
+
+    it {
+      is_expected.to set_up_autoload_for_constant('NotAutoloaded::OldSchoolAutoload').
+                     from_file('fixtures/not_autoloaded/old_school_autoload')
     }
 
-    specify('does not pollute the namespace') {
-      expect(source_file).to define_only_constants_named().
-                             in_a_namespace_named(:NamespaceThatIsNotAutoloaded)
+    it {
+      is_expected.not_to set_up_autoload_for_constant('NotAutoloaded::Nested')
     }
   end
 
-  describe 'extending a namespace' do
-    describe 'whose source files have conventional names' do
-      let(:source_file) {
-        'spec/fixtures/namespace_that_is_autoloaded_conventionally.rb'
+  describe 'extending a namespace whose constituent source files have' do
+    describe 'conventional names used for autoloading' do
+      subject(:source_file) {
+        'spec/fixtures/autoloaded_with_conventional_filename.rb'
       }
 
-      specify('dynamically defines a nested constant stored in a conventionally-named file') {
-        expect(source_file).to autoload_a_constant_named('NamespaceThatIsAutoloadedConventionally::Nested')
+      it { is_expected.to define_constant(:AutoloadedWithConventionalFilename) }
+
+      it {
+        is_expected.to define_constant('AutoloadedWithConventionalFilename::OldSchoolAutoload')
       }
 
-      specify('does not pollute the namespace') {
-        expect(source_file).to define_only_constants_named(:Nested).
-                               in_a_namespace_named(:NamespaceThatIsAutoloadedConventionally)
+      it {
+        is_expected.to define_constant('AutoloadedWithConventionalFilename::Nested').
+                       dynamically
+      }
+
+      it {
+        is_expected.not_to define_constant('AutoloadedWithConventionalFilename::NONEXISTENT')
+      }
+
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithConventionalFilename::OldSchoolAutoload').
+                       from_file('fixtures/autoloaded_with_conventional_filename/old_school_autoload')
+      }
+
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithConventionalFilename::Nested').
+                       from_files('fixtures/autoloaded_with_conventional_filename/nested',
+                                  'fixtures/autoloaded_with_conventional_filename/N-est-ed',
+                                  'fixtures/autoloaded_with_conventional_filename/nest_ed')
+      }
+
+      it {
+        is_expected.not_to set_up_autoload_for_constant('AutoloadedWithConventionalFilename::NONEXISTENT')
       }
     end
 
-    describe 'whose source files have unconventional names' do
-      let(:source_file) {
-        'spec/fixtures/namespace_that_is_autoloaded_unconventionally.rb'
+    describe 'conventional names' do
+      subject(:source_file) {
+        'spec/fixtures/autoloaded_with_conventional_filename_only.rb'
+      }
+
+      it { is_expected.to define_constant(:AutoloadedWithConventionalFilenameOnly) }
+
+      it {
+        is_expected.to define_constant('AutoloadedWithConventionalFilenameOnly::OldSchoolAutoload')
+      }
+
+      it {
+        is_expected.to define_constant('AutoloadedWithConventionalFilenameOnly::Nested').
+                       dynamically
+      }
+
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithConventionalFilenameOnly::OldSchoolAutoload').
+                       from_file('fixtures/autoloaded_with_conventional_filename_only/old_school_autoload')
+      }
+
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithConventionalFilenameOnly::Nested').
+                       from_file('fixtures/autoloaded_with_conventional_filename_only/nested')
+      }
+
+      it {
+        is_expected.not_to set_up_autoload_for_constant('AutoloadedWithConventionalFilenameOnly::NONEXISTENT')
+      }
+    end
+
+    describe 'unconventional names' do
+      subject(:source_file) {
+        'spec/fixtures/autoloaded_with_unconventional_filenames.rb'
+      }
+
+      it {
+        is_expected.to define_constant(:AutoloadedWithUnconventionalFilenames)
+      }
+
+      it {
+        is_expected.to define_constant('AutoloadedWithUnconventionalFilenames::OldSchoolAutoload')
+      }
+
+      it {
+        is_expected.to define_constants('AutoloadedWithUnconventionalFilenames::Nested').
+                       dynamically
+      }
+
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithUnconventionalFilenames::OldSchoolAutoload').
+                       from_file('fixtures/autoloaded_with_unconventional_filenames/old_school_autoload')
       }
 
-      specify('dynamically defines a nested constant stored in a unconventionally-named file') {
-        expect(source_file).to autoload_a_constant_named('NamespaceThatIsAutoloadedUnconventionally::Nested')
+      it {
+        is_expected.to set_up_autoload_for_constant('AutoloadedWithUnconventionalFilenames::Nested').
+                       from_files('fixtures/autoloaded_with_unconventional_filenames/N-est-ed',
+                                  'fixtures/autoloaded_with_unconventional_filenames/nest_ed')
       }
 
-      specify('does not pollute the namespace') {
-        expect(source_file).to define_only_constants_named(:Nested).
-                               in_a_namespace_named(:NamespaceThatIsAutoloadedUnconventionally)
+      it {
+        is_expected.not_to set_up_autoload_for_constant('AutoloadedWithUnconventionalFilenames::NONEXISTENT')
       }
     end
   end

data/spec/fixtures/autoloaded_with_conventional_filename.rb

@@ -0,0 +1,10 @@
+require 'autoloaded'
+
+module AutoloadedWithConventionalFilename
+
+  autoload :OldSchoolAutoload,
+           'fixtures/autoloaded_with_conventional_filename/old_school_autoload'
+
+  extend ::Autoloaded
+
+end

data/spec/fixtures/autoloaded_with_conventional_filename/nested.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithConventionalFilename
+
+  module Nested; end
+
+end

data/spec/fixtures/autoloaded_with_conventional_filename/old_school_autoload.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithConventionalFilename
+
+  module OldSchoolAutoload; end
+
+end

data/spec/fixtures/autoloaded_with_conventional_filename_only.rb

@@ -0,0 +1,10 @@
+require 'autoloaded'
+
+module AutoloadedWithConventionalFilenameOnly
+
+  autoload :OldSchoolAutoload,
+           'fixtures/autoloaded_with_conventional_filename_only/old_school_autoload'
+
+  extend ::Autoloaded
+
+end

data/spec/fixtures/autoloaded_with_conventional_filename_only/nested.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithConventionalFilenameOnly
+
+  module Nested; end
+
+end

data/spec/fixtures/autoloaded_with_conventional_filename_only/old_school_autoload.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithConventionalFilenameOnly
+
+  module OldSchoolAutoload; end
+
+end

data/spec/fixtures/autoloaded_with_unconventional_filenames.rb

@@ -0,0 +1,10 @@
+require 'autoloaded'
+
+module AutoloadedWithUnconventionalFilenames
+
+  autoload :OldSchoolAutoload,
+           'fixtures/autoloaded_with_unconventional_filenames/old_school_autoload'
+
+  extend ::Autoloaded
+
+end

data/spec/fixtures/autoloaded_with_unconventional_filenames/N-est-ed.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithUnconventionalFilenames
+
+  module Nested; end
+
+end

data/spec/fixtures/autoloaded_with_unconventional_filenames/old_school_autoload.rb

@@ -0,0 +1,5 @@
+module AutoloadedWithUnconventionalFilenames
+
+  module OldSchoolAutoload; end
+
+end

data/spec/fixtures/not_autoloaded.rb

@@ -0,0 +1,5 @@
+module NotAutoloaded
+
+  autoload :OldSchoolAutoload, 'fixtures/not_autoloaded/old_school_autoload'
+
+end

data/spec/fixtures/not_autoloaded/old_school_autoload.rb

@@ -0,0 +1,5 @@
+module NotAutoloaded
+
+  module OldSchoolAutoload; end
+
+end

data/spec/matchers.rb

@@ -1,72 +1,114 @@
+require 'support/util'
 require 'support/without_side_effects'
 
-RSpec::Matchers.define :autoload_a_constant_named do |constant_name|
+RSpec::Matchers.define :define_constants do |*constant_names|
   match do |source_file|
     # Ensure the file exists.
     File.open source_file, 'r' do
     end
 
-    constant_tokens = constant_name.split('::')
-    constant_up_till_last = constant_tokens[0...-1].join('::')
-    constant_last = constant_tokens.last
-
     without_side_effects do
-      begin
-        eval constant_name.to_s
-      rescue NameError
-      else
-        raise("#{constant_name} is already defined")
+      constant_names.each do |constant_name|
+        if Util.constantize(constant_name)
+          fail "constant #{constant_name} is already defined outside #{source_file}"
+        end
       end
 
       load source_file
 
-      begin
-        eval constant_name.to_s
-      rescue NameError
+      any_statically_defined = false
+      if dynamically?
+        any_statically_defined = constant_names.any? do |constant_name|
+          current_scope = Object
+          constant_name.split(Util.namespace_delimiter).all? do |token|
+            current_scope.constants.include?(token.to_sym).tap do |result|
+              if result
+                current_scope = Util.constantize([current_scope.name, token].join(Util.namespace_delimiter))
+              end
+            end
+          end
+        end
+      end
+
+      if any_statically_defined
         false
       else
-        eval(constant_up_till_last).autoload? constant_last.to_sym
+        constant_names.all? do |constant_name|
+          namespace, unqualified_constant_name = Util.namespace_and_unqualified_constant_name(constant_name,
+                                                                                              raise_if_namespace_invalid: true)
+          (!dynamically? ||
+           !namespace.constants.include?(unqualified_constant_name.to_sym)) &&
+            Util.constantize(constant_name)
+        end
       end
     end
   end
-end
 
-RSpec::Matchers.define :define_only_constants_named do |*constant_names|
-  attr_reader :expected_constants, :extraneous_defined_constants, :namespace_name
+  chain :dynamically do
+    @dynamically = true
+  end
 
-  match do |source_file|
-    @expected_constants, @extraneous_defined_constants = [], []
+  description do
+    fragments = []
+    fragments << case constant_names.length
+                   when 0
+                     'no constants'
+                   when 1
+                     "constant #{constant_names.first}"
+                   else
+                     "constants #{constant_names.join ' and '}"
+                 end
+    fragments << 'dynamically' if dynamically?
+    "define #{fragments.join ' '}"
+  end
+
+  def dynamically?
+    @dynamically
+  end
+end
 
+RSpec::Matchers.define :set_up_autoload_for_constant do |constant_name|
+  match do |source_file|
     # Ensure the file exists.
     File.open source_file, 'r' do
     end
 
-    unless namespace_name
-      raise "missing .in_a_namespace_named(:Namespace) clause"
-    end
+    without_side_effects do
+      namespace, unqualified_constant_name = Util.namespace_and_unqualified_constant_name(constant_name)
+      if namespace && namespace.autoload?(unqualified_constant_name)
+        fail "#{namespace.name}::#{unqualified_constant_name} is already set up for autoload outside #{source_file}"
+      end
 
-    defined_constants = without_side_effects do
       load source_file
 
-      namespace = eval(namespace_name.to_s)
-
-      # Trigger autoloading.
-      constant_names.each do |constant_name|
-        namespace.const_get constant_name
+      namespace, unqualified_constant_name = Util.namespace_and_unqualified_constant_name(constant_name,
+                                                                                          raise_if_namespace_invalid: true)
+      if filename_or_filenames
+        Array(filename_or_filenames).sort == Array(namespace.autoload?(unqualified_constant_name)).sort
+      else
+        namespace.autoload? unqualified_constant_name
       end
-
-      namespace.constants.sort.collect(&:to_sym)
     end
-    @expected_constants = constant_names.sort.collect(&:to_sym)
-    @extraneous_defined_constants = defined_constants - expected_constants
-    extraneous_defined_constants.empty?
   end
 
-  chain :in_a_namespace_named do |namespace_name|
-    @namespace_name = namespace_name
+  chain :from_file do |filename|
+    @filename_or_filenames = filename
+  end
+
+  chain :from_files do |*filenames|
+    @filename_or_filenames = filenames
   end
 
-  failure_message do |source_file|
-    "expected only #{expected_constants.join ' and '} to be defined in #{namespace_name} but also found #{extraneous_defined_constants.join ' and '}"
+  description do
+    fragments = []
+    fragments << "constant #{constant_name}"
+    if filename_or_filenames
+      unless (filenames = Array(filename_or_filenames)).empty?
+        fragments << "from file#{(filenames.length == 1) ? nil : 's'} #{filenames.join ' and '}"
+      end
+    end
+    "set up #{Module.name}#autoload? for #{fragments.join ' '}"
   end
+
+  attr_reader :filename_or_filenames
 end

data/spec/support/util.rb

@@ -0,0 +1,43 @@
+module Util
+
+  class << self
+
+    def constantize(name)
+      return nil unless name
+
+      begin
+        eval name.to_s
+      rescue NameError
+        nil
+      end
+    end
+
+    def namespace_and_unqualified_constant_name(constant_name,
+                                                raise_if_namespace_invalid: false)
+      namespace_name, unqualified_constant_name = split_namespace_and_constant(constant_name)
+      if namespace_name && (namespace = constantize(namespace_name)).nil?
+        if raise_if_namespace_invalid
+          raise "namespace of #{constant_name} is not defined"
+        end
+      end
+      [namespace, unqualified_constant_name]
+    end
+
+    def namespace_delimiter
+      '::'
+    end
+
+  private
+
+    def split_namespace_and_constant(constant_name)
+      if (last_delimiter_index = constant_name.to_s.rindex(namespace_delimiter))
+        return [constant_name[0...last_delimiter_index],
+                constant_name[(last_delimiter_index + namespace_delimiter.length)..-1]]
+      end
+
+      return [nil, constant_name]
+    end
+
+  end
+
+end

data/spec/support/without_side_effects.rb

@@ -10,7 +10,7 @@ def without_side_effects
 
     begin
       out_writer.write Marshal.dump(yield)
-    rescue => e
+    rescue Exception => e
       clean_backtrace = e.backtrace.reject do |frame|
         frame.include? __FILE__
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: autoloaded
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Nils Jonsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,7 +70,7 @@ files:
 - ".yardopts"
 - Gemfile
 - Guardfile
-- History.markdown
+- History.md
 - License.md
 - README.md
 - Rakefile
@@ -90,6 +90,18 @@ files:
 - spec/autoloaded/refine/string/to_source_filename_spec.rb
 - spec/autoloaded/version_spec.rb
 - spec/autoloaded_spec.rb
+- spec/fixtures/autoloaded_with_conventional_filename.rb
+- spec/fixtures/autoloaded_with_conventional_filename/N-est-ed.rb
+- spec/fixtures/autoloaded_with_conventional_filename/nest_ed.rb
+- spec/fixtures/autoloaded_with_conventional_filename/nested.rb
+- spec/fixtures/autoloaded_with_conventional_filename/old_school_autoload.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only/nested.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only/old_school_autoload.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/N-est-ed.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/nest_ed.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/old_school_autoload.rb
 - spec/fixtures/filenames/AFilename.rb
 - spec/fixtures/filenames/a-file-name.rb
 - spec/fixtures/filenames/a-filename.rb
@@ -97,19 +109,13 @@ files:
 - spec/fixtures/filenames/a_filename.rb
 - spec/fixtures/filenames/afile-name.rb
 - spec/fixtures/filenames/afile_name.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/N-est-ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/nest_ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/nested.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally/N-est-ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally/nest_ed.rb
-- spec/fixtures/namespace_that_is_not_autoloaded.rb
-- spec/fixtures/namespace_that_is_not_autoloaded/nested.rb
+- spec/fixtures/not_autoloaded.rb
+- spec/fixtures/not_autoloaded/old_school_autoload.rb
 - spec/matchers.rb
 - spec/spec_helper.rb
+- spec/support/util.rb
 - spec/support/without_side_effects.rb
-homepage: https://github.com/njonsson/autoloaded
+homepage: http://njonsson.github.io/autoloaded
 licenses:
 - MIT
 metadata: {}
@@ -139,6 +145,18 @@ test_files:
 - spec/autoloaded/refine/string/to_source_filename_spec.rb
 - spec/autoloaded/version_spec.rb
 - spec/autoloaded_spec.rb
+- spec/fixtures/autoloaded_with_conventional_filename.rb
+- spec/fixtures/autoloaded_with_conventional_filename/N-est-ed.rb
+- spec/fixtures/autoloaded_with_conventional_filename/nest_ed.rb
+- spec/fixtures/autoloaded_with_conventional_filename/nested.rb
+- spec/fixtures/autoloaded_with_conventional_filename/old_school_autoload.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only/nested.rb
+- spec/fixtures/autoloaded_with_conventional_filename_only/old_school_autoload.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/N-est-ed.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/nest_ed.rb
+- spec/fixtures/autoloaded_with_unconventional_filenames/old_school_autoload.rb
 - spec/fixtures/filenames/AFilename.rb
 - spec/fixtures/filenames/a-file-name.rb
 - spec/fixtures/filenames/a-filename.rb
@@ -146,16 +164,10 @@ test_files:
 - spec/fixtures/filenames/a_filename.rb
 - spec/fixtures/filenames/afile-name.rb
 - spec/fixtures/filenames/afile_name.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/N-est-ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/nest_ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_conventionally/nested.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally/N-est-ed.rb
-- spec/fixtures/namespace_that_is_autoloaded_unconventionally/nest_ed.rb
-- spec/fixtures/namespace_that_is_not_autoloaded.rb
-- spec/fixtures/namespace_that_is_not_autoloaded/nested.rb
+- spec/fixtures/not_autoloaded.rb
+- spec/fixtures/not_autoloaded/old_school_autoload.rb
 - spec/matchers.rb
 - spec/spec_helper.rb
+- spec/support/util.rb
 - spec/support/without_side_effects.rb
 has_rdoc: 

data/History.markdown

@@ -1,9 +0,0 @@
-# Version history for the _Autoloaded_ project
-
-## <a name="v1.0.0"></a>v1.0.0, Wed 10/29/2013
-
-* Add support for Ruby v2.0
-
-## <a name="v0.0.3"></a>v0.0.3, Fri 10/24/2014
-
-(First release)

data/spec/fixtures/namespace_that_is_autoloaded_conventionally.rb

@@ -1,7 +0,0 @@
-require 'autoloaded'
-
-module NamespaceThatIsAutoloadedConventionally
-
-  extend ::Autoloaded
-
-end

data/spec/fixtures/namespace_that_is_autoloaded_conventionally/nested.rb

@@ -1,5 +0,0 @@
-module NamespaceThatIsAutoloadedConventionally
-
-  module Nested; end
-
-end

data/spec/fixtures/namespace_that_is_autoloaded_unconventionally.rb

@@ -1,7 +0,0 @@
-require 'autoloaded'
-
-module NamespaceThatIsAutoloadedUnconventionally
-
-  extend ::Autoloaded
-
-end

data/spec/fixtures/namespace_that_is_autoloaded_unconventionally/N-est-ed.rb

@@ -1,5 +0,0 @@
-module NamespaceThatIsAutoloadedUnconventionally
-
-  module Nested; end
-
-end

data/spec/fixtures/namespace_that_is_not_autoloaded.rb

@@ -1 +0,0 @@
-module NamespaceThatIsNotAutoloaded; end

data/spec/fixtures/namespace_that_is_not_autoloaded/nested.rb

@@ -1,5 +0,0 @@
-module NamespaceThatIsNotAutoloaded
-
-  module Nested; end
-
-end