kramdown-rfc2629 1.3.29 → 1.3.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e453f1845b6d5384b372a0e934068226afe4d2241c7f0b16bf0bd4efc216ef8
-  data.tar.gz: 9e2d8c085ad1c78a95347843650b5d47f05872108ac7d93a91e6eaad62285e0a
+  metadata.gz: 450d01ba97272a13529eebbfacb09eeca5bc2ab11ca5e62ffbb030283fe27d46
+  data.tar.gz: 1c8662ed374b3b5de9977d84600c71ebe95ff58844270fe40048a85e5b04eb17
 SHA512:
-  metadata.gz: 52d76611fd7500af5b0d688e43b858d0d97a83c0e0cba73ef42d5cb076f922be008fc7c2a053a77bbbf0c11465038891f1c07d823f6d2675918adb5708e4f0d0
-  data.tar.gz: 44aa98da4b6e6d263d77865a7d2335d64320ce4422ecac139c61f5f060acd47781f8bac49197c938e2ccf97dfe4c8ebf23770eaf503cd3422e77b27ce9752002
+  metadata.gz: 79145499d9ee1c7a8596d730956175c28278e8b66d011aa37a1797c043104abba756b3e37b4a69b19b687603530d7ae980ccaace45444614e272ec7e522c4c0d
+  data.tar.gz: f1acecfe30457df4f7c4a8e9083a29b7d9d17fd26a971a960e295ceabbbc72019529e5422af71c83bea76d1abc25d187d6cb69b6bf15342ac3ee19d52197685d

data/kramdown-rfc2629.gemspec

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

@@ -695,7 +695,7 @@ COLORS
             message = "fetching"
             fetch_timeout = 60 # seconds; long timeout needed for Travis
           end
-          $stderr.puts "#{fn}: #{message}"
+          $stderr.puts "#{fn}: #{message} from #{url}"
           if ENV["HAVE_WGET"]
             `cd #{REFCACHEDIR}; wget -t 3 -T #{fetch_timeout} -Nnv "#{url}"` # ignore errors if offline (hack)
             begin
@@ -739,8 +739,12 @@ COLORS
 
       # [subdirectory name, cache ttl in seconds, does it provide for ?anchor=]
       XML_RESOURCE_ORG_MAP = {
-        "RFC" => ["bibxml", 86400*7], # these should change rarely
-        "I-D" => "bibxml3",
+        "RFC" => ["bibxml", 86400*7, false,
+                  ->(fn, n){ "https://www.rfc-editor.org/refs/bibxml/#{fn}"}
+                 ],
+        "I-D" => ["bibxml3", false, false,
+                  ->(fn, n){ "https://datatracker.ietf.org/doc/bibxml3/draft-#{n.sub(/\Adraft-/, '')}/xml" }
+                 ],
         "W3C" => "bibxml4",
         "3GPP" => "bibxml5",
         "ANSI" => "bibxml2",
@@ -761,6 +765,7 @@ COLORS
       XML_RESOURCE_ORG_HOST = ENV["XML_RESOURCE_ORG_HOST"] || "xml2rfc.tools.ietf.org"
       XML_RESOURCE_ORG_PREFIX = ENV["XML_RESOURCE_ORG_PREFIX"] ||
                                 "https://#{XML_RESOURCE_ORG_HOST}/public/rfc"
+      KRAMDOWN_USE_TOOLS_SERVER = ENV["KRAMDOWN_USE_TOOLS_SERVER"]
 
       KRAMDOWN_REFCACHETTL = (e = ENV["KRAMDOWN_REFCACHETTL"]) ? e.to_i : 3600
 
@@ -783,10 +788,14 @@ COLORS
           to_insert = ""
           src.scan(/(W3C|3GPP|[A-Z-]+)[.]?([A-Za-z_0-9.\/\+-]+)/) do |t, n|
             fn = "reference.#{t}.#{n}.xml"
-            sub, ttl, can_anchor = XML_RESOURCE_ORG_MAP[t]
+            sub, ttl, can_anchor, altproc = XML_RESOURCE_ORG_MAP[t]
             ttl ||= KRAMDOWN_REFCACHETTL  # everything but RFCs might change a lot
             puts "*** Huh: #{fn}" unless sub
-            url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}"
+            if altproc && !KRAMDOWN_USE_TOOLS_SERVER
+              url = altproc.call(fn, n)
+            else
+              url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}"
+            end
             # if can_anchor # create anchor server-side for stand_alone: false
             #   url << "?anchor=#{anchor}"
             #   fn[/.xml$/] = "--anchor=#{anchor}.xml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.29
+  version: 1.3.30
 platform: ruby
 authors:
 - Carsten Bormann