metanorma-ietf 1.0.1 → 1.0.2

data/appveyor.yml

@@ -0,0 +1,35 @@
+version: '{build}'
+
+cache:
+  - vendor/bundle
+
+environment:
+  matrix:
+    - RUBY_VERSION: 25
+    - RUBY_VERSION: 24
+    - RUBY_VERSION: _trunk
+
+matrix:
+  allow_failures:
+    - RUBY_VERSION: _trunk
+
+install:
+  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
+  - refreshenv
+
+build_script:
+  - set PYTHON_VERSION=37
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%USERPROFILE%\AppData\Roaming\Python\Python%PYTHON_VERSION%\Scripts;C:\Python%PYTHON_VERSION%\Scripts;C:\Python%PYTHON_VERSION%;%PATH%
+  - pip3 install --user --upgrade pip
+  - pip3 install --user xml2rfc
+  - bundle config --local path vendor/bundle
+  - bundle update
+  - bundle install
+
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
+test_script:
+  - bundle exec rake

data/bin/asciidoctor-rfc2.bat

@@ -0,0 +1,2 @@
+@echo off
+ruby %~dp0\asciidoctor-rfc2 %*

data/lib/asciidoctor/rfc/common/base.rb

@@ -377,15 +377,22 @@ HERE
         wgcache_name = "#{Dir.home}/.asciidoc-rfc-workgroup-cache.json"
         # If we are required to, clear the wg cache
         if node.attr("flush-caches") == "true"
-          system("rm -f #{wgcache_name}")
+          FileUtils.rm wgcache_name, :force => true
         end
         # Is there already a wg cache? If not, create it.
         wg = []
+
         if Pathname.new(wgcache_name).file?
-          File.open(wgcache_name, "r") do |f|
-            wg = JSON.parse(f.read)
+          begin
+            File.open(wgcache_name, "r") do |f|
+              wg = JSON.parse(f.read)
+            end
+          rescue Exception => e
+            STDERR.puts "Cache #{wgcache_name} is invalid, drop it"
           end
-        else
+        end
+
+        if wg.empty?
           File.open(wgcache_name, "w") do |b|
             STDERR.puts "Reading workgroups from https://tools.ietf.org/wg/..."
             Kernel.open("https://tools.ietf.org/wg/") do |f|

data/lib/asciidoctor/rfc/v2/blocks.rb

@@ -154,6 +154,18 @@ module Asciidoctor
         result
       end
 
+      # is this a text-only example? if so, mark it up as paragraphs
+      def text_only_example(node)
+        seen_artwork = false
+        node.blocks.each do |b|
+          case b.context
+          when :listing, :image, :literal, :stem
+            seen_artwork = true
+          end
+        end
+        !seen_artwork
+      end
+
       # Syntax:
       #   [[id]]
       #   .Title
@@ -172,22 +184,31 @@ module Asciidoctor
         }
         # TODO iref
         seen_artwork = false
-        noko do |xml|
-          xml.figure **attr_code(figure_attributes) do |xml_figure|
+
+        if text_only_example(node)
+          noko do |xml|
             node.blocks.each do |b|
-              case b.context
-              when :listing, :image, :literal, :stem
-                xml_figure << send(b.context, b).join("\n")
-                seen_artwork = true
-              else
-                # we want to see the para text, not its <t> container
-                if seen_artwork
-                  xml_figure.postamble do |postamble|
-                    postamble << b.content
-                  end
+              xml << node.content
+            end
+          end
+        else
+          noko do |xml|
+            xml.figure **attr_code(figure_attributes) do |xml_figure|
+              node.blocks.each do |b|
+                case b.context
+                when :listing, :image, :literal, :stem
+                  xml_figure << send(b.context, b).join("\n")
+                  seen_artwork = true
                 else
-                  xml_figure.preamble do |preamble|
-                    preamble << b.content
+                  # we want to see the para text, not its <t> container
+                  if seen_artwork
+                    xml_figure.postamble do |postamble|
+                      postamble << b.content
+                    end
+                  else
+                    xml_figure.preamble do |preamble|
+                      preamble << b.content
+                    end
                   end
                 end
               end

data/lib/asciidoctor/rfc/v2/table.rb

@@ -72,8 +72,9 @@ module Asciidoctor
 
               rowlength += cell.text.size
               xml.ttcol **attr_code(ttcol_attributes) do |ttcol|
-                ttcol << cell.text
+                #ttcol << cell.text
                 # NOT cell.content: v2 does not permit blocks in cells
+                ttcol << Array(cell.content).join("").gsub(%r{<t>}, "").gsub(%r{</t>}, "")
               end
             end
             warn "asciidoctor: WARNING (#{current_location(node)}): header row of table is longer than 72 ascii characters" if rowlength > 72
@@ -101,8 +102,9 @@ module Asciidoctor
             row.each do |cell|
               rowlength += cell.text.size
               xml.c do |c|
-                c << cell.text
+                #c << cell.text
                 # NOT cell.content: v2 does not permit blocks in cells
+                c << Array(cell.content).join("").gsub(%r{<t>}, "").gsub(%r{</t>}, "")
               end
             end
             warn "asciidoctor: WARNING (#{current_location(node)}): row #{i} of table is longer than 72 ascii characters" if rowlength > 72

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
     Formerly known as asciidoctor-ietf.
   DESCRIPTION
 
-  spec.homepage      = "https://github.com/riboseinc/metanorma-ietf"
+  spec.homepage      = "https://github.com/metanorma/metanorma-ietf"
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -223,7 +223,9 @@ files:
 - LICENSE
 - README.adoc
 - Rakefile
+- appveyor.yml
 - bin/asciidoctor-rfc2
+- bin/asciidoctor-rfc2.bat
 - bin/asciidoctor-rfc3
 - bin/console
 - bin/rspec
@@ -261,7 +263,7 @@ files:
 - rfc2629-other.ent
 - rfc2629-xhtml.ent
 - rfc2629.dtd
-homepage: https://github.com/riboseinc/metanorma-ietf
+homepage: https://github.com/metanorma/metanorma-ietf
 licenses:
 - BSD-2-Clause
 metadata: {}