asciidoctor-rfc 0.2.0 → 0.8.0

data/spec/asciidoctor/rfc/v2/ulist_spec.rb

@@ -93,4 +93,44 @@ describe Asciidoctor::RFC::V2::Converter do
       </t>
     OUTPUT
   end
+
+  it "renders a nested list containing a literal" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc2)).to be_equivalent_to <<~'OUTPUT'
+      [[id]]
+      * First
+      * Second
+      +
+      ....
+      <entry>
+      ....
+    INPUT
+      <t>
+         <list style="symbols">
+           <t>First</t>
+           <t>Second<figure>
+         <artwork>&lt;entry&gt;</artwork>
+       </figure></t>
+         </list>
+      </t>
+    OUTPUT
+  end
+  
+  it "renders a nested list containing a comment" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc2)).to be_equivalent_to <<~'OUTPUT'
+      [[id]]
+      * First
+      * Second
+      +
+      NOTE: Note
+    INPUT
+      <t>
+         <list style="symbols">
+           <t>First</t>
+           <t>Second<vspace blankLines="1"/>
+           <cref>Note</cref>
+           </t>
+         </list>
+      </t>
+    OUTPUT
+  end
 end

data/spec/asciidoctor/rfc/v3/dlist_spec.rb

@@ -96,7 +96,26 @@ describe Asciidoctor::RFC::V3::Converter do
       </dl>
     OUTPUT
   end
-  it "permits multi paragraph list items" do
+  it "renders a description list with definitions on the next line" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+
+      == Section 1
+      A:: 
+      +
+      B
+    INPUT
+      <section anchor="_section_1" numbered="false">
+         <name>Section 1</name>
+         <dl>
+         <dt>A</dt>
+         <dd><t>B</t></dd>
+       </dl>
+      </section>
+    OUTPUT
+  end
+  it "permits multi paragraph definition list items through list continuation" do
     expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
       = Document title
       Author
@@ -118,4 +137,87 @@ describe Asciidoctor::RFC::V3::Converter do
       </section>
     OUTPUT
   end
+  it "permits multi paragraph definition list items through open blocks" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+
+      == Section 1
+      Notes::  Note 1.
+      +
+      --
+      Note 2.
+      
+      Note 3.
+      --
+    INPUT
+      <section anchor="_section_1" numbered="false">
+         <name>Section 1</name>
+         <dl>
+         <dt>Notes</dt>
+         <dd><t>Note 1.</t><t>Note 2.</t>
+       <t>Note 3.</t></dd>
+       </dl>
+      </section>
+    OUTPUT
+  end
+  it "permits definition list items with a single open block" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+
+      == Section 1
+      Notes::  Note 1.
+      +
+      --
+      Note 2.
+      --
+    INPUT
+      <section anchor="_section_1" numbered="false">
+         <name>Section 1</name>
+         <dl>
+         <dt>Notes</dt>
+         <dd><t>Note 1.</t><t>Note 2.</t>
+       </dd>
+       </dl>
+      </section>
+    OUTPUT
+  end
+  it "renders definition lists without definitions" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+
+      == Section 1
+      Notes::  
+    INPUT
+      <section anchor="_section_1" numbered="false">
+         <name>Section 1</name>
+         <dl>
+         <dt>Notes</dt>
+         <dd/>
+       </dl>
+      </section>
+    OUTPUT
+  end
+  it "renders definition lists with more definition terms than definitions" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+
+      == Section 1
+      Notes1::
+      Notes2:: Definition 
+    INPUT
+      <section anchor="_section_1" numbered="false">
+         <name>Section 1</name>
+         <dl>
+         <dt>Notes1</dt>
+         <dd/>
+         <dt>Notes2</dt>
+         <dd>Definition</dd>
+       </dl>
+      </section>
+    OUTPUT
+  end
 end

data/spec/asciidoctor/rfc/v3/image_spec.rb

@@ -12,6 +12,24 @@ describe Asciidoctor::RFC::V3::Converter do
       </figure>
     OUTPUT
   end
+  it "renders an image within an example" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      [[id1]]
+      .Example Title
+      [align=right,alt=Example]
+      ====
+      [[id]]
+      .Image Title
+      [align=center,alt=alt_text]
+      image::http:://www.example/org/filename.jpg[]
+      ====
+    INPUT
+      <figure anchor="id1">
+         <name>Example Title</name>
+         <artwork align="center" alt="alt_text" anchor="id" name="Image Title" src="http:://www.example/org/filename.jpg" type="binary-art"/>
+      </figure>
+    OUTPUT
+  end
   it "renders an image with macro attributes" do
     expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
       [[id]]

data/spec/asciidoctor/rfc/v3/listing_spec.rb

@@ -19,6 +19,32 @@ describe Asciidoctor::RFC::V3::Converter do
     OUTPUT
   end
 
+  it "renders a listing block within an example" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      [#id]
+      ====
+      [[literal-id]]
+      .filename.rb
+      [source,ruby]
+      ----
+      def listing(node)
+        result = []
+        result << "<figure>" if node.parent.context != :example
+      end
+      ----
+      ====
+    INPUT
+      <figure anchor="id">
+      <sourcecode anchor="literal-id" name="filename.rb" type="ruby">
+      def listing(node)
+        result = []
+        result &lt;&lt; "&lt;figure&gt;" if node.parent.context != :example
+      end
+      </sourcecode>
+      </figure>
+    OUTPUT
+  end
+
   it "renders a listing block without source attribute" do
     expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
       [[literal-id]]

data/spec/asciidoctor/rfc/v3/literal_spec.rb

@@ -42,7 +42,26 @@ describe Asciidoctor::RFC::V3::Converter do
       ++++
     INPUT
       <figure>
-      <artwork type="ascii-art">
+      <artwork type="ascii-art" align="center">
+      sqrt(4) = 2
+      </artwork>
+      </figure>
+    OUTPUT
+  end
+  it "renders stem as a literal within an example" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+      :stem:
+      
+      [#id]
+      ====
+      [stem]
+      ++++
+      sqrt(4) = 2
+      ++++
+      ====
+    INPUT
+      <figure anchor="id">
+      <artwork type="ascii-art" align="center">
       sqrt(4) = 2
       </artwork>
       </figure>

data/spec/asciidoctor/rfc/v3/preamble_spec.rb

@@ -64,6 +64,156 @@ describe Asciidoctor::RFC::V3::Converter do
       </rfc>
     OUTPUT
   end
+  it "renders admonitions in preamble as notes, following an abstract" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+      :docName:
+      
+      Abstract
+
+      [NOTE]
+      .Title of Note
+      ====
+      This is another note.
+      ====
+
+      == Lorem
+      Ipsum.
+    INPUT
+      <?xml version="1.0" encoding="US-ASCII"?>
+      <!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+
+      <rfc submissionType="IETF" prepTime="2000-01-01T05:00:00Z" version="3">
+      <front>
+      <title>Document title</title>
+      <author fullname="Author"/>
+      <date day="1" month="January" year="2000"/>
+      <abstract><t>Abstract</t></abstract>
+      <note>
+      <name>Title of Note</name>
+      <t>This is another note.</t>
+      </note>
+      </front><middle>
+      <section anchor="_lorem" numbered="false">
+         <name>Lorem</name>
+         <t>Ipsum.</t>
+      </section>
+      </middle>
+      </rfc>
+    OUTPUT
+  end
+
+  it "renders unordered lists in preamble as abstract" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+      :docName:
+
+      * Preamble 1
+      * Preamble 2
+
+      == Lorem
+      Ipsum.
+    INPUT
+      <?xml version="1.0" encoding="US-ASCII"?>
+      <!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+
+      <rfc prepTime="2000-01-01T05:00:00Z"
+                version="3" submissionType="IETF">
+      <front>
+      <title>Document title</title>
+      <author fullname="Author">
+      </author>
+      <date day="1" month="January" year="2000"/>
+      <abstract>
+      <ul>
+         <li>Preamble 1</li>
+         <li>Preamble 2</li>
+      </ul>
+      </abstract>
+      </front><middle>
+      <section anchor="_lorem" numbered="false">
+      <name>Lorem</name>
+      <t>Ipsum.</t>
+      </section>
+      </middle>
+      </rfc>
+    OUTPUT
+  end
+  it "renders ordered lists in preamble as abstract" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+      :docName:
+
+      . Preamble 1
+      . Preamble 2
+
+      == Lorem
+      Ipsum.
+    INPUT
+      <?xml version="1.0" encoding="US-ASCII"?>
+      <!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+
+      <rfc prepTime="2000-01-01T05:00:00Z"
+                version="3" submissionType="IETF">
+      <front>
+      <title>Document title</title>
+      <author fullname="Author">
+      </author>
+      <date day="1" month="January" year="2000"/>
+      <abstract>
+      <ol type="1">
+         <li>Preamble 1</li>
+         <li>Preamble 2</li>
+      </ol>
+      </abstract>
+      </front><middle>
+      <section anchor="_lorem" numbered="false">
+      <name>Lorem</name>
+      <t>Ipsum.</t>
+      </section>
+      </middle>
+      </rfc>
+    OUTPUT
+  end
+  it "renders definition lists in preamble as abstract" do
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
+      = Document title
+      Author
+      :docName:
+
+      Preamble 1:: Preamble 2
+
+      == Lorem
+      Ipsum.
+    INPUT
+      <?xml version="1.0" encoding="US-ASCII"?>
+      <!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+
+      <rfc prepTime="2000-01-01T05:00:00Z"
+                version="3" submissionType="IETF">
+      <front>
+      <title>Document title</title>
+      <author fullname="Author">
+      </author>
+      <date day="1" month="January" year="2000"/>
+      <abstract>
+        <dl>
+          <dt>Preamble 1</dt>
+          <dd>Preamble 2</dd>
+        </dl>
+      </abstract>
+      </front><middle>
+      <section anchor="_lorem" numbered="false">
+      <name>Lorem</name>
+      <t>Ipsum.</t>
+      </section>
+      </middle>
+      </rfc>
+    OUTPUT
+  end
   it "renders admonitions in preamble as notes" do
     expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
       = Document title

data/spec/asciidoctor/rfc/v3/references_spec.rb

@@ -11,6 +11,8 @@ describe Asciidoctor::RFC::V3::Converter do
 
       [bibliography]
       == References
+      
+      === Normative References
       ++++
       <reference anchor='ISO.IEC.10118-3' target='https://www.iso.org/standard/67116.html'>
         <front>
@@ -43,7 +45,7 @@ describe Asciidoctor::RFC::V3::Converter do
       </section>
       </middle><back>
       <references anchor="_references">
-      <name>References</name>
+      <name>Normative References</name>
       <reference anchor='ISO.IEC.10118-3' target='https://www.iso.org/standard/67116.html'>
          <front>
            <title>ISO/IEC FDIS 10118-3 -- Information technology -- Security techniques -- Hash-functions -- Part 3: Dedicated hash-functions</title>
@@ -72,7 +74,7 @@ describe Asciidoctor::RFC::V3::Converter do
   end
 
   it "renders raw RFC XML as references, with displayreferences" do
-    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3)).to be_equivalent_to <<~'OUTPUT'
+    expect(Asciidoctor.convert(<<~'INPUT', backend: :rfc3, header_footer: true)).to be_equivalent_to <<~'OUTPUT'
       = Document title
       Author
       :doctype: internet-draft
@@ -84,6 +86,8 @@ describe Asciidoctor::RFC::V3::Converter do
       == References
       * [[[xxx,1]]]
       * [[[gof,2]]]
+      
+      === Normative References
       ++++
       <reference anchor='ISO.IEC.10118-3' target='https://www.iso.org/standard/67116.html'>
         <front>
@@ -110,38 +114,35 @@ describe Asciidoctor::RFC::V3::Converter do
       </reference>
       ++++
     INPUT
-      <section anchor="_text" numbered="false">
-      <name>Text</name>
-      <t>Text</t>
-      </section>
-      <displayreference target="xxx" to="1"/>
-      <displayreference target="gof" to="2"/>
-      <references anchor="_references">
-      <name>References</name>
-      <reference anchor='ISO.IEC.10118-3' target='https://www.iso.org/standard/67116.html'>
-         <front>
-           <title>ISO/IEC FDIS 10118-3 -- Information technology -- Security techniques -- Hash-functions -- Part 3: Dedicated hash-functions</title>
-           <author>
-             <organization>International Organization for Standardization</organization>
-             <address>
-               <postal>
-                 <street>BIBC II</street>
-                 <street>Chemin de Blandonnet 8</street>
-                 <street>CP 401</street>
-                 <city>Vernier</city>
-                 <region>Geneva</region>
-                 <code>1214</code>
-                 <country>Switzerland</country>
-               </postal>
-               <phone>+41 22 749 01 11</phone>
-               <email>central@iso.org</email>
-               <uri>https://www.iso.org/</uri>
-             </address>
-           </author>
-           <date day='15' month='September' year='2017'/>
-         </front>
-      </reference>
-      </references>
+      <?xml version="1.0" encoding="US-ASCII"?>
+       <!DOCTYPE rfc SYSTEM "rfc2629.dtd">
+       <?rfc strict="yes"?>
+       <?rfc toc="yes"?>
+       <?rfc tocdepth="4"?>
+       <?rfc symrefs=""?>
+       <?rfc sortrefs=""?>
+       <?rfc compact="yes"?>
+       <?rfc subcompact="no"?>
+       <rfc submissionType="IETF" prepTime="2000-01-01T05:00:00Z" version="3">
+       <front>
+         <title>Document title</title>
+         <author fullname="Author"/>
+         <date day="1" month="January" year="2000"/>
+     
+       </front><middle>
+       <section anchor="_text" numbered="false">
+         <name>Text</name>
+         <t>Text</t>
+       </section>
+       </middle><back>
+       <displayreference target="xxx" to="1"/>
+       <displayreference target="gof" to="2"/>
+       <references anchor="_normative_references">
+         <name>Normative References</name>
+         <reference anchor="ISO.IEC.10118-3" target="https://www.iso.org/standard/67116.html">  <front>    <title>ISO/IEC FDIS 10118-3 -- Information technology -- Security techniques -- Hash-functions -- Part 3: Dedicated hash-functions</title>    <author>      <organization>International Organization for Standardization</organization>      <address>        <postal>          <street>BIBC II</street>          <street>Chemin de Blandonnet 8</street>          <street>CP 401</street>          <city>Vernier</city>          <region>Geneva</region>          <code>1214</code>          <country>Switzerland</country>        </postal>        <phone>+41 22 749 01 11</phone>        <email>central@iso.org</email>        <uri>https://www.iso.org/</uri>      </address>    </author>    <date day="15" month="September" year="2017"/>  </front></reference>
+       </references>
+       </back>
+      </rfc>
     OUTPUT
   end
 end