psych 3.0.2-java → 3.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0cd551e6f43bcd6884c1efd454765a9544649e5a
-  data.tar.gz: f660bc87fca4221c306f93f9b0de800e4aa11b06
+SHA256:
+  metadata.gz: 7aed9d05032bc444bab436880e7451b18b177a162de7796189801eaa5197932c
+  data.tar.gz: e525367cd2cfe469492166b957bfdf55db72865525c3c507253e92b100d47112
 SHA512:
-  metadata.gz: c17282aa46f06bdbfb34e5be66b1037ca6c4e0b6175e543a804a623e2a0e16e6d88ef0c7203e7d903f83c587f584f36e76234495a8dc8399061f4e26d35e652b
-  data.tar.gz: 75022ffc21735051df9de9d674a5867b69472ed136486eb09daa342ade8163c87da03b29cede5a4365dcbf7a4e161789eb87038f952405ad0df601d609dd626e
+  metadata.gz: ccc121b4129b153433fac77601a600d843df7ef89511b24113c4d3aa63661c092f240e4753fdf7f3c4821be95010c70a52489eb51326d2247ea7b3f3f1ff6b8b
+  data.tar.gz: 4174038bcdd55991e3c3c76d025832ac403edab7e47c805799e48de59bf2a143e5c3b99801d627700efc6bb0e1755c779ba5c1f5524c9d1370047a46f0ae8b4a

data/README.md

@@ -14,11 +14,13 @@ serialize and de-serialize most Ruby objects to and from the YAML format.
 
 ## Examples
 
-    # Load YAML in to a Ruby object
-    Psych.load('--- foo') # => 'foo'
+```ruby
+# Load YAML in to a Ruby object
+Psych.load('--- foo') # => 'foo'
 
-    # Emit YAML from a Ruby object
-    Psych.dump("foo")     # => "--- foo\n...\n"
+# Emit YAML from a Ruby object
+Psych.dump("foo")     # => "--- foo\n...\n"
+```
 
 ## Dependencies
 

data/Rakefile

@@ -14,11 +14,13 @@ if RUBY_PLATFORM =~ /java/
   require 'rake/javaextensiontask'
   Rake::JavaExtensionTask.new("psych") do |ext|
     require 'maven/ruby/maven'
+    # force load of versions to overwrite constants with values from repo.
+    load './lib/psych/versions.rb'
     # uses Mavenfile to write classpath into pkg/classpath
     # and tell maven via system properties the snakeyaml version
     # this is basically the same as running from the commandline:
     # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
-    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.18", '-Dverbose=true')
+    Maven::Ruby::Maven.new.exec('dependency:build-classpath', "-Dsnakeyaml.version=1.23", '-Dverbose=true')
     ext.source_version = '1.7'
     ext.target_version = '1.7'
     ext.classpath = File.read('pkg/classpath')

data/ext/java/PsychEmitter.java

@@ -202,7 +202,7 @@ public class PsychEmitter extends RubyObject {
                 value.asJavaString(),
                 NULL_MARK,
                 NULL_MARK,
-                SCALAR_STYLES[(int)style.convertToInteger().getLongValue()]);
+                SCALAR_STYLES[style.convertToInteger().getIntValue()]);
         emit(context, event);
         return this;
     }
@@ -222,7 +222,7 @@ public class PsychEmitter extends RubyObject {
                 implicit.isTrue(),
                 NULL_MARK,
                 NULL_MARK,
-                SEQUENCE_BLOCK != style.convertToInteger().getLongValue());
+                FLOW_STYLES[style.convertToInteger().getIntValue()]);
         emit(context, event);
         return this;
     }
@@ -249,7 +249,7 @@ public class PsychEmitter extends RubyObject {
                 implicit.isTrue(),
                 NULL_MARK,
                 NULL_MARK,
-                MAPPING_BLOCK != style.convertToInteger().getLongValue());
+                FLOW_STYLES[style.convertToInteger().getIntValue()]);
         emit(context, event);
         return this;
     }
@@ -332,16 +332,22 @@ public class PsychEmitter extends RubyObject {
     DumperOptions options = new DumperOptions();
     IRubyObject io;
 
-    private static final Mark NULL_MARK = new Mark(null, 0, 0, 0, null, 0);
+    private static final Mark NULL_MARK = new Mark("", 0, 0, 0, new int[0], 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
+    private static final DumperOptions.ScalarStyle[] SCALAR_STYLES = {
+            DumperOptions.ScalarStyle.PLAIN, // ANY
+            DumperOptions.ScalarStyle.PLAIN,
+            DumperOptions.ScalarStyle.SINGLE_QUOTED,
+            DumperOptions.ScalarStyle.DOUBLE_QUOTED,
+            DumperOptions.ScalarStyle.LITERAL,
+            DumperOptions.ScalarStyle.FOLDED
+    };
+
+    private static final DumperOptions.FlowStyle[] FLOW_STYLES = {
+            DumperOptions.FlowStyle.AUTO,
+            DumperOptions.FlowStyle.BLOCK,
+            DumperOptions.FlowStyle.FLOW
     };
 }

data/ext/java/PsychLibrary.java

@@ -57,7 +57,13 @@ public class PsychLibrary implements Library {
         catch( IOException e ) {
             // ignored
         }
-        RubyString version = runtime.newString(props.getProperty("version", "0.0") + ".0");
+        String snakeyamlVersion = props.getProperty("version", "0.0");
+
+        if (snakeyamlVersion.endsWith("-SNAPSHOT")) {
+            snakeyamlVersion = snakeyamlVersion.substring(0, snakeyamlVersion.length() - "-SNAPSHOT".length());
+        }
+
+        RubyString version = runtime.newString(snakeyamlVersion + ".0");
         version.setFrozen(true);
         psych.setConstant("SNAKEYAML_VERSION", version);
 

data/ext/java/PsychParser.java

@@ -41,6 +41,7 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyEncoding;
+import org.jruby.RubyFixnum;
 import org.jruby.RubyIO;
 import org.jruby.RubyKernel;
 import org.jruby.RubyModule;
@@ -295,7 +296,7 @@ public class PsychParser extends RubyObject {
         IRubyObject tag = stringOrNilFor(runtime, se.getTag(), tainted);
         IRubyObject plain_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInPlainScalar());
         IRubyObject quoted_implicit = runtime.newBoolean(se.getImplicit().canOmitTagInNonPlainScalar());
-        IRubyObject style = runtime.newFixnum(translateStyle(se.getStyle()));
+        IRubyObject style = runtime.newFixnum(translateStyle(se.getScalarStyle()));
         IRubyObject val = stringFor(runtime, se.getValue(), tainted);
 
         invoke(context, handler, "scalar", val, anchor, tag, plain_implicit,
@@ -359,24 +360,26 @@ public class PsychParser extends RubyObject {
         RubyKernel.raise(context, runtime.getKernel(), new IRubyObject[] { exception }, Block.NULL_BLOCK);
     }
 
-    private static int translateStyle(Character style) {
+    private static int translateStyle(DumperOptions.ScalarStyle style) {
         if (style == null) return 0; // any
 
         switch (style) {
-            case 0: return 1; // plain
-            case '\'': return 2; // single-quoted
-            case '"': return 3; // double-quoted
-            case '|': return 4; // literal
-            case '>': return 5; // folded
+            case PLAIN: return 1; // plain
+            case SINGLE_QUOTED: return 2; // single-quoted
+            case DOUBLE_QUOTED: return 3; // double-quoted
+            case LITERAL: return 4; // literal
+            case FOLDED: return 5; // folded
             default: return 0; // any
         }
     }
     
-    private static int translateFlowStyle(Boolean flowStyle) {
-        if (flowStyle == null) return 0; // any
-
-        if (flowStyle) return 2;
-        return 1;
+    private static int translateFlowStyle(DumperOptions.FlowStyle flowStyle) {
+        switch (flowStyle) {
+            case AUTO: return 0;
+            case BLOCK: return 1;
+            case FLOW:
+            default: return 2;
+        }
     }
 
     @JRubyMethod
@@ -394,9 +397,9 @@ public class PsychParser extends RubyObject {
         if (event == null) {
             return ((RubyClass)context.runtime.getClassFromPath("Psych::Parser::Mark")).newInstance(
                     context,
-                    runtime.newFixnum(0),
-                    runtime.newFixnum(0),
-                    runtime.newFixnum(0),
+                    RubyFixnum.zero(runtime),
+                    RubyFixnum.zero(runtime),
+                    RubyFixnum.zero(runtime),
                     Block.NULL_BLOCK
             );
         }
@@ -405,7 +408,7 @@ public class PsychParser extends RubyObject {
 
         return ((RubyClass)context.runtime.getClassFromPath("Psych::Parser::Mark")).newInstance(
                 context,
-                runtime.newFixnum(mark.getIndex()),
+                RubyFixnum.zero(runtime),
                 runtime.newFixnum(mark.getLine()),
                 runtime.newFixnum(mark.getColumn()),
                 Block.NULL_BLOCK

data/ext/psych/psych_emitter.c

@@ -521,6 +521,7 @@ static VALUE set_line_width(VALUE self, VALUE width)
 
 void Init_psych_emitter(void)
 {
+#undef rb_intern
     VALUE psych     = rb_define_module("Psych");
     VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
     cPsychEmitter   = rb_define_class_under(psych, "Emitter", handler);

data/ext/psych/psych_parser.c

@@ -548,6 +548,7 @@ static VALUE mark(VALUE self)
 
 void Init_psych_parser(void)
 {
+#undef rb_intern
 #if 0
     mPsych = rb_define_module("Psych");
 #endif

data/lib/psych.rb

@@ -3,7 +3,12 @@ require 'psych/versions'
 case RUBY_ENGINE
 when 'jruby'
   require 'psych_jars'
-  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  if JRuby::Util.respond_to?(:load_ext)
+    JRuby::Util.load_ext('org.jruby.ext.psych.PsychLibrary')
+  else
+    require 'java'; require 'jruby'
+    org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+  end
 else
   begin
     require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
@@ -418,6 +423,24 @@ module Psych
   # to control the output format.  If an IO object is passed in, the YAML will
   # be dumped to that IO object.
   #
+  # Currently supported options are:
+  #
+  # [<tt>:indentation</tt>]   Number of space characters used to indent.
+  #                           Acceptable value should be in <tt>0..9</tt> range,
+  #                           otherwise option is ignored.
+  #
+  #                           Default: <tt>2</tt>.
+  # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #
+  #                           Default: <tt>0</tt> (meaning "wrap at 81").
+  # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
+  #                           strictly formal).
+  #
+  #                           Default: <tt>false</tt>.
+  # [<tt>:header</tt>]        Write <tt>%YAML [version]</tt> at the beginning of document.
+  #
+  #                           Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -427,10 +450,10 @@ module Psych
   #   Psych.dump(['a', 'b'], StringIO.new)  # => #<StringIO:0x000001009d0890>
   #
   #   # Dump an array with indentation set
-  #   Psych.dump(['a', ['b']], :indentation => 3) # => "---\n- a\n-  - b\n"
+  #   Psych.dump(['a', ['b']], indentation: 3) # => "---\n- a\n-  - b\n"
   #
   #   # Dump an array to an IO with indentation set
-  #   Psych.dump(['a', ['b']], StringIO.new, :indentation => 3)
+  #   Psych.dump(['a', ['b']], StringIO.new, indentation: 3)
   def self.dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -492,7 +515,7 @@ module Psych
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a Ruby object, or if the file is empty, it returns
-  # the specified default return value, which defaults to an empty Hash
+  # the specified +fallback+ return value, which defaults to +false+.
   def self.load_file filename, fallback: false
     File.open(filename, 'r:bom|utf-8') { |f|
       self.load f, filename, fallback: FALLBACK.new(fallback)

data/lib/psych/nodes/alias.rb

@@ -14,6 +14,8 @@ module Psych
       def initialize anchor
         @anchor = anchor
       end
+
+      def alias?; true; end
     end
   end
 end

data/lib/psych/nodes/document.rb

@@ -56,6 +56,8 @@ module Psych
       def root
         children.first
       end
+
+      def document?; true; end
     end
   end
 end

data/lib/psych/nodes/mapping.rb

@@ -52,6 +52,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def mapping?; true; end
     end
   end
 end

data/lib/psych/nodes/node.rb

@@ -63,6 +63,13 @@ module Psych
         io
       end
       alias :to_yaml :yaml
+
+      def alias?;    false; end
+      def document?; false; end
+      def mapping?;  false; end
+      def scalar?;   false; end
+      def sequence?; false; end
+      def stream?;   false; end
     end
   end
 end

data/lib/psych/nodes/scalar.rb

@@ -63,6 +63,8 @@ module Psych
         @quoted = quoted
         @style  = style
       end
+
+      def scalar?; true; end
     end
   end
 end

data/lib/psych/nodes/sequence.rb

@@ -77,6 +77,8 @@ module Psych
         @implicit = implicit
         @style    = style
       end
+
+      def sequence?; true; end
     end
   end
 end

data/lib/psych/nodes/stream.rb

@@ -33,6 +33,8 @@ module Psych
         super()
         @encoding = encoding
       end
+
+      def stream?; true; end
     end
   end
 end

data/lib/psych/versions.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module Psych
   # The version is Psych you're using
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '1.23'.freeze
   end
 end

data/psych.gemspec

@@ -3,10 +3,9 @@
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "3.0.2"
+  s.version = "3.0.3"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
-  s.date = "2017-12-04"
   s.summary = "Psych is a YAML parser and emitter"
   s.description = <<-DESCRIPTION
 Psych is a YAML parser and emitter. Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
@@ -20,7 +19,7 @@ DESCRIPTION
   # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   s.files = [
     ".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console",
-    "bin/setup", "ext/psych/.gitignore", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h",
+    "bin/setup", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h",
     "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h",
     "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h",
     "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c",
@@ -54,7 +53,7 @@ DESCRIPTION
       "ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java",
       "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"
     ]
-    s.requirements = "jar org.yaml:snakeyaml, 1.18"
+    s.requirements = "jar org.yaml:snakeyaml, 1.23"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: java
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-04 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,6 @@ files:
 - ext/java/PsychParser.java
 - ext/java/PsychToRuby.java
 - ext/java/PsychYamlTree.java
-- ext/psych/.gitignore
 - ext/psych/depend
 - ext/psych/extconf.rb
 - ext/psych/psych.c
@@ -182,9 +181,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar org.yaml:snakeyaml, 1.18
+- jar org.yaml:snakeyaml, 1.23
 rubyforge_project:
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter

data/ext/psych/.gitignore

@@ -1,11 +0,0 @@
-/api.c
-/config.h
-/dumper.c
-/emitter.c
-/loader.c
-/parser.c
-/reader.c
-/scanner.c
-/writer.c
-/yaml.h
-/yaml_private.h