kramdown-rfc2629 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f17e8d2990e09477872f2e100956b2f3953d443
-  data.tar.gz: 582147203f31a6dd912f1b838f2d9621cae9f04f
+  metadata.gz: '093c0c98d2b679755d6a2307648d63182d8b8de7'
+  data.tar.gz: 39b8ecce64d79e06ce5f85adb5388f67cf1764c5
 SHA512:
-  metadata.gz: 23ac538b0241dd6014bf0fbd2b203809487034faa7aafe47dbdcc4d8612c918006817a31cecdc02f9abef0c1a36dc59ea58616e64a63f754c36ad8ca477aff98
-  data.tar.gz: 3a82b121f0ce3b7e9fae1fb59467693fd9722a5eb8582fcf84da349ab99256c339953df9db49b6b0f44c9e8f930bb16a9b7f7544e2210f8dcaabafffe3e37b59
+  metadata.gz: f843b988452947cce54335d0243d8bd6f9041958b26b8713f22cae3800263480c669cd1ee01079e177c763ead1477db782c74bb67e91467275b478f053b60fa8
+  data.tar.gz: b37725e52da7743d811a677ecb8b93dd1ac5052968d276f59cdb679228f7004100e340d22ca14cf940ad8c8bca5fb600bd672ac91cf56250b18539b2068eb5cf

data/bin/kramdown-rfc2629

@@ -42,7 +42,7 @@ def xml_from_sections(input)
   # the first section is a YAML with front matter parameters (don't put a label here)
   # We put back the "---" plus gratuitous blank lines to hack the line number in errors
   yaml_in = input[/---\s*/] << sections.shift[2]
-  ps = KramdownRFC::ParameterSet.new(YAML.load(yaml_in))
+  ps = KramdownRFC::ParameterSet.new(YAML.safe_load(yaml_in, [Date], [], true))
   coding_override = ps.has(:coding)
   smart_quotes = ps[:smart_quotes]
 

data/kramdown-rfc2629.gemspec

@@ -1,10 +1,10 @@
 spec = Gem::Specification.new do |s|
   s.name = 'kramdown-rfc2629'
-  s.version = '1.2.3'
+  s.version = '1.2.5'
   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.13.0')
+  s.add_dependency('kramdown', '~> 1.14.0')
   s.add_dependency('certified', '~> 1.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)
   s.require_path = 'lib'

data/lib/kramdown-rfc2629.rb

@@ -11,7 +11,7 @@
 
 raise "sorry, 1.8 was last decade" unless RUBY_VERSION >= '1.9'
 
-gem 'kramdown', '~> 1.13.0'
+gem 'kramdown', '~> 1.14.0'
 require 'kramdown'
 my_span_elements =  %w{list figure xref eref iref cref spanx vspace}
 Kramdown::Parser::Html::Constants::HTML_SPAN_ELEMENTS.concat my_span_elements
@@ -182,7 +182,7 @@ module Kramdown
               end
             end
           end
-          # compensate for XML2RFC idiosyncracy by insisting on a blank line
+          # compensate for XML2RFC idiosyncrasy by insisting on a blank line
           unless el.attr.delete('tight')
             result[0,0] = "\n" unless result[0,1] == "\n"
           end
@@ -383,6 +383,7 @@ module Kramdown
       end
 
       def convert_a(el, indent, opts)
+        gi = el.attr.delete('gi')
         res = inner(el, indent, opts)
         target = el.attr['target']
         if target[0] == "#"     # handle [](#foo) as xref as in RFC 7328
@@ -390,25 +391,32 @@ module Kramdown
           if target.downcase == res.downcase
             res = ''            # get rid of raw anchors leaking through
           end
-          "<xref#{el_html_attributes(el)}>#{res}</xref>"
+          gi ||= "xref"
         else
-          "<eref#{el_html_attributes(el)}>#{res}</eref>"
+          gi ||= "eref"
         end
+        "<#{gi}#{el_html_attributes(el)}>#{res}</#{gi}>"
       end
 
       def convert_xref(el, indent, opts)
+        gi = el.attr.delete('gi')
         target = el.attr['target']
         if target[0] == "&"
           "#{target};"
-        elsif target =~ %r{\A\w+:(?://|.*@)}
-          "<eref#{el_html_attributes(el)}/>"
         else
-          "<xref#{el_html_attributes(el)}/>"
+          if target =~ %r{\A\w+:(?://|.*@)}
+            gi ||= "eref"
+          else
+            gi ||= "xref"
+          end
+          "<#{gi}#{el_html_attributes(el)}/>"
         end
       end
 
       REFCACHEDIR = ENV["KRAMDOWN_REFCACHEDIR"] || ".refcache"
 
+      # warn "*** REFCACHEDIR #{REFCACHEDIR}"
+
       KRAMDOWN_OFFLINE = ENV["KRAMDOWN_OFFLINE"]
       KRAMDOWN_REFCACHE_REFETCH = ENV["KRAMDOWN_REFCACHE_REFETCH"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.5
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.0
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: certified
   requirement: !ruby/object:Gem::Requirement