kramdown-rfc2629 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77162c605ddf46855d7f888b073be3da19c49b7a
-  data.tar.gz: a9749cb468679b2df0b7c9d050d2f4ea90f3af34
+  metadata.gz: 0b7cb03b26cc3280334da9e30264652850c904f4
+  data.tar.gz: 593ed4923195d254b3c27ace03e09a9e24a22f0e
 SHA512:
-  metadata.gz: 939fb9aeacd5d43165e7dd5adbc38140c78299fe2a8fe953f76cfc3f4b83f01a55acb92eee3b57e3430ce16f0028a148124748ebd04f1959698bd7682b0c1432
-  data.tar.gz: c90505e4f90e6777563c530127381f81cc109eb5f6e7426fc7ae24b6748204436c214a62f163ace98024526aa5063982a83ca641c4b259d6e299f3ee5d2ea295
+  metadata.gz: 6403e62c32307c3e66b93d7c130f6efe5b7ccc3587da9ba7f075a206820b476699ecf0dd1e83ae4bb815dbea94b7ada550a8f838ef6c395c08170df36a113352
+  data.tar.gz: 9698f63a545f44d08ddcd97aac1baf282b1171da5627e840a1be8a833ed8147e04f47b67d727feb1832786085670e9bf5e384ab253e89d9ea9f230cac7aa7c16

data/README.md

@@ -14,7 +14,7 @@ their work in markdown.
 # Usage
 
 Start by installing the kramdown-rfc2629 gem (this automatically
-installs kramdown version 1.3.x as well):
+installs kramdown version 1.4.x as well):
 
     sudo gem install kramdown-rfc2629
 
@@ -24,9 +24,8 @@ structure provided by kramdown.  `bin/kramdown-rfc2629` started out as
 a simple command-line program showing how to use this, but can now do
 much more (see below).
 
-To use kramdown-rfc2629, you'll need a Ruby 1.9 or 2.0, the command
-"wget" (if you want to use the offline feature), and maybe [XML2RFC][]
-if you want to see the fruits of your work.
+To use kramdown-rfc2629, you'll need a Ruby 1.9 or 2.x, and maybe
+[XML2RFC][] if you want to see the fruits of your work.
 
     kramdown-rfc2629 mydraft.mkd >mydraft.xml
     xml2rfc mydraft.xml
@@ -180,7 +179,9 @@ spell it out like this:
       RFC6690:
 
 (as in the author list, `ins` is an abbreviation for
-"initials/surname".) Then you can simply reference `{{ASN.1}}` and
+"initials/surname"; note that the first title had to be put in double
+quotes as it contains a colon which is special syntax in YAML.)
+Then you can simply reference `{{ASN.1}}` and
 `{{ECMA262}}` in the text.  (Make sure the reference keys are valid XML
 names, though.)
 
@@ -199,13 +200,13 @@ Moving from XML to Markdown for RFC writing apparently is a
 no-brainer, so I'm not the only one who has written code for this.
 
 [Miek Gieben][] has done a [similar thing][pandoc2rfc] employing
-pandoc/asciidoc.  He uses multiple input files instead of
+pandoc, now documented in [RFC 7328][].  He uses multiple input files instead of
 kramdown-rfc2629's sectionized input format.  He keeps the metadata in
 a separate XML file, similar to the way the previous version of
 kramdown-rfc2629 stored (and still can store) the metadata in XML in
 the markdown document.  He also uses a slightly different referencing
 syntax, which is closer to what markdown does elsewhere but more
-verbose.
+verbose (this syntax is now also supported in kramdown-rfc2629).
 
 # License
 
@@ -221,3 +222,4 @@ license.
 [Miek Gieben]: http://www.miek.nl/
 [pandoc2rfc]: https://github.com/miekg/pandoc2rfc/
 [XML2RFC]: http://xml.resource.org
+[RFC 7328]: http://tools.ietf.org/html/rfc7328

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.0.17'
+  s.version = '1.0.18'
   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.}
@@ -10,7 +10,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ['kramdown-rfc2629']
   s.default_executable = 'kramdown-rfc2629'
   s.required_ruby_version = '>= 1.9.2'
-  s.requirements = 'wget'
+  # s.requirements = 'wget'
   #  s.has_rdoc = true
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"

data/lib/kramdown-rfc2629.rb

@@ -356,15 +356,34 @@ module Kramdown
         fn = "#{REFCACHEDIR}/#{File.basename(url)}"
         f = File.stat(fn) rescue nil
         if !f || tn - f.ctime >= tvalid
-          $stderr.puts "#{fn}: #{f && tn-f.ctime}"
-          `cd #{REFCACHEDIR}; wget -t 3 -T 20 -Nnv "#{url}"` # ignore errors if offline (hack)
-          begin
-            File.utime nil, nil, fn
-          rescue Errno::ENOENT
-            warn "Can't fetch #{url} -- is wget in path?"
+          $stderr.puts "#{fn}: #{f && "renewing (stale by #{"%.1f" % ((tn-f.ctime)/86400)} days)" || "fetching"}"
+          if ENV["HAVE_WGET"]
+            `cd #{REFCACHEDIR}; wget -t 3 -T 20 -Nnv "#{url}"` # ignore errors if offline (hack)
+            begin
+              File.utime nil, nil, fn
+            rescue Errno::ENOENT
+              warn "Can't fetch #{url} -- is wget in path?"
+            end
+          else
+            require 'open-uri'
+            require 'timeout'
+            begin
+              Timeout::timeout(f ? 10 : 30) do # give up quickly if just renewing
+                open(url) do |f|
+                  s = f.read
+                  if f.status[0] != "200"
+                    warn "*** Status code #{status} while fetching #{url}"
+                  else
+                    File.write(fn, s)
+                  end
+                end
+              end
+            rescue OpenURI::HTTPError, SocketError, Timeout::Error => e
+              warn "*** #{e} while fetching #{url}"
+            end
           end
         end
-        File.read(fn)
+        File.read(fn) # this blows up if no cache available after fetch attempt
       end
 
       XML_RESOURCE_ORG_MAP = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-16 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -57,8 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements:
-- wget
+requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: