diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/pathname/pathname.c | 17 | ||||
| -rw-r--r-- | test/pathname/test_pathname.rb | 14 |
4 files changed, 39 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Sat Nov 5 12:14:31 2016 Tanaka Akira <akr@fsij.org> + + * ext/pathname/pathname.c (Pathname#empty?): New method. + [ruby-core:76404] [Feature#12596] Proposed by John Backus. + Sat Nov 5 11:53:02 2016 Shugo Maeda <shugo@ruby-lang.org> * test/ruby/test_refinement.rb (test_refine_alias_in_subclass): @@ -180,6 +180,9 @@ with all sufficient information, see the ChangeLog file or Redmine * Add an into option. [Feature #11191] +* pathname + * New method: Pathname#empty? [Feature#12596] + * WEBrick * Don't allow , as a separator [Bug #12791] diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 5987ccf462..e617e82176 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -990,6 +990,22 @@ path_zero_p(VALUE self) return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self)); } +/* + * Tests the file is empty. + * + * See Dir#empty? and FileTest.empty?. + */ +static VALUE +path_empty_p(VALUE self) +{ + + VALUE path = get_strpath(self); + if (RTEST(rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, path))) + return rb_funcall(rb_cDir, rb_intern("empty?"), 1, path); + else + return rb_funcall(rb_mFileTest, rb_intern("empty?"), 1, path); +} + static VALUE glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass)) { @@ -1452,6 +1468,7 @@ Init_pathname(void) rb_define_method(rb_cPathname, "world_writable?", path_world_writable_p, 0); rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0); rb_define_method(rb_cPathname, "zero?", path_zero_p, 0); + rb_define_method(rb_cPathname, "empty?", path_empty_p, 0); rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1); rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0); rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0); diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb index 2690a3f6de..848d4e4190 100644 --- a/test/pathname/test_pathname.rb +++ b/test/pathname/test_pathname.rb @@ -1212,6 +1212,20 @@ class TestPathname < Test::Unit::TestCase } end + def test_empty? + with_tmpchdir('rubytest-pathname') {|dir| + open("nonemptyfile", "w") {|f| f.write "abc" } + open("emptyfile", "w") {|f| } + Dir.mkdir("nonemptydir") + open("nonemptydir/somefile", "w") {|f| } + Dir.mkdir("emptydir") + assert_equal(true, Pathname("emptyfile").empty?) + assert_equal(false, Pathname("nonemptyfile").empty?) + assert_equal(true, Pathname("emptydir").empty?) + assert_equal(false, Pathname("nonemptydir").empty?) + } + end + def test_s_glob with_tmpchdir('rubytest-pathname') {|dir| open("f", "w") {|f| f.write "abc" } |