kramdown-rfc2629 1.3.3 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90cb07b1f67f6144ecf9d473923815c57ceec4bf7042d5721fce8bf913366f5d
-  data.tar.gz: d5d30942efc132820a0b594cc1e3bd01bd2a51f709a6272f36f5eaa4f05466a5
+  metadata.gz: 0bf90a7fd57ee1492ceaf533983659336ca24c1334b79cd9be55661c4622d10f
+  data.tar.gz: 940584f0bea9de4fb1e2e9b91a79bd8b4eb0192543f625d7c0cbfa9858402275
 SHA512:
-  metadata.gz: 138ea75eeb6cfb75814c40a9d9c7d6c4ab87b1fe9970cebdb775c8ffff2e68bd5cd1a729797598798001e97dfbdf85a7f9fc603297868239554c55f3ad6b3a47
-  data.tar.gz: '09b44f0fd87645c46ea29fdf73db44e7682e5355d3f72ba88a508d2d7e8ba48167d844c92ddd27818169ffe67fb30288a7f299c1fee28763b87d2a0dd9523d34'
+  metadata.gz: f444f161ab0611bc92bbdb2f790c13f1676b9e035368fbcd7869317e5f30b28dd3e59789e55c0c6e3f67f5f8d4d5fa3d2368b26e307ab44f2e846604670754ab
+  data.tar.gz: dfcae66926b4a96424d0be1144d7ccf5c00a28b5153d2adf5897484b9f51826989bf14314909e7a3327ad9ac75b9b57f63270626890b7de3648ddbf2d63e2c5d

data/data/kramdown-rfc2629.erb

@@ -43,9 +43,20 @@
     </abstract>
 
 <% sechash.keys.each do |k| -%>
-<%   if k =~ /\Anote_(.*)/ -%>
-
-    <note title="<%= $1.gsub("_", " ")%>">
+<%   if k =~ /\A(to_be_removed_)?note_(.*)/ -%>
+
+<% option = ""
+       text = ""
+       if $1
+         if $options.v3
+           option = " removeInRFC=\"true\""
+         else
+           text = "      <t>[This note is to be removed before publishing as an RFC.]</t>\n"
+         end
+       end
+    -%>
+    <note title="<%= $2.gsub("_", " ")%>"<%= option %>>
+<%= text -%>
 
 <%= sechash.delete(k) -%>
 

data/kramdown-rfc2629.gemspec

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

@@ -150,6 +150,31 @@ module Kramdown
         generate_id(value).gsub(/-+/, '-')
       end
 
+      def svg_munch_color(c, fill)
+        case c
+        when /\A#(..)(..)(..)\z/
+          if [$1, $2, $3].map {|x| x.to_i(16)}.sum >= 300 # arbitrary
+            'white'
+          else
+            'black'
+          end
+        when 'none'
+          'none' if fill        # delete for stroke
+        else
+          c
+        end
+      end
+
+      def svg_clean(s)          # expensive, risky
+        require "rexml/document"
+        d = REXML::Document.new(s)
+        REXML::XPath.each(d.root, "//*[@shape-rendering]") { |x| x.attributes["shape-rendering"] = nil }  #; warn x.inspect }
+        REXML::XPath.each(d.root, "//*[@text-rendering]") { |x| x.attributes["text-rendering"] = nil }  #; warn x.inspect  }
+        REXML::XPath.each(d.root, "//*[@stroke]") { |x| x.attributes["stroke"] = svg_munch_color(x.attributes["stroke"], false) }
+        REXML::XPath.each(d.root, "//*[@fill]") { |x| x.attributes["fill"] = svg_munch_color(x.attributes["fill"], true) }
+        d.to_s
+      end
+
       def convert_codeblock(el, indent, opts)
         # el.attr['anchor'] ||= saner_generate_id(el.value) -- no longer in 1.0.6
         result = el.value
@@ -194,12 +219,26 @@ module Kramdown
             end
           end
           case t
-          when "goat"
+          when "goat", "ditaa", "mscgen", "plantuml", "plantuml-utxt"
             require 'tempfile'
             file = Tempfile.new("kramdown-rfc")
             file.write(result)
             file.close
-            result1, _s = Open3.capture2("goat #{file.path}", stdin_data: result);
+            case t
+            when "goat"
+              result1, _s = Open3.capture2("goat #{file.path}", stdin_data: result);
+            when "ditaa"        # XXX: This needs some form of option-setting
+              result1, _s = Open3.capture2("ditaa #{file.path} --svg -o -", stdin_data: result);
+              result1 = svg_clean(result1)
+            when "mscgen"
+              result1, _s = Open3.capture2("mscgen -T svg -i #{file.path} -o -", stdin_data: result);
+              result1 = svg_clean(result1)
+            when "plantuml", "plantuml-utxt"
+              plantuml = "@startuml\n#{result}\n@enduml"
+              result1, _s = Open3.capture2("plantuml -pipe -tsvg", stdin_data: plantuml);
+              result1 = svg_clean(result1)
+              result, _s = Open3.capture2("plantuml -pipe -tutxt", stdin_data: plantuml) if t == "plantuml-utxt"
+            end
             # warn ["goat:", result1.inspect]
             file.unlink
             result1, _s = Open3.capture2("svgcheck -qa", stdin_data: result1);
@@ -477,7 +516,8 @@ module Kramdown
                   end
                 end
               end
-            rescue OpenURI::HTTPError, SocketError, Timeout::Error => e
+            rescue OpenURI::HTTPError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED,
+                   SocketError, Timeout::Error => e
               warn "*** #{e} while fetching #{url}"
             end
           end
@@ -485,7 +525,7 @@ module Kramdown
         begin
           File.read(fn) # this blows up if no cache available after fetch attempt
         rescue Errno::ENOENT => e
-          warn "*** #{e} for ${fn}"
+          warn "*** #{e} for #{fn}"
         end
       end
 
@@ -537,7 +577,7 @@ module Kramdown
             fn = "reference.#{t}.#{n}.xml"
             sub, ttl, can_anchor = XML_RESOURCE_ORG_MAP[t]
             ttl ||= KRAMDOWN_REFCACHETTL  # everything but RFCs might change a lot
-            puts "Huh: ${fn}" unless sub
+            puts "*** Huh: #{fn}" unless sub
             url = "#{XML_RESOURCE_ORG_PREFIX}/#{sub}/#{fn}"
             if can_anchor # create anchor server-side for stand_alone: false
               url << "?anchor=#{anchor}"
@@ -547,7 +587,10 @@ module Kramdown
             to_insert.scrub! rescue nil # only do this for Ruby >= 2.1
             # this may be a bit controversial: Don't break the build if reference is broken
             if KRAMDOWN_OFFLINE
-              to_insert ||= "<reference anchor='#{anchor}'> <front> <title>*** BROKEN REFERENCE ***</title> <author> <organization/> </author> <date/> </front> </reference>"
+              unless to_insert
+                to_insert = "<reference anchor='#{anchor}'> <front> <title>*** BROKEN REFERENCE ***</title> <author> <organization/> </author> <date/> </front> </reference>"
+                warn "*** KRAMDOWN_OFFLINE: Inserting broken reference for #{fn}"
+              end
             else
               exit 66 unless to_insert # EX_NOINPUT
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kramdown-rfc2629
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.8
 platform: ruby
 authors:
 - Carsten Bormann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kramdown