mn-requirements 0.5.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45bfa485d0ed37004f7be357184feaf264d3f1511c81d4c238fe76efbcb55160
-  data.tar.gz: b33033cc464bdd80ff7b504d19484ae2e14ff676d286cb3482f74747fd910201
+  metadata.gz: 58cdfecc41db4908d909bbea682bbc79c298c16841018e58fb76c0d92d8183fc
+  data.tar.gz: a9a57c6fa6ae5fec7f6f14b7b7d3d7948fed1f4da9b4df71df9f9a8e4bff0fa7
 SHA512:
-  metadata.gz: 81250e40928eb52e237ce4804509a2b4d2278eac1e2238b8b32c2badb16fe29bdecb8b59c76a2c7e441ec5a839a5a51bdbc92a2ecfe5e07d79e895085f5ea4b6
-  data.tar.gz: 0b55d47abceb725787f91e85615a01b54e957a713c1ba9aba79278956c0ad8d1f43990e7e1f3ab311f7ec21007b48eb472ea51ef25bc750541609be9179eeaf2
+  metadata.gz: a3e95d50c33122bda50a4535d62646131a8a42a270a9c4a8ad1e5604471d4ae3b31cdac269989557a659c4bff7a5ce603a698d51c7abe7e8a60b943df79bd17a
+  data.tar.gz: a407485c15d7cef0e0e0ffe0f94bfa8c88ce567f900865836f6d26788875239f5fc7210e5fa33f9f44b8a416cdecc2781db5e4b34e5683409bc0c9cb85b41b66

data/README.adoc

@@ -2,7 +2,7 @@
 
 image:https://img.shields.io/gem/v/mn-requirements.svg["Gem Version", link="https://rubygems.org/gems/mn-requirements"]
 image:https://github.com/metanorma/mn-requirements/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/mn-requirements/actions?workflow=rake"]
-image:https://codeclimate.com/github/metanorma/mn-requirements/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/mn-requirements"]
+// image:https://codeclimate.com/github/metanorma/mn-requirements/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/mn-requirements"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/mn-requirements.svg["Pull Requests", link="https://github.com/metanorma/mn-requirements/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/mn-requirements/latest.svg["Commits since latest",link="https://github.com/metanorma/mn-requirements/releases"]
 

data/lib/metanorma/default/default.rb

@@ -57,8 +57,10 @@ module Metanorma
       end
 
       def reqt_attrs(node, attrs)
+        anchor = node&.id
         attr_code(attrs.merge(
-                    id: Metanorma::Utils.anchor_or_uuid(node),
+                    id: "_#{UUIDTools::UUID.random_create}",
+                    anchor: anchor && !anchor.empty? ? anchor : nil,
                     unnumbered: node.option?("unnumbered") ? "true" : nil,
                     number: node.attr("number"),
                     subsequence: node.attr("subsequence"),

data/lib/metanorma/modspec/cleanup.rb

@@ -76,11 +76,21 @@ module Metanorma
       end
 
       def requirement_anchor_identifier(reqt)
-        Metanorma::Utils::guid_anchor?(reqt["id"]) or return
+        (!reqt["anchor"] || Metanorma::Utils::guid_anchor?(reqt["anchor"])) or
+          return
         id = reqt.at("./identifier") or return
-        anchor = id.text.strip
+        anchor = identifier2text(id)
         anchor.empty? and return
-        reqt["id"] = Metanorma::Utils::to_ncname(anchor)
+        reqt["anchor"] = anchor
+      end
+
+      # allow case where identifier contains a link, which has not yet been
+      # converted to its target text
+      def identifier2text(ident)
+        m = ident.dup
+        l = m.at("./link[normalize-space(.)='']") and
+          l.replace(l["target"])
+        m.text.strip
       end
 
       def requirement_target_identifiers(reqt)
@@ -105,7 +115,8 @@ module Metanorma
       def requirement_metadata_to_requirement(reqt)
         xpath = requirement_metadata_requirement_tags
         reqt.xpath(xpath.map { |x| "./#{x}" }.join(" | ")).each do |c|
-          c["id"] = Metanorma::Utils::anchor_or_uuid
+          # c["id"] = Metanorma::Utils::anchor_or_uuid
+          c["id"] = "_#{UUIDTools::UUID.random_create}"
           c["model"] = reqt["model"] # all requirements must have a model
           requirement_metadata_to_requirement1(c)
         end
@@ -142,22 +153,29 @@ module Metanorma
 
       def add_misccontainer_anchor_aliases(xmldoc)
         m = add_misc_container(xmldoc)
-        x = ".//table[@id = '_misccontainer_anchor_aliases']/tbody"
+        x = ".//table[@anchor='_misccontainer_anchor_aliases']/tbody"
         unless ins = m.at(x)
-          m << "<table id = '_misccontainer_anchor_aliases'><tbody/></table>"
+          m << "<table anchor='_misccontainer_anchor_aliases' id='_#{UUIDTools::UUID.random_create}'><tbody/></table>"
           ins = m.at(x)
         end
         ins
       end
 
       def requirement_anchor_aliases(reqt)
+        ids = requirement_anchor_aliases_extract(reqt) or return
+        table = add_misccontainer_anchor_aliases(reqt.document)
+        alias_id = reqt["anchor"] or return
+        table << "<tr><th>#{alias_id}</th>#{ids.join}</tr>"
+      end
+
+      def requirement_anchor_aliases_extract(reqt)
         x = reqt.xpath("./identifier")
         x.empty? and return
-        table = add_misccontainer_anchor_aliases(reqt.document)
-        ids = x.each_with_object([]) do |i, m|
+        x.each_with_object([]) do |i, m|
           m << "<td>#{i.text}</td>"
+          alias_id = ::Metanorma::Utils.to_ncname(i.text)
+          alias_id != i.text and m << "<td>#{alias_id}</td>"
         end
-        table << "<tr><th>#{reqt['id']}</th>#{ids.join}</tr>"
       end
 
       def requirement_identifier_cleanup(reqt)

data/lib/metanorma/modspec/validate.rb

@@ -71,7 +71,6 @@ module Metanorma
 
       def reqt_to_conformance(reqt, reqtclass, confclass)
         return unless type2validate(reqt) == reqtclass
-
         r = @ids[:id][reqt["id"]]
         (r[:label] && @ids[:class][confclass]&.any? do |x|
            x[:subject].include?(r[:label])
@@ -143,7 +142,7 @@ module Metanorma
       end
 
       def reqt_links_struct(reqt)
-        { id: reqt["id"], elem: reqt, label: reqt.at("./identifier")&.text,
+        { id: reqt["anchor"], elem: reqt, label: reqt.at("./identifier")&.text,
           subject: classif_tag(reqt, "target"),
           child: reqt.xpath("./requirement | ./recommendation | ./permission")
             .map { |r| r.at("./identifier")&.text },

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -42,5 +42,5 @@ spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "xml-c14n"
+  spec.add_development_dependency "canon"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-25 00:00:00.000000000 Z
+date: 2025-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: xml-c14n
+  name: canon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="