metanorma-ietf 2.3.6 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a19bfaee2381bda7dd532941697aa43f6c9804940b9c2f82897f6950d195cc7
-  data.tar.gz: ba4c70b46014f9c41c4971e99da7608df7f2780855bbdbd005e6e4c542dda215
+  metadata.gz: 9a0a93b0a29195d775f23e2ba37414870b8e708a006bba0498b3113aebe787c9
+  data.tar.gz: 53a29d58e5c0c601c29de23d0515d43e690458b8b848f67cacf5064403c3b834
 SHA512:
-  metadata.gz: 4b3eafc5eccb17ceaa77851f1aef2d66ea2fd6b39213b2537643571ee4f3b827a1b5b4d2fc2f9e3622649302661285035a483567b90d32cdddc693ca0d62f86d
-  data.tar.gz: 41c2f933072a61553455c06ac46ce40cd49e81fa86e162740b179a3099ad033eafd9a09723cbfe05c6d7b86227bf5fbd2e4121d4c92e6f625927a535e53ee58e
+  metadata.gz: e89e41ec81886905668543d6f24ad31ef6ea9cf0a38551f56f1fa3e8007bb6068421b221d0d835951054894146d218b47ae0fe9d1cc1a621f7df6f85a7442e3d
+  data.tar.gz: 11d9d25373f48d7fb3197e5107168c64b8230d519f1e45b410dec5403aab6158f81c8f0e34c2553aff7fa1f32f5974d7a8d7a77a6e5233fb0ef65aa1a300a2c6

data/lib/asciidoctor/ietf/cleanup.rb

@@ -8,10 +8,6 @@ module Asciidoctor
         rfc_anchor_cleanup(xmldoc)
       end
 
-      BCP_KEYWORDS =
-        ["MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
-         "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", "OPTIONAL"].freeze
-
       def abstract_cleanup(xmldoc)
         xmldoc.xpath("//abstract[not(text())]").each do |x|
           x.remove

data/lib/asciidoctor/ietf/front.rb

@@ -119,7 +119,7 @@ module Asciidoctor
           strict: node.attr("strict"),
           compact: node.attr("compact"),
           subcompact: node.attr("subcompact"),
-          toc: node.attr("toc-include") == "false" ? "no" : "yes",
+          tocinclude: node.attr("toc-include") == "false" ? "no" : "yes",
           tocdepth: node.attr("toc-depth"),
           symrefs: node.attr("sym-refs"),
           sortrefs: node.attr("sort-refs"),

data/lib/asciidoctor/ietf/ietf.rng

@@ -842,7 +842,7 @@
         </element>
       </optional>
       <optional>
-        <element name="toc">
+        <element name="tocinclude">
           <text/>
         </element>
       </optional>

data/lib/asciidoctor/ietf/isodoc.rng

@@ -1011,8 +1011,14 @@
       <ref name="imagemap"/>
       <ref name="svgmap"/>
       <ref name="inputform"/>
+      <ref name="toc"/>
     </choice>
   </define>
+  <define name="toc">
+    <element name="toc">
+      <ref name="ul"/>
+    </element>
+  </define>
   <define name="inputform">
     <element name="form">
       <attribute name="id">
@@ -1254,6 +1260,12 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">

data/lib/asciidoctor/ietf/validate.rb

@@ -1,4 +1,4 @@
-require "open-uri"
+require "metanorma/ietf/data/workgroups"
 
 module Asciidoctor
   module Ietf
@@ -34,59 +34,8 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "ietf.rng"))
       end
 
-      def wgcache_name
-        "#{Dir.home}/.metanorma-ietf-workgroup-cache.json"
-      end
-
-      def open_wg_cache(node)
-        node.attr("flush-caches") == "true" and
-          FileUtils.rm wgcache_name, force: true
-        wg = []
-        if Pathname.new(wgcache_name).file?
-          begin
-            File.open(wgcache_name, "r") { |f| wg = JSON.parse(f.read) }
-          rescue Exception => e
-            warn "Cache #{wgcache_name} is invalid, drop it"
-          end
-        end
-        [wg, wgcache_name]
-      end
-
-      def cache_workgroup_ietf(wg, _b)
-        warn "Reading workgroups from https://tools.ietf.org/wg/..."
-        URI.open("https://tools.ietf.org/wg/") do |f|
-          f.each_line do |l|
-            l.scan(%r{<td width="50%" style='padding: 0 1ex'>([^<]+)</td>}) do |w|
-              wg << w[0].gsub(/\s+$/, "").gsub(/ Working Group$/, "")
-            end
-          end
-        end
-        wg
-      end
-
-      def cache_workgroup_irtf(wg, _b)
-        warn "Reading workgroups from https://irtf.org/groups..."
-        URI.open("https://irtf.org/groups", ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE) do |f|
-          f.each_line do |l|
-            l.scan(%r{<a title="([^"]+) Research Group"[^>]+>([^<]+)<}) do |w|
-              wg << w[0].gsub(/\s+$/, "")
-              wg << w[1].gsub(/\s+$/, "") # abbrev
-            end
-          end
-        end
-        wg
-      end
-
-      def cache_workgroup(node)
-        wg, wgcache_name = open_wg_cache(node)
-        if wg.empty?
-          File.open(wgcache_name, "w") do |b|
-            wg = cache_workgroup_ietf(wg, b)
-            wg = cache_workgroup_irtf(wg, b)
-            b << wg.to_json
-          end
-        end
-        wg
+      def cache_workgroup(_node)
+        Metanorma::Ietf::Data::WORKGROUPS
       end
     end
   end

data/lib/isodoc/ietf/section.rb

@@ -33,7 +33,7 @@ module IsoDoc::Ietf
         strict: node&.at(ns("//pi/strict"))&.text || "yes",
         compact: node&.at(ns("//pi/compact"))&.text || "yes",
         subcompact: node&.at(ns("//pi/subcompact"))&.text || "no",
-        toc: node&.at(ns("//pi/toc-include"))&.text,
+        toc: node&.at(ns("//pi/tocinclude"))&.text,
         tocdepth: node&.at(ns("//pi/toc-depth"))&.text || "4",
         symrefs: node&.at(ns("//pi/sym-refs"))&.text || "yes",
         sortrefs: node&.at(ns("//pi/sort-refs"))&.text || "yes",

data/lib/metanorma/ietf/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ietf
-    VERSION = "2.3.6".freeze
+    VERSION = "2.4.0".freeze
   end
 end

data/metanorma-ietf.gemspec

@@ -38,6 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "isodoc", "~> 1.7.0"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "metanorma-standoc", "~> 1.10.0"
+  spec.add_dependency "metanorma-ietf-data"
   spec.add_dependency "nokogiri", "~> 1.11.6"
   spec.add_dependency "open-uri"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ietf
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-19 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.10.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-ietf-data
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement