akr	2010-08-09 22:15:49 +0900 (Mon, 09 Aug 2010)

  New Revision: 28941

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28941

  Log:
    * ext/pathname/pathname.c (path_open): Pathname#open
      translated from pathname.rb.

  Modified files:
    trunk/ChangeLog
    trunk/ext/pathname/lib/pathname.rb
    trunk/ext/pathname/pathname.c
    trunk/test/pathname/test_pathname.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28940)
+++ ChangeLog	(revision 28941)
@@ -1,3 +1,8 @@
+Mon Aug  9 22:15:19 2010  Tanaka Akira  <akr@f...>
+
+	* ext/pathname/pathname.c (path_open): Pathname#open
+	  translated from pathname.rb.
+
 Mon Aug  9 22:11:09 2010  Tanaka Akira  <akr@f...>
 
 	* test/ruby/test_signal.rb (TestSignal#test_exit_action): use
Index: ext/pathname/lib/pathname.rb
===================================================================
--- ext/pathname/lib/pathname.rb	(revision 28940)
+++ ext/pathname/lib/pathname.rb	(revision 28941)
@@ -512,11 +512,6 @@
 
 class Pathname    # * File *
 
-  # See <tt>File.open</tt>.  Opens the file for reading or writing.
-  def open(*args, &block) # :yield: file
-    File.open(@path, *args, &block)
-  end
-
   # See <tt>File.readlink</tt>.  Read symbolic link.
   def readlink() self.class.new(File.readlink(@path)) end
 
Index: ext/pathname/pathname.c
===================================================================
--- ext/pathname/pathname.c	(revision 28940)
+++ ext/pathname/pathname.c	(revision 28941)
@@ -337,6 +337,25 @@
 }
 
 /*
+ * See <tt>File.open</tt>.  Opens the file for reading or writing.
+ */
+static VALUE
+path_open(int argc, VALUE *argv, VALUE self)
+{
+    VALUE args[4];
+    int n;
+
+    args[0] = get_strpath(self);
+    n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
+    if (rb_block_given_p()) {
+        return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
+    }
+    else {
+        return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args);
+    }
+}
+
+/*
  * == Pathname
  *
  * Pathname represents a pathname which locates a file in a filesystem.
@@ -547,4 +566,5 @@
     rb_define_method(rb_cPathname, "fnmatch?", path_fnmatch, -1);
     rb_define_method(rb_cPathname, "ftype", path_ftype, 0);
     rb_define_method(rb_cPathname, "make_link", path_make_link, 1);
+    rb_define_method(rb_cPathname, "open", path_open, -1);
 }
Index: test/pathname/test_pathname.rb
===================================================================
--- test/pathname/test_pathname.rb	(revision 28940)
+++ test/pathname/test_pathname.rb	(revision 28941)
@@ -818,9 +818,27 @@
   def test_open
     with_tmpchdir('rubytest-pathname') {|dir|
       open("a", "w") {|f| f.write "abc" }
-      Pathname("a").open {|f|
+      path = Pathname("a")
+
+      path.open {|f|
         assert_equal("abc", f.read)
       }
+
+      path.open("r") {|f|
+        assert_equal("abc", f.read)
+      }
+
+      Pathname("b").open("w", 0444) {|f| f.write "def" }
+      assert_equal(0444, File.stat("b").mode & 0777)
+      assert_equal("def", File.read("b"))
+
+      Pathname("c").open("w", 0444, {}) {|f| f.write "ghi" }
+      assert_equal(0444, File.stat("c").mode & 0777)
+      assert_equal("ghi", File.read("c"))
+
+      g = path.open
+      assert_equal("abc", g.read)
+      g.close
     }
   end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/