diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/pathname.rb | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,6 +1,7 @@ -Fri Nov 7 11:06:57 2003 Tanaka Akira <akr@m17n.org> +Fri Nov 7 12:50:28 2003 Tanaka Akira <akr@m17n.org> - * lib/pathname.rb (Pathname#+): return the argument if self is `.'. + * lib/pathname.rb (Pathname#+): if self or the argument is `.', return + another. Fri Nov 7 10:23:24 2003 Nobuyoshi Nakada <nobu@ruby-lang.org> 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 |