mn-requirements 0.1.4.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d626036b19a5d6878dea7341d5d76a0dec9fdd298298517a0fc332b1045faf39
-  data.tar.gz: 49597201b5b2b0ac782ffb5edec441011f15922aa33b095bc3fd4ed2912a194e
+  metadata.gz: 9e3ca9ac70068ad84544ecd69a028aa771675c790affd49f35812b2a8677ffdc
+  data.tar.gz: e47bf092f613aa369275f154a9937f5d32c3b88f9cfddf8492a95268c6d3d76c
 SHA512:
-  metadata.gz: 8d013a395a330b2a03580e4035ac1970e0606ff0c9fb20efb498e6a0dc923024d89eb86667186f53302a9c37c84f89765ed14f668db7a13995787119136d3d03
-  data.tar.gz: 1eee3937b804a2bed138fcd719fd80551ea9925eac4025269f98ca8d52e28cbc0bf5fb36c6d0fe22c87d7f0d98510e11c656ecd23d72dbea319d9b1cb74d4599
+  metadata.gz: aa55fdb9e247e0c5c22daa72a3ce16e5a953af35bf128cd02782e1a24b261acc0a3bc5ac8eb19db04164b0375d5c6a3d62455eac0eacbb9c1be7e14546e220a1
+  data.tar.gz: 58eba09e93a17784d3cf4540e0c90a6dbf8c7e44a364038d3926183acdb842d061e9375b1e07c9e28955eb768e21d4556517fc3a4caeafb6cc70187614b77db7

data/lib/metanorma/modspec/cleanup.rb

@@ -1,28 +1,41 @@
 module Metanorma
   class Requirements
     class Modspec < Default
+      REQT_TYPE_NORM = {
+        requirement: "general",
+        recommendation: "general",
+        permission: "general",
+        requirements_class: "class",
+        requirement_class: "class",
+        recommendation_class: "class",
+        permission_class: "class",
+        conformance_test: "verification",
+        conformance_class: "conformanceclass",
+        abstract_test: "abstracttest",
+      }.freeze
+
       def requirement_type_cleanup(reqt)
-        reqt["type"] = case reqt["type"]
-                       when "requirement", "recommendation", "permission"
-                         "general"
-                       when "requirements_class" then "class"
-                       when "conformance_test" then "verification"
-                       when "conformance_class" then "conformanceclass"
-                       when "abstract_test" then "abstracttest"
-                       else reqt["type"]
-                       end
+        ret = REQT_TYPE_NORM[reqt["type"]&.to_sym] or return
+        reqt["type"] = ret
       end
 
       def requirement_metadata_component_tags
         %w(test-purpose test-method test-method-type conditions part description
-           reference step requirement permission recommendation guidance)
+           reference step guidance) +
+          requirement_metadata_requirement_tags
+      end
+
+      def requirement_metadata_requirement_tags
+        %w(conformance-test conformance-class abstract-test requirement-class
+           recommendation-class permission-class requirement permission
+           recommendation)
       end
 
       def requirement_metadata1(reqt, dlist, ins)
         ins1 = super
         dlist.xpath("./dt").each do |e|
-          tag = e&.text&.gsub(/ /, "-")&.downcase
-          next unless requirement_metadata_component_tags.include? tag
+          tag = e.text&.gsub(/ /, "-")&.downcase
+          next unless requirement_metadata_component_tags.include?(tag)
 
           ins1.next = requirement_metadata1_component(e, tag)
           ins1 = ins1.next
@@ -36,9 +49,9 @@ module Metanorma
           requirement_metadata1(val, d, d)
           d.remove
         end
-        if REQS.include?(term.text) && !val.text.empty?
+        requirement_metadata_requirement_tags.include?(term.text) &&
+          !val.text.empty? and
           val.children = "<identifier>#{val.text.strip}</identifier>"
-        end
         val
       end
 
@@ -59,8 +72,8 @@ module Metanorma
       end
 
       def requirement_metadata_to_component(reqt)
-        xpath = requirement_metadata_component_tags -
-          %w(description requirement permission recommendation)
+        xpath = requirement_metadata_component_tags - %w(description) -
+          requirement_metadata_requirement_tags
         reqt.xpath(xpath.map { |x| ".//#{x}" }.join(" | ")).each do |c|
           c["class"] = c.name
           c.name = "component"
@@ -68,13 +81,25 @@ module Metanorma
       end
 
       def requirement_metadata_to_requirement(reqt)
-        reqt.xpath("./requirement | ./permission | ./recommendation")
-          .each do |c|
+        xpath = requirement_metadata_requirement_tags
+        reqt.xpath(xpath.map { |x| "./#{x}" }.join(" | ")).each do |c|
           c["id"] = Metanorma::Utils::anchor_or_uuid
           c["model"] = reqt["model"] # all requirements must have a model
+          requirement_metadata_to_requirement1(c)
         end
       end
 
+      def requirement_metadata_to_requirement1(reqt)
+        reqt["type"] = reqt.name.sub(/-/, "_")
+        reqt.name =
+          case reqt.name
+          when "recommendation-class", "recommendation" then "recommendation"
+          when "permission-class", "permission" then "permission"
+          else "requirement"
+          end
+        requirement_type_cleanup(reqt)
+      end
+
       def requirement_subparts_to_blocks(reqt)
         reqt.xpath(".//component | .//description").each do |c|
           next if %w(p ol ul dl table component description)

data/lib/metanorma/modspec/isodoc.rb

@@ -198,8 +198,6 @@ module Metanorma
       end
 
       def requirement_table_cleanup(table)
-        return table unless table["type"] == "recommendclass"
-
         table.xpath(ns("./tbody/tr/td/table")).each do |t|
           x = t.at(ns("./thead/tr")) or next
           t.parent.parent.replace(x)

data/lib/metanorma/modspec/reqt_label.rb

@@ -7,14 +7,14 @@ module Metanorma
 
         label = elem.at(ns("./identifier"))&.text
         if inject_crossreference_reqt?(elem, label)
-          recommendation_label_xref(elem, label, xrefs)
+          recommendation_label_xref(elem, label, xrefs, type)
         else
           type = recommendation_class_label(elem)
           super
         end
       end
 
-      def recommendation_label_xref(elem, label, xrefs)
+      def recommendation_label_xref(elem, label, xrefs, type)
         id = @reqtlabels[label]
         number = xrefs.anchor(id, :xref, false)
         number.nil? and return type

data/lib/metanorma/requirements/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   class Requirements
-    VERSION = "0.1.4.1".freeze
+    VERSION = "0.1.6".freeze
   end
 end

data/mn-requirements.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
+  spec.add_development_dependency "metanorma-standoc"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.4.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: metanorma-standoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement