mn-requirements 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01bee8304acc8f185870fb5f6960e2a7393d096acc9cdf9ea4e87918baf297e0
-  data.tar.gz: 11412398e35579a0e3022250101a3629409b7f784da526d152de6a1a69c00e33
+  metadata.gz: bd0f29f7ad1df5f2127ec2c47f22d03e50bc6ec18e76459352ba6d873117d049
+  data.tar.gz: 60f5b1e8cd4463f0d2492731a502b33ea9b9d3930fa5fc09d99b2aa14285f153
 SHA512:
-  metadata.gz: e9d3f86cd517967140e1febd7c7852d55dd3b1b4b8c74d1159c335d42717fc51c960218caf5631d9f135701b8f812b830685ad5224ac9dbc4249ee24a0cfcda9
-  data.tar.gz: 7cc6c088de6e4ea5ae8050844ccf0d9cf49369bf63b89ffa4892316539d57d5ae89074fe184191a4e78e940d59efef1abc09e3bd88805125ff734aeb7f11f735
+  metadata.gz: 9028d71bdb94818359b7ebda35103973ce7906eae30aad1b881085fccdde2d78f6a07edb5fdc939c9234738751a48bda2a06bafba6809457808ba5fe563b189c
+  data.tar.gz: 83e2726e3edeb550d272860a8e477a50629bc298468555cb3fcf251b60b318a4e63a42b750d2812542bf8185007b0da0eb0ad49a926f4e0688c7c2a4b55efd5b

data/lib/isodoc/i18n.rb

@@ -5,7 +5,7 @@ module IsoDoc
   class MnRequirementsI18n < I18n
     def load_yaml1(lang, script)
       case lang
-      when "en", "fr", "ru", "de", "es", "ar"
+      when "en", "fr", "ru", "de", "es", "ar", "ja"
         load_yaml2(lang)
       when "zh"
         if script == "Hans" then load_yaml2("zh-Hans")

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

@@ -0,0 +1,31 @@
+requirements:
+  default:
+    requirement: 要求
+    recommendation: 推奨
+    permission: 許可
+    obligation: 義務
+    subject: 主題
+    inherits: 継承
+  modspec:
+    recommendationtest: 要求テスト
+    requirementtest: 要求テスト
+    permissiontest: 許可テスト
+    recommendationclass: 要求クラス
+    requirementclass: 要求クラス
+    permissionclass: 許可クラス
+    abstracttest: 抽象テスト
+    conformanceclass: 適合クラス
+    conformancetest: 適合性テスト
+    targettype: ターゲットタイプ
+    target: ターゲット
+    testpurpose: テスト目的
+    testmethod: 試験方法
+    dependency: 前提条件
+    indirectdependency: 間接的な前提条件
+    identifier: 識別子
+    included_in: 含まれる
+    statement: 声明
+    description: 説明
+    guidance: ガイダンス
+    implements: 実装
+    provision: 規範的声明

data/lib/metanorma/default/cleanup.rb

@@ -72,7 +72,7 @@ module Metanorma
       end
 
       def requirement_metadata1_attrs
-        %w(obligation model type)
+        %w(obligation model type class)
       end
 
       def requirement_metadata1_tags

data/lib/metanorma/default/default.rb

@@ -65,6 +65,7 @@ module Metanorma
                     obligation: node.attr("obligation"),
                     filename: node.attr("filename"),
                     type: node.attr("type"),
+                    class: node.attr("class"),
                   ))
       end
 

data/lib/metanorma/modspec/cleanup.rb

@@ -34,7 +34,7 @@ module Metanorma
       def requirement_metadata1(reqt, dlist, ins)
         ins1 = super
         dlist.xpath("./dt").each do |e|
-          tag = e.text&.gsub(/ /, "-")&.downcase
+          tag = e.text&.tr(" ", "-")&.downcase
           tag = "description" if tag == "statement"
           next unless requirement_metadata_component_tags.include?(tag)
 
@@ -93,7 +93,8 @@ module Metanorma
       end
 
       def requirement_metadata_to_component(reqt)
-        xpath = requirement_metadata_component_tags - %w(statement description) -
+        xpath = requirement_metadata_component_tags - %w(statement
+                                                         description) -
           requirement_metadata_requirement_tags
         reqt.xpath(xpath.map { |x| ".//#{x}" }.join(" | ")).each do |c|
           c["class"] = c.name

data/lib/metanorma/modspec/isodoc.rb

@@ -8,7 +8,9 @@ module Metanorma
       def requirement_render1(node)
         init_lookups(node.document)
         ret = requirement_guidance_parse(node, super)
-        requirement_table_cleanup(node, ret)
+        out = requirement_table_cleanup(node, ret)
+        out["class"] = "modspec" # deferred; node["class"] is labelling class
+        out
       end
 
       def recommendation_base(node, _klass)
@@ -17,7 +19,6 @@ module Metanorma
         %w(id keep-with-next keep-lines-together unnumbered).each do |x|
           out[x] = node[x] if node[x]
         end
-        out["class"] = "modspec"
         out["type"] = recommend_class(node)
         recommendation_component_labels(node)
         out
@@ -35,9 +36,9 @@ module Metanorma
       def recommendation_header(reqt, out)
         n = recommendation_name(reqt, nil)
         x = if reqt.ancestors("requirement, recommendation, permission").empty?
-              "<thead><tr><th scope='colgroup' colspan='2'>" \
-                "<p class='#{recommend_name_class(reqt)}'>#{n}</p>" \
-                "</th></tr></thead>"
+              <<~THEAD
+                <thead><tr><th scope='colgroup' colspan='2'><p class='#{recommend_name_class(reqt)}'>#{n}</p></th></tr></thead>
+              THEAD
             else
               "<thead><tr><th>#{recommendation_class_label(reqt)}</th>" \
                 "<td>#{n}</td></tr></thead>"
@@ -129,7 +130,7 @@ module Metanorma
           node.xpath(ns("./classification[tag][value]")).each do |c|
             c.at(ns("./tag")).text.casecmp(x).zero? or next
             xref = recommendation_id(c.at(ns("./value")).children.to_xml) and
-              head << [@labels["modspec"][x.gsub(/-/, "")], xref]
+              head << [@labels["modspec"][x.delete("-")], xref]
           end
         end
         head

data/lib/metanorma/modspec/reqt_label.rb

@@ -1,7 +1,11 @@
-class Nokogiri::XML::Document
-  def reqt_iter(&block)
-    xpath("//xmlns:requirement | //xmlns:recommendation | //xmlns:permission")
-      .each_with_object({}, &block)
+module Nokogiri
+  module XML
+    class Document
+      def reqt_iter(&block)
+        xpath("//xmlns:requirement | //xmlns:recommendation | //xmlns:permission")
+          .each_with_object({}, &block)
+      end
+    end
   end
 end
 
@@ -54,17 +58,13 @@ module Metanorma
       end
 
       def recommendation_class_label(node)
+        node["class"] and return node["class"]
         case node["type"]
-        when "verification" then @labels["modspec"]["conformancetest"]
         when "class" then @labels["modspec"]["#{node.name}class"]
-        when "abstracttest" then @labels["modspec"]["abstracttest"]
-        when "conformanceclass" then @labels["modspec"]["conformanceclass"]
-        else
-          case node.name
-          when "recommendation" then @labels["default"]["recommendation"]
-          when "requirement" then @labels["default"]["requirement"]
-          when "permission" then @labels["default"]["permission"]
-          end
+        when "verification" then @labels["modspec"]["conformancetest"]
+        when "abstracttest", "conformanceclass"
+          @labels["modspec"][node["type"]]
+        else @labels["default"][node.name]
         end
       end
 

data/lib/metanorma/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -226,6 +226,7 @@ files:
 - lib/isodoc-yaml/i18n-en.yaml
 - lib/isodoc-yaml/i18n-es.yaml
 - lib/isodoc-yaml/i18n-fr.yaml
+- lib/isodoc-yaml/i18n-ja.yaml
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc/i18n.rb