hike 0.1.1 → 0.1.2

data/lib/hike.rb

@@ -1,5 +1,5 @@
 module Hike
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 
   autoload :DirectoryIndex,  "hike/directory_index"
   autoload :Extensions,      "hike/extensions"

data/lib/hike/trail.rb

@@ -10,39 +10,59 @@ module Hike
     end
 
     def find(*logical_paths)
-      @index.expire_mtimes
-      candidates = candidates_for_paths(logical_paths)
+      index.expire_mtimes
 
-      paths.each do |path|
-        candidates.each do |candidate|
-          filename = File.join(path, candidate)
-          return filename if exists?(filename)
+      logical_paths.each do |logical_path|
+        if result = find_path(logical_path)
+          return result
         end
       end
-
       nil
     end
 
     protected
-      def candidates_for_paths(logical_paths)
-        logical_paths.map do |logical_path|
-          candidates_for_path(logical_path)
-        end.flatten
+      attr_reader :index
+
+      def find_path(logical_path)
+        dirname, basename = File.split(logical_path)
+        pattern = filename_pattern_for(basename)
+
+        paths.each do |root|
+          path = File.join(root, dirname)
+          matches = match_files_in(path, pattern)
+          return File.join(path, match_from(matches, basename)) unless matches.empty?
+        end
+        nil
       end
 
-      def candidates_for_path(logical_path)
-        candidates = extensions.map { |ext| logical_path + ext }
-        candidates.unshift(logical_path) if has_extension?(logical_path)
-        candidates
+      def match_files_in(dirname, pattern)
+        index.files(dirname).grep(pattern)
       end
 
-      def has_extension?(logical_path)
-        extensions.include?(File.extname(logical_path))
+      def filename_pattern_for(basename)
+        extension_pattern = extensions.map { |e| Regexp.escape(e) }.join("|")
+        extension_pattern += "|" if has_registered_extension?(basename)
+        /^#{Regexp.escape(basename)}(?:#{extension_pattern})$/
+      end
+
+      def match_from(matches, basename)
+        if matches.length == 1
+          matches.first
+        elsif matches.length > 1
+          ordered_match_from(matches, basename)
+        end
+      end
+
+      def ordered_match_from(matches, basename)
+        extensions.each do |extension|
+          candidate = basename + extension
+          return candidate if matches.include?(candidate)
+        end
+        basename
       end
 
-      def exists?(path)
-        dirname, basename = File.dirname(path), File.basename(path)
-        @index.files(dirname).include?(basename)
+      def has_registered_extension?(logical_path)
+        extensions.include?(File.extname(logical_path))
       end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hike
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -05:00
+date: 2010-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: []