mn-requirements 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30b7b9d9468a1d20886f1d84d6992071a95a2376a5f066bd9b455571e7e425d
-  data.tar.gz: 2888d62224f0110f4a23980042c34490f7f32889146304c56847f0d3b2d18ddc
+  metadata.gz: 9e3ca9ac70068ad84544ecd69a028aa771675c790affd49f35812b2a8677ffdc
+  data.tar.gz: e47bf092f613aa369275f154a9937f5d32c3b88f9cfddf8492a95268c6d3d76c
 SHA512:
-  metadata.gz: 289876376e7c00e2c120fb64f1c4be5ab19dba91db83036c6be974eadf8f6f0d291e6316219fad482f0d5df04dee9362afb15e6844ec84ae3029bbf1860242ff
-  data.tar.gz: a868912d83376103770d8602b56fa0643da967a2833e9d9df59fe72f6469d1c6901edb0ef879c78cd5eaa8577f1e6d053269a7ef8eec5c2d5d1fae604c03aab0
+  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/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n