kramdown-rfc2629 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b446390e8d5d464268692fd4bf5f2fad820dc87
-  data.tar.gz: 6b9539a2d30c40a91454eb5aa59d21a0f80fc1a3
+  metadata.gz: f5a93977ea72476245d2a3555dd8978d78416ba0
+  data.tar.gz: 4ae1d52c514cea2b256b9f5f7f23a3690d8a2ffd
 SHA512:
-  metadata.gz: 9bba48685f5837c4bae563de4670c47bc6128fc64ab8c2d3fb437e9be71aa17c50acad812a9ec9d1a0f38cd2bc3b1c36f5abbc1a8badcf921a7a36058f766ed0
-  data.tar.gz: 4c65264e33ae41498adf9720a5336a33f5e91db3bd203f5fe7fda897f6a6a0312cc987c29f7bb8a7534ef2b52fa004d9fd5e16cce04e6f6891046bad8df80744
+  metadata.gz: 1c3db0d746211e5aa7a8daa6285f1aed51c7e282719d8037de05c535a0cea1b8e5c592da93bcbc3554a62dbd424a71ab2e202237d1803da0561ac0aa5ba6eb66
+  data.tar.gz: 64ffd6b6d199472cfef7c6546c09ff38fc15c57f82af8b9827bbebee67c64b7b169304fe4f2ac912424aa69cdf380a66717af5ad9b0b6b645dddad250ae15d81

data/bin/kramdown-rfc2629

@@ -215,16 +215,18 @@ class ParameterSet
   end
 end
 
+XML_RESOURCE_ORG_PREFIX = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_PREFIX
+
 def bibtagsys(bib)
   if bib =~ /\Arfc(\d+)/i
     rfc4d = "%04d" % $1.to_i
     [bib.upcase,
-     "http://xml.resource.org/public/rfc/bibxml/reference.RFC.#{rfc4d}.xml"]
+     "#{XML_RESOURCE_ORG_PREFIX}/bibxml/reference.RFC.#{rfc4d}.xml"]
   elsif bib =~ /\A([-A-Z0-9]+)\./ &&
         dir = Kramdown::Converter::Rfc2629::XML_RESOURCE_ORG_MAP[$1]
     bib1 = bib.gsub(/\A[0-9]/) { "_#{$&}" } # can't start an ID with a number
     [bib1,
-     "http://xml.resource.org/public/rfc/#{dir}/reference.#{bib}.xml"]
+     "#{XML_RESOURCE_ORG_PREFIX}/#{dir}/reference.#{bib}.xml"]
   end
 end
 

data/kramdown-rfc2629.gemspec

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

data/lib/kramdown-rfc2629.rb

@@ -360,7 +360,7 @@ module Kramdown
         f = File.stat(fn) rescue nil
         if !f || tn - f.ctime >= tvalid
           $stderr.puts "#{fn}: #{f && tn-f.ctime}"
-          `cd #{REFCACHEDIR}; wget -Nnv "#{url}"` # ignore errors if offline (hack)
+          `cd #{REFCACHEDIR}; wget -t 3 -T 20 -Nnv "#{url}"` # ignore errors if offline (hack)
           begin
             File.utime nil, nil, fn
           rescue Errno::ENOENT
@@ -384,6 +384,11 @@ module Kramdown
         "PKCS" => "bibxml2",
       }
 
+      # XML_RESOURCE_ORG_HOST = ENV["XML_RESOURCE_ORG_HOST"] || "xml.resource.org"
+      XML_RESOURCE_ORG_HOST = ENV["XML_RESOURCE_ORG_HOST"] || "xml2rfc.tools.ietf.org"
+      XML_RESOURCE_ORG_PREFIX = ENV["XML_RESOURCE_ORG_PREFIX"] ||
+                                "http://#{XML_RESOURCE_ORG_HOST}/public/rfc"
+
       def convert_img(el, indent, opts) # misuse the tag!
         if a = el.attr
           alt = a.delete('alt').strip
@@ -398,7 +403,7 @@ module Kramdown
             fn = "reference.#{t}.#{n}.xml"
             sub = XML_RESOURCE_ORG_MAP[t]
             puts "Huh: ${fn}" unless sub
-            url = "http://xml.resource.org/public/rfc/#{sub}/#{fn}"
+            url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}"
             to_insert = get_and_cache_resource(url)
           end
           to_insert.gsub(/<\?xml version=["']1.0["'] encoding=["']UTF-8["']\?>/, '').

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown