pathname2 1.1.0 → 1.2.0

data/CHANGES

@@ -1,3 +1,7 @@
+== 1.2.0 - 29-Aug-2005
+* Added the 'ascend' and 'descend' methods.
+* Added corresponding test suite additions.
+
 == 1.1.0 - 13-Jul-2005
 * Added the 'find' facade.
 

data/lib/pathname2.rb

@@ -69,7 +69,7 @@ class Pathname < String
          Win32API.new("shlwapi", "PathRemoveBackslash", "P", "P")
    end
 
-   VERSION  = "1.1.0"
+   VERSION  = "1.2.0"
    MAX_PATH = 260
    
    # Creates and returns a new Pathname object.
@@ -143,6 +143,54 @@ class Pathname < String
       self.to_a.each{ |element| yield element }
    end
 
+   # Yields each component of the path, concatenating the next component on
+   # each iteration, as a new Pathname object, starting with the root path.
+   #
+   # For example, if the path is "/foo/bar/baz", then "/" would be yielded
+   # 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 = "" 
+      else
+         path = absolute? ? root : ""
+      end
+
+      # Yield the root directory if an absolute path (and not Windows)
+      unless PLATFORM.match("mswin")
+         yield root if absolute?
+      end
+
+      self.each{ |element|
+         path << element << @sep
+         yield Pathname.new(path.chop)
+      }
+   end
+
+   # Yields the path, minus one component on each iteration, as a new
+   # Pathname object, ending with the root path.
+   #
+   # 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 "/".
+   def ascend
+      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")
+         end
+         yield Pathname.new(path)
+         n -= 1
+      end
+
+      # Yield the root directory if an absolute path (and not Windows)
+      unless PLATFORM.match("mswin")
+         yield root if absolute?
+      end
+   end
+
    # Returns the root directory of the path, or '.' if there is no root
    # directory.
    #

data/test/tc_pathname.rb

@@ -12,7 +12,8 @@ require "test/unit"
 
 class TC_Pathname < Test::Unit::TestCase
    def setup
-      @path = Pathname.new("/usr/local/bin")
+      @abs_path = Pathname.new("/usr/local/bin")
+      @rel_path = Pathname.new("usr/local/bin")
    end
    
    # Convenience method for test_plus
@@ -32,21 +33,59 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.1.0", Pathname::VERSION)
+      assert_equal("1.2.0", 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) }
+
+      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", rel_array[0])
+      assert_equal("usr/local", rel_array[1])
+      assert_equal("usr", rel_array[2])
+   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) }
+
+      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("usr", rel_array[0])
+      assert_equal("usr/local", rel_array[1])
+      assert_equal("usr/local/bin", rel_array[2])
    end
 
    def test_unc
-      assert_raises(NotImplementedError){ @path.unc? }
+      assert_raises(NotImplementedError){ @abs_path.unc? }
    end
 
    def test_enumerable
-      assert_respond_to(@path, :each)
+      assert_respond_to(@abs_path, :each)
    end
    
    def test_root
-      assert_respond_to(@path, :root)
-      assert_nothing_raised{ @path.root }
-      assert_equal("/", @path.root)
+      assert_respond_to(@abs_path, :root)
+      assert_nothing_raised{ @abs_path.root }
+      assert_equal("/", @abs_path.root)
 
       path1 = Pathname.new("foo")
       path2 = Pathname.new("foo/bar/baz")
@@ -55,8 +94,8 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_root?
-      assert_respond_to(@path, :root?)
-      assert_nothing_raised{ @path.root? }
+      assert_respond_to(@abs_path, :root?)
+      assert_nothing_raised{ @abs_path.root? }
 
       path1 = Pathname.new("/")
       path2 = Pathname.new("a")
@@ -65,8 +104,8 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_absolute
-      assert_respond_to(@path, :absolute?)
-      assert_nothing_raised{ @path.absolute? }
+      assert_respond_to(@abs_path, :absolute?)
+      assert_nothing_raised{ @abs_path.absolute? }
       assert_equal(true, Pathname.new("/usr/bin/ruby").absolute?)
       assert_equal(false, Pathname.new("foo").absolute?)
       assert_equal(false, Pathname.new("foo/bar").absolute?)
@@ -74,8 +113,8 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_relative
-      assert_respond_to(@path, :relative?)
-      assert_nothing_raised{ @path.relative? }
+      assert_respond_to(@abs_path, :relative?)
+      assert_nothing_raised{ @abs_path.relative? }
       assert_equal(false, Pathname.new("/usr/bin/ruby").relative?)
       assert_equal(true, Pathname.new("foo").relative?)
       assert_equal(true, Pathname.new("foo/bar").relative?)
@@ -83,14 +122,14 @@ class TC_Pathname < Test::Unit::TestCase
    end
    
    def test_to_a
-      assert_respond_to(@path, :to_a)
-      assert_nothing_raised{ @path.to_a }
-      assert_kind_of(Array, @path.to_a)
-      assert_equal(%w/usr local bin/, @path.to_a)
+      assert_respond_to(@abs_path, :to_a)
+      assert_nothing_raised{ @abs_path.to_a }
+      assert_kind_of(Array, @abs_path.to_a)
+      assert_equal(%w/usr local bin/, @abs_path.to_a)
    end
 
    def test_spaceship_operator
-      assert_respond_to(@path, :<=>)
+      assert_respond_to(@abs_path, :<=>)
 
       assert_pathname_cmp( 0, "/foo/bar", "/foo/bar")
       assert_pathname_cmp(-1, "/foo/bar", "/foo/zap")
@@ -100,7 +139,7 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_plus_operator
-      assert_respond_to(@path, :+)
+      assert_respond_to(@abs_path, :+)
 
       # Standard stuff
       assert_pathname_plus("/foo/bar", "/foo", "bar")
@@ -146,21 +185,21 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_facade_io
-      assert_respond_to(@path, :foreach)
-      assert_respond_to(@path, :read)
-      assert_respond_to(@path, :readlines)
-      assert_respond_to(@path, :sysopen)
+      assert_respond_to(@abs_path, :foreach)
+      assert_respond_to(@abs_path, :read)
+      assert_respond_to(@abs_path, :readlines)
+      assert_respond_to(@abs_path, :sysopen)
    end
 
    def test_facade_file
       File.methods(false).each{ |method|
-         assert_respond_to(@path, method.to_sym)
+         assert_respond_to(@abs_path, method.to_sym)
       }
    end
 
    def test_facade_dir
       Dir.methods(false).each{ |method|
-         assert_respond_to(@path, method.to_sym)
+         assert_respond_to(@abs_path, method.to_sym)
       }
    end
 
@@ -172,13 +211,13 @@ class TC_Pathname < Test::Unit::TestCase
       methods.delete("identical?")
 
       methods.each{ |method|
-         assert_respond_to(@path, method.to_sym)
+         assert_respond_to(@abs_path, method.to_sym)
       }
    end
 
    def test_facade_find
-      assert_respond_to(@path, :find)
-      assert_nothing_raised{ @path.find{} }
+      assert_respond_to(@abs_path, :find)
+      assert_nothing_raised{ @abs_path.find{} }
 
       Pathname.new(Dir.pwd).find{ |f|
          Find.prune if f.match("CVS")
@@ -187,6 +226,6 @@ class TC_Pathname < Test::Unit::TestCase
    end
    
    def teardown
-      @path = nil
+      @abs_path = nil
    end
 end

data/test/tc_pathname_win.rb

@@ -21,10 +21,13 @@ class TC_Pathname < Test::Unit::TestCase
       @ypath = Pathname.new("\\\\foo")
       @zpath = Pathname.new("\\\\")
       @epath = Pathname.new("")
+      
+      @abs_array = []
+      @rel_array = []
    end
    
    def test_version
-      assert_equal("1.1.0", Pathname::VERSION)
+      assert_equal("1.2.0", Pathname::VERSION)
    end
    
    # Convenience method for test_plus
@@ -48,6 +51,40 @@ class TC_Pathname < Test::Unit::TestCase
       assert_nothing_raised{ @fpath.each{ |e| } }
    end
    
+   def test_descend
+      assert_respond_to(@bpath, :descend)
+      assert_nothing_raised{ @bpath.descend{} }
+      
+      @bpath.descend{ |path| @abs_array.push(path) }
+      @npath.descend{ |path| @rel_array.push(path) }
+      
+      assert_equal("C:", @abs_array[0])
+      assert_equal("C:\\Program Files", @abs_array[1])
+      assert_equal("C:\\Program Files\\Windows NT", @abs_array[2])
+      assert_equal("C:\\Program Files\\Windows NT\\Accessories", @abs_array[3])
+      
+      assert_equal("foo", @rel_array[0])
+      assert_equal("foo\\bar", @rel_array[1])
+      assert_equal("foo\\bar\\baz", @rel_array[2])
+   end
+   
+   def test_ascend
+      assert_respond_to(@bpath, :ascend)
+      assert_nothing_raised{ @bpath.ascend{} }
+      
+      @bpath.ascend{ |path| @abs_array.push(path) }
+      @npath.ascend{ |path| @rel_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("foo\\bar\\baz", @rel_array[0])
+      assert_equal("foo\\bar", @rel_array[1])     
+      assert_equal("foo", @rel_array[2])     
+   end
+   
    # Fails due to PathIsURL for some reason
    #def test_immutability
    #   path = "C:\\Program Files\\foo\\bar".freeze
@@ -233,5 +270,8 @@ class TC_Pathname < Test::Unit::TestCase
       @ypath = nil
       @zpath = nil
       @epath = nil
+      
+      @abs_array.clear
+      @rel_array.clear
    end
 end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.10
+rubygems_version: 0.8.11
 specification_version: 1
 name: pathname2
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2005-07-13
+  version: 1.2.0
+date: 2005-08-30 00:00:00 -06:00
 summary: An alternate implementation of the Pathname class
 require_paths: 
   - lib
@@ -24,6 +24,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
   - Daniel J. Berger
 files: