kramdown-rfc2629 1.7.26 → 1.7.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7aa2d98f6377652b1c5bf94a53831f65c4e454d4a8f293eef483b6541a323d36
-  data.tar.gz: 5c04d3787a5f5624c437208eb8ace8016ba52a1e4b47390ee307581986918023
+  metadata.gz: 880af82027af212e74845c3ceb283ecc48954d3208ce7cee1209908604202052
+  data.tar.gz: 71397f5c1e959147bb5c7374cd8a03517bf8e77181640ac9e23d6b838a0e7d3e
 SHA512:
-  metadata.gz: 3ffa19bbfc3366e71cae7b9614397d7c3ff03ac1dd151939ba20be94e1515f4cab8f6a7ec4be6fcb9e5a4c5a5640b660a5e347a7042a168ff8778e76db64d40b
-  data.tar.gz: ca5898ccabb02316de20ff47c7a02e5035e8a38eee53f0d486e684b260e53204432470465d740fc8efdc045b9a51389c0f2d8eae92a15d9d1a3f52ab87de8784
+  metadata.gz: '018402d18f48ae61a425c84b320ff1a812c54bf568b1eadd93b6f9a619fd170927c49b4192fa455faf981c9a37dcf74542eb1aac791c2936aeeb8484a53e2cb0'
+  data.tar.gz: d5288a91a0d6a7979197ca585fe4f474bcc8868b0d2b56b3b0ef204df3da141c92d01992d46fe58240b12db7c152428856976965f584c59ac12269c22c24f481

data/kramdown-rfc2629.gemspec

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

@@ -268,6 +268,13 @@ end
 
 include ::Kramdown::Utils::Html
 
+# Make this a method so there is a more speaking traceback if this fails
+def read_erbfile
+  erbfilename = ENV["KRAMDOWN_ERB_FILE"] ||
+                File.expand_path('../../../data/kramdown-rfc2629.erb', __FILE__)
+  File.read(erbfilename, coding: "UTF-8")
+end
+
 def xml_from_sections(input)
 
   unless ENV["KRAMDOWN_NO_SOURCE"]
@@ -436,8 +443,9 @@ def xml_from_sections(input)
 
   norm_ref.each do |k, v|
     # could check bibtagsys here: needed if open_refs is nil or string
-    target = ps.has(v ? :normative : :informative)
-    warn "*** overwriting #{k}" if target.has_key?(k)
+    kind = v ? :normative : :informative
+    target = ps.has(kind)
+    warn "** (#{kind} reference #{k} is both inline and in YAML header)" if target.has_key?(k)
     target[k] = open_refs[k] # add reference to normative/informative
   end
   # note that unused items from ref are considered OK, therefore no check for that here
@@ -509,8 +517,7 @@ def xml_from_sections(input)
     end
   end
 
-  erbfilename = File.expand_path '../../../data/kramdown-rfc2629.erb', __FILE__
-  erbfile = File.read(erbfilename, coding: "UTF-8")
+  erbfile = read_erbfile
   erb = ERB.trim_new(erbfile, '-')
   # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
   input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")

data/lib/kramdown-rfc/yamlcheck.rb

@@ -7,7 +7,7 @@ module KramdownRFC
       if node.scalar?
         node.value
       else
-        node.children&.map {short_name(_1)}&.join("_")
+        node.children&.map {|nm| short_name(nm)}&.join("_")
       end
     end
 
@@ -15,8 +15,8 @@ module KramdownRFC
     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 = children.map { |key_node, _value_node|
+          key_node }.group_by{|nm| short_name(nm)}.select { |_value, nodes| nodes.size > 1 }
 
         duplicates.each do |key, nodes|
           name = (path + [key]).join("/")
@@ -24,7 +24,7 @@ module KramdownRFC
           warn "** duplicate map key >#{name}< in YAML, lines #{lines}"
         end
 
-        children.each do |key_node, value_node| 
+        children.each do |key_node, value_node|
           newname = short_name(key_node)
           check_dup_keys1(value_node, path + Array(newname))
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.26
+  version: 1.7.28
 platform: ruby
 authors:
 - Carsten Bormann
 bindir: bin
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown