Allow File.open and File.new with 4 arguments

lumeet · lumeet · commit a4e00cf89ad3 · 2015-03-26T17:35:06.000+02:00
The methods now support filename, mode, permissions and options as
separate parameters.
diff --git a/core/src/main/java/org/jruby/RubyFile.java b/core/src/main/java/org/jruby/RubyFile.java
@@ -321,7 +321,7 @@ public IRubyObject flock(ThreadContext context, IRubyObject operation) {
     }
 
     // rb_file_initialize
-    @JRubyMethod(name = "initialize", required = 1, optional = 2, visibility = PRIVATE)
+    @JRubyMethod(name = "initialize", required = 1, optional = 3, visibility = PRIVATE)
     public IRubyObject initialize(ThreadContext context, IRubyObject[] args, Block block) {
         if (openFile != null) {
             throw context.runtime.newRuntimeError("reinitializing File");
@@ -1225,7 +1225,10 @@ protected IRubyObject openFile(ThreadContext context, IRubyObject args[]) {
                 break;
             }
             case 4:
-                options = args[3].convertToHash();
+                options = args[3];
+                if (!options.isNil() && !(options instanceof RubyHash)) {
+                    throw runtime.newArgumentError("wrong number of arguments (4 for 1..3)");
+                }
                 vperm(pm, args[2]);
                 vmode(pm, args[1]);
                 break;
diff --git a/test/mri/excludes/TestPathname.rb b/test/mri/excludes/TestPathname.rb
@@ -1,6 +1,5 @@
 exclude :test_find, "fails to EACCES an unreadable path, root cause of test_find.rb's test_unreadable_dir failure?"
 exclude :test_lchmod, "fails on Travis, maybe on Linux in general?"
-exclude :test_open, "4-args open()"
 exclude :test_realdirpath, "bad symlink resolution"
 exclude :test_realpath, "needs investigation"
 exclude :test_relative_path_from_casefold, "path encoding problems"
