psych 5.1.2 → 5.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bdb85aafa27b992e7e8db6905f6e1bc52976bbfc3f71e0ce1adee552a89682
-  data.tar.gz: a8d566aa3e16cde752a41ffdb5990af2b2d4f7082ad8774dbd3a8250636fef20
+  metadata.gz: e5d417b41683c961407366e4a651797b33d94aea7d2be6112847e855e62e7b5a
+  data.tar.gz: 664df43090f7b9ad7888b82275d76883f6bca98c88c5e7659c74e42f6b5ccd61
 SHA512:
-  metadata.gz: ca436b4d85c8c931bfc9b05d2f16a52f03d01f65c5d708419f75ce926ba55ef9aa4af95a811fec0309773ec6f8963002ffa5ead5cc2f69e1666d3759f24a688b
-  data.tar.gz: bc2aabe53f58a0eb15fed477c96767bc4267ce6bd1f929010c580a0891fdbe28517fdf030a09356dd9b84000c60e1fe7d403d2d9414b5b3a7db8bfa152f5ba5a
+  metadata.gz: 4c670ab925079058a8e483d0fc062ce3c5e39eecc6e7a8a3691f2293e0796253d48a129bd15409a885265a9f130c97fd3379ab1f8a87f95f03d48453b34ec606
+  data.tar.gz: 87e0765bdec353ab86682bf0462bbae2b3511ac186fa0ae8eb714fe524e3eb673f7e2db82c5fd07931e06df4a713f8f699ceac2dbe94af19b134216f9aa5b9c3

data/ext/psych/psych.c

@@ -23,7 +23,7 @@ VALUE mPsych;
 void Init_psych(void)
 {
     #ifdef HAVE_RB_EXT_RACTOR_SAFE
-	RB_EXT_RACTOR_SAFE(true);
+        RB_EXT_RACTOR_SAFE(true);
     #endif
     mPsych = rb_define_module("Psych");
 

data/ext/psych/psych_emitter.c

@@ -17,7 +17,7 @@ static ID id_canonical;
 static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 {
     if(!yaml_emitter_emit(emitter, event))
-	rb_raise(rb_eRuntimeError, "%s", emitter->problem);
+        rb_raise(rb_eRuntimeError, "%s", emitter->problem);
 }
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
@@ -82,13 +82,13 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
-	line_width = rb_funcall(options, id_line_width, 0);
-	indent     = rb_funcall(options, id_indentation, 0);
-	canonical  = rb_funcall(options, id_canonical, 0);
+        line_width = rb_funcall(options, id_line_width, 0);
+        indent     = rb_funcall(options, id_indentation, 0);
+        canonical  = rb_funcall(options, id_canonical, 0);
 
-	yaml_emitter_set_width(emitter, NUM2INT(line_width));
-	yaml_emitter_set_indent(emitter, NUM2INT(indent));
-	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+        yaml_emitter_set_width(emitter, NUM2INT(line_width));
+        yaml_emitter_set_indent(emitter, NUM2INT(indent));
+        yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
     rb_ivar_set(self, id_io, io);
@@ -136,84 +136,118 @@ static VALUE end_stream(VALUE self)
     return self;
 }
 
-/* call-seq: emitter.start_document(version, tags, implicit)
- *
- * Start a document emission with YAML +version+, +tags+, and an +implicit+
- * start.
- *
- * See Psych::Handler#start_document
- */
-static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+struct start_document_data {
+    VALUE self;
+    VALUE version;
+    VALUE tags;
+    VALUE imp;
+
+    yaml_tag_directive_t * head;
+};
+
+static VALUE start_document_try(VALUE d)
 {
+    struct start_document_data * data = (struct start_document_data *)d;
+    VALUE self = data->self;
+    VALUE version = data->version;
+    VALUE tags = data->tags;
+    VALUE imp = data->imp;
+
     yaml_emitter_t * emitter;
-    yaml_tag_directive_t * head = NULL;
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
-
     Check_Type(version, T_ARRAY);
 
     if(RARRAY_LEN(version) > 0) {
-	VALUE major = rb_ary_entry(version, (long)0);
-	VALUE minor = rb_ary_entry(version, (long)1);
+        VALUE major = rb_ary_entry(version, (long)0);
+        VALUE minor = rb_ary_entry(version, (long)1);
 
-	version_directive.major = NUM2INT(major);
-	version_directive.minor = NUM2INT(minor);
+        version_directive.major = NUM2INT(major);
+        version_directive.minor = NUM2INT(minor);
     }
 
     if(RTEST(tags)) {
-	long i = 0;
-	long len;
-	rb_encoding * encoding = rb_utf8_encoding();
-
-	Check_Type(tags, T_ARRAY);
-
-	len = RARRAY_LEN(tags);
-	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
-	tail  = head;
-
-	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_AREF(tags, i);
-	    VALUE name;
-	    VALUE value;
-
-	    Check_Type(tuple, T_ARRAY);
-
-	    if(RARRAY_LEN(tuple) < 2) {
-		xfree(head);
-		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
-	    }
-	    name  = RARRAY_AREF(tuple, 0);
-	    value = RARRAY_AREF(tuple, 1);
-	    StringValue(name);
-	    StringValue(value);
-	    name = rb_str_export_to_enc(name, encoding);
-	    value = rb_str_export_to_enc(value, encoding);
-
-	    tail->handle = (yaml_char_t *)StringValueCStr(name);
-	    tail->prefix = (yaml_char_t *)StringValueCStr(value);
-
-	    tail++;
-	}
+        long i = 0;
+        long len;
+        rb_encoding * encoding = rb_utf8_encoding();
+
+        Check_Type(tags, T_ARRAY);
+
+        len = RARRAY_LEN(tags);
+        data->head = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+        tail = data->head;
+
+        for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
+            VALUE tuple = RARRAY_AREF(tags, i);
+            VALUE name;
+            VALUE value;
+
+            Check_Type(tuple, T_ARRAY);
+
+            if(RARRAY_LEN(tuple) < 2) {
+                rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+            }
+
+            name  = RARRAY_AREF(tuple, 0);
+            value = RARRAY_AREF(tuple, 1);
+            StringValue(name);
+            StringValue(value);
+            name = rb_str_export_to_enc(name, encoding);
+            value = rb_str_export_to_enc(value, encoding);
+
+            tail->handle = (yaml_char_t *)StringValueCStr(name);
+            tail->prefix = (yaml_char_t *)StringValueCStr(value);
+
+            tail++;
+        }
     }
 
     yaml_document_start_event_initialize(
-	    &event,
-	    (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
-	    head,
-	    tail,
-	    imp ? 1 : 0
-	    );
+            &event,
+            (RARRAY_LEN(version) > 0) ? &version_directive : NULL,
+            data->head,
+            tail,
+            imp ? 1 : 0
+            );
 
     emit(emitter, &event);
 
-    if(head) xfree(head);
-
     return self;
 }
 
+static VALUE start_document_ensure(VALUE d)
+{
+    struct start_document_data * data = (struct start_document_data *)d;
+
+    xfree(data->head);
+
+    return Qnil;
+}
+
+/* call-seq: emitter.start_document(version, tags, implicit)
+ *
+ * Start a document emission with YAML +version+, +tags+, and an +implicit+
+ * start.
+ *
+ * See Psych::Handler#start_document
+ */
+static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
+{
+    struct start_document_data data = {
+        .self = self,
+        .version = version,
+        .tags = tags,
+        .imp = imp,
+
+        .head = NULL,
+    };
+
+    return rb_ensure(start_document_try, (VALUE)&data, start_document_ensure, (VALUE)&data);
+}
+
 /* call-seq: emitter.end_document(implicit)
  *
  * End a document emission with an +implicit+ ending.
@@ -241,14 +275,14 @@ static VALUE end_document(VALUE self, VALUE imp)
  * See Psych::Handler#scalar
  */
 static VALUE scalar(
-	VALUE self,
-	VALUE value,
-	VALUE anchor,
-	VALUE tag,
-	VALUE plain,
-	VALUE quoted,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE value,
+        VALUE anchor,
+        VALUE tag,
+        VALUE plain,
+        VALUE quoted,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -261,25 +295,25 @@ static VALUE scalar(
     value = rb_str_export_to_enc(value, encoding);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     yaml_scalar_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    (yaml_char_t*)StringValuePtr(value),
-	    (int)RSTRING_LEN(value),
-	    plain ? 1 : 0,
-	    quoted ? 1 : 0,
-	    (yaml_scalar_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            (yaml_char_t*)StringValuePtr(value),
+            (int)RSTRING_LEN(value),
+            plain ? 1 : 0,
+            quoted ? 1 : 0,
+            (yaml_scalar_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -294,36 +328,36 @@ static VALUE scalar(
  * See Psych::Handler#start_sequence
  */
 static VALUE start_sequence(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_sequence_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_sequence_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -357,12 +391,12 @@ static VALUE end_sequence(VALUE self)
  * See Psych::Handler#start_mapping
  */
 static VALUE start_mapping(
-	VALUE self,
-	VALUE anchor,
-	VALUE tag,
-	VALUE implicit,
-	VALUE style
-	) {
+        VALUE self,
+        VALUE anchor,
+        VALUE tag,
+        VALUE implicit,
+        VALUE style
+        ) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
     rb_encoding *encoding;
@@ -372,22 +406,22 @@ static VALUE start_mapping(
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, encoding);
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, encoding);
     }
 
     if(!NIL_P(tag)) {
-	Check_Type(tag, T_STRING);
-	tag = rb_str_export_to_enc(tag, encoding);
+        Check_Type(tag, T_STRING);
+        tag = rb_str_export_to_enc(tag, encoding);
     }
 
     yaml_mapping_start_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
-	    (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
-	    implicit ? 1 : 0,
-	    (yaml_mapping_style_t)NUM2INT(style)
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor)),
+            (yaml_char_t *)(NIL_P(tag) ? NULL : StringValueCStr(tag)),
+            implicit ? 1 : 0,
+            (yaml_mapping_style_t)NUM2INT(style)
+            );
 
     emit(emitter, &event);
 
@@ -426,14 +460,14 @@ static VALUE alias(VALUE self, VALUE anchor)
     TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if(!NIL_P(anchor)) {
-	Check_Type(anchor, T_STRING);
-	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
+        Check_Type(anchor, T_STRING);
+        anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
 
     yaml_alias_event_initialize(
-	    &event,
-	    (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
-	    );
+            &event,
+            (yaml_char_t *)(NIL_P(anchor) ? NULL : StringValueCStr(anchor))
+            );
 
     emit(emitter, &event);
 

data/ext/psych/psych_parser.c

@@ -32,9 +32,9 @@ 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);
+        void * str = (void *)StringValuePtr(string);
+        *read = (size_t)RSTRING_LEN(string);
+        memcpy(buf, str, *read);
     }
 
     return 1;
@@ -80,23 +80,23 @@ static VALUE allocate(VALUE klass)
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 {
     if (parser->error == YAML_MEMORY_ERROR) {
-	return rb_eNoMemError;
+        return rb_eNoMemError;
     } else {
-	size_t line, column;
-	VALUE ePsychSyntaxError;
+        size_t line, column;
+        VALUE ePsychSyntaxError;
 
-	line = parser->context_mark.line + 1;
-	column = parser->context_mark.column + 1;
+        line = parser->context_mark.line + 1;
+        column = parser->context_mark.column + 1;
 
-	ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
+        ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
 
-	return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
-		path,
-		SIZET2NUM(line),
-		SIZET2NUM(column),
-		SIZET2NUM(parser->problem_offset),
-		parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
-		parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
+        return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
+                path,
+                SIZET2NUM(line),
+                SIZET2NUM(column),
+                SIZET2NUM(parser->problem_offset),
+                parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
+                parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
     }
 }
 
@@ -108,18 +108,18 @@ static VALUE transcode_string(VALUE src, int * parser_encoding)
     int source_encoding = rb_enc_get_index(src);
 
     if (source_encoding == utf8) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (source_encoding == utf16le) {
-	*parser_encoding = YAML_UTF16LE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16LE_ENCODING;
+        return src;
     }
 
     if (source_encoding == utf16be) {
-	*parser_encoding = YAML_UTF16BE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16BE_ENCODING;
+        return src;
     }
 
     src = rb_str_export_to_enc(src, rb_utf8_encoding());
@@ -138,36 +138,36 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
 
     /* if no encoding is returned, assume ascii8bit. */
     if (NIL_P(io_external_encoding)) {
-	io_external_enc_index = rb_ascii8bit_encindex();
+        io_external_enc_index = rb_ascii8bit_encindex();
     } else {
-	io_external_enc_index = rb_to_encoding_index(io_external_encoding);
+        io_external_enc_index = rb_to_encoding_index(io_external_encoding);
     }
 
     /* Treat US-ASCII as utf_8 */
     if (io_external_enc_index == rb_usascii_encindex()) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_utf8_encindex()) {
-	*parser_encoding = YAML_UTF8_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF8_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_enc_find_index("UTF-16LE")) {
-	*parser_encoding = YAML_UTF16LE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16LE_ENCODING;
+        return src;
     }
 
     if (io_external_enc_index == rb_enc_find_index("UTF-16BE")) {
-	*parser_encoding = YAML_UTF16BE_ENCODING;
-	return src;
+        *parser_encoding = YAML_UTF16BE_ENCODING;
+        return src;
     }
 
     /* Just guess on ASCII-8BIT */
     if (io_external_enc_index == rb_ascii8bit_encindex()) {
-	*parser_encoding = YAML_ANY_ENCODING;
-	return src;
+        *parser_encoding = YAML_ANY_ENCODING;
+        return src;
     }
 
     /* If the external encoding is something we don't know how to handle,
@@ -261,238 +261,238 @@ static VALUE parse(VALUE self, VALUE handler, VALUE yaml, VALUE path)
     yaml_parser_initialize(parser);
 
     if (rb_respond_to(yaml, id_read)) {
-	yaml = transcode_io(yaml, &parser_encoding);
-	yaml_parser_set_encoding(parser, parser_encoding);
-	yaml_parser_set_input(parser, io_reader, (void *)yaml);
+        yaml = transcode_io(yaml, &parser_encoding);
+        yaml_parser_set_encoding(parser, parser_encoding);
+        yaml_parser_set_input(parser, io_reader, (void *)yaml);
     } else {
-	StringValue(yaml);
-	yaml = transcode_string(yaml, &parser_encoding);
-	yaml_parser_set_encoding(parser, parser_encoding);
-	yaml_parser_set_input_string(
-		parser,
-		(const unsigned char *)RSTRING_PTR(yaml),
-		(size_t)RSTRING_LEN(yaml)
-		);
+        StringValue(yaml);
+        yaml = transcode_string(yaml, &parser_encoding);
+        yaml_parser_set_encoding(parser, parser_encoding);
+        yaml_parser_set_input_string(
+                parser,
+                (const unsigned char *)RSTRING_PTR(yaml),
+                (size_t)RSTRING_LEN(yaml)
+                );
     }
 
     while(!done) {
-	VALUE event_args[5];
-	VALUE start_line, start_column, end_line, end_column;
-
-	if(parser->error || !yaml_parser_parse(parser, &event)) {
-	    VALUE exception;
-
-	    exception = make_exception(parser, path);
-	    yaml_parser_delete(parser);
-	    yaml_parser_initialize(parser);
-
-	    rb_exc_raise(exception);
-	}
-
-	start_line = SIZET2NUM(event.start_mark.line);
-	start_column = SIZET2NUM(event.start_mark.column);
-	end_line = SIZET2NUM(event.end_mark.line);
-	end_column = SIZET2NUM(event.end_mark.column);
-
-	event_args[0] = handler;
-	event_args[1] = start_line;
-	event_args[2] = start_column;
-	event_args[3] = end_line;
-	event_args[4] = end_column;
-	rb_protect(protected_event_location, (VALUE)event_args, &state);
-
-	switch(event.type) {
-	    case YAML_STREAM_START_EVENT:
-	      {
-		  VALUE args[2];
-
-		  args[0] = handler;
-		  args[1] = INT2NUM(event.data.stream_start.encoding);
-		  rb_protect(protected_start_stream, (VALUE)args, &state);
-	      }
-	      break;
-	  case YAML_DOCUMENT_START_EVENT:
-	    {
-		VALUE args[4];
-		/* Get a list of tag directives (if any) */
-		VALUE tag_directives = rb_ary_new();
-		/* Grab the document version */
-		VALUE version = event.data.document_start.version_directive ?
-		    rb_ary_new3(
-			(long)2,
-			INT2NUM(event.data.document_start.version_directive->major),
-			INT2NUM(event.data.document_start.version_directive->minor)
-			) : rb_ary_new();
-
-		if(event.data.document_start.tag_directives.start) {
-		    yaml_tag_directive_t *start =
-			event.data.document_start.tag_directives.start;
-		    yaml_tag_directive_t *end =
-			event.data.document_start.tag_directives.end;
-		    for(; start != end; start++) {
-			VALUE handle = Qnil;
-			VALUE prefix = Qnil;
-			if(start->handle) {
-			    handle = rb_str_new2((const char *)start->handle);
-			    PSYCH_TRANSCODE(handle, encoding, internal_enc);
-			}
-
-			if(start->prefix) {
-			    prefix = rb_str_new2((const char *)start->prefix);
-			    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-			}
-
-			rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
-		    }
-		}
-		args[0] = handler;
-		args[1] = version;
-		args[2] = tag_directives;
-		args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
-		rb_protect(protected_start_document, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_DOCUMENT_END_EVENT:
-	    {
-		VALUE args[2];
-
-		args[0] = handler;
-		args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
-		rb_protect(protected_end_document, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_ALIAS_EVENT:
-	    {
-		VALUE args[2];
-		VALUE alias = Qnil;
-		if(event.data.alias.anchor) {
-		    alias = rb_str_new2((const char *)event.data.alias.anchor);
-		    PSYCH_TRANSCODE(alias, encoding, internal_enc);
-		}
-
-		args[0] = handler;
-		args[1] = alias;
-		rb_protect(protected_alias, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SCALAR_EVENT:
-	    {
-		VALUE args[7];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE plain_implicit, quoted_implicit, style;
-		VALUE val = rb_str_new(
-		    (const char *)event.data.scalar.value,
-		    (long)event.data.scalar.length
-		    );
-
-		PSYCH_TRANSCODE(val, encoding, internal_enc);
-
-		if(event.data.scalar.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		if(event.data.scalar.tag) {
-		    tag = rb_str_new2((const char *)event.data.scalar.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		plain_implicit =
-		    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
-
-		quoted_implicit =
-		    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.scalar.style);
-
-		args[0] = handler;
-		args[1] = val;
-		args[2] = anchor;
-		args[3] = tag;
-		args[4] = plain_implicit;
-		args[5] = quoted_implicit;
-		args[6] = style;
-		rb_protect(protected_scalar, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SEQUENCE_START_EVENT:
-	    {
-		VALUE args[5];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.sequence_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		tag = Qnil;
-		if(event.data.sequence_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		implicit =
-		    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.sequence_start.style);
-
-		args[0] = handler;
-		args[1] = anchor;
-		args[2] = tag;
-		args[3] = implicit;
-		args[4] = style;
-
-		rb_protect(protected_start_sequence, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_SEQUENCE_END_EVENT:
-	    rb_protect(protected_end_sequence, handler, &state);
-	    break;
-	  case YAML_MAPPING_START_EVENT:
-	    {
-		VALUE args[5];
-		VALUE anchor = Qnil;
-		VALUE tag = Qnil;
-		VALUE implicit, style;
-		if(event.data.mapping_start.anchor) {
-		    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-		    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-		}
-
-		if(event.data.mapping_start.tag) {
-		    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-		    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-		}
-
-		implicit =
-		    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
-
-		style = INT2NUM(event.data.mapping_start.style);
-
-		args[0] = handler;
-		args[1] = anchor;
-		args[2] = tag;
-		args[3] = implicit;
-		args[4] = style;
-
-		rb_protect(protected_start_mapping, (VALUE)args, &state);
-	    }
-	    break;
-	  case YAML_MAPPING_END_EVENT:
-	    rb_protect(protected_end_mapping, handler, &state);
-	    break;
-	  case YAML_NO_EVENT:
-	    rb_protect(protected_empty, handler, &state);
-	    break;
-	  case YAML_STREAM_END_EVENT:
-	    rb_protect(protected_end_stream, handler, &state);
-	    done = 1;
-	    break;
-	}
-	yaml_event_delete(&event);
-	if (state) rb_jump_tag(state);
+        VALUE event_args[5];
+        VALUE start_line, start_column, end_line, end_column;
+
+        if(parser->error || !yaml_parser_parse(parser, &event)) {
+            VALUE exception;
+
+            exception = make_exception(parser, path);
+            yaml_parser_delete(parser);
+            yaml_parser_initialize(parser);
+
+            rb_exc_raise(exception);
+        }
+
+        start_line = SIZET2NUM(event.start_mark.line);
+        start_column = SIZET2NUM(event.start_mark.column);
+        end_line = SIZET2NUM(event.end_mark.line);
+        end_column = SIZET2NUM(event.end_mark.column);
+
+        event_args[0] = handler;
+        event_args[1] = start_line;
+        event_args[2] = start_column;
+        event_args[3] = end_line;
+        event_args[4] = end_column;
+        rb_protect(protected_event_location, (VALUE)event_args, &state);
+
+        switch(event.type) {
+            case YAML_STREAM_START_EVENT:
+              {
+                  VALUE args[2];
+
+                  args[0] = handler;
+                  args[1] = INT2NUM(event.data.stream_start.encoding);
+                  rb_protect(protected_start_stream, (VALUE)args, &state);
+              }
+              break;
+          case YAML_DOCUMENT_START_EVENT:
+            {
+                VALUE args[4];
+                /* Get a list of tag directives (if any) */
+                VALUE tag_directives = rb_ary_new();
+                /* Grab the document version */
+                VALUE version = event.data.document_start.version_directive ?
+                    rb_ary_new3(
+                        (long)2,
+                        INT2NUM(event.data.document_start.version_directive->major),
+                        INT2NUM(event.data.document_start.version_directive->minor)
+                        ) : rb_ary_new();
+
+                if(event.data.document_start.tag_directives.start) {
+                    yaml_tag_directive_t *start =
+                        event.data.document_start.tag_directives.start;
+                    yaml_tag_directive_t *end =
+                        event.data.document_start.tag_directives.end;
+                    for(; start != end; start++) {
+                        VALUE handle = Qnil;
+                        VALUE prefix = Qnil;
+                        if(start->handle) {
+                            handle = rb_str_new2((const char *)start->handle);
+                            PSYCH_TRANSCODE(handle, encoding, internal_enc);
+                        }
+
+                        if(start->prefix) {
+                            prefix = rb_str_new2((const char *)start->prefix);
+                            PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+                        }
+
+                        rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+                    }
+                }
+                args[0] = handler;
+                args[1] = version;
+                args[2] = tag_directives;
+                args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_start_document, (VALUE)args, &state);
+            }
+            break;
+          case YAML_DOCUMENT_END_EVENT:
+            {
+                VALUE args[2];
+
+                args[0] = handler;
+                args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_end_document, (VALUE)args, &state);
+            }
+            break;
+          case YAML_ALIAS_EVENT:
+            {
+                VALUE args[2];
+                VALUE alias = Qnil;
+                if(event.data.alias.anchor) {
+                    alias = rb_str_new2((const char *)event.data.alias.anchor);
+                    PSYCH_TRANSCODE(alias, encoding, internal_enc);
+                }
+
+                args[0] = handler;
+                args[1] = alias;
+                rb_protect(protected_alias, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SCALAR_EVENT:
+            {
+                VALUE args[7];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE plain_implicit, quoted_implicit, style;
+                VALUE val = rb_str_new(
+                    (const char *)event.data.scalar.value,
+                    (long)event.data.scalar.length
+                    );
+
+                PSYCH_TRANSCODE(val, encoding, internal_enc);
+
+                if(event.data.scalar.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.scalar.tag) {
+                    tag = rb_str_new2((const char *)event.data.scalar.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                plain_implicit =
+                    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+                quoted_implicit =
+                    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.scalar.style);
+
+                args[0] = handler;
+                args[1] = val;
+                args[2] = anchor;
+                args[3] = tag;
+                args[4] = plain_implicit;
+                args[5] = quoted_implicit;
+                args[6] = style;
+                rb_protect(protected_scalar, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SEQUENCE_START_EVENT:
+            {
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.sequence_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                tag = Qnil;
+                if(event.data.sequence_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.sequence_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_sequence, (VALUE)args, &state);
+            }
+            break;
+          case YAML_SEQUENCE_END_EVENT:
+            rb_protect(protected_end_sequence, handler, &state);
+            break;
+          case YAML_MAPPING_START_EVENT:
+            {
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.mapping_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.mapping_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.mapping_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_mapping, (VALUE)args, &state);
+            }
+            break;
+          case YAML_MAPPING_END_EVENT:
+            rb_protect(protected_end_mapping, handler, &state);
+            break;
+          case YAML_NO_EVENT:
+            rb_protect(protected_empty, handler, &state);
+            break;
+          case YAML_STREAM_END_EVENT:
+            rb_protect(protected_end_stream, handler, &state);
+            done = 1;
+            break;
+        }
+        yaml_event_delete(&event);
+        if (state) rb_jump_tag(state);
     }
 
     return self;

data/lib/psych/nodes/node.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'stringio'
 require_relative '../class_loader'
 require_relative '../scalar_scanner'
 
@@ -56,6 +55,7 @@ module Psych
       #
       # See also Psych::Visitors::Emitter
       def yaml io = nil, options = {}
+        require "stringio"
         real_io = io || StringIO.new(''.encode('utf-8'))
 
         Visitors::Emitter.new(real_io, options).accept self

data/lib/psych/scalar_scanner.rb

@@ -4,6 +4,8 @@ module Psych
   ###
   # Scan scalars for built in types
   class ScalarScanner
+    autoload :Date, "date"
+
     # Taken from http://yaml.org/type/timestamp.html
     TIME = /^-?\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|\s+)\d{1,2}:\d\d:\d\d(?:\.\d*)?(?:\s*(?:Z|[-+]\d{1,2}:?(?:\d\d)?))?$/
 
@@ -61,7 +63,6 @@ module Psych
           string
         end
       elsif string.match?(/^\d{4}-(?:1[012]|0\d|\d)-(?:[12]\d|3[01]|0\d|\d)$/)
-        require 'date'
         begin
           class_loader.date.strptime(string, '%F', Date::GREGORIAN)
         rescue ArgumentError

data/lib/psych/versions.rb

@@ -2,7 +2,7 @@
 
 module Psych
   # The version of Psych you are using
-  VERSION = '5.1.2'
+  VERSION = '5.2.0.beta1'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '2.7'.freeze

data/lib/psych/visitors/yaml_tree.rb

@@ -17,19 +17,15 @@ module Psych
         def initialize
           @obj_to_id   = {}.compare_by_identity
           @obj_to_node = {}.compare_by_identity
-          @targets     = []
           @counter     = 0
         end
 
         def register target, node
-          @targets << target
           @obj_to_node[target] = node
         end
 
         def key? target
           @obj_to_node.key? target
-        rescue NoMethodError
-          false
         end
 
         def id_for target
@@ -69,6 +65,7 @@ module Psych
             fail(ArgumentError, "Invalid line_width #{@line_width}, must be non-negative or -1 for unlimited.")
           end
         end
+        @stringify_names = options[:stringify_names]
         @coders     = []
 
         @dispatch_cache = Hash.new do |h,klass|
@@ -271,7 +268,7 @@ module Psych
           tag   = 'tag:yaml.org,2002:str'
           plain = false
           quote = false
-        elsif o == 'y' || o == 'n'
+        elsif o == 'y' || o == 'Y' || o == 'n' || o == 'N'
           style = Nodes::Scalar::DOUBLE_QUOTED
         elsif @line_width && o.length > @line_width
           style = Nodes::Scalar::FOLDED
@@ -327,7 +324,7 @@ module Psych
         if o.class == ::Hash
           register(o, @emitter.start_mapping(nil, nil, true, Psych::Nodes::Mapping::BLOCK))
           o.each do |k,v|
-            accept k
+            accept(@stringify_names && Symbol === k ? k.to_s : k)
             accept v
           end
           @emitter.end_mapping
@@ -340,7 +337,7 @@ module Psych
         register(o, @emitter.start_mapping(nil, '!set', false, Psych::Nodes::Mapping::BLOCK))
 
         o.each do |k,v|
-          accept k
+          accept(@stringify_names && Symbol === k ? k.to_s : k)
           accept v
         end
 

data/lib/psych.rb

@@ -340,7 +340,7 @@ module Psych
   # provided, the object contained in the first document will be returned.
   # +filename+ will be used in the exception message if any exception
   # is raised while parsing.  If +yaml+ is empty, it returns
-  # the specified +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   #
   # Raises a Psych::SyntaxError when a YAML syntax error is detected.
   #
@@ -479,6 +479,7 @@ module Psych
   #
   #                           Default: <tt>2</tt>.
   # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #                           For unlimited line width use <tt>-1</tt>.
   #
   #                           Default: <tt>0</tt> (meaning "wrap at 81").
   # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
@@ -489,6 +490,10 @@ module Psych
   #
   #                           Default: <tt>false</tt>.
   #
+  # [<tt>:stringify_names</tt>] Dump symbol keys in Hash objects as string.
+  #
+  #                             Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -502,6 +507,9 @@ module Psych
   #
   #   # Dump an array to an IO with indentation set
   #   Psych.dump(['a', ['b']], StringIO.new, indentation: 3)
+  #
+  #   # Dump hash with symbol keys as string
+  #   Psych.dump({a: "b"}, stringify_names: true) # => "---\na: b\n"
   def self.dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -552,6 +560,7 @@ module Psych
   #
   #                           Default: <tt>2</tt>.
   # [<tt>:line_width</tt>]    Max character to wrap line at.
+  #                           For unlimited line width use <tt>-1</tt>.
   #
   #                           Default: <tt>0</tt> (meaning "wrap at 81").
   # [<tt>:canonical</tt>]     Write "canonical" YAML form (very verbose, yet
@@ -562,6 +571,10 @@ module Psych
   #
   #                           Default: <tt>false</tt>.
   #
+  # [<tt>:stringify_names</tt>] Dump symbol keys in Hash objects as string.
+  #
+  #                             Default: <tt>false</tt>.
+  #
   # Example:
   #
   #   # Dump an array, get back a YAML string
@@ -575,6 +588,9 @@ module Psych
   #
   #   # Dump an array to an IO with indentation set
   #   Psych.safe_dump(['a', ['b']], StringIO.new, indentation: 3)
+  #
+  #   # Dump hash with symbol keys as string
+  #   Psych.dump({a: "b"}, stringify_names: true) # => "---\na: b\n"
   def self.safe_dump o, io = nil, options = {}
     if Hash === io
       options = io
@@ -653,7 +669,7 @@ module Psych
   ###
   # Safely loads 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 +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   # See safe_load for options.
   def self.safe_load_file filename, **kwargs
     File.open(filename, 'r:bom|utf-8') { |f|
@@ -664,7 +680,7 @@ module Psych
   ###
   # Loads 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 +fallback+ return value, which defaults to +false+.
+  # the specified +fallback+ return value, which defaults to +nil+.
   # See load for options.
   def self.load_file filename, **kwargs
     File.open(filename, 'r:bom|utf-8') { |f|

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.0.beta1
 platform: ruby
 authors:
 - Aaron Patterson
 - SHIBATA Hiroshi
 - Charles Oliver Nutter
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stringio
@@ -97,7 +96,7 @@ licenses:
 - MIT
 metadata:
   msys2_mingw_dependencies: libyaml
-post_install_message:
+  changelog_uri: https://github.com/ruby/psych/releases
 rdoc_options:
 - "--main"
 - README.md
@@ -114,8 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.1
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Psych is a YAML parser and emitter
 test_files: []