asciidoctor-rfc 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f4e13a1c0b1f7b874d877b3af7ac9bb6a9c57e
-  data.tar.gz: a8568b817911f27790d5f6c650be1b7f7b689b1b
+  metadata.gz: b5863fe02ba89d28e9da58e35cebe4502982de33
+  data.tar.gz: 2f2b188dbd17dfbe10ec94cf9fdf3133d5e07af5
 SHA512:
-  metadata.gz: be627748bf8653eb0c6216f8c407e3a4a6859f73e7e3c6063226c510a8c132f420255a07a717a2c0b68772cf25a6ba99a09e21c4b277392fba9137557e41e71f
-  data.tar.gz: ee27131d6f964ea7ef0470c2b487212b3a8ae215e32182e9a9f2cb77f39db82bd0cc295969c8831a1443dfb829f4decec1e2773cbf2dfdfe9133b55aab43a95a
+  metadata.gz: 4a02f95152d0448df4363d6c77562db8044b70bb9e33612a78903ade801f371f3b1013efc630ef05b3b88f4287d3ddd1a42d634562a95ac33e756edf250576a7
+  data.tar.gz: eec672a895df5026b803681f745273ff2e533d59a9e2caa9e4085b180d52f51ad1c7966a2456ca174a05f833d6a918fe0372716f1b0c6852fb9c5b65bb4aa454

data/lib/asciidoctor/rfc/v2/blocks.rb

@@ -30,7 +30,7 @@ module Asciidoctor
         }
 
         # NOTE: html escaping is performed by Nokogiri
-        artwork_content = node.lines.join("\n")
+        artwork_content = "\n" +  node.lines.join("\n") + "\n"
 
         ret = noko do |xml|
           if node.parent.context != :example
@@ -38,10 +38,16 @@ module Asciidoctor
               anchor: node.id,
             }
             xml.figure **attr_code(figure_attributes) do |xml_figure|
-              xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              # xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              xml_figure.artwork **attr_code(artwork_attributes) do |a|
+                a.cdata artwork_content
+              end
             end
           else
-            xml.artwork artwork_content, **attr_code(artwork_attributes)
+            # xml.artwork artwork_content, **attr_code(artwork_attributes)
+            xml.artwork **attr_code(artwork_attributes) do |a|
+              a.cdata artwork_content
+            end
           end
         end
         ret
@@ -57,7 +63,7 @@ module Asciidoctor
         }
 
         # NOTE: html escaping is performed by Nokogiri
-        artwork_content = node.lines.join("\n")
+        artwork_content = "\n" +  node.lines.join("\n") + "\n"
 
         ret = noko do |xml|
           if node.parent.context != :example
@@ -65,10 +71,16 @@ module Asciidoctor
               anchor: node.id,
             }
             xml.figure **attr_code(figure_attributes) do |xml_figure|
-              xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              # xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              xml_figure.artwork **attr_code(artwork_attributes) do |a|
+                a.cdata artwork_content
+              end
             end
           else
-            xml.artwork artwork_content, **attr_code(artwork_attributes)
+            # xml.artwork artwork_content, **attr_code(artwork_attributes)
+            xml.artwork **attr_code(artwork_attributes) do |a|
+              a.cdata artwork_content
+            end
           end
         end
         ret
@@ -202,7 +214,7 @@ module Asciidoctor
 
         # NOTE: html escaping is performed by Nokogiri
         sourcecode_content =
-          sourcecode_attributes[:src].nil? ? node.lines.join("\n") : ""
+          sourcecode_attributes[:src].nil? ? "\n" + node.lines.join("\n") + "\n" : ""
 
         noko do |xml|
           if node.parent.context != :example
@@ -210,10 +222,17 @@ module Asciidoctor
               anchor: node.id,
             }
             xml.figure **attr_code(figure_attributes) do |xml_figure|
-              xml_figure.artwork sourcecode_content, **attr_code(sourcecode_attributes)
+              # xml_figure.artwork sourcecode_content, **attr_code(sourcecode_attributes)
+              xml_figure.artwork **attr_code(sourcecode_attributes) do |a|
+                a.cdata sourcecode_content
+              end
+
             end
           else
-            xml.artwork sourcecode_content, **attr_code(sourcecode_attributes)
+            # xml.artwork sourcecode_content, **attr_code(sourcecode_attributes)
+            xml.artwork **attr_code(sourcecode_attributes) do |a|
+              a.cdata sourcecode_content
+            end
           end
         end
       end

data/lib/asciidoctor/rfc/v3/blocks.rb

@@ -30,15 +30,21 @@ module Asciidoctor
         }
 
         # NOTE: html escaping is performed by Nokogiri
-        artwork_content = node.lines.join("\n")
+        artwork_content = "\n" + node.lines.join("\n") + "\n"
 
         noko do |xml|
           if node.parent.context != :example
             xml.figure do |xml_figure|
-              xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              # xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              xml_figure.artwork **attr_code(artwork_attributes) do |a|
+                a.cdata artwork_content
+              end
             end
           else
-            xml.artwork artwork_content, **attr_code(artwork_attributes)
+            # xml.artwork artwork_content, **attr_code(artwork_attributes)
+            xml.artwork **attr_code(artwork_attributes) do |a|
+              a.cdata artwork_content
+            end
           end
         end
       end
@@ -54,15 +60,21 @@ module Asciidoctor
         }
 
         # NOTE: html escaping is performed by Nokogiri
-        artwork_content = node.lines.join("\n")
+        artwork_content = "\n" + node.lines.join("\n") + "\n"
 
         noko do |xml|
           if node.parent.context != :example
             xml.figure do |xml_figure|
-              xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              # xml_figure.artwork artwork_content, **attr_code(artwork_attributes)
+              xml_figure.artwork **attr_code(artwork_attributes) do |a|
+                a.cdata artwork_content
+              end
             end
           else
-            xml.artwork artwork_content, **attr_code(artwork_attributes)
+            # xml.artwork artwork_content, **attr_code(artwork_attributes)
+            xml.artwork **attr_code(artwork_attributes) do |a|
+              a.cdata artwork_content
+            end
           end
         end
       end
@@ -211,15 +223,21 @@ module Asciidoctor
 
         # NOTE: html escaping is performed by Nokogiri
         sourcecode_content =
-          sourcecode_attributes[:src].nil? ? node.lines.join("\n") : ""
+          sourcecode_attributes[:src].nil? ? "\n" + node.lines.join("\n") + "\n" : ""
 
         noko do |xml|
           if node.parent.context != :example
             xml.figure do |xml_figure|
-              xml_figure.sourcecode sourcecode_content, **attr_code(sourcecode_attributes)
+              # xml_figure.sourcecode sourcecode_content, **attr_code(sourcecode_attributes)
+              xml_figure.sourcecode **attr_code(sourcecode_attributes) do |a|
+                a.cdata sourcecode_content
+              end
             end
           else
-            xml.sourcecode sourcecode_content, **attr_code(sourcecode_attributes)
+            # xml.sourcecode sourcecode_content, **attr_code(sourcecode_attributes)
+            xml.sourcecode **attr_code(sourcecode_attributes) do |a|
+              a.cdata sourcecode_content
+            end
           end
         end
       end

data/lib/asciidoctor/rfc/version.rb

@@ -1,5 +1,5 @@
 module Asciidoctor
   module RFC
-    VERSION = "0.8.2".freeze
+    VERSION = "0.8.3".freeze
   end
 end

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

@@ -14,9 +14,9 @@ describe Asciidoctor::RFC::V2::Converter do
       ====
     INPUT
       <figure anchor="id" align="left" alt="Alt Text" title="Figure 1" suppress-title="true">
-      <artwork name="figure1.txt">
+      <artwork name="figure1.txt"><![CDATA[
       Figures are only permitted to contain listings (sourcecode), images (artwork), or literal (artwork)
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -38,9 +38,9 @@ describe Asciidoctor::RFC::V2::Converter do
       <preamble>
       Preamble text
       </preamble>
-      <artwork name="figure1.txt">
+      <artwork name="figure1.txt"><![CDATA[
       Figures are only permitted to contain listings (sourcecode), images (artwork), or literal (artwork)
-      </artwork>
+      ]]></artwork>
       <postamble>
       Postamble text
       </postamble>

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

@@ -13,8 +13,7 @@ describe Asciidoctor::RFC::V2::Converter do
       ----
     INPUT
       <figure anchor="literal-id">
-        <artwork name="filename.rb" type="ruby" src="http://example.com/ruby.rb" alt="Alt Text">
-        </artwork>
+        <artwork name="filename.rb" type="ruby" src="http://example.com/ruby.rb" alt="Alt Text"><![CDATA[]]></artwork>
       </figure>
     OUTPUT
   end
@@ -35,8 +34,7 @@ describe Asciidoctor::RFC::V2::Converter do
       ====
     INPUT
       <figure anchor="id">
-        <artwork name="filename.rb" type="ruby" src="http://example.com/ruby.rb" alt="Alt Text">
-        </artwork>
+        <artwork name="filename.rb" type="ruby" src="http://example.com/ruby.rb" alt="Alt Text"><![CDATA[]]></artwork>
       </figure>
     OUTPUT
   end
@@ -54,12 +52,12 @@ describe Asciidoctor::RFC::V2::Converter do
       ----
     INPUT
       <figure anchor="literal-id">
-      <artwork name="filename.rb" type="ruby">
+      <artwork name="filename.rb" type="ruby"><![CDATA[
       def listing(node)
         result = []
-        result &lt;&lt; "&lt;figure&gt;" if node.parent.context != :example
+        result << "<figure>" if node.parent.context != :example
       end
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -71,10 +69,10 @@ describe Asciidoctor::RFC::V2::Converter do
       Notice that the monospace markup is preserved in the output.
     INPUT
       <figure>
-      <artwork>
+      <artwork><![CDATA[
       This is an example of a paragraph styled with `listing`.
       Notice that the monospace markup is preserved in the output.
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end

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

@@ -10,9 +10,9 @@ describe Asciidoctor::RFC::V2::Converter do
       ....
     INPUT
       <figure anchor="literal-id">
-      <artwork align="left" name="filename" type="abnf" alt="alt_text">
+      <artwork align="left" name="filename" type="abnf" alt="alt_text"><![CDATA[
         Literal contents.
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -28,9 +28,9 @@ describe Asciidoctor::RFC::V2::Converter do
       <1> This is a callout
     INPUT
       <figure anchor="literal-id">
-      <artwork align="left" name="filename" alt="alt_text">
+      <artwork align="left" name="filename" alt="alt_text"><![CDATA[
         Literal contents.
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -44,9 +44,9 @@ describe Asciidoctor::RFC::V2::Converter do
       ++++
     INPUT
       <figure>
-      <artwork align="center">
+      <artwork align="center"><![CDATA[
       sqrt(4) = 2
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -64,9 +64,9 @@ describe Asciidoctor::RFC::V2::Converter do
       ====
     INPUT
       <figure anchor="id">
-      <artwork align="center">
+      <artwork align="center"><![CDATA[
       sqrt(4) = 2
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end

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

@@ -23,9 +23,9 @@ describe Asciidoctor::RFC::V2::Converter do
       </list>
       </t>
       <figure>
-      <artwork>
+      <artwork><![CDATA[
       And this is ascii-art
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end

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

@@ -104,14 +104,16 @@ describe Asciidoctor::RFC::V2::Converter do
       <entry>
       ....
     INPUT
-      <t>
+           <t>
          <list style="symbols">
            <t>First</t>
            <t>Second<figure>
-         <artwork>&lt;entry&gt;</artwork>
+         <artwork><![CDATA[
+       <entry>
+       ]]></artwork>
        </figure></t>
          </list>
-      </t>
+       </t>
     OUTPUT
   end
 

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

@@ -25,9 +25,9 @@ describe Asciidoctor::RFC::V3::Converter do
     INPUT
       <figure anchor="id">
       <name>Figure 1</name>
-      <artwork anchor="id2" name="figure1.txt" type="ascii-art">
+      <artwork anchor="id2" name="figure1.txt" type="ascii-art"><![CDATA[
       Figures are only permitted to contain listings (sourcecode), images (artwork), or literal (artwork)
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end

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

@@ -13,8 +13,7 @@ describe Asciidoctor::RFC::V3::Converter do
       ----
     INPUT
       <figure>
-      <sourcecode anchor="literal-id" name="filename.rb" type="ruby" src="http://example.com/ruby.rb">
-      </sourcecode>
+      <sourcecode anchor="literal-id" name="filename.rb" type="ruby" src="http://example.com/ruby.rb"><![CDATA[]]></sourcecode>
       </figure>
     OUTPUT
   end
@@ -35,12 +34,12 @@ describe Asciidoctor::RFC::V3::Converter do
       ====
     INPUT
       <figure anchor="id">
-      <sourcecode anchor="literal-id" name="filename.rb" type="ruby">
+      <sourcecode anchor="literal-id" name="filename.rb" type="ruby"><![CDATA[
       def listing(node)
         result = []
-        result &lt;&lt; "&lt;figure&gt;" if node.parent.context != :example
+        result << "<figure>" if node.parent.context != :example
       end
-      </sourcecode>
+      ]]></sourcecode>
       </figure>
     OUTPUT
   end
@@ -58,12 +57,12 @@ describe Asciidoctor::RFC::V3::Converter do
       ----
     INPUT
       <figure>
-      <sourcecode anchor="literal-id" name="filename.rb" type="ruby">
+      <sourcecode anchor="literal-id" name="filename.rb" type="ruby"><![CDATA[
       def listing(node)
         result = []
-        result &lt;&lt; "&lt;figure&gt;" if node.parent.context != :example
+        result << "<figure>" if node.parent.context != :example
       end
-      </sourcecode>
+      ]]></sourcecode>
       </figure>
     OUTPUT
   end
@@ -75,10 +74,10 @@ describe Asciidoctor::RFC::V3::Converter do
       Notice that the monospace markup is preserved in the output.
     INPUT
       <figure>
-      <sourcecode>
+      <sourcecode><![CDATA[
       This is an example of a paragraph styled with `listing`.
       Notice that the monospace markup is preserved in the output.
-      </sourcecode>
+      ]]></sourcecode>
       </figure>
     OUTPUT
   end

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

@@ -10,9 +10,9 @@ describe Asciidoctor::RFC::V3::Converter do
       ....
     INPUT
       <figure>
-      <artwork anchor="literal-id" align="left" name="filename" type="ascii-art" alt="alt_text">
+      <artwork anchor="literal-id" align="left" name="filename" type="ascii-art" alt="alt_text"><![CDATA[
         Literal contents.
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -27,9 +27,9 @@ describe Asciidoctor::RFC::V3::Converter do
       <1> This is a callout
     INPUT
       <figure>
-      <artwork anchor="literal-id" align="left" name="filename" type="ascii-art" alt="alt_text">
+      <artwork anchor="literal-id" align="left" name="filename" type="ascii-art" alt="alt_text"><![CDATA[
         Literal contents.
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -42,9 +42,9 @@ describe Asciidoctor::RFC::V3::Converter do
       ++++
     INPUT
       <figure>
-      <artwork type="ascii-art" align="center">
+      <artwork type="ascii-art" align="center"><![CDATA[
       sqrt(4) = 2
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end
@@ -61,9 +61,9 @@ describe Asciidoctor::RFC::V3::Converter do
       ====
     INPUT
       <figure anchor="id">
-      <artwork type="ascii-art" align="center">
+      <artwork type="ascii-art" align="center"><![CDATA[
       sqrt(4) = 2
-      </artwork>
+      ]]></artwork>
       </figure>
     OUTPUT
   end

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

@@ -68,9 +68,9 @@ describe Asciidoctor::RFC::V3::Converter do
       <li>Fenced code blocks</li>
       </ul>
       <figure>
-      <artwork type="ascii-art">
+      <artwork type="ascii-art"><![CDATA[
       Wha?
-      </artwork>
+      ]]></artwork>
       </figure>
       <t>Yep. AsciiDoc and Markdown share a lot of common syntax already.</t>
       </blockquote>

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

@@ -15,16 +15,16 @@ describe Asciidoctor::RFC::V3::Converter do
       ....
       ****
     INPUT
-      <aside anchor="id">
-      <t>Sidebar</t>
+      <aside anchor="id"><t>Sidebar</t>
       <t>Another sidebar</t>
       <ul>
       <li>This is a list</li>
       </ul>
       <figure>
-      <artwork type="ascii-art">And this is ascii-art</artwork>
-      </figure>
-      </aside>
+        <artwork type="ascii-art"><![CDATA[
+      And this is ascii-art
+      ]]></artwork>
+      </figure></aside>
     OUTPUT
   end
 end

data/spec/examples/davies-template-bare-06.adoc

@@ -201,7 +201,6 @@ versions of xml2rfc.
 
 ----
 
-
 /**** an example C program */
 
 #include <stdio.h>
@@ -221,7 +220,6 @@ main(int argc, char *argv[])
 
 /* end of file */
 
-
 ----
 ====
 

data/spec/examples/draft-iab-html-rfc-bis.xml.adoc

@@ -1839,7 +1839,6 @@ attribute with value "title".
 ....
 <h1 id="title">HyperText Markup Language Request For
     Comments Format</h1>
-
 ....
 
 Inside a reference, the title is rendered as an HTML &lt;span&gt;
@@ -1914,7 +1913,6 @@ or
 
 ....
 [<a class="xref" href="#RFC1234">RFC1234</a>]
-
 ....
 
 [#element-svg]

data/spec/examples/stupid-s.mkd.adoc

@@ -151,7 +151,6 @@ different location.
 ====
 ....
 
-
         STuPiD   ```````````````````````````````,
         Script   <----------------------------. ,
                                               | ,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-rfc
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: asciidoctor-rfc lets you write Internet-Drafts and RFCs in AsciiDoc.