summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-18 03:09:54 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-18 03:09:54 +0000
commit78dc3da299f49eec2783190ad72812852750f40e (patch)
tree61337a349ba6dc71369b3ef0baa3f292b9ae1d37
parent623c6d972a5365f469d4ceb0fc3326faf35ba7b6 (diff)
Pathname#relative_path_from uses is_a?
I reconsidered because simpler code would have better maintainablity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/pathname/lib/pathname.rb8
-rw-r--r--test/pathname/test_pathname.rb1
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 383d47b52f3..2fd0642e14f 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 fbf4bb34598..f8e4937802c 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))