mn-requirements 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 835ebdf2e3bbc0dea0c8eb3103e3aebe23f896d9610a99a1ddafc45b3e7953f2
-  data.tar.gz: 984be6317de16bd417ae59c7645ba970a32ba2add0261679c683560a01c5476c
+  metadata.gz: 1cc32c6334d63f4745d279e84ea08305400eccc4f020ac410b85488e47e3c6ce
+  data.tar.gz: 57e1f8b559a619d6d01a18520d15f3de7787d0eb7fed17add4c120bc58b0d862
 SHA512:
-  metadata.gz: 1fd6e0090c521fa3817505429b75ec281e1f801257143f675ec82eb90eea20d0a2848aff92fa9d13f95dde5ddf5b9bee11e15f5b919bf779b8ed1fbf2f6305fe
-  data.tar.gz: c7c3fabad721fa9c88e738bce338105b2b856de8747c60aee62b8cfc0e39e7c140afc328697c4f668f13704afc96ad896a5f61f96914e2fc0644b6e61b659ad9
+  metadata.gz: 817a441beba95552171c674b07c7d447808496a642c90181baf039723b7fcdef1dbb5ee23ecac9e167ffea9d09871af3bfa48dec7c40c7cc46b4fe48559e1286
+  data.tar.gz: '09ee6db13e6fc2eb7e99ec2fbeb281a6ce3a9aed08e8d41b865a1acd458c2ec9fa642325bfff50de1ec8689ba9f8e8a74f914e0c5e3759670ee85c183f787ec1'

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: المعرف
     included_in: مدرج في
     statement: بيان
+    description: وصف
     guidance: إرشاد
     implements: تنفذ
     provision: بيان المعياري

data/lib/isodoc-yaml/i18n-de.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: Kennung
     included_in: Enthalten in
     statement: Aussage
+    description: Beschreibung
     guidance: Anleitung
     implements: Implementiert
     provision: Normative Aussage

data/lib/isodoc-yaml/i18n-en.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: Identifier
     included_in: Included in
     statement: Statement
+    description: Description
     guidance: Guidance
     implements: Implements
     provision: Normative statement

data/lib/isodoc-yaml/i18n-es.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: Identificador
     included_in: Incluido en
     statement: Declaración
+    description: Descripción
     guidance: Orientación
     implements: Implementa
     provision: Declaración normativa

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: Identifiant
     included_in: Inclus dans
     statement: Déclaration
+    description: Description
     guidance: Avis
     implements: Implémente
     provision: Déclaration normative

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: Идентификатор
     included_in: Входит в
     statement: Утверждение
+    description: Описание
     guidance: Руководство
     implements: Реализует
     provision: Нормативное положение

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -25,6 +25,7 @@ requirements:
     identifier: 标识符
     included_in: 包含在
     statement: 陈述
+    description: 描述
     guidance: 指导意见
     implements: 它实现
     provision: 规范性陈述

data/lib/metanorma/modspec/isodoc.rb

@@ -69,8 +69,8 @@ module Metanorma
 
       def recommend_title(node, out)
         label = node.at(ns("./identifier")) or return
-        out.add_child("<tr><td scope='colgroup' colspan='2'>" \
-                      "<tt>#{label.children.to_xml}</tt></td>")
+        out.add_child("<tr><th>#{@labels['modspec']['identifier']}</th>" \
+                      "<td><tt>#{label.children.to_xml}</tt></td>")
       end
 
       def recommendation_attributes1(node)
@@ -162,7 +162,8 @@ module Metanorma
       def recommendation_attr_keyvalue(node, key, value)
         tag = node.at(ns("./#{key}")) or return nil
         value = node.at(ns("./#{value}")) or return nil
-        !%w(target indirect-dependency implements).include?(tag.text.downcase) or
+        !%w(target indirect-dependency
+            implements).include?(tag.text.downcase) or
           return nil
         [Metanorma::Utils.strict_capitalize_first(tag.text), value.children]
       end
@@ -184,12 +185,23 @@ module Metanorma
           return reqt_dl(node.first_element_child, out)
         node.name == "component" and
           return recommendation_attributes1_component(node, out)
+        node.name == "description" and
+          return requirement_description_parse(node, out)
         out.add_child("<tr#{id_attr(node)}><td colspan='2'></td></tr>").first
           .at(ns(".//td")) <<
           (preserve_in_nested_table?(node) ? node : node.children)
         out
       end
 
+      def requirement_description_parse(node, out)
+        lbl = "statement"
+        recommend_class(node.parent) == "recommendclass" and
+          lbl = "description"
+        out << "<tr><th>#{@labels['modspec'][lbl]}</th>" \
+               "<td>#{node.children.to_xml}</td></tr>"
+        out
+      end
+
       def requirement_guidance_parse(node, out)
         ins = out.at(ns("./tbody"))
         node.xpath(ns("./component[@class = 'guidance']")).each do |f|
@@ -208,47 +220,6 @@ module Metanorma
         end
         out
       end
-
-      def rec_subj(node)
-        case node["type"]
-        when "class" then @labels["modspec"]["targettype"]
-        else @labels["default"]["subject"]
-        end
-      end
-
-      def rec_target(node)
-        case node["type"]
-        when "class" then @labels["modspec"]["targettype"]
-        when "conformanceclass" then @labels["modspec"]["requirementclass"]
-        when "verification", "abstracttest" then @labels["default"]["requirement"]
-        else @labels["modspec"]["target"]
-        end
-      end
-
-      def recommend_class(node)
-        case node["type"]
-        when "verification", "abstracttest" then "recommendtest"
-        when "class", "conformanceclass" then "recommendclass"
-        else "recommend"
-        end
-      end
-
-      def recommend_name_class(node)
-        if %w(verification abstracttest).include?(node["type"])
-          "RecommendationTestTitle"
-        else "RecommendationTitle"
-        end
-      end
-
-      def recommend_component_label(node)
-        c = case node["class"]
-            when "test-purpose" then "Test purpose"
-            when "test-method" then "Test method"
-            else node["class"]
-            end
-        @labels["default"][c] || @labels["modspec"][c] ||
-          Metanorma::Utils.strict_capitalize_first(c)
-      end
     end
   end
 end

data/lib/metanorma/modspec/reqt_label.rb

@@ -142,6 +142,47 @@ module Metanorma
           ret << [@labels["modspec"]["included_in"], xref]
         ret
       end
+
+      def rec_subj(node)
+        case node["type"]
+        when "class" then @labels["modspec"]["targettype"]
+        else @labels["default"]["subject"]
+        end
+      end
+
+      def rec_target(node)
+        case node["type"]
+        when "class" then @labels["modspec"]["targettype"]
+        when "conformanceclass" then @labels["modspec"]["requirementclass"]
+        when "verification", "abstracttest" then @labels["default"]["requirement"]
+        else @labels["modspec"]["target"]
+        end
+      end
+
+      def recommend_class(node)
+        case node["type"]
+        when "verification", "abstracttest" then "recommendtest"
+        when "class", "conformanceclass" then "recommendclass"
+        else "recommend"
+        end
+      end
+
+      def recommend_name_class(node)
+        if %w(verification abstracttest).include?(node["type"])
+          "RecommendationTestTitle"
+        else "RecommendationTitle"
+        end
+      end
+
+      def recommend_component_label(node)
+        c = case node["class"]
+            when "test-purpose" then "Test purpose"
+            when "test-method" then "Test method"
+            else node["class"]
+            end
+        @labels["default"][c] || @labels["modspec"][c] ||
+          Metanorma::Utils.strict_capitalize_first(c)
+      end
     end
   end
 end

data/lib/metanorma/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-19 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n