mn-requirements 0.1.3.1 → 0.1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c6daaae7b2380a13eacd8c2abd7bc18795532e824c1901fcab476ed5fdd55a1
-  data.tar.gz: e630016785ad74e041b6c5049d57d43807fe803d2593452b2c8ebaaf1e22f8d6
+  metadata.gz: d626036b19a5d6878dea7341d5d76a0dec9fdd298298517a0fc332b1045faf39
+  data.tar.gz: 49597201b5b2b0ac782ffb5edec441011f15922aa33b095bc3fd4ed2912a194e
 SHA512:
-  metadata.gz: 31d37eeb8a10ca7722ace26d5f315557eb0251cf47f901f14526962492a43c85a6960ab08254ed3a3626070014e4ce46e3e27dbdc7cdbddf93ea0f446398e0f9
-  data.tar.gz: 9ca8c5478b8f39309315988646fb2859f7c15d5b0a971324778fc135302b8d711fdf8e5267ecc2bee9cb3df7fef7851d47d7641cb62f2ddc604442be5bc44ea2
+  metadata.gz: 8d013a395a330b2a03580e4035ac1970e0606ff0c9fb20efb498e6a0dc923024d89eb86667186f53302a9c37c84f89765ed14f668db7a13995787119136d3d03
+  data.tar.gz: 1eee3937b804a2bed138fcd719fd80551ea9925eac4025269f98ca8d52e28cbc0bf5fb36c6d0fe22c87d7f0d98510e11c656ecd23d72dbea319d9b1cb74d4599

data/Rakefile

@@ -1,8 +1,6 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "isodoc/gem_tasks"
 
-IsoDoc::GemTasks.install
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec

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

@@ -25,3 +25,4 @@ requirements:
     identifier: المعرف
     included_in: مدرج في
     statement: بيان
+    guidance: إرشاد

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

@@ -25,3 +25,5 @@ requirements:
     identifier: Kennung
     included_in: Enthalten in
     statement: Aussage
+    guidance: Anleitung
+

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

@@ -25,3 +25,5 @@ requirements:
     identifier: Identifier
     included_in: Included in
     statement: Statement
+    guidance: Guidance
+

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

@@ -25,3 +25,4 @@ requirements:
     identifier: Identificador
     included_in: Incluido en
     statement: Declaración
+    guidance: Orientación

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

@@ -25,3 +25,5 @@ requirements:
     identifier: Identifiant
     included_in: Inclus dans
     statement: Déclaration
+    guidance: Avis
+

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

@@ -25,3 +25,5 @@ requirements:
     identifier: Идентификатор
     included_in: Входит в
     statement: Утверждение
+    guidance: Руководство
+

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

@@ -25,3 +25,5 @@ requirements:
     identifier: 标识符
     included_in: 包含在
     statement: 陈述
+    guidance: 指导意见
+

data/lib/metanorma/modspec/cleanup.rb

@@ -15,7 +15,7 @@ module Metanorma
 
       def requirement_metadata_component_tags
         %w(test-purpose test-method test-method-type conditions part description
-           reference step requirement permission recommendation)
+           reference step requirement permission recommendation guidance)
       end
 
       def requirement_metadata1(reqt, dlist, ins)
@@ -59,9 +59,9 @@ module Metanorma
       end
 
       def requirement_metadata_to_component(reqt)
-        reqt.xpath(".//test-method | .//test-purpose | .//conditions | "\
-                   ".//part | .//test-method-type | .//step | .//reference")
-          .each do |c|
+        xpath = requirement_metadata_component_tags -
+          %w(description requirement permission recommendation)
+        reqt.xpath(xpath.map { |x| ".//#{x}" }.join(" | ")).each do |c|
           c["class"] = c.name
           c.name = "component"
         end

data/lib/metanorma/modspec/isodoc.rb

@@ -6,7 +6,8 @@ module Metanorma
     class Modspec < Default
       def requirement_render1(node)
         init_lookups(node.document)
-        requirement_table_cleanup(super)
+        ret = requirement_guidance_parse(node, super)
+        requirement_table_cleanup(ret)
       end
 
       def recommendation_base(node, _klass)
@@ -86,9 +87,8 @@ module Metanorma
         subj = node.at(ns("./subject"))&.children and
           head << [rec_subj(node), subj]
         node.xpath(ns("./classification[tag = 'target']/value")).each do |v|
-          xref = recommendation_id(v.text) and head << [
-            rec_target(node), xref
-          ]
+          xref = recommendation_id(v.text) and
+            head << [rec_target(node), xref]
         end
         head += recommendation_backlinks(node)
         recommendation_attributes1_dependencies(node, head)
@@ -121,32 +121,37 @@ module Metanorma
         head
       end
 
+      def id_attr(node)
+        node["id"] ? " id='#{node['id']}'" : ""
+      end
+
       def recommendation_steps(node)
         node.elements.each { |e| recommendation_steps(e) }
         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#{id_attr(d)}>"\
+                      "#{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
+          f = f.replace("<li#{id_attr(f)}>#{f.children.to_xml}</li>").first
           d << f
         end
         node
       end
 
       def recommendation_attributes1_component(node, out)
+        return out if node["class"] == "guidance"
+
         node = recommendation_steps(node)
-        out << "<tr><td>#{node['label']}</td><td>#{node.children}</td></tr>"
+        out << "<tr#{id_attr(node)}><td>#{node['label']}</td>"\
+               "<td>#{node.children}</td></tr>"
         out
       end
 
       def recommendation_attr_keyvalue(node, key, value)
-        tag = node.at(ns("./#{key}"))
-        value = node.at(ns("./#{value}"))
-        (tag && value && !%w(target
-                             indirect-dependency).include?(tag.text)) or
-          return nil
+        tag = node.at(ns("./#{key}")) or return nil
+        value = node.at(ns("./#{value}")) or return nil
+        !%w(target indirect-dependency).include?(tag.text) or return nil
         [tag.text.capitalize, value.children]
       end
 
@@ -162,18 +167,26 @@ module Metanorma
       end
 
       def requirement_component_parse(node, out)
-        return out if node["exclude"] == "true"
-
+        node["exclude"] == "true" and return out
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
         node.name == "component" and
           return recommendation_attributes1_component(node, out)
-        out.add_child("<tr><td colspan='2'></td></tr>").first
+        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_guidance_parse(node, out)
+        ins = out.at(ns("./tbody"))
+        node.xpath(ns("./component[@class = 'guidance']")).each do |f|
+          ins << "<tr#{id_attr(f)}><td>#{@labels['modspec']['guidance']}</td>"\
+                 "<td>#{f.children}</td></tr>"
+        end
+        out
+      end
+
       def reqt_dl(node, out)
         node.xpath(ns("./dt")).each do |dt|
           dd = dt.next_element

data/lib/metanorma/requirements/version.rb

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

metadata

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