String#end_with?('/') rather than == '/'

bin/benchmark

@@ -221,6 +221,25 @@ benchmark('bsearch-or-include') do
   end
 end
 
+benchmark('add-trailing-slash') do
+  Benchmark.ips do |x|
+    x.config(config)
+    @string_slash = '/'
+    @string_trailing_slash = 'D:/'
+    @string_no_trailing_slash = '/bin'
+
+    x.report(:string_slash_end_with) { (@string_slash.end_with?('/') ? @string_slash : "#{@string_slash}/") + "str" }
+    x.report(:string_trailing_slash_end_with) { (@string_trailing_slash.end_with?('/') ? @string_trailing_slash : "#{@string_trailing_slash}/") + "str" }
+    x.report(:string_no_trailing_slash_end_with) { (@string_no_trailing_slash.end_with?('/') ? @string_no_trailing_slash : "#{@string_no_trailing_slash}/") + "str" }
+
+    x.report(:string_slash_file_join) { ::File.join(@string_slash, "str") }
+    x.report(:string_trailing_slash_file_join) { ::File.join(@string_trailing_slash, "str") }
+    x.report(:string_no_trailing_slash_file_join) { ::File.join(@string_no_trailing_slash, "str") }
+
+    x.compare!
+  end
+end
+
 benchmark('one-element-hash') do
   Benchmark.ips do |x|
     x.config(config)

lib/path_list.rb

@@ -577,7 +577,7 @@ def each(root = '.', &block)
     return self unless root_candidate.exists?
     return self unless recursive_match?(root_candidate.parent, dir_matcher)
 
-    relative_root = root == '/' ? root : "#{root}/"
+    relative_root = root.end_with?('/') ? root : "#{root}/"
 
     recursive_each(root_candidate, relative_root, dir_matcher, file_matcher, &block)
 

lib/path_list/candidate.rb

@@ -29,20 +29,20 @@ def full_path_downcase
     #   the containing directory as a Candidate,
     #   or nil if this is already the root
     def parent
-      puts "@full_path: #{@full_path}"
-      return if @full_path == '/'
+      puts "#{__FILE__}:#{__LINE__}, @full_path: #{@full_path}"
+      return if @full_path.end_with?('/') # '/' on unix X:/ on win
 
-      puts "::File.dirname(@full_path): #{::File.dirname(@full_path)}"
+      puts "#{__FILE__}:#{__LINE__}, ::File.dirname(@full_path): #{::File.dirname(@full_path)}"
       self.class.new(::File.dirname(@full_path), true)
     end
 
     # @return [Array<Candidate>]
     #   the children of this as Candidates
     def child_candidates
       @child_candidates ||= begin
-        prepend_path = @full_path == '/' ? '' : @full_path
+        prepend_path = @full_path.end_with?('/') ? @full_path : "#{@full_path}/"
 
-        children.map { |filename| self.class.new("#{prepend_path}/#{filename}") }
+        children.map { |filename| self.class.new("#{prepend_path}#{filename}") }
       end
     end
 

lib/path_list/matcher/exact_string/case_insensitive.rb

@@ -22,6 +22,8 @@ def initialize(item, polarity)
         # @param (see Matcher#match)
         # @return (see Matcher#match)
         def match(candidate)
+          puts "#{__FILE__}:#{__LINE__}, @item: #{@item}"
+          puts "#{__FILE__}:#{__LINE__}, candidate.full_path_downcase: #{candidate.full_path_downcase}"
           return @polarity if @item == candidate.full_path_downcase
         end
       end

lib/path_list/matcher/exact_string/set/case_insensitive.rb

@@ -17,6 +17,8 @@ def initialize(set, polarity)
           # @param (see Matcher#match)
           # @return (see Matcher#match)
           def match(candidate)
+            puts "#{__FILE__}:#{__LINE__}, @set: #{@set}"
+            puts "#{__FILE__}:#{__LINE__}, candidate.full_path_downcase: #{candidate.full_path_downcase}"
             @polarity if @set.include?(candidate.full_path_downcase)
           end
         end

lib/path_list/matcher/path_regexp.rb

@@ -21,6 +21,8 @@ def self.build(regexp_tokens, polarity)
       # @param (see Matcher#match)
       # @return (see Matcher#match)
       def match(candidate)
+        puts "#{__FILE__}:#{__LINE__}, @regexp: #{@regexp}"
+        puts "#{__FILE__}:#{__LINE__}, candidate.full_path: #{candidate.full_path}"
         @polarity if @regexp.match?(candidate.full_path)
       end
 

lib/path_list/matcher/path_regexp/case_insensitive.rb

@@ -8,6 +8,8 @@ class CaseInsensitive < PathRegexp
         # @param (see Matcher#match)
         # @return (see Matcher#match)
         def match(candidate)
+          puts "#{__FILE__}:#{__LINE__}, @regexp: #{@regexp}"
+          puts "#{__FILE__}:#{__LINE__}, candidate.full_path: #{candidate.full_path}"
           @polarity if @regexp.match?(candidate.full_path_downcase)
         end
 

lib/path_list/token_regexp/compress.rb

@@ -8,6 +8,7 @@ class << self
         # @param parts [Array<Symbol, String, EscapedString>]
         # @return [Array<Symbol, String, EscapedString>]
         def compress!(parts)
+          puts "#{__FILE__}:#{__LINE__}, parts (before): #{parts}"
           loop do
             next if compress_any!(parts)
             next if compress_any_dir!(parts)
@@ -17,6 +18,7 @@ def compress!(parts)
 
             break
           end
+          puts "#{__FILE__}:#{__LINE__}, parts (after): #{parts}"
         end
 
         private