jruby · Aug 21, 2015 · Aug 21, 2015
diff --git a/core/src/main/java/org/jruby/ext/psych/PsychLibrary.java b/core/src/main/java/org/jruby/ext/psych/PsychLibrary.java
@@ -27,6 +27,10 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby.ext.psych;
 
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.Properties;
+
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF16BEEncoding;
 import org.jcodings.specific.UTF16LEEncoding;
@@ -42,19 +46,28 @@
 import org.jruby.runtime.load.Library;
 
 public class PsychLibrary implements Library {
-    // NOTE: we add the last .0 for format compat with libyaml version numbers
-    // TODO: This should always reflect the SnakeYAML version
-    private static final String SNAKEYAML_VERSION = "1.13.0";
     public void load(final Ruby runtime, boolean wrap) {
         RubyModule psych = runtime.defineModule("Psych");
-
-        RubyString version = runtime.newString(SNAKEYAML_VERSION);
+
+        // load version from properties packed with the jar
+        Properties props = new Properties();
+        InputStream is = runtime.getJRubyClassLoader().getResourceAsStream("META-INF/maven/org.yaml/snakeyaml/pom.properties");
+        try {
+            props.load(is);
+        }
+        catch( IOException e ) {
+            // ignored
+        } finally {
+            try {is.close();} catch (IOException ioe) {}
+        }
+        RubyString version = runtime.newString(props.getProperty("version", "0.0") + ".0");
         version.setFrozen(true);
-
-        final RubyArray versionElements = runtime.newArray(runtime.newFixnum(1), runtime.newFixnum(13), runtime.newFixnum(0));
+        psych.setConstant("SNAKEYAML_VERSION", version);
+
+        String[] versionParts = version.toString().split("\\.");
+        final RubyArray versionElements = runtime.newArray(runtime.newFixnum(Integer.parseInt(versionParts[0])), runtime.newFixnum(Integer.parseInt(versionParts[1])), runtime.newFixnum(Integer.parseInt(versionParts[2])));
         versionElements.setFrozen(true);
 
-        psych.setConstant("LIBYAML_VERSION", version);
         psych.getSingletonClass().addMethod("libyaml_version", new JavaMethodZero(psych, Visibility.PUBLIC) {
             @Override
             public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name) {

diff --git a/core/src/main/java/org/jruby/ext/psych/PsychParser.java b/core/src/main/java/org/jruby/ext/psych/PsychParser.java
@@ -34,6 +34,7 @@
 
 import org.jcodings.Encoding;
 import org.jcodings.specific.UTF8Encoding;
+import org.jcodings.unicode.UnicodeEncoding;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -51,6 +52,8 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.IOInputStream;
+import org.jruby.util.encoding.CharsetTranscoder;
+import org.jruby.util.io.EncodingUtils;
 import org.jruby.util.log.Logger;
 import org.jruby.util.log.LoggerFactory;
 import org.yaml.snakeyaml.DumperOptions;
@@ -135,10 +138,19 @@ private StreamReader readerFor(ThreadContext context, IRubyObject yaml) {
 
         if (yaml instanceof RubyString) {
             ByteList byteList = ((RubyString)yaml).getByteList();
+            Encoding enc = byteList.getEncoding();
+
+            // if not unicode, transcode to UTF8
+            if (!(enc instanceof UnicodeEncoding)) {
+                byteList = CharsetTranscoder.strTranscode(context, (RubyString)yaml, enc, UTF8Encoding.INSTANCE, context.nil);
+                enc = UTF8Encoding.INSTANCE;
+            }
+
             ByteArrayInputStream bais = new ByteArrayInputStream(byteList.getUnsafeBytes(), byteList.getBegin(), byteList.getRealSize());
 
-            Charset charset = byteList.getEncoding().getCharset();
-            if (charset == null) charset = Charset.defaultCharset();
+            Charset charset = enc.getCharset();
+
+            assert charset != null : "charset for encoding " + enc + " should not be null";
 
             InputStreamReader isr = new InputStreamReader(bais, charset);
 
@@ -147,9 +159,10 @@ private StreamReader readerFor(ThreadContext context, IRubyObject yaml) {
 
         // fall back on IOInputStream, using default charset
         if (yaml.respondsTo("read")) {
-            Charset charset = (yaml instanceof RubyIO)
-                ? ((RubyIO)yaml).getReadEncoding().getCharset()
-                : Charset.defaultCharset();
+            Encoding enc = (yaml instanceof RubyIO)
+                ? ((RubyIO)yaml).getReadEncoding()
+                : UTF8Encoding.INSTANCE;
+            Charset charset = enc.getCharset();
             return new StreamReader(new InputStreamReader(new IOInputStream(yaml), charset));
         } else {
             throw runtime.newTypeError(yaml, runtime.getIO());

diff --git a/core/src/main/java/org/jruby/ext/psych/PsychToRuby.java b/core/src/main/java/org/jruby/ext/psych/PsychToRuby.java
@@ -40,33 +40,40 @@
 
 public class PsychToRuby {
     public static void initPsychToRuby(Ruby runtime, RubyModule psych) {
+        RubyClass classLoader = runtime.defineClassUnder("ClassLoader", runtime.getObject(), RubyObject.OBJECT_ALLOCATOR, psych);
+
         RubyModule visitors = runtime.defineModuleUnder("Visitors", psych);
         RubyClass visitor = runtime.defineClassUnder("Visitor", runtime.getObject(), runtime.getObject().getAllocator(), visitors);
         RubyClass psychToRuby = runtime.defineClassUnder("ToRuby", visitor, RubyObject.OBJECT_ALLOCATOR, visitors);
 
-        psychToRuby.defineAnnotatedMethods(PsychToRuby.class);
+        psychToRuby.defineAnnotatedMethods(ToRuby.class);
+        classLoader.defineAnnotatedMethods(ClassLoader.class);
     }
 
-    @JRubyMethod(visibility = PRIVATE)
-    public static IRubyObject build_exception(ThreadContext context, IRubyObject self, IRubyObject klass, IRubyObject message) {
-        if (klass instanceof RubyClass) {
-            IRubyObject exception = ((RubyClass)klass).allocate();
-            ((RubyException)exception).message = message;
-            return exception;
-        } else {
-            throw context.runtime.newTypeError(klass, context.runtime.getClassClass());
+    public static class ToRuby {
+        @JRubyMethod(visibility = PRIVATE)
+        public static IRubyObject build_exception(ThreadContext context, IRubyObject self, IRubyObject klass, IRubyObject message) {
+            if (klass instanceof RubyClass) {
+                IRubyObject exception = ((RubyClass)klass).allocate();
+                ((RubyException)exception).message = message;
+                return exception;
+            } else {
+                throw context.runtime.newTypeError(klass, context.runtime.getClassClass());
+            }
         }
     }
 
-    @JRubyMethod(visibility = PRIVATE)
-    public static IRubyObject path2class(ThreadContext context, IRubyObject self, IRubyObject path) {
-        try {
-            return context.runtime.getClassFromPath(path.asJavaString());
-        } catch (RaiseException re) {
-            if (re.getException().getMetaClass() == context.runtime.getNameError()) {
-                throw context.runtime.newArgumentError("undefined class/module " + path);
+    public static class ClassLoader {
+        @JRubyMethod(visibility = PRIVATE)
+        public static IRubyObject path2class(ThreadContext context, IRubyObject self, IRubyObject path) {
+            try {
+                return context.runtime.getClassFromPath(path.asJavaString());
+            } catch (RaiseException re) {
+                if (re.getException().getMetaClass() == context.runtime.getNameError()) {
+                    throw context.runtime.newArgumentError("undefined class/module " + path);
+                }
+                throw re;
             }
-            throw re;
         }
     }
 }