psych 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76501960d9e1f76da817745bcf5b6b5d34ba5f6c33802b742035682a5a062d3
-  data.tar.gz: dc5219b7de7a7fcde49f94123dbea690ce8fd31374ed5070f48a1b2a281c86bf
+  metadata.gz: 289d2a9532c36be34f187b80d36eb98ebac368da3539a44e8e6e291bc7f184eb
+  data.tar.gz: d717de45e2a5519d4a2c27a26a2e1aed7269e1c80b5213a19c070f1d56712a03
 SHA512:
-  metadata.gz: 25a56e306eb46df408a9a0b34100e2f825adf8ae1dffeb85c4ce2ab35544c33a94de8c2a91d4e1a5f59c6cfeaa18ee1b97d53bc2d8536657f3d671344ba3827d
-  data.tar.gz: 63cd6890821bf311ca8bbce351e137390f592619eeb7bb912b8926cb6e31f22750e95ecd083eab392c62903095359acd1fff18623cb36d00eae195fabf4f7b10
+  metadata.gz: d00bc06b2fd173ea66dbb8f7b5a5ad75ad6074eff6f011d9d9774ef33662a0c0e642f0dd4daa67776b1a89fdb54854932809351b12052eea00c69b9499792639
+  data.tar.gz: 27428cdb1bce30907b2654310632967274e1bb2dd43a5a7e634577cf797911b4931b4165e57c8e6545e08f1e9c9979be18600ed3d9a589e52d7df5360b7689f3

data/README.md

@@ -26,8 +26,8 @@ Psych.dump("foo")     # => "--- foo\n...\n"
 
 ## Installation
 
-Psych has been included with MRI since 1.9.2, and is the default YAML parser
-in 1.9.3.
+Psych has been included with MRI since 1.9.2, and has been the default YAML parser
+since 1.9.3.
 
 If you want a newer gem release of Psych, you can use RubyGems:
 

data/ext/psych/psych_parser.c

@@ -32,9 +32,20 @@ static int io_reader(void * data, unsigned char *buf, size_t size, size_t *read)
     *read = 0;
 
     if(! NIL_P(string)) {
-        void * str = (void *)StringValuePtr(string);
-        *read = (size_t)RSTRING_LEN(string);
-        memcpy(buf, str, *read);
+        char * str = StringValuePtr(string);
+        size_t len = (size_t)RSTRING_LEN(string);
+
+        /* IO#read(size) is documented to return at most `size` bytes, but a
+         * misbehaving IO-like object may return more. Clamp the copy to the
+         * buffer libyaml gave us to avoid writing past its end, rounding down
+         * to a character boundary so a multibyte character is never split. */
+        if(len > size) {
+            rb_encoding * enc = rb_enc_get(string);
+            len = (size_t)(rb_enc_left_char_head(str, str + size, str + len, enc) - str);
+        }
+
+        *read = len;
+        memcpy(buf, str, len);
     }
 
     return 1;

data/ext/psych/psych_to_ruby.c

@@ -28,12 +28,6 @@ static VALUE path2class(VALUE self, VALUE path)
     return rb_path_to_class(path);
 }
 
-static VALUE init_data(VALUE self, VALUE data, VALUE values)
-{
-    rb_struct_initialize(data, values);
-    return data;
-}
-
 void Init_psych_to_ruby(void)
 {
     VALUE psych     = rb_define_module("Psych");
@@ -43,7 +37,6 @@ void Init_psych_to_ruby(void)
     VALUE visitor   = rb_define_class_under(visitors, "Visitor", rb_cObject);
     cPsychVisitorsToRuby = rb_define_class_under(visitors, "ToRuby", visitor);
 
-    rb_define_private_method(cPsychVisitorsToRuby, "init_data", init_data, 2);
     rb_define_private_method(cPsychVisitorsToRuby, "build_exception", build_exception, 2);
     rb_define_private_method(class_loader, "path2class", path2class, 1);
 }

data/lib/psych/versions.rb

@@ -2,9 +2,9 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.3.0'
+  VERSION = '5.4.0'
 
   if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '2.9'.freeze
+    DEFAULT_SNAKEYAML_VERSION = '2.10'.freeze
   end
 end

data/lib/psych/visitors/to_ruby.rb

@@ -12,6 +12,10 @@ module Psych
     ###
     # This class walks a YAML AST, converting each node to Ruby
     class ToRuby < Psych::Visitors::Visitor
+      unless RUBY_VERSION < "3.2"
+        DATA_INITIALIZE = Data.instance_method(:initialize)
+      end
+
       def self.create(symbolize_names: false, freeze: false, strict_integer: false, parse_symbols: true)
         class_loader = ClassLoader.new
         scanner      = ScalarScanner.new class_loader, strict_integer: strict_integer, parse_symbols: parse_symbols
@@ -219,8 +223,7 @@ module Psych
             revive_data_members(members, o)
           end
           data ||= allocate_anon_data(o, members)
-          values = data.members.map { |m| members[m] }
-          init_data(data, values)
+          DATA_INITIALIZE.bind_call(data, **members)
           data.freeze
           data
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.4.0
 platform: ruby
 authors:
 - Aaron Patterson