diff options
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 1 | ||||
| -rw-r--r-- | test/pathname/test_pathname.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 3baf818f08..7fb923c6ae 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -503,6 +503,7 @@ class Pathname # ArgumentError is raised when it cannot find a relative path. # def relative_path_from(base_directory) + base_directory = Pathname.new(base_directory) unless Pathname === base_directory dest_directory = self.cleanpath.to_s base_directory = base_directory.cleanpath.to_s dest_prefix = dest_directory diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index 42bab36bc5..3bea182ed4 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -291,9 +291,10 @@ class TestPathname < Test::Unit::TestCase end def relative_path_from(dest_directory, base_directory) - Pathname.new(dest_directory).relative_path_from(Pathname.new(base_directory)).to_s + Pathname.new(dest_directory).relative_path_from(base_directory).to_s end + defassert(:relative_path_from, "../a", Pathname.new("a"), "b") defassert(:relative_path_from, "../a", "a", "b") defassert(:relative_path_from, "../a", "a", "b/") defassert(:relative_path_from, "../a", "a/", "b") |