diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-07 03:51:15 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-11-07 03:51:15 +0000 |
commit | fb55a6d12f0d54f9107de665a3e12fc522b46335 (patch) | |
tree | 7574f78c66e95a40fcc505c0185d1448f62d67ea /lib/pathname.rb | |
parent | dc592364e62b75e778834dad8eaf1447f24ec573 (diff) | |
download | ruby-fb55a6d12f0d54f9107de665a3e12fc522b46335.tar.gz |
lib/pathname.rb (Pathname#+): if self or the argument is `.', return another.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/pathname.rb')
-rw-r--r-- | lib/pathname.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/pathname.rb b/lib/pathname.rb index c433f5dffc..96aa57330b 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -216,10 +216,13 @@ class Pathname # If self is the current working directory `.' or # the argument is absolute pathname, # the argument is just returned. + # If the argument is `.', self is returned. def +(other) other = Pathname.new(other) unless Pathname === other if @path == '.' || other.absolute? other + elsif other.to_s == '.' + self elsif %r{/\z} =~ @path Pathname.new(@path + other.to_s) else @@ -685,5 +688,12 @@ if $0 == __FILE__ assert_relpath_err(".", "..") end + def test_plus + assert_equal(Pathname.new('a/b'), Pathname.new('a') + Pathname.new('b')) + assert_equal(Pathname.new('a'), Pathname.new('a') + Pathname.new('.')) + assert_equal(Pathname.new('b'), Pathname.new('.') + Pathname.new('b')) + assert_equal(Pathname.new('.'), Pathname.new('.') + Pathname.new('.')) + assert_equal(Pathname.new('/b'), Pathname.new('a') + Pathname.new('/b')) + end end end |