diff options
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 8 | ||||
| -rw-r--r-- | test/pathname/test_pathname.rb | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 383d47b52f..2fd0642e14 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -503,13 +503,9 @@ 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 base_directory.is_a? Pathname dest_directory = self.cleanpath.to_s - base_directory = - if base_directory.respond_to? :cleanpath - base_directory - else - Pathname.new(base_directory) - end.cleanpath.to_s + base_directory = base_directory.cleanpath.to_s dest_prefix = dest_directory dest_names = [] while r = chop_basename(dest_prefix) diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index fbf4bb3459..f8e4937802 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -1439,6 +1439,7 @@ class TestPathname < Test::Unit::TestCase Pathname.new("/foo/bar").relative_path_from("/foo/baz")) obj = Object.new def obj.cleanpath() Pathname.new("/foo/baz") end + def obj.is_a?(m) m == Pathname end assert_equal( Pathname.new("../bar"), Pathname.new("/foo/bar").relative_path_from(obj)) |