kramdown-rfc2629 1.4.18 → 1.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f351fb251c634da227a9ce9202094ee20ac11689be7b2144f118ba07aa2b31fb
-  data.tar.gz: 45d0559f1f6c6ff2c4ba18bab26a4e88bec8faad622cf0b9183c144eb419441f
+  metadata.gz: e9d0ef4b91bf819df60d48b12c30be152eab6a987ba2d88a3572bde42e180925
+  data.tar.gz: '09603840027889929894dfc79170f6f7d16a0e932cfe7b6dfc4d2d2501eb7f7d'
 SHA512:
-  metadata.gz: 2d3acf198070f8d7b69995f9f581302a6d20bbb24241350a169ef8cc5ccfeb49d191adfaaa11442df5859534812761d91c7f7c5a8b22b5a2aec19c8d2a02e48b
-  data.tar.gz: b1c5d6d9c968d82a453bcdfcc234e1dc4f3844ba9084942f73fd5212258d0d1e361f55fc1cb36910b58a4c2e68286cfe20695cf8d6d1c9e538a9907164d89d71
+  metadata.gz: 35f806b212b3f6e321614752853dc73ed351f1119c208b7fd83cbd471e3d64e40145b3af19a999a2e2e403a1ff780c5b12baef21c6b44e7e4f4ed8e434610e17
+  data.tar.gz: cb0ddd23e2ced4bda22a095d08926dbbaf6f12a8605faf53289a422c8e1bd2b9d5a9a01a350d88c5843c12ff0a0be4098425403507771d5ba526126bc130bb7d

data/README.md

@@ -562,7 +562,7 @@ remaining 20 % some more, but that hasn't been done.
 
 If you have XML, there is an experimental upconverter that does 99 %
 of the work.  Please [contact the
-author](mailto:cabo@tzi.org?subject=Markdown for RFCXML) if you want
+author](mailto:cabo@tzi.org?subject=Markdown%20for%20RFCXML) if you want
 to try it.
 
 Actually, if the XML was generated by kramdown-rfc2629, you can simply

data/bin/kdrfc

@@ -6,13 +6,15 @@ require 'open3'
 # try to get this from gemspec.
 KDRFC_VERSION=Gem.loaded_specs["kramdown-rfc2629"].version rescue "unknown-version"
 
+KDRFC_PREPEND = [ENV["KDRFC_PREPEND"]].compact
+
 def v3_flag?
   $options.v3 ? ["--v3"] : []
 end
 
 def process_mkd(input, output)
   warn "* converting locally from markdown #{input} to xml #{output}" if $options.verbose
-  o, s = Open3.capture2("kramdown-rfc2629", *v3_flag?, input)
+  o, s = Open3.capture2(*KDRFC_PREPEND, "kramdown-rfc2629", *v3_flag?, input)
   if s.success?
     File.open(output, "w") do |fo|
       fo.print(o)
@@ -41,7 +43,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("xml2rfc", *v3_flag?, *flags, input)
+    o, s = Open3.capture2(*KDRFC_PREPEND, "xml2rfc", *v3_flag?, *flags, input)
     puts o
     if s.success?
       warn "* #{output} written" if $options.verbose
@@ -51,19 +53,37 @@ def process_xml_locally(input, output, *flags)
     end
   rescue Errno::ENOENT
     warn "*** falling back to remote processing" if $options.verbose
-    process_xml_remotely(input, output)
+    process_xml_remotely(input, output, *flags)
   end
 end
 
 XML2RFC_WEBSERVICE = ENV["KRAMDOWN_XML2RFC_WEBSERVICE"] ||
                      'http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc-dev.cgi'
 
+MODE_AS_FORMAT = {
+  nil => {                    # v2
+    "--text" => "txt/ascii",
+    "--html" => "html/ascii",
+  },
+  true => {                     # v3
+    "--text" => "txt/v3ascii",
+    "--html" => "html/v3ascii",
+    "--v2v3" => "v3xml/ascii",
+  }
+}
 
-def process_xml_remotely(input, output)
+def process_xml_remotely(input, output, *flags)
   warn "* converting remotely from xml #{input} to txt #{output}" if $options.verbose
+  format = flags[0] || "--text"
+  # warn [:V3, $options.v3].inspect
+  maf = MODE_AS_FORMAT[$options.v3][format]
+  unless maf
+    warn "*** don't know how to convert remotely from xml #{input} to txt #{output}"
+    exit(1)
+  end
   url = URI(XML2RFC_WEBSERVICE)
   req = Net::HTTP::Post.new(url)
-  form = [["modeAsFormat", "txt/#{"v3" if $options.v3}ascii"],
+  form = [["modeAsFormat", maf],
           ["type", "binary"],
           ["input", File.open(input),
            {filename: "input.xml",

data/bin/kramdown-rfc-cache-subseries-bibxml

@@ -14,7 +14,7 @@ require 'fileutils'
 
 begin
   require 'net/http/persistent'
-rescue
+rescue LoadError
   warn "*** please install net-http-persistent:"
   warn "   gem install net-http-persistent"
   warn "(prefix by sudo only if required)."

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.4.18'
+  s.version = '1.4.19'
   s.summary = "Kramdown extension for generating RFC 7749 XML."
   s.description = %{An RFC7749 (XML2RFC) generating backend for Thomas Leitner's
 "kramdown" markdown parser.  Mostly useful for RFC writers.}

data/lib/kramdown-rfc2629.rb

@@ -125,7 +125,7 @@ module Kramdown
             when /\A(.*) \((#{SECTIONS_RE})\)\z/
               href = $1
               handle_bares($2, attr, "parens", href)
-            when /\A([\w.]+)<(.+)\z/
+            when /\A(#{XREF_BASE})<(.+)\z/
               href = $2
               attr['section'] = $1
               attr['sectionFormat'] = 'bare'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.4.18
+  version: 1.4.19
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown