kramdown-rfc2629 1.7.35 → 1.7.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db828f3c40e956c5cf30f1c29cf658784bac36c2af464cf0216ef8fa14434d71
-  data.tar.gz: '09516f03f56523d7636f14689b15975417f9ce10cf8fd6f980cf844af003c945'
+  metadata.gz: a9ff7213b94221a765a71330807020f096d5359482a00597494a7b7ac947a3ab
+  data.tar.gz: c9950dd8e71d8dcd45d128a1ef505c10336ce66fba9a790e4db4db114902e02c
 SHA512:
-  metadata.gz: 0da3a29b338f0a3ce60e54b9dae53cfd6568e75e0320c256a716728ec099e0f8b60a819f0f6c210f3c14b1c81a74d981cbe6f30c42d1b1f5ca315f0f690f6301
-  data.tar.gz: a2af7e2f8f79cc46dd0ff426c90457d8543b99be587e8defde3bc7b824ee3afa25feaef98b33cb4777e20ae3fb1de9cb9b9a872d53736852e0d5cc137d1217ca
+  metadata.gz: df87cfdc51a33bdc89a67723a66f475671d29d71ace9796bd2698135ee4b99e3a62072a0412ec9c0773b202790beae1a8d8ad10d7c8c41dd43c0a57812973018
+  data.tar.gz: 1c4de95e1f2dffdac9faff39ed32853cf36ae072ee6bdb447c8ce87f74203ca24165e391d1ee5fe92bc49ecc20ae6abf57a44d6cb26917e33096b9156528f7a1

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.35'
+  s.version = '1.7.36'
   s.summary = "Kramdown extension for generating RFCXML (RFC 799x)."
   s.description = %{An RFCXML (RFC 799x) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc/command.rb

@@ -192,8 +192,12 @@ NMDTAGS = ["{:/nomarkdown}\n\n", "\n\n{::nomarkdown}\n"]
 
 NORMINFORM = { "!" => :normative, "?" => :informative }
 
-def yaml_load(input, *args)
- begin
+
+# Handle several transitions of YAML API:
+# * very early Ruby (no safe_load, before Ruby 2.1)
+# * Ruby before 3.1 (safe_load, positional parameters)
+# * Ruby 2.6 up (safe_load, keyword parameters)
+def yaml_load_compat(input, *args)
   if YAML.respond_to?(:safe_load)
     begin
       YAML.safe_load(input, *args)
@@ -203,10 +207,25 @@ def yaml_load(input, *args)
   else
     YAML.load(input)
   end
- rescue Psych::SyntaxError => e
-   warn "*** YAML syntax error: #{e}"
-   exit 65 # EX_DATAERR
- end
+end
+
+def yaml_diagnose(input, *args)
+  l = input.lines.to_a
+  (l.size-1).downto(0) do |nl|
+    yaml_load_compat(l[0...nl].join, *args) rescue next
+    warn "** YAML appears to be parsable up to line #{nl}"
+    return
+  end
+end
+
+def yaml_load(input, *args)
+  begin
+    yaml_load_compat(input, *args)
+  rescue Psych::SyntaxError => e
+    warn "*** YAML syntax error: #{e}"
+    yaml_diagnose(input, *args) rescue nil
+    exit 65 # EX_DATAERR
+  end
 end
 
 def process_kramdown_options(coding_override = nil,
@@ -303,13 +322,13 @@ def xml_from_sections(input)
   # the first section is a YAML with front matter parameters (don't put a label here)
   # We put back the "---" plus gratuitous blank lines to hack the line number in errors
   yaml_in = input[/---\s*/] << sections.shift[2]
+  ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true))
   begin
     require 'kramdown-rfc/yamlcheck'
     KramdownRFC::YAMLcheck.check_dup_keys(yaml_in)
   rescue => e
     warn "** Cannot check for duplicate keys in YAML header (#{e})"
   end
-  ps = KramdownRFC::ParameterSet.new(yaml_load(yaml_in, [Date], [], true))
 
   if v = ps[:v]
     warn "*** unsupported RFCXML version #{v}" if v != 3

data/lib/kramdown-rfc2629.rb

@@ -745,7 +745,7 @@ COLORS
                                 "<![CDATA[#{result}#{result =~ /\n\Z/ ? '' : "\n"}]]>")
             if result1          # nest TXT in artset with SVG
               retsvg = mk_artwork(artwork_attr, "svg",
-                                  result1.sub(/.*?<svg/m, "<svg"))
+                                  result1.sub(/.*?<svg/m, "<svg")) # , t == "mermaid")
               retart = "<artset>#{retsvg}#{retart}</artset>"
             end
             "#{' '*indent}<figure#{el_html_attributes(el)}>#{retart}</figure>\n"
@@ -844,8 +844,14 @@ COLORS
         result
       end
 
-      def mk_artwork(artwork_attr, typ, content)
-        "<artwork #{html_attributes(artwork_attr.merge("type" => typ))}>#{content}</artwork>"
+      def mk_artwork(artwork_attr, typ, content, use_data = false)
+        if use_data
+          warn "** using data URI for artwork type #{typ}"
+          data = %{data:application/octet-stream;base64,#{[content].pack('m0')}}
+          "<artwork #{html_attributes(artwork_attr.merge("type" => typ, "src" => data))}></artwork>"
+        else
+          "<artwork #{html_attributes(artwork_attr.merge("type" => typ))}>#{content}</artwork>"
+        end
       end
 
       def convert_blockquote(el, indent, opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.35
+  version: 1.7.36
 platform: ruby
 authors:
 - Carsten Bormann
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.2
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).
 test_files: []