pathname2 1.6.5-universal-mingw32 → 1.7.1-universal-mingw32

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDcxYjA1NDMxNWUyNWYzNGZlOTE4NGJhNzM5NDUzNGFhNTZlMDY4Yg==
+  data.tar.gz: !binary |-
+    YTM1ZGMwYzJlODBlM2E0OGUyZjZmZmJmOTE1ZjU5Y2IyMjk3NWJjOA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWEwM2Y2ZGZlY2I0NjhhNzY2ZWNjZjRiMzE2ZTIwNGY2NGZmNmE0MTI2NmJh
+    Y2ZhNmJkZTRjOTIxZmZiYmRhMzcyYTk1YjQ2MzAyZDgyYjJlM2E0MjViMmVh
+    ZGY1MjZmM2NjZTViM2Y4N2IzYzFjZmQzZjQwOTUxNWY4OTVjZGQ=
+  data.tar.gz: !binary |-
+    YzMwMDNmMmI0YTdlZThhMTAxYWIzN2Y1OGQzM2FkYmQ4NzlmNjYyOTZkMWU0
+    Y2RmNWJjZDUyYTNkM2RlODJiNjVlMjA5ZGM1YTdlZTIwZjdhNjkyZjdkMzUx
+    ZTdlM2UyMzczMDYzYjgwNzJmMzNjOTcwMTE0Y2M0NGUzNmU3MzY=

data/CHANGES

@@ -1,3 +1,13 @@
+== 1.7.1 - 28-Mar-2014
+* Updated gemspec for Windows vs Unix.
+* Updated README and MANIFEST.
+
+== 1.7.0 - 28-Mar-2014
+* Windows now uses FFI internally instead of win32-api.
+* Added a custom pretty_print method for the pp library.
+* Reorganized the test suite for Windows, and added many
+  more test tasks to the Rakefile.
+
 == 1.6.5 - 19-Sep-2011
 * Added the String#to_path instance method. This returns a Pathname
   object.

data/MANIFEST

@@ -8,4 +8,31 @@
 * examples/example_pathname.rb
 * lib/pathname2.rb
 * test/test_pathname.rb
-* test/test_pathname_windows.rb
+* test/test_version.rb
+* test/windows/test_append.rb
+* test/windows/test_aref.rb
+* test/windows/test_ascend.rb
+* test/windows/test_children.rb
+* test/windows/test_clean.rb
+* test/windows/test_clean_bang.rb
+* test/windows/test_constructor.rb
+* test/windows/test_descend.rb
+* test/windows/test_drive_number.rb
+* test/windows/test_each.rb
+* test/windows/test_facade.rb
+* test/windows/test_is_absolute.rb
+* test/windows/test_is_relative.rb
+* test/windows/test_is_root.rb
+* test/windows/test_is_unc.rb
+* test/windows/test_long_path.rb
+* test/windows/test_misc.rb
+* test/windows/test_parent.rb
+* test/windows/test_pstrip.rb
+* test/windows/test_pstrip_bang.rb
+* test/windows/test_realpath.rb
+* test/windows/test_relative_path_from.rb
+* test/windows/test_root.rb
+* test/windows/test_short_path.rb
+* test/windows/test_to_a.rb
+* test/windows/test_undecorate.rb
+* test/windows/test_undecorate_bang.rb

data/README

@@ -2,8 +2,9 @@
   A drop-in replacement for the current Pathname class.
 
 == Prerequisites
-  * facade 1.0.4 or later
-  * windows-pr 1.1.2 or later (Windows only)
+  * facade
+  * ffi (Windows only)
+  * test-unit (testing only)
    
 == Installation
 
@@ -76,9 +77,7 @@
   supposed to be private. See ruby-core:7383.
    
   Any other issues should be reported on the project page at
-  http://www.rubyforge.org/projects/shards
-
-  The git repo itself is located at https://github.com/djberg96/pathname2
+  https://github.com/djberg96/pathname2
 
 == Future Plans
   Suggestions welcome.
@@ -87,7 +86,7 @@
   Artistic 2.0
    
 == Copyright
-  (C) 2003-2011 Daniel J. Berger
+  (C) 2003-2014 Daniel J. Berger
   All rights reserved.
 
 == Warranty

data/Rakefile

@@ -8,7 +8,12 @@ namespace :gem do
   desc "Build the pathname2 gem"
   task :create => [:clean] do
     spec = eval(IO.read('pathname2.gemspec'))
-    Gem::Builder.new(spec).build
+    if Gem::VERSION < "2.0"
+      Gem::Builder.new(spec).build
+    else
+      require 'rubygems/package'
+      Gem::Package.build(spec)
+    end
   end
 
   desc "Install the pathname2 gem"
@@ -23,13 +28,184 @@ Rake::TestTask.new('test') do |t|
   t.warning = true
   t.verbose = true
    
-  if Config::CONFIG['host_os'] =~ /mswin|win32|dos|cygwin|mingw/i
-    t.test_files = FileList['test/test_pathname_windows.rb']
+  if File::ALT_SEPARATOR
+    t.test_files = FileList["test/windows/*.rb"] + FileList["test/test_version.rb"]
   else
     t.test_files = FileList['test/test_pathname.rb']
   end
 end
 
+namespace :test do
+  dir = File::ALT_SEPARATOR ? "windows" : "unix"
+  Rake::TestTask.new(:all) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/*.rb"] + FileList["test/test_version.rb"]
+  end
+
+  Rake::TestTask.new(:append) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_append.rb"]
+  end
+
+  Rake::TestTask.new(:aref) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_aref.rb"]
+  end
+
+  Rake::TestTask.new(:ascend) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_ascend.rb"]
+  end
+
+  Rake::TestTask.new(:children) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_children.rb"]
+  end
+
+  Rake::TestTask.new(:clean) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_clean.rb"]
+  end
+
+  Rake::TestTask.new(:clean!) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_clean_bang.rb"]
+  end
+
+  Rake::TestTask.new(:constructor) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_constructor.rb"]
+  end
+
+  Rake::TestTask.new(:descend) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_descend.rb"]
+  end
+
+  Rake::TestTask.new(:drive_number) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_drive_number.rb"]
+  end
+ 
+  Rake::TestTask.new(:each) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_each.rb"]
+  end
+
+  Rake::TestTask.new(:facade) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_facade.rb"]
+  end
+
+  Rake::TestTask.new(:is_absolute) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_is_absolute.rb"]
+  end
+ 
+  Rake::TestTask.new(:is_relative) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_is_relative.rb"]
+  end
+
+  Rake::TestTask.new(:is_root) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_is_root.rb"]
+  end
+
+  Rake::TestTask.new(:is_unc) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_is_unc.rb"]
+  end
+ 
+  Rake::TestTask.new(:long_path) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_long_path.rb"]
+  end
+
+  Rake::TestTask.new(:misc) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_misc.rb"]
+  end
+
+  Rake::TestTask.new(:parent) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_parent.rb"]
+  end
+
+  Rake::TestTask.new(:pstrip) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_pstrip.rb"]
+  end
+
+  Rake::TestTask.new(:pstrip!) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_pstrip_bang.rb"]
+  end
+
+  Rake::TestTask.new(:realpath) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_realpath.rb"]
+  end
+
+  Rake::TestTask.new(:relative_path_from) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_relative_path_from.rb"]
+  end
+
+  Rake::TestTask.new(:root) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_root.rb"]
+  end
+
+  Rake::TestTask.new(:short_path) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_short_path.rb"]
+  end
+
+  Rake::TestTask.new(:to_a) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_to_a.rb"]
+  end
+
+  Rake::TestTask.new(:undecorate) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_undecorate.rb"]
+  end
+
+  Rake::TestTask.new(:undecorate!) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_undecorate_bang.rb"]
+  end
+end
+
 desc 'Run the Pathname benchmark suite'
 task :benchmark do
   sh 'ruby -Ilib benchmarks/bench_pathname.rb'

data/lib/pathname2.rb

@@ -1,12 +1,12 @@
 # == Synopsis
 #
-# Pathname represents a path name on a filesystem.  A Pathname can be
+# Pathname represents a path name on a filesystem. A Pathname can be
 # relative or absolute.  It does not matter whether the path exists or not.
 #
 # All functionality from File, FileTest, and Dir is included, using a facade
 # pattern.
 #
-# This class works on both Unix and Windows, including UNC path names.  Note
+# This class works on both Unix and Windows, including UNC path names. Note
 # that forward slashes are converted to backslashes on Windows systems.
 #
 # == Usage
@@ -27,24 +27,22 @@
 # path1 + path2 # "C:\\foo\\bar\\zap"
 # path1.exists? # Does the path exist?
 #
-# == Author
-#
-# Daniel J. Berger
-# djberg96 at gmail dot com
-# imperator on IRC (irc.freenode.net)
-#
-# == Copyright
-# Copyright (c) 2005-2011 Daniel J. Berger.
-# Licensed under the same terms as Ruby itself.
-#
 require 'facade'
 require 'fileutils'
+require 'pp'
 
 if File::ALT_SEPARATOR
-  require 'windows/path'
-  require 'windows/file'
-  require 'windows/error'
-  require 'windows/limits'
+  require 'ffi'
+  class String
+    # Convenience method for converting strings to UTF-16LE for wide character
+    # functions that require it.
+    def wincode
+      if self.encoding.name != 'UTF-16LE'
+        temp = self.dup
+        (temp.tr(File::SEPARATOR, File::ALT_SEPARATOR) << 0.chr).encode('UTF-16LE')
+      end
+    end
+  end
 end
 
 # You're mine now.
@@ -54,6 +52,8 @@ class Pathname < String
   class Error < StandardError; end
   extend Facade
 
+  undef_method :pretty_print
+
   facade File, File.methods(false).map{ |m| m.to_sym } - [
     :chmod, :lchmod, :chown, :lchown, :dirname, :fnmatch, :fnmatch?,
     :link, :open, :realpath, :rename, :symlink, :truncate, :utime,
@@ -69,16 +69,31 @@ class Pathname < String
   alias :_plus_ :+ # Used to prevent infinite loops in some cases
 
   if File::ALT_SEPARATOR
-    include Windows::Path
-    include Windows::File
-    include Windows::Error
-    include Windows::Limits
+    extend FFI::Library
+    ffi_lib :shlwapi
+
+    attach_function :PathAppendW, [:pointer, :pointer], :bool
+    attach_function :PathCanonicalizeW, [:pointer, :buffer_in], :bool
+    attach_function :PathCreateFromUrlW, [:buffer_in, :pointer, :pointer, :ulong], :long
+    attach_function :PathGetDriveNumberW, [:buffer_in], :int
+    attach_function :PathIsRelativeW, [:buffer_in], :bool
+    attach_function :PathIsRootW, [:buffer_in], :bool
+    attach_function :PathIsUNCW, [:buffer_in], :bool
+    attach_function :PathIsURLW, [:buffer_in], :bool
+    attach_function :PathRemoveBackslashW, [:buffer_in], :pointer
+    attach_function :PathStripToRootW, [:pointer], :bool
+    attach_function :PathUndecorateW, [:pointer], :void
+
+    ffi_lib :kernel32
+
+    attach_function :GetLongPathNameW, [:buffer_in, :buffer_out, :ulong], :ulong
+    attach_function :GetShortPathNameW, [:buffer_in, :pointer, :ulong], :ulong
   end
 
   public
 
   # The version of the pathname2 library
-  VERSION = '1.6.5'
+  VERSION = '1.7.1'
 
   # The maximum length of a path
   MAXPATH = 1024 unless defined? MAXPATH # Yes, I willfully violate POSIX
@@ -102,8 +117,7 @@ class Pathname < String
   # example, all forward slashes are replaced with backslashes.
   #
   # File URL's will be converted to Pathname objects, e.g. the file URL
-  # "file:///C:/Documents%20and%20Settings" will become
-  # 'C:\Documents and Settings'.
+  # "file:///C:/Documents%20and%20Settings" will become 'C:\Documents and Settings'.
   #
   # Examples:
   #
@@ -115,7 +129,7 @@ class Pathname < String
   def initialize(path)
     if path.length > MAXPATH
       msg = "string too long.  maximum string length is " + MAXPATH.to_s
-      raise Error, msg
+      raise ArgumentError, msg
     end
 
     @sep = File::ALT_SEPARATOR || File::SEPARATOR
@@ -125,11 +139,15 @@ class Pathname < String
     # because Ruby's URI class does not (currently) parse absolute file URL's
     # properly when they include a drive letter.
     if @win
-      if PathIsURL(path)
-        buf = 0.chr * MAXPATH
-        len = [buf.length].pack("l")
-        if PathCreateFromUrl(path, buf, len, 0) == S_OK
-          path = buf.strip
+      wpath = path.wincode
+
+      if PathIsURLW(wpath)
+        buf = FFI::MemoryPointer.new(:char, MAXPATH)
+        len = FFI::MemoryPointer.new(:ulong)
+        len.write_ulong(buf.size)
+
+        if PathCreateFromUrlW(wpath, buf, len, 0) == 0
+          path = buf.read_string(path.size * 2).tr(0.chr, '')
         else
           raise Error, "invalid file url: #{path}"
         end
@@ -137,16 +155,13 @@ class Pathname < String
     else
       if path.index('file:///', 0)
         require 'uri'
-        if RUBY_VERSION.to_f >= 1.9
-          path = URI::Parser.new.unescape(path)[7..-1] # Blech
-        else
-          path = URI.decode(URI.parse(path).path)
-        end
+        path = URI::Parser.new.unescape(path)[7..-1]
       end
     end
 
     # Convert forward slashes to backslashes on Windows
-    path = path.tr("/", @sep) if @win
+    path = path.tr(File::SEPARATOR, File::ALT_SEPARATOR) if @win
+
     super(path)
   end
 
@@ -184,7 +199,7 @@ class Pathname < String
   # the returned pathnames will contain the filename only.
   #
   # Note that the result never contain the entries '.' and '..' in the
-  # the directory because they are not children.  Also note that this method
+  # the directory because they are not children. Also note that this method
   # is *not* recursive.
   #
   # Example:
@@ -220,10 +235,12 @@ class Pathname < String
     unless @win
       raise NotImplementedError, "not supported on this platform"
     end
-    buf = 0.chr * MAXPATH
-    buf[0..self.length-1] = self
-    PathUndecorate(buf)
-    self.class.new(buf.split(0.chr).first)
+
+    wpath = FFI::MemoryPointer.from_string(self.wincode)
+
+    PathUndecorateW(wpath)
+
+    self.class.new(wpath.read_string(wpath.size).split("\000\000").first.tr(0.chr, ''))
   end
 
   # Windows only
@@ -231,14 +248,7 @@ class Pathname < String
   # Performs the substitution of Pathname#undecorate in place.
   #
   def undecorate!
-    unless @win
-      raise NotImplementedError, "not supported on this platform"
-    end
-    buf = 0.chr * MAXPATH
-    buf[0..self.length-1] = self
-    PathUndecorate(buf)
-    replace(buf.split(0.chr).first)
-    self
+    self.replace(undecorate)
   end
 
   # Windows only
@@ -251,13 +261,16 @@ class Pathname < String
   #    path.short_path # => C:\Progra~1\Java.
   #
   def short_path
-    unless @win
-      raise NotImplementedError, "not supported on this platform"
-    end
-    buf = 0.chr * MAXPATH
-    buf[0..self.length-1] = self
-    GetShortPathName(self, buf, buf.length)
-    self.class.new(buf.split(0.chr).first)
+    raise NotImplementedError, "not supported on this platform" unless @win
+
+    buf = FFI::MemoryPointer.new(:char, MAXPATH)
+    wpath = self.wincode
+
+    size = GetShortPathNameW(wpath, buf, buf.size)
+
+    raise SystemCallError.new('GetShortPathName', FFI.errno) if size == 0
+
+    self.class.new(buf.read_bytes(size * 2).delete(0.chr))
   end
 
   # Windows only
@@ -270,16 +283,19 @@ class Pathname < String
   #    path.long_path # => C:\Program Files\Java.
   #
   def long_path
-    unless @win
-      raise NotImplementedError, "not supported on this platform"
-    end
-    buf = 0.chr * MAXPATH
-    buf[0..self.length-1] = self
-    GetLongPathName(self, buf, buf.length)
-    self.class.new(buf.split(0.chr).first)
+    raise NotImplementedError, "not supported on this platform" unless @win
+
+    buf = FFI::MemoryPointer.new(:char, MAXPATH)
+    wpath = self.wincode
+
+    size = GetLongPathNameW(wpath, buf, buf.size)
+
+    raise SystemCallError.new('GetShortPathName', FFI.errno) if size == 0
+
+    self.class.new(buf.read_bytes(size * 2).delete(0.chr))
   end
 
-  # Removes trailing slash, if present.  Non-destructive.
+  # Removes all trailing slashes, if present. Non-destructive.
   #
   # Example:
   #
@@ -288,31 +304,20 @@ class Pathname < String
   #
   def pstrip
     str = self.dup
-    if @win
-      PathRemoveBackslash(str)
+    return str if str.empty?
+
+    while ["/", "\\"].include?(str.to_s[-1].chr)
       str.strip!
-    else
-      if str.to_s[-1].chr == @sep
-        str.strip!
-        str.chop!
-      end
+      str.chop!
     end
+
     self.class.new(str)
   end
 
   # Performs the substitution of Pathname#pstrip in place.
   #
   def pstrip!
-    if @win
-      PathRemoveBackslash(self)
-      strip!
-    else
-      if self.to_s[-1].chr == @sep
-        strip!
-        chop!
-      end
-    end
-    self
+    self.replace(pstrip)
   end
 
   # Splits a pathname into strings based on the path separator.
@@ -323,7 +328,12 @@ class Pathname < String
   #    Pathname.new('C:\WINNT\Fonts').to_a # => ['C:', 'WINNT', 'Fonts']
   #
   def to_a
-    array = split(@sep) # Split string by path separator
+    # Split string by path separator
+    if @win
+      array = tr(File::SEPARATOR, File::ALT_SEPARATOR).split(@sep)
+    else
+      array = split(@sep)
+    end
     array.delete("")    # Remove empty elements
     array
   end
@@ -481,7 +491,7 @@ class Pathname < String
   # Returns the root directory of the path, or '.' if there is no root
   # directory.
   #
-  # On Unix, this means the '/' character.  On Windows, this can refer
+  # On Unix, this means the '/' character. On Windows, this can refer
   # to the drive letter, or the server and share path if the path is a
   # UNC path.
   #
@@ -499,11 +509,9 @@ class Pathname < String
     dir = "."
 
     if @win
-      buf = 0.chr * MAXPATH
-      buf[0..self.length-1] = self
-
-      if PathStripToRoot(buf)
-        dir = buf.split(0.chr).first
+      wpath = FFI::MemoryPointer.from_string(self.wincode)
+      if PathStripToRootW(wpath)
+        dir = wpath.read_string(wpath.size).split("\000\000").first.tr(0.chr, '')
       end
     else
       dir = "/" if self =~ /^\//
@@ -521,7 +529,7 @@ class Pathname < String
   #
   def root?
     if @win
-      PathIsRoot(self)
+      PathIsRootW(self.wincode)
     else
       self == root
     end
@@ -538,11 +546,8 @@ class Pathname < String
   #    Pathname.new('C:\Program Files').unc? # => false
   #
   def unc?
-    unless @win
-      raise NotImplementedError, "not supported on this platform"
-    end
-
-    PathIsUNC(self)
+    raise NotImplementedError, "not supported on this platform" unless @win
+    PathIsUNCW(self.wincode)
   end
 
   # MS Windows only
@@ -559,12 +564,12 @@ class Pathname < String
       raise NotImplementedError, "not supported on this platform"
     end
 
-    num = PathGetDriveNumber(self)
+    num = PathGetDriveNumberW(self.wincode)
     num >= 0 ? num : nil
   end
 
   # Compares two Pathname objects.  Note that Pathnames may only be compared
-  # against other Pathnames, not strings.  Otherwise nil is returned.
+  # against other Pathnames, not strings. Otherwise nil is returned.
   #
   # Example:
   #
@@ -587,7 +592,8 @@ class Pathname < String
   #    Pathname.new('/usr/local/bin').parent # => '/usr/local'
   #
   def parent
-   self + ".." # Use our custom '+' method
+    return self if root?
+    self + ".." # Use our custom '+' method
   end
 
   # Returns a relative path from the argument to the receiver. If +self+
@@ -636,7 +642,7 @@ class Pathname < String
     dest_arr.delete('.')
     base_arr.delete('.')
 
-    diff_arr = dest_arr - base_arr
+    # diff_arr = dest_arr - base_arr
 
     while !base_arr.empty? && !dest_arr.empty? && base_arr[0] == dest_arr[0]
       base_arr.shift
@@ -657,11 +663,11 @@ class Pathname < String
     end
   end
 
-  # Adds two Pathname objects together, or a Pathname and a String.  It
+  # Adds two Pathname objects together, or a Pathname and a String. It
   # also automatically cleans the Pathname.
   #
   # Adding a root path to an existing path merely replaces the current
-  # path.  Adding '.' to an existing path does nothing.
+  # path. Adding '.' to an existing path does nothing.
   #
   # Example:
   #
@@ -680,11 +686,15 @@ class Pathname < String
 
     # Use the builtin PathAppend() function if on Windows - much easier
     if @win
-      buf = 0.chr * MAXPATH
-      buf[0..self.length-1] = self
-      PathAppend(buf, string)
-      buf = buf.split("\0").first
-      return self.class.new(buf) # PathAppend cleans automatically
+      path = FFI::MemoryPointer.new(:char, MAXPATH)
+      path.write_string(self.dup.wincode)
+      more = FFI::MemoryPointer.from_string(string.wincode)
+
+      PathAppendW(path, more)
+
+      path = path.read_string(path.size).split("\000\000").first.delete(0.chr)
+
+      return self.class.new(path) # PathAppend cleans automatically
     end
 
     # If the string is an absolute directory, return it
@@ -723,7 +733,7 @@ class Pathname < String
   #
   def relative?
     if @win
-      PathIsRelative(self)
+      PathIsRelativeW(self.wincode)
     else
       root == "."
     end
@@ -741,9 +751,9 @@ class Pathname < String
     return self if self.empty?
 
     if @win
-      path = 0.chr * MAXPATH
-      if PathCanonicalize(path, self)
-        return self.class.new(path.split(0.chr).first)
+      ptr = FFI::MemoryPointer.new(:char, MAXPATH)
+      if PathCanonicalizeW(ptr, self.wincode)
+        return self.class.new(ptr.read_string(ptr.size).delete(0.chr))
       else
         return self
       end
@@ -772,32 +782,7 @@ class Pathname < String
   # in place.
   #
   def clean!
-    return self if self.empty?
-
-    if @win
-      path = 0.chr * MAXPATH
-      if PathCanonicalize(path, self)
-        replace(path.split(0.chr).first)
-      end
-      return self
-    end
-
-    final = []
-
-    to_a.each{ |element|
-      next if element == "."
-      final.push(element)
-      if element == ".." && self != ".."
-        2.times{ final.pop }
-      end
-    }
-
-    final = final.join(@sep)
-    final = root + final if root != "."
-    final = "." if final.empty?
-    replace(self.class.new(final))
-
-    self
+    self.replace(clean)
   end
 
   alias cleanpath! clean!
@@ -828,6 +813,15 @@ class Pathname < String
     local_path
   end
 
+  # A custom pretty printer
+  def pretty_print(q)
+    if File::ALT_SEPARATOR
+      q.text(self.to_s.tr(File::SEPARATOR, File::ALT_SEPARATOR))
+    else
+      q.text(self.to_s)
+    end
+  end
+
   #-- Find facade
 
   # Pathname#find is an iterator to traverse a directory tree in a depth first