kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/pathname/pathname.c (path_expand_path): Pathname#expand_path

Browse source 
translated from pathname.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-08-20 01:40:51 +00:00
parent 1fa5a50cd0
commit 19fb560d21
4 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 20 10:40:04 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_expand_path): Pathname#expand_path
translated from pathname.rb.
Thu Aug 19 22:44:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Aug 19 22:44:56 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/make-snapshot (usage): add usage. * tool/make-snapshot (usage): add usage.

3
ext/pathname/lib/pathname.rb
View file

@ -512,9 +512,6 @@ end
class Pathname # * File * class Pathname # * File *
# See <tt>File.expand_path</tt>.
def expand_path(*args) self.class.new(File.expand_path(@path, *args)) end
# See <tt>File.split</tt>. Returns the #dirname and the #basename in an # See <tt>File.split</tt>. Returns the #dirname and the #basename in an
# Array. # Array.
def split() File.split(@path).map {|f| self.class.new(f) } end def split() File.split(@path).map {|f| self.class.new(f) } end

16
ext/pathname/pathname.c
View file

@ -459,6 +459,21 @@ path_extname(VALUE self)
return rb_funcall(rb_cFile, rb_intern("extname"), 1, str); return rb_funcall(rb_cFile, rb_intern("extname"), 1, str);
} }
/*
* See <tt>File.expand_path</tt>.
*/
static VALUE
path_expand_path(int argc, VALUE *argv, VALUE self)
{
VALUE str = get_strpath(self);
VALUE dname;
if (rb_scan_args(argc, argv, "01", &dname) == 0)
str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str);
else
str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname);
return rb_class_new_instance(1, &str, rb_obj_class(self));
}
/* /*
* == Pathname * == Pathname
* *
@ -681,4 +696,5 @@ Init_pathname()
rb_define_method(rb_cPathname, "basename", path_basename, -1); rb_define_method(rb_cPathname, "basename", path_basename, -1);
rb_define_method(rb_cPathname, "dirname", path_dirname, 0); rb_define_method(rb_cPathname, "dirname", path_dirname, 0);
rb_define_method(rb_cPathname, "extname", path_extname, 0); rb_define_method(rb_cPathname, "extname", path_extname, 0);
rb_define_method(rb_cPathname, "expand_path", path_expand_path, -1);
} }

8
test/pathname/test_pathname.rb
View file

@ -926,6 +926,14 @@ class TestPathname < Test::Unit::TestCase
assert_equal(".ext", Pathname("basename.ext").extname) assert_equal(".ext", Pathname("basename.ext").extname)
end end
def test_expand_path
assert_equal(Pathname("/a"), Pathname("/a").expand_path)
assert_equal(Pathname("/a"), Pathname("a").expand_path("/"))
assert_equal(Pathname("/a"), Pathname("a").expand_path(Pathname("/")))
assert_equal(Pathname("/b"), Pathname("/b").expand_path(Pathname("/a")))
assert_equal(Pathname("/a/b"), Pathname("b").expand_path(Pathname("/a")))
end
def test_split def test_split
assert_equal([Pathname("dirname"), Pathname("basename")], Pathname("dirname/basename").split) assert_equal([Pathname("dirname"), Pathname("basename")], Pathname("dirname/basename").split)
end end