kramdown-rfc2629 1.6.24 → 1.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba33d9f40d0de90b356fe771cfc8b4dcafb576bf412d5229b0ec2de531fbcd5a
-  data.tar.gz: 532cd2d8ac24eab2fb930198e4b57a6e8ec9fc5074b7dd5b418985784f5bd8b7
+  metadata.gz: fd317f54435256ae6bf63de8753a3f544b63caa1922cadf008f550f242071a48
+  data.tar.gz: f5c44616bf9debf61856c692c61125da531d966e8f33331fce936ea6efbac6fd
 SHA512:
-  metadata.gz: ccda242ccfda63d8d166bfd386ff38ddfd16ad0b83ef969111317c4d5b1330af861815468c88eaa6c1940a85b24a601b8a531b075d210d81ef6b81c3993a26e0
-  data.tar.gz: dd75cc152c578abc018321db4f840dc5fc7062cd42172aed2f40af7c276454d9ebecc7db085efd37fb751f0f9fa132764d3eb586f889f2a2f52aecf07b7a45cb
+  metadata.gz: f895cbca96c9bccca39afb5fbd83b6815ecfcb1a43b9287f7a1bb28de4cc765543cc8f2e9b62564bb71c03efc7651d70b5a5ad68f913888d0657ee8605244546
+  data.tar.gz: a73cb2f7a94d14e7d08593ff2562f9f1cd52aaab969ccf025af66452ebae22ff8a7cb8c52551c1fde43ac5604011c1363ab501ce251a0094264bcadbb3798c55

data/README.md

@@ -33,7 +33,7 @@ To use kramdown-rfc, you'll need Ruby (at least version 2.3, but
 preferably a current version), and maybe
 [XML2RFC][] if you want to see the fruits of your work.
 
-    kramdown-rfc mydraft.mkd >mydraft.xml
+    kramdown-rfc mydraft.md >mydraft.xml
     xml2rfc mydraft.xml
 
 (The most popular file name extension that IETF people have for
@@ -43,11 +43,11 @@ descriptions here, any extension such as .mkd will do, too.)
 A more brief interface for both calling kramdown-rfc and XML2RFC
 is provided by `kdrfc`:
 
-    kdrfc mydraft.mkd
+    kdrfc mydraft.md
 
 `kdrfc` can also use a remote installation of XML2RFC if needed:
 
-    kdrfc -r mydraft.mkd
+    kdrfc -r mydraft.md
 
 # Versions of RFCXML
 

data/bin/echars

@@ -1,17 +1,39 @@
 #!/usr/bin/env ruby
 require 'unicode/name'
+require 'unicode/scripts'
+require 'unicode/blocks'
+require 'json'
+
+def readable(c)
+  j = c.to_json
+  if j.size == 3
+    j[1...-1]
+  else
+    j
+  end
+end
+
 hist = Hash.new(0)
 ARGF.read.each_char do |c|
   hist[c] += 1 unless c.ord.between?(32, 126)
 end
 hist.delete("\n")
-cl = "*** Latin"
-hist.keys.sort.partition {|c| c =~ /\A\p{Latin}\z/}.each do |l|
-  puts cl unless l.empty?
+hist.keys.sort.group_by {|c| Unicode::Blocks.block(c)}.each do |block, l|
+  scripts = Set[]
+  l.each do |c|
+    scripts << Unicode::Scripts.scripts(c)
+  end
+  if scripts.size == 1
+      puts "*** #{block} (#{scripts.join})"
+  else
+    puts "*** #{block}"
+  end
   l.each  do |c|
-    puts "#{c}: U+#{"%04X %4d" % [c.ord, hist[c]]
+    s = "#{readable(c)}: U+#{"%04X %4d" % [c.ord, hist[c]]
                    } #{Unicode::Name.correct(c) ||
-                       Unicode::Name.label(c)}"
+                       Unicode::Name.label(c)
+                   }"
+    s << " (#{Unicode::Scripts.scripts(c).join(", ")})" if scripts.size != 1
+    puts s
   end
-  cl = "*** Non-Latin"
 end

data/bin/kdrfc

@@ -10,7 +10,7 @@ kdrfc.options.txt = true             # default
 
 op = OptionParser.new do |opts|
   opts.banner = <<BANNER
-Usage: kdrfc [options] file.md|file.mkd|file.xml
+Usage: kdrfc [options] file.md|file.xml
 Version: #{KDRFC_VERSION}
 BANNER
   opts.on("-V", "--version", "Show version and exit") do |v|

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.6.24'
+  s.version = '1.6.26'
   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.}
@@ -9,6 +9,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('certified', '~> 1.0')
   s.add_dependency('json_pure', '~> 2.0')
   s.add_dependency('unicode-name', '~> 1.0')
+  s.add_dependency('unicode-blocks', '~> 1.0')
+  s.add_dependency('unicode-scripts', '~> 1.0')
+  s.add_dependency('net-http-persistent', '~> 4.0')
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/echars bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',

data/lib/kramdown-rfc/command.rb

@@ -490,7 +490,7 @@ require 'ostruct'
 $options ||= OpenStruct.new
 op = OptionParser.new do |opts|
   opts.banner = <<BANNER
-Usage: kramdown-rfc2629 [options] file.md|file.mkd > file.xml
+Usage: kramdown-rfc2629 [options] [file.md] > file.xml
 Version: #{KDRFC_VERSION}
 BANNER
   opts.on("-V", "--version", "Show version and exit") do |v|

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

@@ -1,7 +1,9 @@
 require 'uri'
 require 'net/http'
+require 'net/http/persistent'
 require 'open3'
 require 'ostruct'
+require 'json'
 
 module KramdownRFC
 
@@ -65,50 +67,78 @@ def process_xml_locally(input, output, *flags)
   end
 end
 
+# curl https://author-tools.ietf.org/api/render/text -X POST -F "file=@..."
 XML2RFC_WEBSERVICE = ENV["KRAMDOWN_XML2RFC_WEBSERVICE"] ||
-                     'http://xml2rfc.tools.ietf.org/cgi-bin/xml2rfc-dev.cgi'
+                     'https://author-tools.ietf.org/api/render/'
 
 MODE_AS_FORMAT = {
-  nil => {                    # v2
-    "--text" => "txt/ascii",
-    "--html" => "html/ascii",
-  },
-  true => {                     # v3
-    "--text" => "txt/v3ascii",
-    "--html" => "html/v3ascii",
-    "--v2v3" => "v3xml/ascii",
-  }
+    "--text" => "text",
+    "--html" => "html",
+    "--v2v3" => "xml",
+    "--pdf" => "pdf",
 }
 
-# XXX move to author-tools@ietf.org API
+def checked_json(t)
+  begin
+    JSON.load(t)
+  rescue => e
+    raise IOError.new("*** JSON result: #{e.detailed_message}, #{diag}")
+  end
+end
+
+def persistent_http
+  $http ||= Net::HTTP::Persistent.new name: 'kramdown-rfc'
+end
+
 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]
+  warn "* converting remotely from xml #{input} to #{format} #{output}" if @options.verbose
+  maf = MODE_AS_FORMAT[format]
   unless maf
-    raise ArgumentError.new("*** don't know how to convert remotely from xml #{input} to txt #{output}")
+    raise ArgumentError.new("*** don't know how to convert remotely from xml #{input} to #{format} #{output}")
   end
-  url = URI(XML2RFC_WEBSERVICE)
+  url = URI(XML2RFC_WEBSERVICE + maf)
   req = Net::HTTP::Post.new(url)
-  form = [["modeAsFormat", maf],
-          ["type", "binary"],
-          ["input", File.open(input),
+  form = [["file", File.open(input),
            {filename: "input.xml",
             content_type: "text/plain"}]]
   diag = ["url/form: ", url, form].inspect
   req.set_form(form, 'multipart/form-data')
-  res = Net::HTTP::start(url.hostname, url.port,
-                         :use_ssl => url.scheme == 'https' ) {|http|
-    http.request(req)
-  }
+  warn "* requesting at #{url}" if @options.verbose
+  t0 = Time.now
+  res = persistent_http.request(url, req)
+  warn "* elapsed time: #{Time.now - t0}" if @options.verbose
   case res
+  when Net::HTTPBadRequest
+    result = checked_json(res.body)
+    raise IOError.new("*** Remote Error: #{result["error"]}")
   when Net::HTTPOK
     case res.content_type
-    when 'application/octet-stream'
+    when 'application/json'
       if res.body == ''
         raise IOError.new("*** HTTP response is empty with status #{res.code}, not written")
       end
+      # warn "* res.body #{res.body}" if @options.verbose
+      result = checked_json(res.body)
+      if logs = result["logs"]
+        if errors = logs["errors"]
+          errors.each do |err|
+            warn("*** Error: #{err}")
+          end
+        end
+        if warnings = logs["warnings"]
+          warnings.each do |w|
+            warn("** Warning: #{w}")
+          end
+        end
+      end
+      raise IOError.new("*** No useful result from remote") unless result["url"]
+      res = persistent_http.request(URI(result["url"]))
+      warn "* result content type #{res.content_type}" if @options.verbose
+      if res.body == ''
+        raise IOError.new("*** Second HTTP response is empty with status #{res.code}, not written")
+      end
       File.open(output, "w") do |fo|
         fo.print(res.body)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.6.24
+  version: 1.6.26
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -80,6 +80,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-blocks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: unicode-scripts
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: |-
   An RFCXML (RFC 799x) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -143,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.2
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).