psych 2.1.0-java → 2.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9dc0b94275e4a1293ff5f5d00f6a81d6f5a39c1
-  data.tar.gz: 680468b64f8d7b1b9b703f0adbd5249c2f9cd48b
+  metadata.gz: 8645c7bd38a6dbc8c7b287fc65e9bfd18b2658fe
+  data.tar.gz: 13e09c0edcdea89dd682f1370dbd1642684d2a59
 SHA512:
-  metadata.gz: 7cd7a891073f8c4469729780b92f90a7fe08277ae74b859b8d0c8a76180a016f223c4ed63908925cdd9accbdb29d277d2152ead31d2486008cfef338f88cb9a8
-  data.tar.gz: 3ac6acb3cdcc50b90870e2e0f5870470c8353725f06b75a9baa800beefd5dfc084ca9c43359f6c47c513dc320e1d38be2598ed778d45f15b748adfecbfb5888d
+  metadata.gz: b37a81b39236778d2fc23d53aef025f90449638f486c9bb72eae2dd7d05f5366bcac94c8596d8638e2394de2ae217ed15ffe0b84b98e858a7415e09a0ead6969
+  data.tar.gz: 75826880b51eeac52e0cb5eee62f931e4931bffc548aad3b12ed5798d5ab18c6e5e7a62d6ca8849db687efaf2058f9d7cd296f80f030850329bd50e95b52a3ec

data/.gitignore

@@ -0,0 +1,14 @@
+*.swp
+*.bundle
+*.jar
+*.class
+.mvn
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gemspec

data/Mavenfile

@@ -0,0 +1,7 @@
+#-*- mode: ruby -*-
+
+jar 'org.yaml:snakeyaml:${snakeyaml.version}'
+
+plugin :dependency, '2.8', :outputFile => 'pkg/classpath'
+
+# vim: syntax=Ruby

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "psych"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/ext/java/PsychEmitter.java

@@ -0,0 +1,345 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2010 Charles O Nutter <headius@headius.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.ext.psych;
+
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jcodings.Encoding;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.IOOutputStream;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.emitter.Emitter;
+import org.yaml.snakeyaml.emitter.EmitterException;
+import org.yaml.snakeyaml.error.Mark;
+import org.yaml.snakeyaml.events.AliasEvent;
+import org.yaml.snakeyaml.events.DocumentEndEvent;
+import org.yaml.snakeyaml.events.DocumentStartEvent;
+import org.yaml.snakeyaml.events.Event;
+import org.yaml.snakeyaml.events.ImplicitTuple;
+import org.yaml.snakeyaml.events.MappingEndEvent;
+import org.yaml.snakeyaml.events.MappingStartEvent;
+import org.yaml.snakeyaml.events.ScalarEvent;
+import org.yaml.snakeyaml.events.SequenceEndEvent;
+import org.yaml.snakeyaml.events.SequenceStartEvent;
+import org.yaml.snakeyaml.events.StreamEndEvent;
+import org.yaml.snakeyaml.events.StreamStartEvent;
+
+import static org.jruby.runtime.Visibility.*;
+
+public class PsychEmitter extends RubyObject {
+    public static void initPsychEmitter(Ruby runtime, RubyModule psych) {
+        RubyClass psychHandler = runtime.defineClassUnder("Handler", runtime.getObject(), runtime.getObject().getAllocator(), psych);
+        RubyClass psychEmitter = runtime.defineClassUnder("Emitter", psychHandler, new ObjectAllocator() {
+            public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
+                return new PsychEmitter(runtime, klazz);
+            }
+        }, psych);
+
+        psychEmitter.defineAnnotatedMethods(PsychEmitter.class);
+    }
+
+    public PsychEmitter(Ruby runtime, RubyClass klass) {
+        super(runtime, klass);
+    }
+
+    @JRubyMethod(visibility = PRIVATE)
+    public IRubyObject initialize(ThreadContext context, IRubyObject io) {
+        options = new DumperOptions();
+        options.setIndent(2);
+
+        this.io = io;
+
+        return context.nil;
+    }
+
+    @JRubyMethod(visibility = PRIVATE)
+    public IRubyObject initialize(ThreadContext context, IRubyObject io, IRubyObject rbOptions) {
+        IRubyObject width     = rbOptions.callMethod(context, "line_width");
+        IRubyObject canonical = rbOptions.callMethod(context, "canonical");
+        IRubyObject level     = rbOptions.callMethod(context, "indentation");
+
+        options = new DumperOptions();
+
+        options.setCanonical(canonical.isTrue());
+        options.setIndent((int)level.convertToInteger().getLongValue());
+        options.setWidth((int)width.convertToInteger().getLongValue());
+
+        this.io = io;
+
+        return context.nil;
+    }
+
+    @JRubyMethod
+    public IRubyObject start_stream(ThreadContext context, IRubyObject encoding) {
+        if (!(encoding instanceof RubyFixnum)) {
+            throw context.runtime.newTypeError(encoding, context.runtime.getFixnum());
+        }
+
+        initEmitter(context, encoding);
+
+        StreamStartEvent event = new StreamStartEvent(NULL_MARK, NULL_MARK);
+
+        emit(context, event);
+
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject end_stream(ThreadContext context) {
+        StreamEndEvent event = new StreamEndEvent(NULL_MARK, NULL_MARK);
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject start_document(ThreadContext context, IRubyObject _version, IRubyObject tags, IRubyObject implicit) {
+        DumperOptions.Version version = null;
+        boolean implicitBool = implicit.isTrue();
+        Map<String, String> tagsMap = null;
+
+        RubyArray versionAry = _version.convertToArray();
+        if (versionAry.size() == 2) {
+            int versionInt0 = (int)versionAry.eltInternal(0).convertToInteger().getLongValue();
+            int versionInt1 = (int)versionAry.eltInternal(1).convertToInteger().getLongValue();
+
+            if (versionInt0 == 1) {
+                if (versionInt1 == 0) {
+                    version = DumperOptions.Version.V1_0;
+                } else if (versionInt1 == 1) {
+                    version = DumperOptions.Version.V1_1;
+                }
+            }
+            if (version == null) {
+                throw context.runtime.newArgumentError("invalid YAML version: " + versionAry);
+            }
+        }
+
+        RubyArray tagsAry = tags.convertToArray();
+        if (tagsAry.size() > 0) {
+            tagsMap = new HashMap<String, String>(tagsAry.size());
+            for (int i = 0; i < tagsAry.size(); i++) {
+                RubyArray tagsTuple = tagsAry.eltInternal(i).convertToArray();
+                if (tagsTuple.size() != 2) {
+                    throw context.runtime.newRuntimeError("tags tuple must be of length 2");
+                }
+                IRubyObject key = tagsTuple.eltInternal(0);
+                IRubyObject value = tagsTuple.eltInternal(1);
+                tagsMap.put(
+                        key.asJavaString(),
+                        value.asJavaString());
+            }
+        }
+
+        DocumentStartEvent event = new DocumentStartEvent(NULL_MARK, NULL_MARK, !implicitBool, version, tagsMap);
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject end_document(ThreadContext context, IRubyObject implicit) {
+        DocumentEndEvent event = new DocumentEndEvent(NULL_MARK, NULL_MARK, !implicit.isTrue());
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod(required = 6)
+    public IRubyObject scalar(ThreadContext context, IRubyObject[] args) {
+        IRubyObject value = args[0];
+        IRubyObject anchor = args[1];
+        IRubyObject tag = args[2];
+        IRubyObject plain = args[3];
+        IRubyObject quoted = args[4];
+        IRubyObject style = args[5];
+        
+        if (!(value instanceof RubyString)) {
+            throw context.runtime.newTypeError(value, context.runtime.getString());
+        }
+
+        ScalarEvent event = new ScalarEvent(
+                anchor.isNil() ? null : anchor.asJavaString(),
+                tag.isNil() ? null : tag.asJavaString(),
+                new ImplicitTuple(plain.isTrue(),
+                quoted.isTrue()),
+                value.asJavaString(),
+                NULL_MARK,
+                NULL_MARK,
+                SCALAR_STYLES[(int)style.convertToInteger().getLongValue()]);
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod(required = 4)
+    public IRubyObject start_sequence(ThreadContext context, IRubyObject[] args) {
+        IRubyObject anchor = args[0];
+        IRubyObject tag = args[1];
+        IRubyObject implicit = args[2];
+        IRubyObject style = args[3];
+
+        final int SEQUENCE_BLOCK = 1; // see psych/nodes/sequence.rb
+
+        SequenceStartEvent event = new SequenceStartEvent(
+                anchor.isNil() ? null : anchor.asJavaString(),
+                tag.isNil() ? null : tag.asJavaString(),
+                implicit.isTrue(),
+                NULL_MARK,
+                NULL_MARK,
+                SEQUENCE_BLOCK != style.convertToInteger().getLongValue());
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject end_sequence(ThreadContext context) {
+        SequenceEndEvent event = new SequenceEndEvent(NULL_MARK, NULL_MARK);
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod(required = 4)
+    public IRubyObject start_mapping(ThreadContext context, IRubyObject[] args) {
+        IRubyObject anchor = args[0];
+        IRubyObject tag = args[1];
+        IRubyObject implicit = args[2];
+        IRubyObject style = args[3];
+
+        final int MAPPING_BLOCK = 1; // see psych/nodes/mapping.rb
+
+        MappingStartEvent event = new MappingStartEvent(
+                anchor.isNil() ? null : anchor.asJavaString(),
+                tag.isNil() ? null : tag.asJavaString(),
+                implicit.isTrue(),
+                NULL_MARK,
+                NULL_MARK,
+                MAPPING_BLOCK != style.convertToInteger().getLongValue());
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod
+    public IRubyObject end_mapping(ThreadContext context) {
+        MappingEndEvent event = new MappingEndEvent(NULL_MARK, NULL_MARK);
+        emit(context, event);
+        return this;
+    }
+    
+    @JRubyMethod
+    public IRubyObject alias(ThreadContext context, IRubyObject anchor) {
+        AliasEvent event = new AliasEvent(anchor.asJavaString(), NULL_MARK, NULL_MARK);
+        emit(context, event);
+        return this;
+    }
+
+    @JRubyMethod(name = "canonical=")
+    public IRubyObject canonical_set(ThreadContext context, IRubyObject canonical) {
+        // TODO: unclear if this affects a running emitter
+        options.setCanonical(canonical.isTrue());
+        return canonical;
+    }
+
+    @JRubyMethod
+    public IRubyObject canonical(ThreadContext context) {
+        // TODO: unclear if this affects a running emitter
+        return context.runtime.newBoolean(options.isCanonical());
+    }
+
+    @JRubyMethod(name = "indentation=")
+    public IRubyObject indentation_set(ThreadContext context, IRubyObject level) {
+        // TODO: unclear if this affects a running emitter
+        options.setIndent((int)level.convertToInteger().getLongValue());
+        return level;
+    }
+
+    @JRubyMethod
+    public IRubyObject indentation(ThreadContext context) {
+        // TODO: unclear if this affects a running emitter
+        return context.runtime.newFixnum(options.getIndent());
+    }
+
+    @JRubyMethod(name = "line_width=")
+    public IRubyObject line_width_set(ThreadContext context, IRubyObject width) {
+        options.setWidth((int)width.convertToInteger().getLongValue());
+        return width;
+    }
+
+    @JRubyMethod
+    public IRubyObject line_width(ThreadContext context) {
+        return context.runtime.newFixnum(options.getWidth());
+    }
+
+    private void emit(ThreadContext context, Event event) {
+        try {
+            if (emitter == null) throw context.runtime.newRuntimeError("uninitialized emitter");
+
+            emitter.emit(event);
+        } catch (IOException ioe) {
+            throw context.runtime.newIOErrorFromException(ioe);
+        } catch (EmitterException ee) {
+            throw context.runtime.newRuntimeError(ee.toString());
+        }
+    }
+
+    private void initEmitter(ThreadContext context, IRubyObject _encoding) {
+        if (emitter != null) throw context.runtime.newRuntimeError("already initialized emitter");
+
+        Encoding encoding = PsychLibrary.YAMLEncoding.values()[(int)_encoding.convertToInteger().getLongValue()].encoding;
+        Charset charset = context.runtime.getEncodingService().charsetForEncoding(encoding);
+
+        emitter = new Emitter(new OutputStreamWriter(new IOOutputStream(io, encoding), charset), options);
+    }
+
+    Emitter emitter;
+    DumperOptions options = new DumperOptions();
+    IRubyObject io;
+
+    private static final Mark NULL_MARK = new Mark(null, 0, 0, 0, null, 0);
+
+    // Map style constants from Psych values (ANY = 0 ... FOLDED = 5)
+    // to SnakeYaml values; see psych/nodes/scalar.rb.
+    private static final Character[] SCALAR_STYLES = new Character[] {
+        null, // ANY; we'll choose plain
+        null, // PLAIN
+        '\'', // SINGLE_QUOTED
+        '"',  // DOUBLE_QUOTED
+        '|',  // LITERAL
+        '>',  // FOLDED
+    };
+}

data/ext/java/PsychLibrary.java

@@ -0,0 +1,93 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2010 Charles O Nutter <headius@headius.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** 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;
+import org.jcodings.specific.UTF8Encoding;
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyModule;
+import org.jruby.RubyString;
+import org.jruby.internal.runtime.methods.JavaMethod.JavaMethodZero;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.Library;
+
+public class PsychLibrary implements Library {
+    public void load(final Ruby runtime, boolean wrap) {
+        RubyModule psych = runtime.defineModule("Psych");
+
+        // load version from properties packed with the jar
+        Properties props = new Properties();
+        try( InputStream is = runtime.getJRubyClassLoader().getResourceAsStream("META-INF/maven/org.yaml/snakeyaml/pom.properties") ) {
+            props.load(is);
+        }
+        catch( IOException e ) {
+            // ignored
+        }
+        RubyString version = runtime.newString(props.getProperty("version", "0.0") + ".0");
+        version.setFrozen(true);
+        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.getSingletonClass().addMethod("libyaml_version", new JavaMethodZero(psych, Visibility.PUBLIC) {
+            @Override
+            public IRubyObject call(ThreadContext context, IRubyObject self, RubyModule clazz, String name) {
+                return versionElements;
+            }
+        });
+        
+        PsychParser.initPsychParser(runtime, psych);
+        PsychEmitter.initPsychEmitter(runtime, psych);
+        PsychToRuby.initPsychToRuby(runtime, psych);
+        PsychYamlTree.initPsychYamlTree(runtime, psych);
+    }
+
+    public enum YAMLEncoding {
+        YAML_ANY_ENCODING(UTF8Encoding.INSTANCE),
+        YAML_UTF8_ENCODING(UTF8Encoding.INSTANCE),
+        YAML_UTF16LE_ENCODING(UTF16LEEncoding.INSTANCE),
+        YAML_UTF16BE_ENCODING(UTF16BEEncoding.INSTANCE);
+
+        YAMLEncoding(Encoding encoding) {
+            this.encoding = encoding;
+        }
+
+        public final Encoding encoding;
+    }
+}