diff options
| -rw-r--r-- | ext/psych/emitter.c | 30 | ||||
| -rw-r--r-- | test/psych/test_document.rb | 46 |
2 files changed, 74 insertions, 2 deletions
diff --git a/ext/psych/emitter.c b/ext/psych/emitter.c index b9cda96..14ed6d0 100644 --- a/ext/psych/emitter.c +++ b/ext/psych/emitter.c @@ -80,17 +80,43 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp) version_directive.minor = NUM2INT(minor); } + yaml_tag_directive_t * head = NULL; + yaml_tag_directive_t * tail = NULL; + + if(RTEST(tags)) { + int i = 0; + + head = xcalloc(RARRAY_LEN(tags), sizeof(yaml_tag_directive_t)); + tail = head; + + for(i = 0; i < RARRAY_LEN(tags); i++) { + VALUE tuple = RARRAY_PTR(tags)[i]; + + if(RARRAY_LEN(tuple) < 2) { + xfree(head); + rb_raise(rb_eRuntimeError, "tag tuple must be of length 2"); + } + + tail->handle = StringValuePtr(RARRAY_PTR(tuple)[0]); + tail->prefix = StringValuePtr(RARRAY_PTR(tuple)[1]); + + tail++; + } + } + yaml_event_t event; yaml_document_start_event_initialize( &event, (RARRAY_LEN(version) > 0) ? &version_directive : NULL, - NULL, - NULL, + head, + tail, imp == Qtrue ? 1 : 0 ); emit(emitter, &event); + if(head) xfree(head); + return self; } diff --git a/test/psych/test_document.rb b/test/psych/test_document.rb new file mode 100644 index 0000000..0bdff11 --- /dev/null +++ b/test/psych/test_document.rb @@ -0,0 +1,46 @@ +require 'minitest/autorun' +require 'psych' + +module Psych + class TestDocument < MiniTest::Unit::TestCase + def setup + @stream = Psych.yaml_ast(<<-eoyml) +%YAML 1.1 +%TAG ! tag:tenderlovemaking.com,2009: +--- !fun + eoyml + @doc = @stream.children.first + end + + def test_parse_tag + assert_equal([['!', 'tag:tenderlovemaking.com,2009:']], + @doc.tag_directives) + end + + def test_emit_tag + assert_match('%TAG ! tag:tenderlovemaking.com,2009:', @stream.to_yaml) + end + + def test_emit_multitag + @doc.tag_directives << ['!!', 'foo.com,2009:'] + yaml = @stream.to_yaml + assert_match('%TAG ! tag:tenderlovemaking.com,2009:', yaml) + assert_match('%TAG !! foo.com,2009:', yaml) + end + + def test_emit_bad_tag + assert_raises(RuntimeError) do + @doc.tag_directives = [['!']] + @stream.to_yaml + end + end + + def test_parse_version + assert_equal([1,1], @doc.version) + end + + def test_emit_version + assert_match('%YAML 1.1', @stream.to_yaml) + end + end +end |