acls 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575f79d69190c7e708e4e2609e216cd8db243a6d
-  data.tar.gz: e720eac597e838e00015ba9edb1a104b587142a1
+  metadata.gz: 371e1095e948bc0bb96b66fd7e3b340572c98d8c
+  data.tar.gz: c936a33a329ef81e344dc884edae92f43028d8fd
 SHA512:
-  metadata.gz: f1c8381ffe8380021dfc0f430639283a994901e2fb42e2cbce5d396fedac86ed05f5cb06107ff71f8497106b2cfc01f8496c359a0bd98185388e0c14ba9cbd16
-  data.tar.gz: 5569fec00b72b029daec5a6f3ae49d37eb640790a2262504fe2de7e3d0e976c96f187a30c1025b96d0009dc9784e2632bbd40d0d4481f00202cf452c9a1fc076
+  metadata.gz: 3ea9822b078d0324cd692311c652cdcd3dd554840d67d13152d41931ecf935c615d28ceb6347f2fdea9f39534d05bc6f4d102477835ba47be3cd5b637e96433e
+  data.tar.gz: ffc5b05d140e0f0158abbfb5514c1c622c8e4fce7a79ceb2d90b28c90b3642151d8f04a9ce5744f6f895d84db80ce795d2d85e970eb2961ddf5512836c4d791c

data/README.md

@@ -78,13 +78,28 @@ Options available:
   values, the root directory is not a namespace and everything falls under the
   `Object` namespace.
 - `exclude`: Must be a collection of strings and/or regexps. For each string in
-  the collection, files are excluded from autoloading if they match the string
+  the collection, files are excluded from autoloading if they match the _name_
   exactly. For each regexp in the collection, files are excluded from
-  autoloading if the path results in a successful match on the regexp.
+  autoloading if the _path_ results in a successful match on the regexp.
 - `immediate`: Must be a collection of strings and/or regexps. Follows the same
   conditional pattern as `exclude`, but on a match this will immediate load the
   file via `load` instead of deferring it using `autoload`.
 
+### Path vs Name
+
+When talking about matching, there are two attributes: _names_ and _paths_.
+
+A _name_ is the base file or directory name, without the Ruby file extension (if
+it has one). e.g. `lib/foobar.rb` would have a _name_ of `foobar`.
+
+A _path_ is the full path to a file or directory. e.g. `lib/foobar.rb`,
+`lib/sub/directory`.
+
+Strings tend to match against names, because names are shorter and strings are
+meant for simple matching. Regexps tend to match against paths because a path
+contains more information and regexps allow you to have more detailed control
+over the matching conditions.
+
 ## Feature List
 
 ### Core

data/lib/acls/loader.rb

@@ -3,8 +3,8 @@ module ACLS
     class << self
       # Use one or more paths to autoload a set of Ruby source files.
       def auto(paths, opts={})
-        trees = build_trees(paths, opts)
-        autoload_magic(trees, default_opts.merge(opts))
+        opts = default_opts.merge(opts)
+        autoload_trees(build_trees(paths, opts), opts)
       end
 
       def default_opts
@@ -30,16 +30,16 @@ module ACLS
       end
 
       def autoload_root(tree, opts)
-          root = Object
-          if opts[:root_ns].is_a?(TrueClass)
-            root = submodule(root, File.basename(tree.directory).camelize)
-          elsif opts[:root_ns].is_a?(String)
-            opts[:root_ns].split('::').each { |ns| root = submodule(root, ns) }
-          end
-          root
+        root = Object
+        if opts[:root_ns].is_a?(TrueClass)
+          root = submodule(root, File.basename(tree.directory).camelize)
+        elsif opts[:root_ns].is_a?(String)
+          opts[:root_ns].split('::').each { |ns| root = submodule(root, ns) }
+        end
+        root
       end
 
-      def autoload_magic(trees, opts)
+      def autoload_trees(trees, opts)
         trees.map do |tree|
           root = autoload_root(tree, opts)
           tree.children.map do |node|
@@ -68,9 +68,9 @@ module ACLS
       def exclude?(mod, tree, opts)
         opts[:exclude].each do |pattern|
           if pattern.is_a?(String)
-            return true if pattern == tree.name
+            return true if pattern == File.basename(tree.path, ".rb")
           else
-            return true if pattern.match(tree.name)
+            return true if pattern.match(tree.path)
           end
         end
         false

data/lib/acls/tree.rb

@@ -16,6 +16,10 @@ module ACLS
       child
     end
 
+    def path
+      @source || @directory
+    end
+
     def to_s
       "name: #{@name}, source: #{@source}, directory: #{@directory}, parent: #{@parent}, children: #{@children.length}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acls
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Kolo Rahl