hike 0.5.1 → 0.6.0

data/lib/hike.rb

@@ -1,7 +1,6 @@
 module Hike
   VERSION = "0.5.1"
 
-  autoload :DirectoryIndex,  "hike/directory_index"
   autoload :Extensions,      "hike/extensions"
   autoload :NormalizedArray, "hike/normalized_array"
   autoload :Paths,           "hike/paths"

data/lib/hike/extensions.rb

@@ -1,3 +1,5 @@
+require 'hike/normalized_array'
+
 module Hike
   class Extensions < NormalizedArray
     def normalize_element(extension)

data/lib/hike/paths.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'hike/normalized_array'
 
 module Hike
   class Paths < NormalizedArray

data/lib/hike/trail.rb

@@ -1,4 +1,6 @@
 require 'pathname'
+require 'hike/extensions'
+require 'hike/paths'
 
 module Hike
   class Trail
@@ -21,7 +23,8 @@ module Hike
 
         options[:directories] ||= false
 
-        options[:index_cache]    = DirectoryIndex.new
+        options[:stat_cache]     = {}
+        options[:entries_cache]  = {}
         options[:patterns_cache] = {}
 
         logical_paths.each do |logical_path|
@@ -63,29 +66,53 @@ module Hike
       end
 
       def find_in_base_path(logical_path, base_path, options, &block)
-        candidate = base_path.join(logical_path).expand_path
+        candidate = base_path.join(logical_path)
         dirname, basename = candidate.split
         match(dirname, basename, options, &block) if paths_contain?(dirname)
       end
 
       def match(dirname, basename, options)
-        index   = options[:index_cache]
-        pattern = pattern_for(basename, options)
+        matches = entries(options[:entries_cache], dirname)
 
-        matches = options[:directories] ? index.entries(dirname) : index.files(dirname)
+        pattern = pattern_for(options[:patterns_cache], basename)
         matches = matches.select { |m| m.to_s =~ pattern }
 
+        cache = options[:stat_cache]
         sort_matches(matches, basename).each do |path|
-          yield dirname.join(path).expand_path.to_s
+          pathname = dirname.join(path)
+
+          if options[:directories]
+            yield pathname.to_s
+          elsif (stat = self.stat(cache, pathname)) && stat.file?
+            yield pathname.to_s
+          end
+        end
+      end
+
+      def stat(cache, pathname)
+        if cache.key?(pathname)
+          cache[pathname]
+        else
+          begin
+            cache[pathname] = pathname.stat
+          rescue Errno::ENOENT
+            cache[pathname] = nil
+          end
         end
       end
 
+      def entries(cache, pathname)
+        cache[pathname] ||= pathname.entries.reject { |entry| entry.to_s =~ /^\.\.?$/ }
+      rescue Errno::ENOENT
+        cache[pathname] = []
+      end
+
       def paths_contain?(dirname)
         paths.any? { |path| dirname.to_s[0, path.to_s.length] == path }
       end
 
-      def pattern_for(basename, options)
-        options[:patterns_cache][basename] ||= begin
+      def pattern_for(cache, basename)
+        cache[basename] ||= begin
           extension_pattern = extensions.map { |e| Regexp.escape(e) }.join("|")
           /^#{Regexp.escape(basename.to_s)}(?:#{extension_pattern}|)+$/
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hike
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-21 00:00:00 -05:00
+date: 2011-03-30 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -29,7 +29,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/hike/directory_index.rb
 - lib/hike/extensions.rb
 - lib/hike/normalized_array.rb
 - lib/hike/paths.rb

data/lib/hike/directory_index.rb

@@ -1,33 +0,0 @@
-require 'pathname'
-
-module Hike
-  class DirectoryIndex
-    def initialize
-      expire_cache
-    end
-
-    def expire_cache
-      @entries = {}
-      @files = {}
-      true
-    end
-
-    def entries(dirname)
-      dirname = Pathname.new(dirname).expand_path
-      @entries[dirname] ||= if dirname.directory?
-        dirname.entries.reject do |entry|
-          entry.to_s =~ /^\.\.?$/
-        end.sort
-      else
-        []
-      end
-    end
-
-    def files(dirname)
-      dirname = Pathname.new(dirname).expand_path
-      @files[dirname] ||= entries(dirname).select do |entry|
-        dirname.join(entry).file?
-      end.map(&:to_s)
-    end
-  end
-end