pathname2 1.4.1 → 1.4.2

data/CHANGES

@@ -1,4 +1,9 @@
-== 1.4.1 - 18-Feb-2005
+== 1.4.2 - 22-Feb-2006
+* Fixed the Pathname#relative_path_from method for Windows.  This really only
+  affected edge cases that you probably never saw anyway.
+* Added corresponding tests for Windows.
+
+== 1.4.1 - 18-Feb-2006
 * Added the Pathname#parent method.
 * Added the Pathname#relative_path_from method.
 * Bug fix for Pathname#pstrip on *nix.

data/lib/pathname2.rb

@@ -77,7 +77,7 @@ class Pathname < String
          Win32API.new("shlwapi", "PathRemoveBackslash", "P", "P")
    end
 
-   VERSION  = "1.4.1"
+   VERSION  = "1.4.2"
    MAX_PATH = 260
    
    # Creates and returns a new Pathname object.
@@ -376,6 +376,8 @@ class Pathname < String
    # the argument must be relative too.
    #
    # This method does not access the filesystem.  It assumes no symlinks.
+   # You should only compare directories against directories, or files against
+   # files, or you may not get expected results.
    #
    # Raises an ArgumentError if it cannot find a relative path.
    def relative_path_from(base)
@@ -387,6 +389,14 @@ class Pathname < String
 
       return Pathname.new(".") if self == base
       return self if base == "."
+      
+      # Because of the way the Windows version handles Pathname#clean, we need
+      # a little extra help here.
+      if @win
+         if base == '..' && (self != '..' || self != '.')
+            raise ArgumentError, "base directory may not contain '..'"
+         end
+      end
 
       dest_arr = self.clean.to_a
       base_arr = base.clean.to_a

data/test/tc_pathname.rb

@@ -71,7 +71,7 @@ class TC_Pathname < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal("1.4.1", Pathname::VERSION)
+      assert_equal("1.4.2", Pathname::VERSION)
    end
 
    # These tests taken directly from Tanaka's pathname.rb. The one failure

data/test/tc_pathname_win.rb

@@ -50,7 +50,7 @@ class TC_Pathname_MSWin < Test::Unit::TestCase
    end
    
    def test_version
-      assert_equal("1.4.0", Pathname::VERSION)
+      assert_equal("1.4.2", Pathname::VERSION)
    end
 
    # Convenience method for test_plus
@@ -69,6 +69,58 @@ class TC_Pathname_MSWin < Test::Unit::TestCase
       assert_equal(int, result)
    end
    
+   # Convenience method for test_relative_path_from
+   def assert_relpath(result, dest, base)
+      assert_equal(result, Pathname.new(dest).relative_path_from(base))
+   end
+
+   # Convenience method for test_relative_path_from_expected_errors
+   def assert_relpath_err(to, from)
+      assert_raise(ArgumentError) {
+         Pathname.new(to).relative_path_from(from)
+      }
+   end
+   
+   def test_relative_path_from
+      assert_relpath("..\\a", "a", "b")
+      assert_relpath("..\\a", "a", "b\\")
+      assert_relpath("..\\a", "a\\", "b")
+      assert_relpath("..\\a", "a\\", "b\\")
+      assert_relpath("..\\a", "c:\\a", "c:\\b")
+      assert_relpath("..\\a", "c:\\a", "c:\\b\\")
+      assert_relpath("..\\a", "c:\\a\\", "c:\\b")
+      assert_relpath("..\\a", "c:\\a\\", "c:\\b\\")
+      
+      assert_relpath("..\\b", "a\\b", "a\\c")
+      assert_relpath("..\\a", "..\\a", "..\\b")
+
+      assert_relpath("a", "a", ".")
+      assert_relpath("..", ".", "a")
+
+      assert_relpath(".", ".", ".")
+      assert_relpath(".", "..", "..")
+      assert_relpath("..", "..", ".")
+
+      assert_relpath("c\\d", "c:\\a\\b\\c\\d", "c:\\a\\b")
+      assert_relpath("..\\..", "c:\\a\\b", "c:\\a\\b\\c\\d")
+      assert_relpath("..\\..\\..\\..\\e", "c:\\e", "c:\\a\\b\\c\\d")
+      assert_relpath("..\\b\\c", "a\\b\\c", "a\\d")
+
+      assert_relpath("..\\a", "c:\\..\\a", "c:\\b")
+      #assert_relpath("..\\..\\a", "..\\a", "b") # fails
+      assert_relpath(".", "c:\\a\\..\\..\\b", "c:\\b")
+      assert_relpath("..", "a\\..", "a")
+      assert_relpath(".", "a\\..\\b", "b")
+
+      assert_relpath("a", "a", "b\\..")
+      assert_relpath("b\\c", "b\\c", "b\\..")
+
+      assert_relpath_err("c:\\", ".")
+      assert_relpath_err(".", "c:\\")
+      assert_relpath_err("a", "..")
+      assert_relpath_err(".", "..")
+   end
+   
    # Convenience method to verify that the receiver was not modified
    # except perhaps slashes
    def assert_non_destructive      

metadata

@@ -1,13 +1,13 @@
 --- !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.4.1
-date: 2006-02-18
+  version: 1.4.2
+date: 2006-02-22 00:00:00 -07:00
 summary: An alternate implementation of the Pathname class
 require_paths: 
-  - lib
+- lib
 email: djberg96@gmail.com
 homepage: http://www.rubyforge.org/projects/shards
 rubyforge_project: 
@@ -18,38 +18,42 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Daniel J. Berger
+- Daniel J. Berger
 files: 
-  - lib/pathname2.rb
-  - README
-  - CHANGES
-  - MANIFEST
-  - test/tc_pathname_win.rb
-  - test/tc_pathname.rb
+- lib/pathname2.rb
+- CHANGES
+- MANIFEST
+- README
+- test/tc_pathname.rb
+- test/tc_pathname_win.rb
 test_files: 
-  - test/tc_pathname.rb
+- test/tc_pathname.rb
 rdoc_options: []
+
 extra_rdoc_files: 
-  - README
-  - CHANGES
+- README
+- CHANGES
 executables: []
+
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: facade
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">="
-          - !ruby/object:Gem::Version 
-            version: 1.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: facade
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: