metanorma-ogc 2.0.0 → 2.0.1

data/lib/isodoc/ogc/reqt.rb

@@ -33,9 +33,8 @@ module IsoDoc
 
       def recommendation_name(node, out)
         b = out.add_child("<p class='#{recommendation_class(node)}'></p>").first
-        if name = node&.at(ns("./name"))&.remove
+        name = node&.at(ns("./name"))&.remove and
           name.children.each { |n| b << n }
-        end
         if title = node&.at(ns("./title"))&.remove
           b << l10n(": ") if name
           title.children.each { |n| b << n }
@@ -64,6 +63,9 @@ module IsoDoc
         oblig = node["obligation"] and out << ["Obligation", oblig]
         subj = node&.at(ns("./subject"))&.remove&.children and
           out << [rec_subj(node), subj]
+        %w(general class).include?(node["type_original"]) and
+          test = @reqt_links[node["id"]] and
+          out << ["Conformance test", "<xref target='#{test}'/>"]
         node.xpath(ns("./inherit")).each do |i|
           out << ["Dependency", i.remove.children]
         end
@@ -75,7 +77,8 @@ module IsoDoc
         return node unless node.at(ns("./component[@class = 'step']"))
 
         d = node.at(ns("./component[@class = 'step']"))
-        d = d.replace("<ol class='steps'><li>#{d.children.to_xml}</li></ol>").first
+        d = d.replace("<ol class='steps'><li>#{d.children.to_xml}</li></ol>")
+          .first
         node.xpath(ns("./component[@class = 'step']")).each do |f|
           f = f.replace("<li>#{f.children.to_xml}</li>").first
           d << f
@@ -177,6 +180,7 @@ module IsoDoc
       end
 
       def recommendation_to_table(docxml)
+        @reqt_links = reqt_links(docxml)
         docxml.xpath(ns("//recommendation")).each do |r|
           recommendation_parse1(r, "recommendation")
         end
@@ -189,6 +193,16 @@ module IsoDoc
         requirement_table_cleanup(docxml)
       end
 
+      def reqt_links(docxml)
+        docxml.xpath(ns("//requirement | //recommendation | //permission"))
+          .each_with_object({}) do |r, m|
+            next unless %w(conformanceclass verification).include?(r["type"])
+            next unless subject = r&.at(ns("./subject/xref/@target"))&.text
+
+            m[subject] = r["id"]
+          end
+      end
+
       # table nested in table: merge label and caption into a single row
       def requirement_table_cleanup1(outer, inner)
         outer.delete("colspan")

data/lib/metanorma/ogc/cleanup.rb

@@ -211,6 +211,21 @@ module Metanorma
           o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
+
+      def sections_order_cleanup(xml)
+        super
+        sort_annexes(xml)
+      end
+
+      def sort_annexes(xml)
+        last = xml.at("//annex[last()]") or return
+        last.next = "<sentinel/>" and last = last.next_element
+        gl = xml.at("//annex[.//term]") and last.previous = gl.remove
+        rev = xml.at("//annex[title[normalize-space(.) = 'Revision history']]") ||
+          xml.at("//annex[title[normalize-space(.) = 'Revision History']]") and
+          last.previous = rev.remove
+        last.remove
+      end
     end
   end
 end

data/lib/metanorma/ogc/validate.rb

@@ -14,6 +14,44 @@ module Metanorma
       def content_validate(doc)
         super
         bibdata_validate(doc.root)
+        reqt_link_validate(doc.root)
+      end
+
+      def reqt_link_validate(docxml)
+        ids = reqt_links(docxml)
+        reqt_to_conformance(ids, "general", "verification", "Requirement",
+                            "Conformance test")
+        reqt_to_conformance(ids, "class", "conformanceclass",
+                            "Requirement class", "Conformance class test")
+        conformance_to_reqt(ids, "general", "verification", "Requirement",
+                            "Conformance test")
+        conformance_to_reqt(ids, "class", "conformanceclass",
+                            "Requirement class", "Conformance class test")
+      end
+
+      def reqt_to_conformance(ids, reqtclass, confclass, reqtlabel, conflabel)
+        ids[reqtclass]&.each do |r|
+          ids[confclass]&.any? { |x| x[:subject] == r[:id] } or
+            @log.add("Requirements", r[:elem],
+                     "#{reqtlabel} #{r[:id]} has no corresponding #{conflabel}")
+        end
+      end
+
+      def conformance_to_reqt(ids, reqtclass, confclass, reqtlabel, conflabel)
+        ids[confclass]&.each do |x|
+          ids[reqtclass]&.any? { |r| x[:subject] == r[:id] } or
+            @log.add("Requirements", x[:elem],
+                     "#{conflabel} #{x[:id]} has no corresponding #{reqtlabel}")
+        end
+      end
+
+      def reqt_links(docxml)
+        docxml.xpath("//requirement | //recommendation | //permission")
+          .each_with_object({}) do |r, m|
+            m[r["type"]] ||= []
+            m[r["type"]] << { id: r["id"], elem: r,
+                              subject: r&.at("./subject/xref/@target")&.text }
+          end
       end
 
       def bibdata_validate(doc)

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.0.0".freeze
+    VERSION = "2.0.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639