pathname2 1.2.0 → 1.2.1

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.2.1 - 1-Sep-2005
+* Bug fix for the ascend and descend methods wrt Windows and UNC paths.
+* More tests added for ascend and descend methods.
+
 == 1.2.0 - 29-Aug-2005
 * Added the 'ascend' and 'descend' methods.
 * Added corresponding test suite additions.

data/MANIFEST

@@ -1,10 +1,10 @@
-CHANGES
-MANIFEST
-README
-install.rb
-pathname2.gempsec
-
-lib/pathname2.rb
-
-test/tc_pathname.rb
-test/tc_pathname_win.rb
+CHANGES
+MANIFEST
+README
+install.rb
+pathname2.gempsec
+
+lib/pathname2.rb
+
+test/tc_pathname.rb
+test/tc_pathname_win.rb

data/lib/pathname2.rb

@@ -46,7 +46,7 @@ class Pathname < String
    facade File
    facade Dir
    
-   if PLATFORM.match("mswin32")
+   if PLATFORM.match("mswin")
       require "Win32API"
       @@PathStripToRoot  = Win32API.new("shlwapi","PathStripToRoot","P","L")
       @@PathIsUNC        = Win32API.new("shlwapi","PathIsUNC","P","L")
@@ -69,7 +69,7 @@ class Pathname < String
          Win32API.new("shlwapi", "PathRemoveBackslash", "P", "P")
    end
 
-   VERSION  = "1.2.0"
+   VERSION  = "1.2.1"
    MAX_PATH = 260
    
    # Creates and returns a new Pathname object.
@@ -81,11 +81,11 @@ class Pathname < String
          raise PathnameError, msg
       end
 
-      @sep   = File::ALT_SEPARATOR || File::SEPARATOR
-      @win32 = PLATFORM.match("mswin32")
+      @sep = File::ALT_SEPARATOR || File::SEPARATOR
+      @win = PLATFORM.match("mswin")
 
       # Handle File URL's for Windows
-      if @win32
+      if @win
          if @@PathIsURL.call(path) > 0
             buf = 0.chr * MAX_PATH
             len = [buf.length].pack("l")
@@ -98,7 +98,7 @@ class Pathname < String
       end
 
       # Convert forward slashes to backslashes on Win32
-      path = path.tr("/", @sep) if @win32
+      path = path.tr("/", @sep) if @win
       super(path)
    end
 
@@ -107,7 +107,7 @@ class Pathname < String
    # Removes the decoration from a path string.  For example,
    # C:\Path\File[5].txt would become C:\Path\File.txt.
    def undecorate
-      unless @win32
+      unless @win
          raise NotImplementedError, "not supported on this platform"
       end
       buf = 0.chr * MAX_PATH
@@ -118,7 +118,7 @@ class Pathname < String
 
    # Removes trailing slash, if present.
    def pstrip
-      if @win32
+      if @win
          @@PathRemoveBackslash.call(self)
          self.strip!
       else
@@ -150,18 +150,26 @@ class Pathname < String
    # on the first iteration, "/foo" on the second, "/foo/bar on the third and
    # finally "/foo/bar/baz".
    def descend
-      if PLATFORM.match("mswin")
-         path = "" 
+      if root?
+         yield root
+         return
+      end
+   
+      if @win
+         path = unc? ? "#{root}\\" : ""
       else
          path = absolute? ? root : ""
       end
 
       # Yield the root directory if an absolute path (and not Windows)
-      unless PLATFORM.match("mswin")
+      unless @win && !unc?
          yield root if absolute?
       end
 
       self.each{ |element|
+         if @win && unc?
+            next if root.to_a.include?(element)
+         end
          path << element << @sep
          yield Pathname.new(path.chop)
       }
@@ -172,21 +180,38 @@ class Pathname < String
    #
    # For example, if the path is "/foo/bar/baz", then "/foo/bar/baz" would
    # be yielded on the first iteration, "/foo/bar" on the second, "/foo" on
-   # the third, and finall "/".
+   # the third, and finally "/".
    def ascend
+      if root?
+         yield root
+         return
+      end
+      
       n = self.to_a.length
 
       while n > 0
          path = self.to_a[0..n-1].join(@sep)
          if self.absolute?
-            path = root << path unless PLATFORM.match("mswin")
+            if @win && unc?
+               path = "\\\\" << path
+            end     
+            unless @win
+               path = root << path
+            end
+         end
+
+         path = Pathname.new(path)
+         yield path
+         
+         if @win && unc?
+            break if path.root?
          end
-         yield Pathname.new(path)
+         
          n -= 1
       end
 
       # Yield the root directory if an absolute path (and not Windows)
-      unless PLATFORM.match("mswin")
+      unless @win
          yield root if absolute?
       end
    end
@@ -199,7 +224,7 @@ class Pathname < String
    # is a UNC path.
    def root
       dir = "."   
-      if @win32
+      if @win
          buf = 0.chr * MAX_PATH
          buf[0..self.length-1] = self
       
@@ -218,7 +243,7 @@ class Pathname < String
 
    # Returns whether or not the path consists only of a root directory.
    def root?
-      if @win32
+      if @win
          @@PathIsRoot.call(self) > 0
       else
          self == root
@@ -230,7 +255,7 @@ class Pathname < String
    # Determines if the string is a valid Universal Naming Convention (UNC)
    # for a server and share path.
    def unc?
-      unless @win32
+      unless @win
          raise NotImplementedError, "not supported on this platform"
       end
 
@@ -244,7 +269,7 @@ class Pathname < String
    #
    # For example, Pathname.new("C:\\foo").drive_number would return 2.
    def drive_number
-      unless @win32
+      unless @win
          raise NotImplementedError, "not supported on this platform"
       end
 
@@ -277,7 +302,7 @@ class Pathname < String
       return self if string == "."
       
       # Use the builtin PathAppend method if on Windows - much easier
-      if @win32
+      if @win
          buf = 0.chr * MAX_PATH
          buf[0..self.length-1] = self
          @@PathAppend.call(buf, string << 0.chr)
@@ -291,7 +316,7 @@ class Pathname < String
       array = self.to_a + string.to_a
       new_string = array.join(@sep)
       
-      unless self.relative? || @win32
+      unless self.relative? || @win
          new_string = @sep + new_string   # Add root path back if needed
       end
       
@@ -305,7 +330,7 @@ class Pathname < String
    
    # Returns whether or not the path is a relative path.
    def relative?
-      if @win32
+      if @win
          @@PathIsRelative.call(self) > 0
       else
          root == "."
@@ -316,7 +341,7 @@ class Pathname < String
    def clean
       return self if self.empty?
 
-      if @win32
+      if @win
          path = 0.chr * MAX_PATH
          if @@PathCanonicalize.call(path, self) > 0
             return Pathname.new(path.split(0.chr).first)

data/test/tc_pathname.rb

@@ -14,6 +14,9 @@ class TC_Pathname < Test::Unit::TestCase
    def setup
       @abs_path = Pathname.new("/usr/local/bin")
       @rel_path = Pathname.new("usr/local/bin")
+
+      @abs_array = []
+      @rel_array = []
    end
    
    # Convenience method for test_plus
@@ -33,45 +36,45 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.2.0", Pathname::VERSION)
+      assert_equal("1.2.1", Pathname::VERSION)
    end
 
    def test_ascend
       assert_respond_to(@abs_path, :ascend)
       assert_nothing_raised{ @abs_path.ascend{} }
 
-      abs_array = []
-      rel_array = []
-      @abs_path.ascend{ |path| abs_array.push(path) }
-      @rel_path.ascend{ |path| rel_array.push(path) }
+      @abs_path.ascend{ |path| @abs_array.push(path) }
+      @rel_path.ascend{ |path| @rel_array.push(path) }
 
-      assert_equal("/usr/local/bin", abs_array[0])
-      assert_equal("/usr/local", abs_array[1])
-      assert_equal("/usr", abs_array[2])
-      assert_equal("/", abs_array[3])
+      assert_equal("/usr/local/bin", @abs_array[0])
+      assert_equal("/usr/local", @abs_array[1])
+      assert_equal("/usr", @abs_array[2])
+      assert_equal("/", @abs_array[3])
+      assert_equal(4, @abs_array.length)
 
-      assert_equal("usr/local/bin", rel_array[0])
-      assert_equal("usr/local", rel_array[1])
-      assert_equal("usr", rel_array[2])
+      assert_equal("usr/local/bin", @rel_array[0])
+      assert_equal("usr/local", @rel_array[1])
+      assert_equal("usr", @rel_array[2])
+      assert_equal(3, @rel_array.length)
    end
 
    def test_descend
       assert_respond_to(@abs_path, :descend)
       assert_nothing_raised{ @abs_path.descend{} }
 
-      abs_array = []
-      rel_array = []
-      @abs_path.descend{ |path| abs_array.push(path) }
-      @rel_path.descend{ |path| rel_array.push(path) }
+      @abs_path.descend{ |path| @abs_array.push(path) }
+      @rel_path.descend{ |path| @rel_array.push(path) }
 
-      assert_equal("/", abs_array[0])
-      assert_equal("/usr", abs_array[1])
-      assert_equal("/usr/local", abs_array[2])
-      assert_equal("/usr/local/bin", abs_array[3])
+      assert_equal("/", @abs_array[0])
+      assert_equal("/usr", @abs_array[1])
+      assert_equal("/usr/local", @abs_array[2])
+      assert_equal("/usr/local/bin", @abs_array[3])
+      assert_equal(4, @abs_array.length)
 
-      assert_equal("usr", rel_array[0])
-      assert_equal("usr/local", rel_array[1])
-      assert_equal("usr/local/bin", rel_array[2])
+      assert_equal("usr", @rel_array[0])
+      assert_equal("usr/local", @rel_array[1])
+      assert_equal("usr/local/bin", @rel_array[2])
+      assert_equal(3, @rel_array.length)
    end
 
    def test_unc
@@ -227,5 +230,9 @@ class TC_Pathname < Test::Unit::TestCase
    
    def teardown
       @abs_path = nil
+      @rel_path = nil
+
+      @abs_array.clear
+      @rel_array.clear
    end
 end

data/test/tc_pathname_win.rb

@@ -24,10 +24,11 @@ class TC_Pathname < Test::Unit::TestCase
       
       @abs_array = []
       @rel_array = []
+      @unc_array = []
    end
    
    def test_version
-      assert_equal("1.2.0", Pathname::VERSION)
+      assert_equal("1.2.1", Pathname::VERSION)
    end
    
    # Convenience method for test_plus
@@ -57,6 +58,7 @@ class TC_Pathname < Test::Unit::TestCase
       
       @bpath.descend{ |path| @abs_array.push(path) }
       @npath.descend{ |path| @rel_array.push(path) }
+      @upath.descend{ |path| @unc_array.push(path) }
       
       assert_equal("C:", @abs_array[0])
       assert_equal("C:\\Program Files", @abs_array[1])
@@ -66,6 +68,9 @@ class TC_Pathname < Test::Unit::TestCase
       assert_equal("foo", @rel_array[0])
       assert_equal("foo\\bar", @rel_array[1])
       assert_equal("foo\\bar\\baz", @rel_array[2])
+      
+      assert_equal("\\\\foo\\bar", @unc_array[0])
+      assert_equal("\\\\foo\\bar\\baz", @unc_array[1])
    end
    
    def test_ascend
@@ -74,15 +79,22 @@ class TC_Pathname < Test::Unit::TestCase
       
       @bpath.ascend{ |path| @abs_array.push(path) }
       @npath.ascend{ |path| @rel_array.push(path) }
+      @upath.ascend{ |path| @unc_array.push(path) }
       
       assert_equal("C:\\Program Files\\Windows NT\\Accessories", @abs_array[0])
       assert_equal("C:\\Program Files\\Windows NT", @abs_array[1])
       assert_equal("C:\\Program Files", @abs_array[2])
       assert_equal("C:", @abs_array[3])
+      assert_equal(4, @abs_array.length)
       
       assert_equal("foo\\bar\\baz", @rel_array[0])
       assert_equal("foo\\bar", @rel_array[1])     
-      assert_equal("foo", @rel_array[2])     
+      assert_equal("foo", @rel_array[2])
+      assert_equal(3, @rel_array.length)
+      
+      assert_equal("\\\\foo\\bar\\baz", @unc_array[0])
+      assert_equal("\\\\foo\\bar", @unc_array[1])
+      assert_equal(2, @unc_array.length)     
    end
    
    # Fails due to PathIsURL for some reason
@@ -273,5 +285,6 @@ class TC_Pathname < Test::Unit::TestCase
       
       @abs_array.clear
       @rel_array.clear
+      @unc_array.clear
    end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: pathname2
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2005-08-30 00:00:00 -06:00
+  version: 1.2.1
+date: 2005-09-01 00:00:00 -06:00
 summary: An alternate implementation of the Pathname class
 require_paths: 
   - lib