jruby#6606 - respect external encoding instead of hard coding UTF-8

Author: ryenus

src/org/jruby/RubyDir.java

@@ -443,7 +443,7 @@ public static IRubyObject chdir(ThreadContext context, IRubyObject recv, IRubyOb
         Ruby runtime = context.getRuntime();
         RubyString path = args.length == 1 ?
             RubyFile.get_path(context, args[0]) : getHomeDirectoryPath(context);
-        String adjustedPath = RubyFile.adjustRootPathOnWindows(runtime, path.getUnicodeValue(), null);
+        String adjustedPath = RubyFile.adjustRootPathOnWindows(runtime, path.asJavaString(), null);
         checkDirIsTwoSlashesOnWindows(runtime, adjustedPath);
         JRubyFile dir = getDir(runtime, adjustedPath, true);
         String realPath = null;
@@ -733,7 +733,7 @@ public static IRubyObject exist(ThreadContext context, IRubyObject recv, IRubyOb
 // ----- Helper Methods --------------------------------------------------------
     protected static String getPath19(ThreadContext context, IRubyObject arg) {
         RubyString pathObject = arg instanceof RubyString ? (RubyString) arg : arg.callMethod(context, "to_path").convertToString();
-        return pathObject.getUnicodeValue();
+        return pathObject.asJavaString();
     }
 
     /** Returns a Java <code>File</code> object for the specified path.  If

src/org/jruby/RubyFile.java

@@ -585,7 +585,7 @@ public static IRubyObject chown(ThreadContext context, IRubyObject recv, IRubyOb
     public static IRubyObject dirname(ThreadContext context, IRubyObject recv, IRubyObject arg) {
         RubyString filename = get_path(context, arg);
 
-        String jfilename = filename.getUnicodeValue();
+        String jfilename = filename.asJavaString();
 
         String name = jfilename.replace('\\', '/');
         int minPathLength = 1;
@@ -1315,7 +1315,7 @@ public static JRubyFile file(IRubyObject pathOrFile) {
             return JRubyFile.create(runtime.getCurrentDirectory(), ((RubyFile) pathOrFile).getPath());
         } else {
             RubyString pathStr = get_path(runtime.getCurrentContext(), pathOrFile);
-            String path = pathStr.getUnicodeValue();
+            String path = pathStr.asJavaString();
             String[] pathParts = splitURI(path);
             if (pathParts != null && pathParts[0].equals("file:")) {
                 path = pathParts[1];

src/org/jruby/RubyFileTest.java

@@ -99,7 +99,7 @@ public static IRubyObject directory_p(ThreadContext context, IRubyObject filenam
         }
         JRubyFile file = file(filename);
 
-        return runtime.newBoolean(file.exists() && runtime.getPosix().stat(file.getAbsolutePath()).isDirectory());
+        return runtime.newBoolean(file.exists() && file.isDirectory());
     }
 
     @JRubyMethod(name = "executable?", required = 1, module = true)
@@ -566,10 +566,12 @@ private static ZipEntry file_in_archive(IRubyObject path) {
         }
 
         RubyString pathStr = get_path(runtime.getCurrentContext(), path);
-        String pathJStr = pathStr.getUnicodeValue();
+        String pathJStr = pathStr.asJavaString();
+        
         if (pathJStr.startsWith("jar:")) {
             pathJStr = pathJStr.substring(4);
         }
+
         if (pathJStr.startsWith("file:")) {
             String file = pathJStr.substring(5);
             int bang = file.indexOf('!');

src/org/jruby/RubyString.java

@@ -385,9 +385,8 @@ public RubyString(Ruby runtime, RubyClass rubyClass) {
     public RubyString(Ruby runtime, RubyClass rubyClass, CharSequence value) {
         super(runtime, rubyClass);
         assert value != null;
-        byte[] bytes = RubyEncoding.encodeUTF8(value);
-        this.value = new ByteList(bytes, false);
-        this.value.setEncoding(UTF8);
+        byte[] bytes = RubyEncoding.encode(value, Charset.defaultCharset());
+        this.value = new ByteList(bytes, runtime.getDefaultExternalEncoding(), false);
     }
 
     public RubyString(Ruby runtime, RubyClass rubyClass, byte[] value) {

src/org/jruby/javasupport/JavaUtil.java

@@ -713,7 +713,7 @@ public void set(Ruby runtime, Object array, int i, IRubyObject value) {
     private static final JavaConverter JAVA_STRING_CONVERTER = new JavaConverter(String.class) {
         public IRubyObject convert(Ruby runtime, Object object) {
             if (object == null) return runtime.getNil();
-            return RubyString.newUnicodeString(runtime, (String)object);
+            return RubyString.newString(runtime, (String)object);
         }
         public IRubyObject get(Ruby runtime, Object array, int i) {
             return convert(runtime, ((String[]) array)[i]);