diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/pathname.rb | 47 |
2 files changed, 35 insertions, 18 deletions
@@ -1,3 +1,9 @@ +Sat Sep 3 13:59:31 2005 Tanaka Akira <akr@m17n.org> + + * lib/pathname.rb (Pathname#descend): Pathname.new("./a/b/c").descend + didn't yield "." + (Pathname#ascend): ditto. + Fri Sep 2 23:51:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (f_arg): f_norm_arg is a VALUE in ripper, not an ID. diff --git a/lib/pathname.rb b/lib/pathname.rb index d9dabd0ca0..7b371def2b 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -448,10 +448,11 @@ class Pathname end paths << v else - until v.to_s == '.' + until v.basename == v paths << v v = v.dirname end + paths << v end paths.reverse_each {|path| yield path } end @@ -482,10 +483,11 @@ class Pathname end paths << v else - until v.to_s == '.' + until v.basename == v paths << v v = v.dirname end + paths << v end paths.each {|path| yield path } end @@ -1273,31 +1275,40 @@ if $0 == __FILE__ end def test_descend_abs - rs = %w[/ /a /a/b /a/b/c] - Pathname.new("/a/b/c").descend {|v| - assert_equal(Pathname.new(rs.shift), v) - } + rs = %w[/ /a /a/b /a/b/c].map {|s| Pathname.new(s) } + Pathname.new("/a/b/c").descend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) end def test_descend_rel - rs = %w[a a/b a/b/c] - Pathname.new("a/b/c").descend {|v| - assert_equal(Pathname.new(rs.shift), v) - } + rs = %w[a a/b a/b/c].map {|s| Pathname.new(s) } + Pathname.new("a/b/c").descend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) + end + + def test_descend_rel_with_current_dir + rs = %w[. ./a ./a/b ./a/b/c].map {|s| Pathname.new(s) } + Pathname.new("./a/b/c").descend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) end def test_ascend_abs - rs = %w[/a/b/c /a/b /a /] - Pathname.new("/a/b/c").ascend {|v| - assert_equal(Pathname.new(rs.shift), v) - } + rs = %w[/a/b/c /a/b /a /].map {|s| Pathname.new(s) } + Pathname.new("/a/b/c").ascend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) end def test_ascend_rel - rs = %w[a/b/c a/b a] - Pathname.new("a/b/c").ascend {|v| - assert_equal(Pathname.new(rs.shift), v) - } + rs = %w[a/b/c a/b a].map {|s| Pathname.new(s) } + Pathname.new("a/b/c").ascend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) end + + def test_ascend_rel_with_current_dir + rs = %w[./a/b/c ./a/b ./a .].map {|s| Pathname.new(s) } + Pathname.new("./a/b/c").ascend {|v| assert_equal(rs.shift, v) } + assert_equal([], rs) + end + end end |