psych 2.0.15 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9723896ce1c029250c40de2395d76fe4133285da
-  data.tar.gz: 6dfe37723db8e821b8c82d656188c95331e7d800
+  metadata.gz: 7c037fcb7ef48f0f83b3b03427ad2ffdd96befdc
+  data.tar.gz: d51f7d29fc63de8aa3aa823e585d060595194347
 SHA512:
-  metadata.gz: d5e5204545c105702e9f0ff93b608b2b804f06e512745c74b3db837088e24f1f356190e01234c7316563c11bf0114596398d5e8894db296e121d4d272ffbd7e9
-  data.tar.gz: e95109b57bf2b48c6236818a4804ff48c68792c5ac11e62eea5ad9b963a72d2de525673a40a73f3659678ee2bf1ea8c606375bb93fccd396ae95d032bac2e8fe
+  metadata.gz: 03afdda5d3685773185c2064b6651ea66d64da1202b4e53966742fbcb72faa0bbcfa587e12e57b67eee3566bf91aaa082af110628bb6e453f9fc7ad7f2b740f7
+  data.tar.gz: a3a4acdd49e43956f05e639e2e0f926e883267fc1552dcb5ca686e557ad4992b0f00d01c780ef052510d831fcfa8af85e6133d290712ea960f3563ab4141dd9b

data/.travis.yml

@@ -1,6 +1,4 @@
 rvm:
-  - 1.9.2
-  - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.2.0
@@ -13,4 +11,4 @@ before_script:
 script: rake test
 matrix:
   allow_failures:
-    - rvm: rbx-2
+    - rvm: rbx-2

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);
 }
@@ -155,7 +166,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     }
 
     if(RTEST(tags)) {
-	int i = 0;
+	long i = 0;
 #ifdef HAVE_RUBY_ENCODING_H
 	rb_encoding * encoding = rb_utf8_encoding();
 #endif
@@ -166,7 +177,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 	tail  = head;
 
 	for(i = 0; i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_PTR(tags)[i];
+	    VALUE tuple = RARRAY_AREF(tags, i);
 	    VALUE name;
 	    VALUE value;
 
@@ -176,8 +187,8 @@ 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);
 #ifdef HAVE_RUBY_ENCODING_H
 	    name = rb_str_export_to_enc(name, encoding);
 	    value = rb_str_export_to_enc(value, encoding);

data/ext/psych/yaml/scanner.c

@@ -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;
     }
 

data/lib/psych.rb

@@ -223,7 +223,7 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.15'
+  VERSION         = '2.0.16'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/visitors/to_ruby.rb

@@ -330,12 +330,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/yaml_tree.rb

@@ -70,6 +70,14 @@ module Psych
         @ss         = ss
         @options    = options
         @line_width = options[:line_width]
+        if @line_width && @line_width < 0
+          if @line_width == -1
+            # Treat -1 as unlimited line-width, same as libyaml does.
+            @line_width = nil
+          else
+            fail(ArgumentError, "Invalid line_width #{@line_width}, must be non-negative or -1 for unlimited.")
+          end
+        end
         @coders     = []
 
         @dispatch_cache = Hash.new do |h,klass|
@@ -510,27 +518,11 @@ module Psych
       def dump_list o
       end
 
-      # '%:z' was no defined until 1.9.3
-      if RUBY_VERSION < '1.9.3'
-        def format_time time
-          formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
-
-          if time.utc?
-            formatted += " Z"
-          else
-            zone = time.strftime('%z')
-            formatted += " #{zone[0,3]}:#{zone[3,5]}"
-          end
-
-          formatted
-        end
-      else
-        def format_time time
-          if time.utc?
-            time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
-          else
-            time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
-          end
+      def format_time time
+        if time.utc?
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+        else
+          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
         end
       end
 

data/test/psych/helper.rb

@@ -91,7 +91,7 @@ module Psych
   end
 end
 
-# backport so that tests will run on 1.9 and 2.0.0
+# backport so that tests will run on 2.0.0
 unless Tempfile.respond_to? :create
   def Tempfile.create(basename, *rest)
     tmpfile = nil

data/test/psych/test_encoding.rb

@@ -249,6 +249,15 @@ module Psych
       assert_encodings @utf8, @handler.strings
     end
 
+    def test_dump_non_ascii_string_to_file
+      Tempfile.create(['utf8', 'yml'], :encoding => 'UTF-8') do |t|
+        h = {'one' => 'いち'}
+        Psych.dump(h, t)
+        t.close
+        assert_equal h, Psych.load_file(t.path)
+      end
+    end
+
     private
     def assert_encodings encoding, strings
       strings.each do |str|

data/test/psych/test_psych.rb

@@ -8,7 +8,17 @@ class TestPsych < Psych::TestCase
     Psych.domain_types.clear
   end
 
-  def test_line_width
+  def test_line_width_invalid
+    assert_raises(ArgumentError) { Psych.dump('x', { :line_width => -2 }) }
+  end
+
+  def test_line_width_no_limit
+    data = { 'a' => 'a b' * 50}
+    expected = "---\na: #{'a b' * 50}\n"
+    assert_equal(expected, Psych.dump(data, { :line_width => -1 }))
+  end
+
+  def test_line_width_limit
     yml = Psych.dump('123456 7', { :line_width => 5 })
     assert_match(/^\s*7/, yml)
   end

data/test/psych/test_yamldbm.rb

@@ -77,7 +77,6 @@ module Psych
     # end
 
     def test_key
-      skip 'only on ruby 2.0.0' if RUBY_VERSION < '2.0.0'
       @yamldbm['a'] = 'b'
       @yamldbm['c'] = 'd'
       assert_equal 'a', @yamldbm.key('b')

data/test/psych/visitors/test_to_ruby.rb

@@ -166,16 +166,14 @@ description:
         assert_equal Complex(1,2), mapping.to_ruby
       end
 
-      if RUBY_VERSION >= '1.9'
-        def test_complex_string
-          node = Nodes::Scalar.new '3+4i', nil, "!ruby/object:Complex"
-          assert_equal Complex(3, 4), node.to_ruby
-        end
+      def test_complex_string
+        node = Nodes::Scalar.new '3+4i', nil, "!ruby/object:Complex"
+        assert_equal Complex(3, 4), node.to_ruby
+      end
 
-        def test_rational_string
-          node = Nodes::Scalar.new '1/2', nil, "!ruby/object:Rational"
-          assert_equal Rational(1, 2), node.to_ruby
-        end
+      def test_rational_string
+        node = Nodes::Scalar.new '1/2', nil, "!ruby/object:Rational"
+        assert_equal Rational(1, 2), node.to_ruby
       end
 
       def test_range_string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.0.15
+  version: 2.0.16
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
   for its YAML parsing and emitting capabilities.  In addition to wrapping
@@ -82,7 +82,6 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - ".autotest"
-- ".gemtest"
 - ".travis.yml"
 - CHANGELOG.rdoc
 - Manifest.txt