kramdown-rfc2629 1.7.13 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37a6e52b1686d310bf22c8c2530ce893e3ea30b74675b6cdd17143c141a51321
-  data.tar.gz: f9cedeb1b71146d4be4affd7ba343c1a2a497b607e82565b772445d7fc686c06
+  metadata.gz: 5ece90445d0767338a8196d8168974776adeaa8823c9030c7138e0f3ce96b39b
+  data.tar.gz: 29ed6223102eb578ce7b156d7e625e4195f08deb6c86275a8f2cac84a54f588e
 SHA512:
-  metadata.gz: 92fc3fc628cbcc21b0368f692f078206caa01fa8d5eb8f712777f369632f1d472efa20c0af96cd71a0e0e2752449d1efbeb2c354973fca4f740722545811b213
-  data.tar.gz: 924dc4cd075193b1cc9310ddee259290e5bd0026a5ccbb7ff2da65ea897ec3a6560e2fccbaee5122cacaa262ac9d4b692bfb14417359b6f39dfbdb8aaea7b340
+  metadata.gz: 3991c909c6d0d4cb3960a6102102fd729507343f172b4f8d5fe1db366dbd993d6758eeba0c0c8c0136728f78050f8a1ae9a6d92cb0f2f3063454af962b6b8576
+  data.tar.gz: 7195608a123184256d77af053e1a8c69631c555e6fb4bf1a0eb6c04cb62b6569d6aa17fd6e23b310f29a1e5eee01677d09154b176a82df7d4d0db7100e73864b

data/bin/kramdown-rfc-lsr

@@ -152,34 +152,46 @@ def num_expand(s)
   s.gsub(/\d+/) {|n| "%09d" % n.to_i}
 end
 
+def want_one(secs, what)
+  case secs.size
+  when 0
+    error_out "*** cannot match #{what}"
+    "*** DOESN'T EXIST ***"
+  when 1
+    yield secs.first
+  else
+    error_out "*** multiple matches for #{what}"
+    "*** MULTIPLE MATCHES ***"
+  end
+end
 require 'open3'
 
 module OpenURI
   class << self
-    def prepped(uri, *rest)
-      newuri = uri.to_s.sub(/\.xml$/, ".prepped.xml")
+    def processed(uri, old, camo, *rest)
+      newuri = uri.to_s.sub(old, camo) # camo name for processed data
       response = Cache.get(newuri) || (
-        unprepped = open_uri(uri, *rest).read
+        unprocessed = open_uri(uri, *rest).read
         fn = [OpenURI::Cache.cache_path, uri.sub(/.*\//, '')].join('/')
-        File.open(fn, 'wb'){|f| f.write unprepped }
-        _prep_out, s = Open3.capture2("xml2rfc", "--prep", fn)
-        fail s.inspect unless s.success?
-        new_fn = fn.sub(/\.xml$/, ".prepped.xml")
+        File.open(fn, 'wb'){|f| f.write unprocessed }
+        new_fn = yield newuri, fn
         Cache.set(newuri, File.open(new_fn))
       )
       response
     end
-    def tidied(uri, *rest)
-      newuri = uri.to_s.sub(/\.html$/, ".tidied.html")
-      response = Cache.get(newuri) || (
-        unprepped = open_uri(uri, *rest).read
-        fn = [OpenURI::Cache.cache_path, uri.sub(/.*\//, '')].join('/')
-        File.open(fn, 'wb'){|f| f.write unprepped }
+    def prepped(uri)
+      processed(uri, /\.xml$/, ".prepped.xml") do |newuri, fn|
+        _prep_out, s = Open3.capture2("xml2rfc", "--prep", fn)
+        fail s.inspect unless s.success?
+        fn.sub(/\.xml$/, ".prepped.xml") # xml2rfc creates new file
+      end
+    end
+    def tidied(uri)
+      processed(uri, /\.html$/, ".tidied.html") do |newuri, fn|
         _prep_out, s = Open3.capture2("tidy", "-mq", "-asxml", "-f", "/dev/null", fn)
-        fail s.inspect unless s.exited?
-        Cache.set(newuri, File.open(fn))
-      )
-      response
+        fail s.inspect unless s.exited? # can't check success
+        fn                              # -m makes in-place change
+      end
     end
   end
 end
@@ -233,16 +245,8 @@ per_reference.keys.sort_by {|x| num_expand(x)}.each do |trg|
         REXML::XPath.match(refdoc.root, "//section[@pn=$pn]",
                            {}, {"pn" => c})}
       what = "#{secpn.join(" or ")} in #{trg}"
-      add << " (#{case secs.size
-                  when 0
-                    error_out "*** cannot match #{what}"
-                    "*** DOESN'T EXIST ***"
-                  when 1
-                    sec = secs.first
+      add << " (#{want_one(secs, what) do |sec|
                     sec[:title] || sec.elements["name"].all_text
-                  else
-                    error_out "*** multiple matches for #{what}"
-                    "*** MULTIPLE MATCHES ***"
                   end})"
     elsif refhtmldoc      # find section name in HTML from anchor s
       secpn = section_number_to_htmlid(s)
@@ -251,15 +255,8 @@ per_reference.keys.sort_by {|x| num_expand(x)}.each do |trg|
                                 {"xmlns" => "http://www.w3.org/1999/xhtml"},
                                 {"pn" => secpn})
       what = "#{secpn} in #{trg}"
-      add << " (#{case secs.size
-                  when 0
-                    error_out "*** cannot match #{what}"
-                    "*** DOESN'T EXIST ***"
-                  when 1
-                    secs.first.text.sub(/^\.\s+/, '')
-                  else
-                    error_out "*** multiple matches for #{what}"
-                    "*** MULTIPLE MATCHES ***"
+      add << " (#{want_one(secs, what) do |sec|
+                    sec.text.sub(/^\.\s+/, '')
                   end})"
     end
     puts "* #{/^[0-9]/ =~ s ? "Section" : "Appendix"} #{s}#{add}"

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.7.13'
+  s.version = '1.7.15'
   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.}
@@ -12,7 +12,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('unicode-blocks', '~> 1.0')
   s.add_dependency('unicode-scripts', '~> 1.0')
   s.add_dependency('net-http-persistent', '~> 4.0')
-  s.add_dependency('differ', '~>0.1')
+  s.add_dependency('differ', '~> 0.1')
+  s.add_dependency('base64', '>= 0.1')
+  s.add_dependency('rexml', '<= 3.2.6') # emergency fix; newer REXML is no longer pure ruby (requires strscan)
   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 bin/kramdown-rfc-extract-sourcecode bin/kramdown-rfc-lsr 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 bin/kramdown-rfc-clean-svg-ids)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',
@@ -25,8 +27,6 @@ spec = Gem::Specification.new do |s|
                    'de-gfm',
                    'kramdown-rfc-clean-svg-ids']
   s.required_ruby_version = '>= 2.3.0'
-  # s.requirements = 'wget'
-  #  s.has_rdoc = true
   s.author = "Carsten Bormann"
   s.email = "cabo@tzi.org"
   s.homepage = "http://github.com/cabo/kramdown-rfc"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.7.13
+  version: 1.7.15
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-18 00:00:00.000000000 Z
+date: 2024-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -136,6 +136,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
 description: |-
   An RFCXML (RFC 799x) generating backend for Thomas Leitner's
   "kramdown" markdown parser.  Mostly useful for RFC writers.
@@ -208,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFCXML (RFC 799x).