jamis-fuzzy_file_finder 1.0.2 → 1.0.3

data/fuzzy_file_finder.gemspec

@@ -1,14 +1,14 @@
 
-# Gem::Specification for Fuzzy_file_finder-1.0.2
+# Gem::Specification for Fuzzy_file_finder-1.0.3
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{fuzzy_file_finder}
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jamis Buck"]
-  s.date = %q{2008-10-11}
+  s.date = %q{2008-10-12}
   s.description = %q{an implementation of TextMate's cmd-T search functionality}
   s.email = %q{jamis@jamisbuck.org}
   s.extra_rdoc_files = ["lib/fuzzy_file_finder.rb", "README.rdoc"]

data/lib/fuzzy_file_finder.rb

@@ -37,7 +37,7 @@ class FuzzyFileFinder
   module Version
     MAJOR = 1
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     STRING = [MAJOR, MINOR, TINY].join(".")
   end
 
@@ -284,7 +284,9 @@ class FuzzyFileFinder
     def match_path(path, path_matches, path_regex, path_segments)
       return path_matches[path] if path_matches.key?(path)
 
-      matchable_name = path.name.sub(@shared_prefix_re, "")
+      name_with_slash = path.name + "/" # add a trailing slash for matching the prefix
+      matchable_name = name_with_slash.sub(@shared_prefix_re, "")
+      matchable_name.chop! # kill the trailing slash
 
       if path_regex
         match = matchable_name.match(path_regex)
@@ -302,8 +304,9 @@ class FuzzyFileFinder
     def match_file(file, file_regex, path_match, &block)
       if file_match = file.name.match(file_regex)
         match_result = build_match_result(file_match, 1)
-        full_match_result = File.join(path_match[:result], match_result[:result])
-        abbr = File.join(path_match[:result].gsub(/[^\/]+/) { |m| m.index("(") ? m : m[0,1] }, match_result[:result])
+        full_match_result = path_match[:result].empty? ? match_result[:result] : File.join(path_match[:result], match_result[:result])
+        shortened_path = path_match[:result].gsub(/[^\/]+/) { |m| m.index("(") ? m : m[0,1] }
+        abbr = shortened_path.empty? ? match_result[:result] : File.join(shortened_path, match_result[:result])
 
         result = { :path => file.path,
                    :abbr => abbr,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jamis-fuzzy_file_finder
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Jamis Buck
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-11 00:00:00 -07:00
+date: 2008-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: []