kramdown-rfc2629 1.7.22 → 1.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6829cc1f3803f3a5badbe865394e4bd303c26fb2ec5710ed2347cdbabea1f529
-  data.tar.gz: 5505e3f40551c0e7a1b4341b2a87ae80aa7e28c5bb773a2b7dc99ad491ab1ded
+  metadata.gz: 213633771643a6c36faef7204ecc4071901838d6653c56717845c5f3df54fb2d
+  data.tar.gz: b560600b6d5579180a2f5b282a9650a1190ea33480da427c90790425d0627cc9
 SHA512:
-  metadata.gz: fb74883f8051016119e1cfe1a2ae7270919d599e8416bde8fa7632d64e5080d02bfba81ad7ec37fc6a4817ee18c1dcb53ff23cefa3f1d5c32c0888456ac7cc9e
-  data.tar.gz: 7f89516975da7b9017642c882c6154173da0116d39db648a298b1c42bb974f9224eec8d6b34f90132008577eba6617b59636b37a40f6dc2851cb1c9f8787b822
+  metadata.gz: fc780509d1146a740d76d366e8359bd4134b25fbeffdd5f4caab3d0e9f53f04c48aa9d06eefd17678661c7ab3c146a8ab3a89cb05e0be932c3657933781c8821
+  data.tar.gz: 9a1afcbd4bdde8e1e9f0145f3f35a5c6f7e6985a5fa4bb4b0d1ba92d48b7b29166fac98499fb0aee53f61b01fe54285aa8382930176cfe8b8d871e4d16b8c019

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/kramdown-rfc2629.gemspec

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

data/lib/kramdown-rfc2629.rb

@@ -1203,6 +1203,7 @@ COLORS
 
       KRAMDOWN_OFFLINE = ENV["KRAMDOWN_OFFLINE"]
       KRAMDOWN_REFCACHE_REFETCH = ENV["KRAMDOWN_REFCACHE_REFETCH"]
+      KRAMDOWN_REFCACHE_QUIET = ENV["KRAMDOWN_REFCACHE_QUIET"]
 
       def get_and_write_resource(url, fn)
         options = {}
@@ -1251,7 +1252,7 @@ COLORS
             message = "fetching"
             fetch_timeout = 60 # seconds; long timeout needed for Travis
           end
-          $stderr.puts "#{fn}: #{message} from #{url}"
+          $stderr.puts "#{fn}: #{message} from #{url}" unless KRAMDOWN_REFCACHE_QUIET
           if Array === url
             begin
               case url[0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.22
+  version: 1.7.24
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -203,6 +203,7 @@ 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: