psych 2.0.13 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ff80d57bc20b6d84ee24df83966f0feebfbe3f
-  data.tar.gz: afa7e8005ce6e5ce2867e4c3d06793d94c2af627
+  metadata.gz: b60d3bf3233df7c3abe9184e81b79eed85129ba1
+  data.tar.gz: b06bdbf39cd19feaf29b19d5fb49f2d0ae6cfe0e
 SHA512:
-  metadata.gz: d219a2267fdb9c6471a9e27e18242e572bcbf259207d78b4a8948dd812fc1da23bde5b24850e099961c4d0384a71d2bb2177c02b8131d771d8c726924ec693f0
-  data.tar.gz: 0ae5569645a513442d8f7859b2ab3154a42c8fc728ec9a82f6a40971554eab5907338032352522755cc59666d13f58d42304f71aaacd6f86b5fc9c7c3f4f9dc9
+  metadata.gz: d9a6914218ecaece3214bb8698a6589bb67b3ded99be295fee23894be97e40dac2c67ca730c4c8c7bf12bc89e68ec7974132adb3a81f6f8f54ae8507fda324a6
+  data.tar.gz: 105c008b421b79781e25f041a4f5d9ddc99fbf79b8a0db1fad1329abee305387fd10156612279daf0bdcaa4baaf1c13382cef0164833ca9e4fc52448e87060c4

data/.travis.yml

@@ -1,11 +1,16 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
+  - 2.2
+  - 2.3.0
   - ruby-head
+  - rbx-2
 before_script:
   - gem install hoe
   - gem install rake-compiler
-  - gem install minitest -v '~> 4.0'
+  - gem install minitest -v '~> 5.0'
 script: rake test
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: rbx-2

data/Manifest.txt

@@ -57,6 +57,7 @@ lib/psych/stream.rb
 lib/psych/streaming.rb
 lib/psych/syntax_error.rb
 lib/psych/tree_builder.rb
+lib/psych/versions.rb
 lib/psych/visitors.rb
 lib/psych/visitors/depth_first.rb
 lib/psych/visitors/emitter.rb
@@ -65,6 +66,7 @@ lib/psych/visitors/to_ruby.rb
 lib/psych/visitors/visitor.rb
 lib/psych/visitors/yaml_tree.rb
 lib/psych/y.rb
+lib/psych_jars.rb
 test/psych/handlers/test_recorder.rb
 test/psych/helper.rb
 test/psych/json/test_stream.rb

data/Rakefile

@@ -1,15 +1,22 @@
 # -*- ruby -*-
 
+require 'psych'
 require 'rubygems'
 require 'hoe'
 
+def java?
+  RUBY_PLATFORM =~ /java/
+end
+
 class Hoe
   remove_const :RUBY_FLAGS
-  RUBY_FLAGS = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
+  flags = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
+  flags = "--1.9 " + flags if java?
+  RUBY_FLAGS = flags
 end
 
 gem 'rake-compiler', '>= 0.4.1'
-gem 'minitest', '~> 4.0'
+gem 'minitest', '~> 5.0'
 require "rake/extensiontask"
 
 Hoe.plugin :doofus, :git, :gemspec
@@ -24,15 +31,57 @@ $hoe = Hoe.spec 'psych' do
   self.testlib           = :minitest
 
   extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-  extra_dev_deps << ['minitest', '~> 4.0']
+  extra_dev_deps << ['minitest', '~> 5.0']
 
   self.spec_extras = {
-    :extensions            => ["ext/psych/extconf.rb"],
     :required_ruby_version => '>= 1.9.2'
   }
 
-  Rake::ExtensionTask.new "psych", spec do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+  if java?
+    require './lib/psych/versions.rb'
+    extra_deps << ['jar-dependencies', '>= 0.1.7']
+
+    # the jar declaration for jar-dependencies
+    self.spec_extras[ 'requirements' ] = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    self.spec_extras[ 'platform' ] = 'java'
+    # TODO: clean this section up.
+    require "rake/javaextensiontask"
+    Rake::JavaExtensionTask.new("psych", spec) do |ext|
+      require 'maven/ruby/maven'
+      # 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=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' )
+      ext.source_version = '1.7'
+      ext.target_version = '1.7'
+      ext.classpath = File.read('pkg/classpath')
+      ext.ext_dir = 'ext/java'
+    end
+  else
+    self.spec_extras[:extensions] = ["ext/psych/extconf.rb"]
+    Rake::ExtensionTask.new "psych", spec do |ext|
+      ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+    end
+  end
+end
+
+def gem_build_path
+  File.join 'pkg', $hoe.spec.full_name
+end
+
+def add_file_to_gem relative_path
+  target_path = File.join gem_build_path, relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir unless File.directory?(target_dir)
+  rm_f target_path
+  safe_ln relative_path, target_path
+  $hoe.spec.files.concat [relative_path]
+end
+
+if java?
+  task gem_build_path => [:compile] do
+    add_file_to_gem 'lib/psych.jar'
   end
 end
 

data/ext/psych/extconf.rb

@@ -1,4 +1,5 @@
 # -*- coding: us-ascii -*-
+# frozen_string_literal: false
 require 'mkmf'
 require 'fileutils'
 

data/ext/psych/psych_emitter.c

@@ -1,5 +1,12 @@
 #include <psych.h>
 
+#if !defined(RARRAY_CONST_PTR)
+#define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s)
+#endif
+#if !defined(RARRAY_AREF)
+#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
+#endif
+
 VALUE cPsychEmitter;
 static ID id_write;
 static ID id_line_width;
@@ -15,7 +22,11 @@ static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 static int writer(void *ctx, unsigned char *buffer, size_t size)
 {
     VALUE io = (VALUE)ctx;
+#ifdef HAVE_RUBY_ENCODING_H
+    VALUE str = rb_enc_str_new((const char *)buffer, (long)size, rb_utf8_encoding());
+#else
     VALUE str = rb_str_new((const char *)buffer, (long)size);
+#endif
     VALUE wrote = rb_funcall(io, id_write, 1, str);
     return (int)NUM2INT(wrote);
 }
@@ -50,14 +61,13 @@ static const rb_data_type_t psych_emitter_type = {
 static VALUE allocate(VALUE klass)
 {
     yaml_emitter_t * emitter;
-
-    emitter = xmalloc(sizeof(yaml_emitter_t));
+    VALUE obj = TypedData_Make_Struct(klass, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_initialize(emitter);
     yaml_emitter_set_unicode(emitter, 1);
     yaml_emitter_set_indent(emitter, 2);
 
-    return TypedData_Wrap_Struct(klass, &psych_emitter_type, emitter);
+    return obj;
 }
 
 /* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
@@ -156,18 +166,20 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     }
 
     if(RTEST(tags)) {
-	int i = 0;
+	long i = 0;
+	long len;
 #ifdef HAVE_RUBY_ENCODING_H
 	rb_encoding * encoding = rb_utf8_encoding();
 #endif
 
 	Check_Type(tags, T_ARRAY);
 
-	head  = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
+	len = RARRAY_LEN(tags);
+	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
 	tail  = head;
 
-	for(i = 0; i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_PTR(tags)[i];
+	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+	    VALUE tuple = RARRAY_AREF(tags, i);
 	    VALUE name;
 	    VALUE value;
 
@@ -177,15 +189,17 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 		xfree(head);
 		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
 	    }
-	    name  = RARRAY_PTR(tuple)[0];
-	    value = RARRAY_PTR(tuple)[1];
+	    name  = RARRAY_AREF(tuple, 0);
+	    value = RARRAY_AREF(tuple, 1);
+	    StringValue(name);
+	    StringValue(value);
 #ifdef HAVE_RUBY_ENCODING_H
 	    name = rb_str_export_to_enc(name, encoding);
 	    value = rb_str_export_to_enc(value, encoding);
 #endif
 
-	    tail->handle = (yaml_char_t *)StringValuePtr(name);
-	    tail->prefix = (yaml_char_t *)StringValuePtr(value);
+	    tail->handle = (yaml_char_t *)RSTRING_PTR(name);
+	    tail->prefix = (yaml_char_t *)RSTRING_PTR(value);
 
 	    tail++;
 	}

data/ext/psych/psych_parser.c

@@ -70,11 +70,11 @@ static const rb_data_type_t psych_parser_type = {
 static VALUE allocate(VALUE klass)
 {
     yaml_parser_t * parser;
+    VALUE obj = TypedData_Make_Struct(klass, yaml_parser_t, &psych_parser_type, parser);
 
-    parser = xmalloc(sizeof(yaml_parser_t));
     yaml_parser_initialize(parser);
 
-    return TypedData_Wrap_Struct(klass, &psych_parser_type, parser);
+    return obj;
 }
 
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)

data/ext/psych/yaml/loader.c

@@ -239,8 +239,8 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
             return yaml_parser_set_composer_error_context(parser,
-                    "found duplicate anchor; first occurence",
-                    alias_data->mark, "second occurence", data.mark);
+                    "found duplicate anchor; first occurrence",
+                    alias_data->mark, "second occurrence", data.mark);
         }
     }
 

data/ext/psych/yaml/scanner.c

@@ -1251,7 +1251,7 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
 
 /*
  * Pop indentation levels from the indents stack until the current level
- * becomes less or equal to the column.  For each intendation level, append
+ * becomes less or equal to the column.  For each indentation level, append
  * the BLOCK-END token.
  */
 
@@ -1266,7 +1266,7 @@ yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
     if (parser->flow_level)
         return 1;
 
-    /* Loop through the intendation levels in the stack. */
+    /* Loop through the indentation levels in the stack. */
 
     while (parser->indent > column)
     {
@@ -2053,7 +2053,7 @@ yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token)
     else
     {
         yaml_parser_set_scanner_error(parser, "while scanning a directive",
-                start_mark, "found uknown directive name");
+                start_mark, "found unknown directive name");
         goto error;
     }
 
@@ -2775,15 +2775,15 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (IS_DIGIT(parser->buffer))
         {
-            /* Check that the intendation is greater than 0. */
+            /* Check that the indentation is greater than 0. */
 
             if (CHECK(parser->buffer, '0')) {
                 yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                        start_mark, "found an intendation indicator equal to 0");
+                        start_mark, "found an indentation indicator equal to 0");
                 goto error;
             }
 
-            /* Get the intendation level and eat the indicator. */
+            /* Get the indentation level and eat the indicator. */
 
             increment = AS_DIGIT(parser->buffer);
 
@@ -2797,7 +2797,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
     {
         if (CHECK(parser->buffer, '0')) {
             yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found an intendation indicator equal to 0");
+                    start_mark, "found an indentation indicator equal to 0");
             goto error;
         }
 
@@ -2847,7 +2847,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     end_mark = parser->mark;
 
-    /* Set the intendation level if it was specified. */
+    /* Set the indentation level if it was specified. */
 
     if (increment) {
         indent = parser->indent >= 0 ? parser->indent+increment : increment;
@@ -2913,7 +2913,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (!READ_LINE(parser, leading_break)) goto error;
 
-        /* Eat the following intendation spaces and line breaks. */
+        /* Eat the following indentation spaces and line breaks. */
 
         if (!yaml_parser_scan_block_scalar_breaks(parser,
                     &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
@@ -2948,8 +2948,8 @@ error:
 }
 
 /*
- * Scan intendation spaces and line breaks for a block scalar.  Determine the
- * intendation level if needed.
+ * Scan indentation spaces and line breaks for a block scalar.  Determine the
+ * indentation level if needed.
  */
 
 static int
@@ -2961,11 +2961,11 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
 
     *end_mark = parser->mark;
 
-    /* Eat the intendation spaces and line breaks. */
+    /* Eat the indentation spaces and line breaks. */
 
     while (1)
     {
-        /* Eat the intendation spaces. */
+        /* Eat the indentation spaces. */
 
         if (!CACHE(parser, 1)) return 0;
 
@@ -2978,12 +2978,12 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
         if ((int)parser->mark.column > max_indent)
             max_indent = (int)parser->mark.column;
 
-        /* Check for a tab character messing the intendation. */
+        /* Check for a tab character messing the indentation. */
 
         if ((!*indent || (int)parser->mark.column < *indent)
                 && IS_TAB(parser->buffer)) {
             return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found a tab character where an intendation space is expected");
+                    start_mark, "found a tab character where an indentation space is expected");
         }
 
         /* Have we found a non-empty line? */
@@ -3504,12 +3504,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse intendation. */
+                /* Check for tab character that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate intendation");
+                            start_mark, "found a tab character that violate indentation");
                     goto error;
                 }
 
@@ -3542,7 +3542,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
             if (!CACHE(parser, 1)) goto error;
         }
 
-        /* Check intendation level. */
+        /* Check indentation level. */
 
         if (!parser->flow_level && (int)parser->mark.column < indent)
             break;

data/lib/psych/class_loader.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/omap'
 require 'psych/set'
 

data/lib/psych/coder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # If an object defines +encode_with+, then an instance of Psych::Coder will

data/lib/psych/core_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)

data/lib/psych/deprecated.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'date'
 
 module Psych

data/lib/psych/exception.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   class Exception < RuntimeError
   end

data/lib/psych/handler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used

data/lib/psych/handlers/document_stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/tree_builder'
 
 module Psych

data/lib/psych/handlers/recorder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych

data/lib/psych/json/ruby_events.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module JSON
     module RubyEvents # :nodoc:

data/lib/psych/json/stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 

data/lib/psych/json/tree_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/json/yaml_events'
 
 module Psych

data/lib/psych/json/yaml_events.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module JSON
     module YAMLEvents # :nodoc:

data/lib/psych/nodes/alias.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/document.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/mapping.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'stringio'
 require 'psych/class_loader'
 require 'psych/scalar_scanner'

data/lib/psych/nodes/scalar.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/sequence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Nodes
     ###

data/lib/psych/nodes.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/nodes/node'
 require 'psych/nodes/stream'
 require 'psych/nodes/document'

data/lib/psych/omap.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   class Omap < ::Hash
   end

data/lib/psych/parser.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # YAML event parser class.  This class parses a YAML document and calls

data/lib/psych/scalar_scanner.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'strscan'
 
 module Psych

data/lib/psych/set.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   class Set < ::Hash
   end

data/lib/psych/stream.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   ###
   # Psych::Stream is a streaming YAML emitter.  It will not buffer your YAML,

data/lib/psych/streaming.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Streaming
     module ClassMethods

data/lib/psych/syntax_error.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/exception'
 
 module Psych

data/lib/psych/tree_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych

data/lib/psych/versions.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: false
+module Psych
+  DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze
+end

data/lib/psych/visitors/depth_first.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Visitors
     class DepthFirst < Psych::Visitors::Visitor

data/lib/psych/visitors/emitter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor

data/lib/psych/visitors/json_tree.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/json/ruby_events'
 
 module Psych

data/lib/psych/visitors/to_ruby.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
 require 'psych/exception'
@@ -61,7 +62,7 @@ module Psych
         case o.tag
         when '!binary', 'tag:yaml.org,2002:binary'
           o.value.unpack('m').first
-        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
           klass = resolve_class($1)
           if klass
             klass.allocate.replace o.value
@@ -208,7 +209,7 @@ module Psych
             obj
           end
 
-        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
           klass   = resolve_class($1)
           members = {}
           string  = nil
@@ -330,12 +331,13 @@ module Psych
         list
       end
 
+      SHOVEL = '<<'
       def revive_hash hash, o
         o.children.each_slice(2) { |k,v|
           key = accept(k)
           val = accept(v)
 
-          if key == '<<' && k.tag != "tag:yaml.org,2002:str"
+          if key == SHOVEL && k.tag != "tag:yaml.org,2002:str"
             case v
             when Nodes::Alias, Nodes::Mapping
               begin

data/lib/psych/visitors/visitor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 module Psych
   module Visitors
     class Visitor