faster_path 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71e809651aa4aa3df08645c40f0d616e3f061648ddeeb0e29086e578003df395
-  data.tar.gz: ded1645695ee0ddfd84261e25be66ed6f96b5386f45e093ecb46c0a6301f8896
+  metadata.gz: 3a5d299440e18a99c763e17b085b7962bfca0f2555b0adf8eb053c77b2d8d282
+  data.tar.gz: fee3ac374b164a25d1af43e0e8cd36ea68f57421db38637b7275a504e38bb391
 SHA512:
-  metadata.gz: ad20f8a279a81ccff6ce068f7c778649d3f71b59576d625e82e4bd1713c78d44dd10eb859b96b925f14c44f64171449c2fd17b46710a53a8e238f75ec17b5195
-  data.tar.gz: 0f2135684d07b33503b4ef62b4f6a750b5648d3b450d8ad0a55f9bdd54853355b86ba9e3e2fd546eb24a9148d9eace955b3642ad9bfeba4ca55c52e8de262bce
+  metadata.gz: 79d7b3931800982e78cc7f00c2fd2281932a2ac3775784f5f9d5c59bf974cd41f30d2d03c6216ce210fdc1754659b714cda6c19cca84e39a464e2bb62f7afa9c
+  data.tar.gz: 1a5b56dff703996bdcf60838ad9881528e51867aa2e9c5d996ff9c28996fb1297e7dacc9380a42def9ff9358e87ac4576a2f7536d5c73b685332b73b9e687122

data/Cargo.lock

@@ -1,13 +1,13 @@
 [[package]]
 name = "array_tool"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "faster_path"
 version = "0.0.1"
 dependencies = [
- "array_tool 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "ruby-sys 0.3.0 (git+https://github.com/danielpclark/ruby-sys?branch=playground)",
@@ -26,7 +26,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "libc"
-version = "0.2.37"
+version = "0.2.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -34,31 +34,31 @@ name = "memchr"
 version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ruby-sys"
 version = "0.3.0"
-source = "git+https://github.com/danielpclark/ruby-sys?branch=playground#184a3cd3bd39b525ff956f7cba1770bbf1522d8b"
+source = "git+https://github.com/danielpclark/ruby-sys?branch=playground#a3d47da5f9d1e597c62a8f03fb7d3a3596393c47"
 dependencies = [
- "libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ruru"
 version = "0.9.3"
-source = "git+https://github.com/danielpclark/ruru?branch=playground#c9b59118ebcf034874d491a0c1f3b57ef05c183a"
+source = "git+https://github.com/danielpclark/ruru?branch=playground#ab84ad4b97c41bfe6fd6d0f8540b2efd77583561"
 dependencies = [
  "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "ruby-sys 0.3.0 (git+https://github.com/danielpclark/ruby-sys?branch=playground)",
 ]
 
 [metadata]
-"checksum array_tool 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7894b81e06d8a2376f015b34dd89770c549932ff90bba6427f7cd83243bb629b"
+"checksum array_tool 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
 "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
-"checksum libc 0.2.37 (registry+https://github.com/rust-lang/crates.io-index)" = "56aebce561378d99a0bb578f8cb15b6114d2a1814a6c7949bbe646d968bb4fa9"
+"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff"
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
 "checksum ruby-sys 0.3.0 (git+https://github.com/danielpclark/ruby-sys?branch=playground)" = "<none>"
 "checksum ruru 0.9.3 (git+https://github.com/danielpclark/ruru?branch=playground)" = "<none>"

data/README.md

@@ -140,23 +140,23 @@ Current methods implemented:
 
 |FasterPath Rust Implementation|Ruby 2.5.0 Implementation|Time Shaved Off|
 |---|---|:---:|
-| `FasterPath.absolute?` | `Pathname#absolute?` | 95.8% |
-| `FasterPath.add_trailing_separator` | `Pathname#add_trailing_separator` | 68.7% |
-| `FasterPath.basename` | `File.basename` | 49.4% |
-| `FasterPath.children` | `Pathname#children` | 39.2% |
-| `FasterPath.chop_basename` | `Pathname#chop_basename` | 76.6% |
-| `FasterPath.cleanpath_aggressive` | `Pathname#cleanpath_aggressive` | 78.2% |
-| `FasterPath.cleanpath_conservative` | `Pathname#cleanpath_conservative` | 74.1% |
-| `FasterPath.del_trailing_separator` | `Pathname#del_trailing_separator` | 87.7% |
-| `FasterPath.directory?` | `Pathname#directory?` | 16.8% |
-| `FasterPath.dirname` | `File.dirname` | 28.9% |
-| `FasterPath.entries` | `Pathname#entries` | 36.1% |
-| `FasterPath.extname` | `File.extname` | 66.2% |
-| `FasterPath.has_trailing_separator?` | `Pathname#has_trailing_separator` | 86.3% |
-| `FasterPath.plus` | `Pathname#join` | 67.9% |
-| `FasterPath.plus` | `Pathname#plus` | 86.6% |
-| `FasterPath.relative?` | `Pathname#relative?` | 87.2% |
-| `FasterPath.relative_path_from` | `Pathname#relative_path_from` | 74.0% |
+| `FasterPath.absolute?` | `Pathname#absolute?` | 95.3% |
+| `FasterPath.add_trailing_separator` | `Pathname#add_trailing_separator` | 48.4% |
+| `FasterPath.basename` | `File.basename` | 12.0% |
+| `FasterPath.children` | `Pathname#children` | 34.4% |
+| `FasterPath.chop_basename` | `Pathname#chop_basename` | 83.4% |
+| `FasterPath.cleanpath_aggressive` | `Pathname#cleanpath_aggressive` | 94.1% |
+| `FasterPath.cleanpath_conservative` | `Pathname#cleanpath_conservative` | 93.5% |
+| `FasterPath.del_trailing_separator` | `Pathname#del_trailing_separator` | 85.4% |
+| `FasterPath.directory?` | `Pathname#directory?` | 6.4% |
+| `FasterPath.dirname` | `File.dirname` | 55.4% |
+| `FasterPath.entries` | `Pathname#entries` | 41.0% |
+| `FasterPath.extname` | `File.extname` | 63.1% |
+| `FasterPath.has_trailing_separator?` | `Pathname#has_trailing_separator` | 88.9% |
+| `FasterPath.plus` | `Pathname#join` | 72.0% |
+| `FasterPath.plus` | `Pathname#plus` | 87.7% |
+| `FasterPath.relative?` | `Pathname#relative?` | 92.6% |
+| `FasterPath.relative_path_from` | `Pathname#relative_path_from` | 93.3% |
 
 You may choose to use the methods directly, or scope change to rewrite behavior on the
 standard library with the included refinements, or even call a method to monkeypatch

data/Rakefile

@@ -5,24 +5,21 @@ require 'faster_path/thermite_initialize'
 
 desc 'System Details'
 task :sysinfo do
-  puts "faster_path #{FasterPath::VERSION}"
-  puts
+  puts "** FasterPath - faster_path v#{FasterPath::VERSION} **"
+  puts RUBY_DESCRIPTION
   puts `rustc -Vv`
+  puts `ldd --version`.scan(/(.*)\n/).first if RbConfig::CONFIG["host_os"].to_s[/linux/]
   puts `cargo -Vv`
-  IO.read('Cargo.toml').split('[dependencies]').last.split("\n").
-    select {|line| line =~ /=/ }.
-    each {|line| puts "%s\t%s" % line.match(/(\S+)[ ="']{1,4}([\d.]+)["']?/).captures }
-  puts
-  puts RUBY_DESCRIPTION
-  puts "bundler\t#{Bundler::VERSION}"
-  puts "rake\t#{Rake::VERSION}"
-  require 'ffi/version';
-  puts "ffi\t#{FFI::VERSION}"
-  begin
-    puts "%s\t%s" % IO.read('Gemfile.lock').match(/(mspec) \(([\d\.]+)\)/).captures
-  rescue Errno::ENOENT => _
-    puts "\nNo Gemfile.lock"
-  end
+  deps = Regexp.new(/name = "([\w\-]+)"\nversion = "(\d+\.\d+\.\d+)"/)
+  puts "** Rust dependencies **"
+  IO.read("Cargo.lock").
+    scan(deps).
+    delete_if {|i| i[0] == "faster_path" }.
+    each {|name, version| puts "#{name.ljust(20)}#{version}"}
+  puts "** Ruby dependencies **"
+  deps = IO.read("Gemfile.lock")
+  puts deps[(deps =~ /DEPENDENCIES/)..-1].sub("\n\n", "\n")
+  puts "RAKE\n   #{Rake::VERSION}"
 end
 
 thermite = Thermite::Tasks.new
@@ -34,36 +31,6 @@ task :contrib do
 ' > Contributors.md;git shortlog -s -n -e | sed 's/^......./- /' >> Contributors.md"
 end
 
-desc "Add libruby to deps"
-task :libruby_release do
-  filename = RbConfig::CONFIG["LIBRUBY_ALIASES"].split(" ").first
-  libfile = File.join(RbConfig::CONFIG["libdir"], filename)
-  deps = "target/release/deps"
-
-  printf "Copying libruby.so ... "
-  unless File.exist? "#{deps}/#{filename}"
-    FileUtils.mkdir_p deps
-    FileUtils.cp libfile, deps
-  end
-  exit 1 unless File.exist? "#{deps}/#{filename}"
-  puts "libruby.so copied."
-end
-
-desc "Add libruby to debug deps"
-task :libruby_debug do
-  filename = RbConfig::CONFIG["LIBRUBY_ALIASES"].split(" ").first
-  libfile = File.join(RbConfig::CONFIG["libdir"], filename)
-  deps = "target/debug/deps"
-
-  printf "Copying libruby.so ... "
-  unless File.exist? "#{deps}/#{filename}"
-    FileUtils.mkdir_p deps
-    FileUtils.cp libfile, deps
-  end
-  exit 1 unless File.exist? "#{deps}/#{filename}"
-  puts "libruby.so copied."
-end
-
 desc 'Build + clean up Rust extension'
 task build_lib: 'thermite:build' do
   thermite.run_cargo 'clean'
@@ -78,7 +45,7 @@ task :lint do
 end
 
 desc "Run Rust Tests"
-task cargo: :libruby_debug do
+task :cargo do
   sh "cargo test -- --nocapture"
 end
 
@@ -117,6 +84,9 @@ Rake::TestTask.new(bench: :build_lib) do |t|
 end
 
 Rake::TestTask.new(pbench: :build_lib) do |t|
+  if ARGV.last == '--long-run'
+    ENV['LONG_RUN'] = '10'
+  end
   t.libs = %w[lib test test/pbench]
   t.pattern = 'test/pbench/pbench_suite.rb'
 end

data/lib/faster_path.rb

@@ -5,6 +5,9 @@ require 'faster_path/thermite_initialize'
 require 'fiddle'
 require 'fiddle/import'
 
+# FasterPath module behaves as a singleton object with the alternative method
+# implementations for Pathname, and some for File, available directly on it.
+#
 module FasterPath
   FFI_LIBRARY = begin
     toplevel_dir = File.dirname(__dir__)
@@ -23,30 +26,50 @@ module FasterPath
     private_class_method :children_compat
   end
 
+  # The Rust architecture bit width: 64bits or 32bits
+  # @return [Integer]
   def self.rust_arch_bits
     Rust.rust_arch_bits
   end
 
+  # The Ruby architecture bit width: 64bits or 32bits
+  # @return [Integer]
   def self.ruby_arch_bits
     1.size * 8
   end
 
+  # A very fast way to check if a string is blank
+  # @param str [#to_s]
+  # @return [true, false]
   def self.blank?(str)
     "#{str}".strip.empty?
   end
 
+  # Rust implementation of File.basename
+  # @param pth [String] the path to evaluate
+  # @param ext [String] any extension to remove
+  # @return [String]
   def self.basename(pth, ext="")
     Public.send(:basename, pth, ext)
   end
 
+  # Rust implementation of Pathname.children
+  # @param pth [String] the path to evaluate
+  # @param with_directory [true, false] whether to include directory in results
+  # @return [Array<String>]
   def self.children(pth, with_directory=true)
     Public.send(:children, pth, with_directory)
   end
 
+  # Rust implementation of Pathname.children
+  # @param pth [String] the path to evaluate
+  # @param with_directory [true, false] whether to include directory in results
+  # @return [Array<Pathname>]
   def self.children_compat(pth, with_directory=true)
     Public.send(:children_compat, pth, with_directory)
   end
 
+  # @private
   module Rust
     extend Fiddle::Importer
     dlload FFI_LIBRARY

data/lib/faster_path/optional/monkeypatches.rb

@@ -1,23 +1,29 @@
 require 'pathname'
 
+# :nodoc:
 module FasterPath
+  # Core module for applying monkeypatches to `Pathname` and `File`
   module MonkeyPatches
+    # Monkeypatch just `File` specific methods
     # rubocop:disable Metrics/CyclomaticComplexity
     # rubocop:disable Metrics/PerceivedComplexity
     def self._ruby_core_file!
       ::File.class_eval do
+        # @private :nodoc:
         def self.basename(pth, ext = '')
           pth = pth.to_path if pth.respond_to? :to_path
           raise TypeError unless pth.is_a?(String) && ext.is_a?(String)
           FasterPath.basename(pth, ext)
         end
 
+        # @private :nodoc:
         def self.extname(pth)
           pth = pth.to_path if pth.respond_to? :to_path
           raise TypeError unless pth.is_a? String
           FasterPath.extname(pth)
         end
 
+        # @private :nodoc:
         def self.dirname(pth)
           pth = pth.to_path if pth.respond_to? :to_path
           raise TypeError unless pth.is_a? String
@@ -26,68 +32,83 @@ module FasterPath
       end
     end
 
+    # Monkeypatch just `Pathname` specific methods
     # rubocop:disable Metrics/MethodLength
     def self._ruby_library_pathname!
       ::Pathname.class_eval do
+        # @private :nodoc:
         def absolute?
           FasterPath.absolute?(@path)
         end
 
+        # @private :nodoc:
         def add_trailing_separator(pth)
           FasterPath.add_trailing_separator(pth)
         end
         private :add_trailing_separator
 
+        # @private :nodoc:
         def children(with_dir=true)
           FasterPath.children_compat(@path, with_dir)
         end if !!ENV['WITH_REGRESSION']
 
+        # @private :nodoc:
         def chop_basename(pth)
           FasterPath.chop_basename(pth)
         end
         private :chop_basename
 
+        # @private :nodoc:
         def cleanpath_aggressive
           Pathname.new(FasterPath.cleanpath_aggressive(@path))
         end
         private :cleanpath_aggressive
 
+        # @private :nodoc:
         def cleanpath_conservative
           Pathname.new(FasterPath.cleanpath_conservative(@path))
         end
         private :cleanpath_conservative
 
+        # @private :nodoc:
         def del_trailing_separator(pth)
           FasterPath.del_trailing_separator(pth)
         end
         private :del_trailing_separator
 
+        # @private :nodoc:
         def directory?
           FasterPath.directory?(@path)
         end
 
+        # @private :nodoc:
         def entries
           FasterPath.entries_compat(@path)
         end if !!ENV['WITH_REGRESSION']
 
+        # @private :nodoc:
         def has_trailing_separator?(pth)
           FasterPath.has_trailing_separator?(pth)
         end
         private :has_trailing_separator?
 
+        # @private :nodoc:
         def join(*args)
           FasterPath.join(self, *args)
         end
 
+        # @private :nodoc:
         def plus(pth, pth2)
           FasterPath.plus(pth, pth2)
         end
         private :plus
 
+        # @private :nodoc:
         def relative?
           FasterPath.relative?(@path)
         end
 
+        # @private :nodoc:
         def relative_path_from(other)
           FasterPath.relative_path_from(@path, other)
         end
@@ -96,9 +117,9 @@ module FasterPath
   end
   private_constant :MonkeyPatches
 
-  def self.sledgehammer_everything!()
+  # Applies all performant monkeypatches to both `Pathname` and `File`
+  def self.sledgehammer_everything!
     MonkeyPatches._ruby_core_file!
     MonkeyPatches._ruby_library_pathname!
-    "CAUTION: Monkey patching effects everything! Be very sure you want this!"
   end
 end

data/lib/faster_path/optional/refinements.rb

@@ -1,20 +1,25 @@
 require 'pathname'
 
+# @private :nodoc:
 module FasterPath
+  # @private :nodoc:
   module RefineFile
     refine File do
+      # @private :nodoc:
       def self.basename(pth, ext = '')
         pth = pth.to_path if pth.respond_to? :to_path
         raise TypeError unless pth.is_a?(String) && ext.is_a?(String)
         FasterPath.basename(pth, ext)
       end
 
+      # @private :nodoc:
       def self.extname(pth)
         pth = pth.to_path if pth.respond_to? :to_path
         raise TypeError unless pth.is_a? String
         FasterPath.extname(pth)
       end
 
+      # @private :nodoc:
       def self.dirname(pth)
         pth = pth.to_path if pth.respond_to? :to_path
         raise TypeError unless pth.is_a? String
@@ -23,66 +28,81 @@ module FasterPath
     end
   end
 
+  # @private :nodoc:
   module RefinePathname
     refine Pathname do
+      # @private :nodoc:
       def absolute?
         FasterPath.absolute?(@path)
       end
 
+      # @private :nodoc:
       def add_trailing_separator(pth)
         FasterPath.add_trailing_separator(pth)
       end
       private :add_trailing_separator
 
+      # @private :nodoc:
       def children(with_dir=true)
         FasterPath.children_compat(@path, with_dir)
       end if !!ENV['WITH_REGRESSION']
 
+      # @private :nodoc:
       def chop_basename(pth)
         FasterPath.chop_basename(pth)
       end
       private :chop_basename
 
+      # @private :nodoc:
       def cleanpath_aggressive
         Pathname.new(FasterPath.cleanpath_aggressive(@path))
       end
       private :cleanpath_aggressive
 
+      # @private :nodoc:
       def cleanpath_conservative
         Pathname.new(FasterPath.cleanpath_conservative(@path))
       end
       private :cleanpath_conservative
 
+      # @private :nodoc:
       def del_trailing_separator(pth)
         FasterPath.del_trailing_separator(pth)
       end
       private :del_trailing_separator
 
+      # @private :nodoc:
       def directory?
         FasterPath.directory?(@path)
       end
 
+      # @private :nodoc:
       def entries
         FasterPath.entries_compat(@path)
       end if !!ENV['WITH_REGRESSION']
 
+      # @private :nodoc:
       def has_trailing_separator?(pth)
         FasterPath.has_trailing_separator?(pth)
       end
 
+      # @private :nodoc:
       def join(*args)
         FasterPath.join(self, *args)
       end
 
+      # @private :nodoc:
       def plus(pth, pth2)
         FasterPath.plus(pth, pth2)
       end
       private :plus
 
+      # @private :nodoc:
       def relative?
         FasterPath.relative?(@path)
       end
 
+      # @private :nodoc:
       def relative_path_from(other)
         FasterPath.relative_path_from(@path, other)
       end

data/lib/faster_path/thermite_initialize.rb

@@ -2,14 +2,19 @@ require 'rubygems'
 require 'rake/tasklib'
 require_relative './version'
 
+# @private :nodoc:
 module Thermite
+  # @private :nodoc:
   class Config
+    # @private :nodoc:
     def ruby_version
       "ruby#{RUBY_VERSION}"
     end
   end
 
+  # @private :nodoc:
   class Tasks < Rake::TaskLib
+    # @private :nodoc:
     def github_download_uri(_tag, version)
       "#{github_uri}/releases/download/v#{FasterPath::VERSION}/#{config.tarball_filename(version)}"
     end

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/src/basename.rs

@@ -1,6 +1,8 @@
 extern crate memchr;
 
-use path_parsing::{find_last_sep_pos, find_last_non_sep_pos, find_last_dot_pos};
+use self::memchr::memrchr;
+
+use path_parsing::{find_last_sep_pos, find_last_non_sep_pos};
 
 pub fn basename<'a>(path: &'a str, ext: &str) -> &'a str {
   let bytes: &[u8] = path.as_bytes();
@@ -20,15 +22,87 @@ pub fn basename<'a>(path: &'a str, ext: &str) -> &'a str {
       left = last_slash_pos + 1;
     }
   }
+  &path[left..left + ext_end(&bytes[left..right], ext)]
+}
+
+fn ext_end(slice: &[u8], ext: &str) -> usize {
+  if ext.len() >= slice.len() || slice == b"." || slice == b".." {
+    return slice.len();
+  }
   let ext_bytes = ext.as_bytes();
-  if ext_bytes == b".*" {
-    if let Some(dot_pos) = find_last_dot_pos(&bytes[left..right]) {
-      right = left + dot_pos;
-    }
-  } else if bytes[left..right].ends_with(ext_bytes) {
-    right -= ext_bytes.len();
+  if ext_bytes.len() == 2 && *ext_bytes.get(1).unwrap() == b'*' {
+    match memrchr(*ext_bytes.get(0).unwrap(), slice) {
+      Some(end) if end != 0 => return end,
+      _ => {}
+    };
+  } else if slice.ends_with(ext_bytes) {
+    return slice.len() - ext_bytes.len();
   }
-  &path[left..right]
+  slice.len()
+}
+
+#[test]
+fn non_dot_asterisk_ext() {
+  // This is undocumented Ruby functionality. We match it in case some code out there relies on it.
+  assert_eq!(basename("abc", "b*"), "a");
+  assert_eq!(basename("abc", "abc"), "abc");
+  assert_eq!(basename("abc", "a*"), "abc");
+  assert_eq!(basename("playlist", "l*"), "play");
+  // Treated as literal "*":
+  assert_eq!(basename("playlist", "yl*"), "playlist");
+  assert_eq!(basename("playl*", "yl*"), "pla");
+}
+
+#[test]
+fn empty() {
+  assert_eq!(basename("", ""), "");
+  assert_eq!(basename("", ".*"), "");
+  assert_eq!(basename("", ".a"), "");
+}
+
+#[test]
+fn sep() {
+  assert_eq!(basename("/", ""), "/");
+  assert_eq!(basename("//", ""), "/");
+}
+
+#[test]
+fn trailing_dot() {
+  assert_eq!(basename("file.test.", ""), "file.test.");
+  assert_eq!(basename("file.test.", "."), "file.test");
+  assert_eq!(basename("file.test.", ".*"), "file.test");
+}
+
+#[test]
+fn trailing_dot_dot() {
+  assert_eq!(basename("a..", ".."), "a");
+  assert_eq!(basename("a..", ".*"), "a.");
+}
+
+#[test]
+fn dot() {
+  assert_eq!(basename(".", ""), ".");
+  assert_eq!(basename(".", "."), ".");
+  assert_eq!(basename(".", ".*"), ".");
+}
+
+#[test]
+fn dot_dot() {
+  assert_eq!(basename("..", ""), "..");
+  assert_eq!(basename("..", ".*"), "..");
+  assert_eq!(basename("..", ".."), "..");
+  assert_eq!(basename("..", "..."), "..");
+}
+
+#[test]
+fn non_dot_ext() {
+  assert_eq!(basename("abc", "bc"), "a");
+}
+
+#[test]
+fn basename_eq_ext() {
+  assert_eq!(basename(".x", ".x"), ".x");
+  assert_eq!(basename(".x", ".*"), ".x");
 }
 
 #[test]

data/src/helpers.rs

@@ -11,13 +11,16 @@ pub trait TryFrom<T>: Sized {
   fn try_from(value: T) -> Result<Self, Self::Error>;
 }
 
+#[cfg(windows)]
 #[inline]
 pub fn is_same_path(a: &str, b: &str) -> bool {
-  if cfg!(windows) {
-    a.to_uppercase() == b.to_uppercase()
-  } else {
-    a == b
-  }
+  a.to_uppercase() == b.to_uppercase()
+}
+
+#[cfg(not(windows))]
+#[inline]
+pub fn is_same_path(a: &str, b: &str) -> bool {
+  a == b
 }
 
 pub fn anyobject_to_string(item: AnyObject) -> Result<String, RubyDebugInfo> {

data/src/path_parsing.rs

@@ -10,12 +10,6 @@ lazy_static! {
   pub static ref SEP_STR: &'static str = str::from_utf8(&[SEP]).unwrap();
 }
 
-// Returns the byte offset of the last byte that equals MAIN_SEPARATOR.
-#[inline(always)]
-pub fn find_last_dot_pos(bytes: &[u8]) -> Option<usize> {
-  memrchr(b'.', bytes)
-}
-
 // Returns the byte offset of the last byte that equals MAIN_SEPARATOR.
 #[inline(always)]
 pub fn find_last_sep_pos(bytes: &[u8]) -> Option<usize> {

data/src/relative_path_from.rs

@@ -1,11 +1,10 @@
+use std::iter;
 use helpers::{is_same_path, to_str};
 use path_parsing::SEP_STR;
 use cleanpath_aggressive::cleanpath_aggressive;
-extern crate array_tool;
-use self::array_tool::iter::ZipOpt;
-use ruru;
-use chop_basename;
+use chop_basename::chop_basename;
 use pathname::Pathname;
+use ruru;
 use ruru::{Exception as Exc, AnyException as Exception};
 
 type MaybeString = Result<ruru::RString, ruru::result::Error>;
@@ -14,79 +13,58 @@ pub fn relative_path_from(itself: MaybeString, base_directory: MaybeString) -> R
   let dest_directory = cleanpath_aggressive(to_str(&itself));
   let base_directory = cleanpath_aggressive(to_str(&base_directory));
 
-  let mut dest_prefix = dest_directory.as_ref();
-  let mut dest_names: Vec<&str> = vec![];
-  loop {
-    match chop_basename::chop_basename(&dest_prefix.clone()) {
-      Some((ref dest, ref basename)) => {
-        dest_prefix = dest;
-        if basename != &"." {
-          dest_names.push(basename)
-        }
-      },
-      None => break,
-    }
-  }
-  dest_names.reverse();
-
-  let mut base_prefix = base_directory.as_ref();
-  let mut base_names: Vec<&str> = vec![];
-  loop {
-    match chop_basename::chop_basename(&base_prefix) {
-      Some((ref base, ref basename)) => {
-        base_prefix = base;
-        if basename != &"." {
-          base_names.push(basename)
-        }
-      },
-      None => break,
-    }
-  }
-  base_names.reverse();
+  let (dest_prefix, mut dest_names) = to_names(dest_directory.as_ref());
+  let (base_prefix, mut base_names) = to_names(base_directory.as_ref());
 
   if !is_same_path(&dest_prefix, &base_prefix) {
     return Err(
       Exception::new(
         "ArgumentError",
-        Some(&format!("different prefix: {} and {}", dest_prefix, base_prefix)[..])
+        Some(&format!("different prefix: {} and {}", dest_prefix, base_prefix)),
       )
     );
   }
 
-  let (dest_names, base_names): (Vec<String>, Vec<String>) = dest_names.
-    iter().
-    zip_option(base_names.iter()).
-    skip_while(|&(a, b)| {
-      match (a, b) {
-        (Some(x), Some(y)) => is_same_path(x,y),
-        _ => false,
-      }
-    }).
-    fold((vec![], vec![]), |mut acc, (a, b)| {
-      if let Some(v) = a {
-        acc.0.push(v.to_string());
-      }
-      if let Some(v) = b {
-        acc.1.push(v.to_string());
-      }
-      acc
-    });
+  // Remove shared tail
+  {
+    let num_same = dest_names.iter().rev().zip(base_names.iter().rev()).
+        take_while(|&(dest, base)| dest == base).count();
+    let num_dest_names = dest_names.len();
+    dest_names.truncate(num_dest_names - num_same);
+    let num_base_names = base_names.len();
+    base_names.truncate(num_base_names - num_same);
+  };
 
-  if base_names.contains(&"..".to_string()) {
+  if base_names.contains(&"..") {
     return Err(
       Exception::new(
         "ArgumentError",
-        Some(&format!("base_directory has ..: {}", base_directory)[..])
+        Some(&format!("base_directory has ..: {}", base_directory)),
       )
     );
   }
 
-  let base_names: Vec<String> = base_names.into_iter().map(|_| "..".to_string()).collect();
-
   if base_names.is_empty() && dest_names.is_empty() {
     Ok(Pathname::new("."))
   } else {
-    Ok(Pathname::new(&base_names.iter().chain(dest_names.iter()).map(String::as_str).
+    Ok(Pathname::new(&iter::repeat("..").take(base_names.len()).chain(dest_names.into_iter().rev()).
         collect::<Vec<&str>>().join(&SEP_STR)))
   }
 }
+
+#[inline(always)]
+fn to_names(path: &str) -> (&str, Vec<&str>) {
+  let mut result: Vec<&str> = vec![];
+  let mut prefix = path;
+  loop {
+    match chop_basename(&prefix) {
+      Some((ref dest, ref basename)) => {
+        prefix = dest;
+        if basename != &"." {
+          result.push(basename);
+        }
+      }
+      None => return (prefix, result),
+    }
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-12 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler