kramdown-rfc2629 1.3.24 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4917395db5dce706708b9a3ce81da25a4089d0982b6f6c577fe2249248718f3c
-  data.tar.gz: c2c3a7ce6d9269674a20dcbd793e2bd0f451cee98fa36dbe5b2be47b29d76f30
+  metadata.gz: 4a18c9460f832be1f0bb626cc1b6ea385a6535b7af585212ec0c961ae1945d36
+  data.tar.gz: f34512123c073979fff13351c1fdd3ec640376a604e9aba7e849652d59172023
 SHA512:
-  metadata.gz: 3818e58468fef81b14fb7bf7e399a0ba740ed08a3b2e2b98a0e4e2019c536a456aec5678e1e3a6a525800d236a245bd86f05bf07610048c287f72c633cb1355d
-  data.tar.gz: 884d1d3650106e695294dfdf96a534db6e1f40fd7204e10bfab118fc50ebca1db65b28762d52c57884732f65da37183c83a34834cbad21a6c9a1f77db6f7e023
+  metadata.gz: 69f0328719872f0bef0d81bffb5fa495e384f599a0fb3843cc4c9d6065811be71f21e7ab9700cb1d1f3419d5a91dc88af62c855b5f97f499519b15b11f888bef
+  data.tar.gz: 56778f5ec4e581ac21d17637c1098924ccd6a0b97facd12a2e636fdae755798c6ce7a545e5b8395ec17168e9e118230c1cca00e23ab8332eedbca6a0cf57dccc

data/bin/kramdown-rfc2629

@@ -4,7 +4,7 @@ require 'kramdown-rfc2629'
 require 'kramdown-rfc/parameterset'
 require 'kramdown-rfc/refxml'
 require 'yaml'
-require 'erb'
+require 'kramdown-rfc/erb'
 require 'date'
 
 # try to get this from gemspec.
@@ -154,7 +154,7 @@ def xml_from_sections(input)
       if bibref
         if old = anchor_to_bibref[word]
           if bibref != old
-            warn "*** conflicting definitions for xref #{anchor}: #{old} != #{bibref}"
+            warn "*** conflicting definitions for xref #{word}: #{old} != #{bibref}"
           end
         else
           anchor_to_bibref[word] = bibref
@@ -229,7 +229,7 @@ def xml_from_sections(input)
 
   erbfilename = File.expand_path '../../data/kramdown-rfc2629.erb', __FILE__
   erbfile = File.read(erbfilename, coding: "UTF-8")
-  erb = ERB.new(erbfile, nil, '-')
+  erb = ERB.trim_new(erbfile, '-')
   # remove redundant nomarkdown pop outs/pop ins as they confuse kramdown
   input = erb.result(binding).gsub(%r"{::nomarkdown}\s*{:/nomarkdown}"m, "")
   ps.warn_if_leftovers

data/kramdown-rfc2629.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.24'
+  s.version = '1.3.25'
   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-rfc/erb.rb

@@ -0,0 +1,16 @@
+require 'erb'
+
+class ERB
+
+  case version.sub("erb.rb [", "")
+  when /\A2.1/                    # works back to 1.9.1
+    def self.trim_new(s, trim)
+      ERB.new(s, nil, trim)
+    end
+  else
+    def self.trim_new(s, trim)
+      ERB.new(s, trim_mode: trim)
+    end
+  end
+
+end

data/lib/kramdown-rfc/refxml.rb

@@ -1,3 +1,5 @@
+require 'kramdown-rfc/erb'
+
 module KramdownRFC
 
   extend Kramdown::Utils::Html
@@ -8,7 +10,7 @@ module KramdownRFC
 
   def self.ref_to_xml(k, v)
     vps = KramdownRFC::ParameterSet.new(v)
-    erb = ERB.new <<-REFERB, nil, '-'
+    erb = ERB.trim_new <<-REFERB, '-'
 <reference anchor="<%= escattr(k) %>" <%= vps.attr("target") %>>
   <front>
     <%= vps.ele("title") -%>
@@ -75,7 +77,7 @@ module KramdownRFC
   ERB
 
   def self.person_element_from_aups(element_name, aups)
-    erb = ERB.new(PERSON_ERB, nil, '-')
+    erb = ERB.trim_new(PERSON_ERB, '-')
     erb.result(binding)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.25
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-01 00:00:00.000000000 Z
+date: 2021-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -74,6 +74,7 @@ files:
 - data/kramdown-rfc2629.erb
 - data/math.json
 - kramdown-rfc2629.gemspec
+- lib/kramdown-rfc/erb.rb
 - lib/kramdown-rfc/gzip-clone.rb
 - lib/kramdown-rfc/parameterset.rb
 - lib/kramdown-rfc/refxml.rb