mn-requirements 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e3ca9ac70068ad84544ecd69a028aa771675c790affd49f35812b2a8677ffdc
-  data.tar.gz: e47bf092f613aa369275f154a9937f5d32c3b88f9cfddf8492a95268c6d3d76c
+  metadata.gz: 241d16930a4f1ea42bad8fb33599eae423582f76111dbf64272afb20141b69ea
+  data.tar.gz: 63c1107edba65cade52ddd9bda6af1fac1e02540ab2f2904a9e6c1af264f4e3a
 SHA512:
-  metadata.gz: aa55fdb9e247e0c5c22daa72a3ce16e5a953af35bf128cd02782e1a24b261acc0a3bc5ac8eb19db04164b0375d5c6a3d62455eac0eacbb9c1be7e14546e220a1
-  data.tar.gz: 58eba09e93a17784d3cf4540e0c90a6dbf8c7e44a364038d3926183acdb842d061e9375b1e07c9e28955eb768e21d4556517fc3a4caeafb6cc70187614b77db7
+  metadata.gz: d33e761d47985154817ac6334406771946fc1dc88c6fb38a1a76f0db7d0c43beb5bd316bfe5bcf2c5aab7a2bb1c9953e3e4a544ca354b8e4f08a004e3bc14a87
+  data.tar.gz: d276f8e75000218b83442b3c8daa76d43f295b2781488fba401cffc6ec92b76f9fe27313f16135392c40a793f216ec6701e03b45c6d6cbe983d44678bc718b59

data/.github/workflows/release.yml

@@ -18,6 +18,9 @@ jobs:
     uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
+      release_command: rake release
+      bundler_cache: false
+      post_install: gem install bundler rake rspec
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/Gemfile

@@ -9,4 +9,3 @@ gemspec
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
-

data/lib/metanorma/default/isodoc.rb

@@ -45,12 +45,12 @@ module Metanorma
         label, title, name = recommendation_labels(node)
         ret = name ? [name] : []
         if label || title
-          ret << l10n(":") unless ret.empty?
+          ret << ":" unless ret.empty?
           ret += ["<br/>", label]
-          ret << l10n(". ") if label && title
+          ret << ". " if label && title
           ret << title
         end
-        out << "<name>#{ret.compact.join}</name>"
+        out << "<name>#{l10n(ret.compact.join)}</name>"
         out
       end
 
@@ -70,13 +70,14 @@ module Metanorma
       end
 
       def recommendation_attr_parse(node, label)
-        "#{label}: #{node.children.to_xml}"
+        l10n("#{label}: #{node.children.to_xml}")
       end
 
       def recommendation_attr_keyvalue(node, key, value)
         tag = node.at(ns("./#{key}")) or return nil
         value = node.at(ns("./#{value}")) or return nil
-        "#{tag.text.capitalize}: #{value.children.to_xml}"
+        l10n("#{Metanorma::Utils.strict_capitalize_first tag.text}: "\
+            "#{value.children.to_xml}")
       end
 
       def recommendation_attributes(node, out)

data/lib/metanorma/modspec/cleanup.rb

@@ -49,9 +49,17 @@ module Metanorma
           requirement_metadata1(val, d, d)
           d.remove
         end
-        requirement_metadata_requirement_tags.include?(term.text) &&
-          !val.text.empty? and
+        requirement_metadata_requirement_tags.include?(term.text) or
+          return val
+        requirement_metadata1_component_val2id(val)
+      end
+
+      def requirement_metadata1_component_val2id(val)
+        if val.at(".//link") && val.text.strip.empty?
+          val.children = "<identifier>#{val.at('.//link')['target']}</identifier>"
+        elsif !val.text.strip.empty?
           val.children = "<identifier>#{val.text.strip}</identifier>"
+        end
         val
       end
 

data/lib/metanorma/modspec/isodoc.rb

@@ -7,7 +7,7 @@ module Metanorma
       def requirement_render1(node)
         init_lookups(node.document)
         ret = requirement_guidance_parse(node, super)
-        requirement_table_cleanup(ret)
+        requirement_table_cleanup(node, ret)
       end
 
       def recommendation_base(node, _klass)
@@ -52,9 +52,9 @@ module Metanorma
         return ret unless title &&
           node.ancestors("requirement, recommendation, permission").empty?
 
-        ret += l10n(": ") unless !name || name.text.empty?
+        ret += ": " unless !name || name.text.empty?
         ret += title.children.to_xml
-        ret
+        l10n(ret)
       end
 
       def recommendation_attributes(node, out)
@@ -152,7 +152,7 @@ module Metanorma
         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]
+        [Metanorma::Utils.strict_capitalize_first(tag.text), value.children]
       end
 
       def reqt_component_type(node)
@@ -197,7 +197,7 @@ module Metanorma
         out
       end
 
-      def requirement_table_cleanup(table)
+      def requirement_table_cleanup(_node, table)
         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

@@ -48,7 +48,7 @@ module Metanorma
 
       def recommendation_class_label(node)
         case node["type"]
-        when "verification" then @labels["modspec"]["#{node.name}test"]
+        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"]

data/lib/metanorma/modspec/validate.rb

@@ -27,6 +27,7 @@ module Metanorma
       def type2validate(reqt)
         type = reqt["type"]
         type = "general" if type.nil? || type.empty?
+        type = "verification" if type == "abstracttest"
         type
       end
 
@@ -48,7 +49,7 @@ module Metanorma
 
         r = @ids[:id][reqt["id"]]
         (r[:label] && @ids[:class][confclass]&.any? do |x|
-           x[:subject] == r[:label]
+           x[:subject].include?(r[:label])
          end) and return
         log_reqt(r, reqtclass, confclass)
       end
@@ -58,7 +59,7 @@ module Metanorma
 
         r = @ids[:id][reqt["id"]]
         (r[:subject] && @ids[:class][reqtclass]&.any? do |x|
-           r[:subject] == x[:label]
+           r[:subject].include?(x[:label])
          end) and return
         log_reqt(r, confclass, reqtclass)
       end
@@ -100,7 +101,8 @@ module Metanorma
 
       def reqt_links_struct(reqt)
         { id: reqt["id"], elem: reqt, label: reqt.at("./identifier")&.text,
-          subject: reqt.at("./classification[tag = 'target']/value")&.text,
+          subject: reqt.xpath("./classification[tag = 'target']/value")
+            .map(&:text),
           child: reqt.xpath("./requirement | ./recommendation | ./permission")
             .map do |r|
                    r.at("./identifier")&.text

data/lib/metanorma/modspec/xrefs.rb

@@ -9,11 +9,11 @@ module Metanorma
             xpath: "requirement[@type = 'class']" },
           { klass: "recommendationclass", label: @labels["modspec"]["recommendationclass"],
             xpath: "recommendation[@type = 'class']" },
-          { klass: "permissiontest", label: @labels["modspec"]["permissiontest"],
+          { klass: "permissiontest", label: @labels["modspec"]["conformancetest"],
             xpath: "permission[@type = 'verification']" },
-          { klass: "recommendationtest", label: @labels["modspec"]["recommendationtest"],
+          { klass: "recommendationtest", label: @labels["modspec"]["conformancetest"],
             xpath: "recommendation[@type = 'verification']" },
-          { klass: "requirementtest", label: @labels["modspec"]["requirementtest"],
+          { klass: "requirementtest", label: @labels["modspec"]["conformancetest"],
             xpath: "requirement[@type = 'verification']" },
           { klass: "abstracttest", label: @labels["modspec"]["abstracttest"],
             xpath: "permission[@type = 'abstracttest']" },

data/lib/metanorma/requirements/selector.rb

@@ -13,6 +13,7 @@ module Metanorma
       @default = options[:default]
       @i18n = i18n_klass(options[:lang] || "en",
                          options[:script] || "Latn",
+                         options[:locale],
                          options[:i18nhash])
       @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
       @models =
@@ -23,8 +24,9 @@ module Metanorma
       %i[default ogc]
     end
 
-    def i18n_klass(lang = "en", script = "Latn", i18nhash = nil)
-      ::IsoDoc::MnRequirementsI18n.new(lang, script, i18nhash: i18nhash)
+    def i18n_klass(lang, script, locale = nil, i18nhash = nil)
+      ::IsoDoc::MnRequirementsI18n.new(lang, script, locale: locale,
+                                                     i18nhash: i18nhash)
     end
 
     # all roles that can be assigned to an example to make it a reqt,

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "isodoc-i18n", "~> 1.0.7"
+  spec.add_dependency "isodoc-i18n", "~> 1.1.2"
   spec.add_dependency "metanorma-utils", "~> 1.4.0"
 
   spec.add_development_dependency "debug"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-23 00:00:00.000000000 Z
+date: 2022-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement