kramdown-rfc2629 1.3.21 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34bc0c22021d827ebe3c42abda25c3255a6f9902fb8ab94cb7b758c29119016b
-  data.tar.gz: 5e457122aa29c8f2ffac9db511ebc50c036b56d170879e8f9cbd46477099f81d
+  metadata.gz: 14ca4896e8d224d830d24a28077c3fda9862692f9dd3c2b8e8fa97c46da3e9ff
+  data.tar.gz: 2cc4e6ee1e9103184ea8a36fc0b7402db7fc5b31ca29ae07b2b677371ab01db3
 SHA512:
-  metadata.gz: c9a397ece10c7c210ea7231e35ea0f949146db5fce32799a1b4bbb91fa59f3bfe7fda9d7b8e3a40127c426cecdd8b304a1370e5f60934ab8bc7af1c94e466518
-  data.tar.gz: 0b22b30f1ca35a27b27d671b2b081c2881d10388f50abffb079c8af506e0ac706f6bf47f3d19d7c20c52029d1654fe854fc3c1098fb0e80aba8edd9cdfac5ede
+  metadata.gz: cdf62e10b98e044a38f99159ee2c0e71432dfb3f2ba3859a232734fba202179e2fe172ad810dcdaf167a670cc181b5a297065443461c6c707b4a6e62722d227a
+  data.tar.gz: 7aa535e17b40aa52288004e7b4bac74753ace928a2e172e2ff8115348bb4955d4350240a794c3443435d8be507988128edbf9d23633de83bd89f4118c68df15b

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,12 +1,12 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.3.21'
+  s.version = '1.3.26'
   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.}
   s.add_dependency('kramdown', '~> 1.17.0')
   s.add_dependency('certified', '~> 1.0')
-  s.add_dependency('json', '~> 2.0')
+  s.add_dependency('json_pure', '~> 2.0')
   s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json)
   s.require_path = 'lib'
   s.executables = ['kramdown-rfc2629', 'doilit', 'kramdown-rfc-extract-markdown', 'kdrfc']

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
 

data/lib/kramdown-rfc2629.rb

@@ -128,6 +128,22 @@ module Kramdown
   end
 
   class Element
+
+    # Not fixing studly element names postalLine and seriesInfo yet
+
+    # occasionally regenerate the studly attribute name list via
+    # script in data/studly.rb
+    STUDLY_ATTR = %w(
+    asciiAbbrev asciiFullname asciiInitials asciiName asciiSurname
+    asciiValue blankLines derivedAnchor derivedContent derivedCounter
+    derivedLink displayFormat docName expiresDate hangIndent hangText
+    indexInclude iprExtract keepWithNext keepWithPrevious originalSrc
+    prepTime quoteTitle quotedFrom removeInRFC sectionFormat seriesNo
+    showOnFrontPage slugifiedName sortRefs submissionType symRefs tocDepth
+    tocInclude
+    )
+    STUDLY_ATTR_MAP = Hash[STUDLY_ATTR.map {|s| [s.downcase, s]}]
+
     def rfc2629_fix
       if a = attr
         if anchor = a.delete('id')
@@ -136,6 +152,11 @@ module Kramdown
         if anchor = a.delete('href')
           a['target'] = anchor
         end
+        attr.keys.each do |k|
+          if (d = k.gsub(/_(.|$)/) { $1.upcase }) != k or d = STUDLY_ATTR_MAP[k]
+            a[d] = a.delete(k)
+          end
+        end
       end
     end
   end
@@ -453,6 +474,9 @@ COLORS
 
       def convert_dl(el, indent, opts)
         if $options.v3
+          if hangindent = el.attr.delete('hangIndent')
+            el.attr['indent'] ||= hangindent # new attribute name wins
+          end
           vspace = el.attr.delete('vspace')
           if vspace && !el.attr['newline']
             el.attr['newline'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.3.26
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-17 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -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
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Kramdown extension for generating RFC 7749 XML.