kramdown-rfc2629 1.7.21 → 1.7.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b359e547f2f8f265b1ee961d2956c32073d4a846a4fa813bd9ff8f898d385f08
-  data.tar.gz: 72ecb5162fc2910ceb62d3ee7df6e6902f1fe15540d2761b1e94ee73c60cffb7
+  metadata.gz: 269381d3a05b02772eb68975943dcf119cd9010d9fdcfb4eb5df92886bfa59bb
+  data.tar.gz: 2f8c3f406037faaa02bd01f0eda40438a601ddaea49ff4c95ff8bcf168e0572a
 SHA512:
-  metadata.gz: a65c817ecab99a017c3335f1e8040ffb37f1e1915e32abea9253cabd7f12014d4176ca2ab8fdd3659ea3d546b9e3ead4c3fd4c7f33ca62f8dd6b3b79bb87606c
-  data.tar.gz: 226b74d1c1a011bbe8631598d91d01c6defaf228c38735405bd86a36456aba3edc74a3cfc27a1e3e91a3f5aa9a7d8075dd34fa35b1b2082ccddea9b339b5a543
+  metadata.gz: 831fa5d0ea40f6f3e7c111160684eb818a6e4837159c2816c9d258c67258249226e5f895bfdb5b512f09af1c593a4176c378e99e395b180fd891409b06635206
+  data.tar.gz: f335e96c5bda06e7de555115ed3ae4057964287c24713082d23105ed9b93ddd0a63df6459887a9ae49fca3510fda4fc8fdcf880f588d1703ec2b422f9dc77cb9

data/bin/kramdown-rfc-extract-figures-tables

@@ -68,10 +68,13 @@ lists.each do |k, v|
     puts
     puts "# #{title}"
     puts "{:unnumbered}"
+    puts
+    puts "{:compact}"
   else
     fail
   end
   v.each_with_index do |(ref, ti), n|
+    ti.sub!(/,?[\p{Zl}\p{Zp}\p{Cc}].*/, "") # first line of caption only
     ti = "[#{ti}](##{ref})" if ref
     puts "#{n+1}. #{ti}"
   end

data/bin/kramdown-rfc-extract-sourcecode

@@ -40,6 +40,7 @@ end
 
 target = nil
 dir = nil
+out_type = out_name = nil
 unfold = true
 targets = [:list, :files, :zip, :yaml]
 require 'optparse'
@@ -52,6 +53,10 @@ begin
     opts.on("-dDIR", "--dir=DIR", "Target directory (default: sourcecode)") do |v|
       dir = v
     end
+    opts.on("-xTYPE/NAME", "--extract=TYPE/NAME", "Extract single item to stdout") do |v|
+      target = :stdout
+      out_type, out_name = v.split("/", 2)
+    end
     opts.on("-f", "--[no-]unfold", "RFC8792-unfold (default: yes)") do |v|
       unfold = v
     end
@@ -74,8 +79,26 @@ target ||= :list
 gensym = "unnamed-000"
 taken = Hash.new { |h, k| h[k] = Hash.new }
 warned = Hash.new { |h, k| h[k] = Hash.new }
-d = REXML::Document.new(ARGF)
-REXML::XPath.each(d.root, "//sourcecode|//artwork") do |x|
+filenames = ARGV.inspect
+begin
+  d = REXML::Document.new(ARGF)
+  dr = d.root
+  unless dr
+    warn "*** Can't parse: #{filenames}"
+    exit(1)
+  end
+rescue Errno::ENOENT
+  warn "*** Not found: #{filenames}"
+  exit(1)
+rescue => e
+  begin
+    warn "*** Can't parse: #{filenames} (#{e.to_s[0..120]})"
+  rescue => e
+    warn "*** Can't parse: #{filenames} (#{e.to_s[0..120]})"
+  end
+  exit(1)
+end
+REXML::XPath.each(dr, "//sourcecode|//artwork") do |x|
   if ty = x[:type]
     is_svg = false
     REXML::XPath.each(x, "svg") do is_svg = true end
@@ -161,6 +184,27 @@ def make_directory_from(dir, taken)
 end
 
 case target
+when :stdout
+  if dataset = taken[out_type]
+    unless out_name
+      case dataset.size
+      when 0
+        warn "No sourcecodes under #{out_type}"
+        exit(1)
+      when 1
+        out_name ||= dataset.keys.first
+      else
+        warn "Multiple sourcecodes under #{out_type}: #{dataset.keys}"
+        exit(1)
+      end
+    end
+    if data = dataset[out_name]
+      puts data
+      exit
+    end
+  end
+  warn "*** Cannot find sourcecode #{out_type}/#{out_name}"
+  exit(1)
 when :yaml
   puts taken.to_yaml
 when :list

data/data/kramdown-rfc2629.erb

@@ -52,6 +52,12 @@
 <% end -%>
 
 <rfc <%=rfcattrs%>>
+<% ps.arr("v3xml2rfc", false) do |pi, val|
+    Array(val).each do |el|
+-%>
+  <?v3xml2rfc <%=pi%>="<%=ps.escattr(el)%>"?>
+<%  end
+   end -%>
   <front>
     <%= ps.ele("title", ps.attr("abbrev=titleabbrev")) %>
 

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.21'
+  s.version = '1.7.23'
   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

@@ -289,6 +289,12 @@ 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]
+  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]

data/lib/kramdown-rfc/kdrfc-processor.rb

@@ -18,6 +18,7 @@ class KDRFC
   # )))
 
 KDRFC_PREPEND = [ENV["KDRFC_PREPEND"]].compact
+KDRFC_XML2RFC_FLAGS = Array(ENV["KDRFC_XML2RFC_FLAGS"]&.split(","))
 
 def v3_flag?
   [*(@options.v3 ? ["--v3"] : []),
@@ -37,6 +38,15 @@ def process_mkd(input, output)
   end
 end
 
+def filename_ct(fn, ext)
+  bn = File.basename(fn, ".*")
+  if r = ENV["KRAMDOWN_RFC_DOCREV"]
+    bn << "-#{r}"
+  end
+  {filename: "#{bn}.#{ext}",
+   content_type: "text/plain"}
+end
+
 def run_idnits(*args)
   if @options.remote
     run_idnits_remotely(*args)
@@ -62,8 +72,7 @@ def run_idnits_remotely(txt_fn)
   url = URI(IDNITS_WEBSERVICE)
   req = Net::HTTP::Post.new(url)
   form = [["file", File.open(txt_fn),
-           {filename: "input.txt",
-            content_type: "text/plain"}],
+           filename_ct(txt_fn, "txt")],
           ["hidetext", "true"]]
   diag = ["url/form: ", url, form].inspect
   req.set_form(form, 'multipart/form-data')
@@ -105,7 +114,7 @@ end
 def process_xml_locally(input, output, *flags)
   warn "* converting locally from xml #{input} to txt #{output}" if @options.verbose
   begin
-    o, s = Open3.capture2(*KDRFC_PREPEND, "xml2rfc", *v3_flag?, *flags, input)
+    o, s = Open3.capture2(*KDRFC_PREPEND, "xml2rfc", *v3_flag?, *flags, *KDRFC_XML2RFC_FLAGS, input)
     puts o
     if s.success?
       warn "* #{output} written" if @options.verbose
@@ -152,8 +161,7 @@ def process_xml_remotely(input, output, *flags)
   url = URI(XML2RFC_WEBSERVICE + maf)
   req = Net::HTTP::Post.new(url)
   form = [["file", File.open(input),
-           {filename: "input.xml",
-            content_type: "text/plain"}]]
+           filename_ct(input, "xml")]]
   diag = ["url/form: ", url, form].inspect
   req.set_form(form, 'multipart/form-data')
   warn "* requesting at #{url}" if @options.verbose

data/lib/kramdown-rfc/yamlcheck.rb

@@ -0,0 +1,44 @@
+require 'yaml'
+
+module KramdownRFC
+  module YAMLcheck
+
+    def self.short_name(node)
+      if node.scalar?
+        node.value
+      else
+        node.children&.map {short_name(_1)}&.join("_")
+      end
+    end
+
+    # Does not follow aliases.
+    def self.check_dup_keys1(node, path)
+      if YAML::Nodes::Mapping === node
+        children = node.children.each_slice(2)
+        duplicates = children.map { |key_node, _value_node| 
+          key_node }.group_by{short_name(_1)}.select { |_value, nodes| nodes.size > 1 }
+
+        duplicates.each do |key, nodes|
+          name = (path + [key]).join("/")
+          lines = nodes.map { |occurrence| occurrence.start_line + 1 }.join(", ")
+          warn "** duplicate map key >#{name}< in YAML, lines #{lines}"
+        end
+
+        children.each do |key_node, value_node| 
+          newname = short_name(key_node)
+          check_dup_keys1(value_node, path + Array(newname))
+        end
+      else
+        node.children.to_a.each { |child| check_dup_keys1(child, path) }
+      end
+    end
+
+    def self.check_dup_keys(data)
+      ast = YAML.parse_stream(data)
+      check_dup_keys1(ast, [])
+    end
+
+    # check_dup_keys(DATA)
+
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.21
+  version: 1.7.23
 platform: ruby
 authors:
 - Carsten Bormann
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2025-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -204,12 +203,12 @@ files:
 - lib/kramdown-rfc/rexml-formatters-conservative.rb
 - lib/kramdown-rfc/rfc8792.rb
 - lib/kramdown-rfc/svg-id-cleanup.rb
+- lib/kramdown-rfc/yamlcheck.rb
 - lib/kramdown-rfc2629.rb
 homepage: http://github.com/cabo/kramdown-rfc
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,8 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).
 test_files: []