mn-requirements 0.5.1 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d557ae4ed71baabb926e12c579a4c1e07f14f0573caacd8cea6b3f2be33057b
-  data.tar.gz: 0f2f09d925e1fbe06fbe782545d21823a34f687345b0993aa0e27c2c27436e1e
+  metadata.gz: 2ef4d021215deb4324b8fa93055251ec2c07a1756a99d33aa0733b3b84ff4d4a
+  data.tar.gz: 5f716ed0412c4a62aace69406099e356f54b432453d3fb85089e9377a614705d
 SHA512:
-  metadata.gz: ee8c23fab75c8bfbfb679942af6053898eb1aa4f0c365fdc7244e6eb39541b05e59b1afa668628d9f6d4a4cb51e61e0d0059446640265717695dbbf61635c29d
-  data.tar.gz: 4e84dae849f84ab1392e3f25e571e3c0ff8a6328c885b468e834eec9e287e158a72bc4e59c98effe38eeff86e5185f64b04886436c53fe1e81760cabb52ee8a1
+  metadata.gz: 3f6bc5c6f41577a1752e453d303a80cfb832f9cc0f482b279bfe7299ab932f424d82c5363deb8705001cc9058598f423e15ed6de5fd25ab2865855015824d96b
+  data.tar.gz: 2eece26b7b81d11902325d1b72c7876ff4af7804b297a81fd2d9173db76093d6a5c07867baa81a4d1ba258bfb0e2fbb05e28b614b6f12d64e6cad36597e5a931

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,13 @@ module Metanorma
       end
 
       def requirement_anchor_identifier(reqt)
-        Metanorma::Utils::guid_anchor?(reqt["id"]) or return
+        # 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.empty? and return
-        reqt["id"] = Metanorma::Utils::to_ncname(anchor)
+        # reqt["id"] = Metanorma::Utils::to_ncname(anchor)
+        reqt["anchor"] = anchor
       end
 
       def requirement_target_identifiers(reqt)
@@ -105,7 +107,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 +145,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/isodoc.rb

@@ -156,163 +156,119 @@ module Metanorma
         id ? " id='#{id}'" : ""
       end
 
-      # KILL
-      def recommendation_stepsX(node)
-        node.elements.each { |e| recommendation_steps(e) }
-        node.at(ns("./component[@class = 'step']")) or return node
-        d = node.at(ns("./component[@class = 'step']"))
+      def recommendation_steps(node, ret)
+        ret.elements.each_with_index do |e, i|
+          e1 = nil
+          e.name == "component" && e["class"] == "step" and
+            e1 = e.replace(semx_fmt_dup(node.elements[i]))
+          recommendation_steps(node.elements[i], e1 || e)
+        end
+        node.name == "component" && node["class"] == "step" and
+          ret["inlist"] = "true"
+        d = ret.at(ns("./semx[@inlist]")) or return ret
+        d.delete("inlist")
         d = d.replace("<ol class='steps'><li#{id_attr(d)}>" \
-        "#{to_xml(d.children)}</li></ol>").first
-        node.xpath(ns("./component[@class = 'step']")).each do |f|
-          f = f.replace("<li#{id_attr(f)}>#{to_xml(f.children)}</li>").first
+                      "#{to_xml(d)}</li></ol>").first
+        ret.xpath(ns("./semx[@inlist]")).each do |f|
+          f.delete("inlist")
+          f = f.replace("<li#{id_attr(f)}>#{to_xml(f)}</li>").first
           d << f
         end
-          node
+        ret
       end
 
+      def recommendation_attributes1_component(node, ret, out)
+        node["class"] == "guidance" and return out
+        ret = recommendation_steps(node, ret)
+        out << "<tr#{id_attr(node)}><th>#{node['label']}</th>" \
+          "<td>#{to_xml(ret)}</td></tr>"
+        node.delete("label") # inserted in recommendation_component_labels
+        out
+      end
 
-        def recommendation_steps(node, ret)
-          ret.elements.each_with_index do |e, i|
-            e1 = nil
-            #require "debug"; e.name == "component" && e["class"] == "step" and binding.b
-            e.name == "component" && e["class"] == "step" and
-              e1 = e.replace(semx_fmt_dup(node.elements[i]))
-            #require "debug"; e.name == "component" && e["class"] == "step" and binding.b
-            recommendation_steps(node.elements[i], e1 || e)
-          end
-          node.name == "component" && node["class"] == "step" and ret["inlist"] = "true"
-          #require "debug"; node.name == "component" && node["class"] == "step" and binding.b
-          d = ret.at(ns("./semx[@inlist]")) or return ret
-          d.delete("inlist")
-          d = d.replace("<ol class='steps'><li#{id_attr(d)}>" \
-                        "#{to_xml(d)}</li></ol>").first
-          ret.xpath(ns("./semx[@inlist]")).each do |f|
-            f.delete("inlist")
-            f = f.replace("<li#{id_attr(f)}>#{to_xml(f)}</li>").first
-            d << f
-          end
-          ret
-        end
-
-        def recommendation_attributes1_component(node, ret, out)
-          node["class"] == "guidance" and return out
-          ret = recommendation_steps(node, ret)
-          out << "<tr#{id_attr(node)}><th>#{node['label']}</th>" \
-            "<td>#{to_xml(ret)}</td></tr>"
-          node.delete("label") # inserted in recommendation_component_labels
-          out
-        end
-
-        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 identifier-base
+      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 identifier-base
             implements).include?(tag.text.downcase) or
-            return nil
-            lbl = semx_fmt_dup(tag)
-            lbl.children = Metanorma::Utils.strict_capitalize_first(lbl.text)
-            [to_xml(lbl), semx_fmt_dup(value)]
-        end
-
-        def reqt_component_type(node)
-          klass = node.name
-          klass == "component" and klass = node["class"]
-          "requirement-#{klass}"
-        end
-
-        # KILL
-        def preserve_in_nested_table?(node)
-          %w(recommendation requirement permission
-           table ol dl ul).include?(node.name)
-        end
+          return nil
+        lbl = semx_fmt_dup(tag)
+        lbl.children = Metanorma::Utils.strict_capitalize_first(lbl.text)
+        [to_xml(lbl), semx_fmt_dup(value)]
+      end
 
-        # KILL
-        def requirement_component_parse(node, out)
-          node["exclude"] == "true" and return out
-          ret = semx_fmt_dup(node)
-          descr_classif_render(node, ret)
-          ret.elements.size == 1 && ret.first_element_child.name == "dl" and
-            return reqt_dl(ret.first_element_child, out)
-          node.name == "component" and
-            return recommendation_attributes1_component(node, ret, out)
-          node.name == "description" and
-            return requirement_description_parse(node, ret, out)
-          id = node["id"] || node["original-id"]
-          !preserve_in_nested_table?(node) && id and attr = " id='#{id}'"
-          out.add_child("<tr#{id_attr(node)}><td colspan='2'#{attr}></td></tr>").first
-            .at(ns(".//td")) <<
-          (preserve_in_nested_table?(node) ? node.dup : ret)
-          out
-        end
+      def reqt_component_type(node)
+        klass = node.name
+        klass == "component" and klass = node["class"]
+        "requirement-#{klass}"
+      end
 
-          def preserve_in_nested_table?(node)
-          #%w(recommendation requirement permission table ol dl ul hr br p).include?(node.name)
-          !%w(subject inherit identifier measurement-target specification verification import description component).include?(node.name)
-        end
+      def preserve_in_nested_table?(node)
+        !%w(subject inherit identifier measurement-target specification
+            verification import description component).include?(node.name)
+      end
 
-         def requirement_component_parse(node, out)
-          node["exclude"] == "true" and return out
-          ret = semx_fmt_dup(node)
-          descr_classif_render(node, ret)
-          id = node["id"] || node["original-id"]
-          id and attr = " id='#{id}'"
-          preserve = preserve_in_nested_table?(node)
-          if id == node["id"]
-            if node["original-id"]
-              attr = " id='#{node["original-id"]}'"
-            else
+      def requirement_component_parse(node, out)
+        node["exclude"] == "true" and return out
+        ret = semx_fmt_dup(node)
+        descr_classif_render(node, ret)
+        id = node["id"] || node["original-id"]
+        id and attr = " id='#{id}'"
+        preserve = preserve_in_nested_table?(node)
+        if id == node["id"]
+          if node["original-id"]
+            attr = " id='#{node['original-id']}'"
+          else
             node["original-id"] = node["id"]
-            end
-            node.delete("id")
           end
-          if preserve
-            n = Nokogiri::XML::Node.new(node.name, node.document)
-            node.attributes.each { |k, v| n[k] = v }
-            node.children.empty? or n << ret
-            ret = n
-          end
-          ret.elements.size == 1 && ret.first_element_child.name == "dl" and
-            return reqt_dl(ret.first_element_child, out)
-          node.name == "component" and
-            return recommendation_attributes1_component(node, ret, out)
-          node.name == "description" and
-            return requirement_description_parse(node, ret, out)
-          #!preserve_in_nested_table?(node) && id and attr = " id='#{id}'"
-          out.add_child("<tr#{attr}><td colspan='2'></td></tr>").first
-            .at(ns(".//td")) << (%(permission requirement recommendation).include?(node.name) ? node.dup : ret)
-          #(preserve_in_nested_table?(node) ? node.dup : ret)
-          out
+          node.delete("id")
         end
-
-        def requirement_description_parse(node, ret, out)
-          lbl = "description"
-          recommend_class(node.parent) == "recommend" and
-            lbl = "statement"
-          out << "<tr><th>#{@labels['modspec'][lbl]}</th>" \
-            "<td>#{to_xml(ret)}</td></tr>"
-          out
+        if preserve
+          n = Nokogiri::XML::Node.new(node.name, node.document)
+          node.attributes.each { |k, v| n[k] = v }
+          node.children.empty? or n << ret
+          ret = n
         end
+        ret.elements.size == 1 && ret.first_element_child.name == "dl" and
+          return reqt_dl(ret.first_element_child, out)
+        node.name == "component" and
+          return recommendation_attributes1_component(node, ret, out)
+        node.name == "description" and
+          return requirement_description_parse(node, ret, out)
+        out.add_child("<tr#{attr}><td colspan='2'></td></tr>").first
+          .at(ns(".//td")) << (%(permission requirement recommendation).include?(node.name) ? node.dup : ret)
+        out
+      end
 
-        def requirement_guidance_parse(node, out)
-          ins = out.at(ns("./fmt-provision/table/tbody"))
-          origs = node.xpath(ns("./component[@class = 'guidance']"))
-          out.xpath(ns("./component[@class = 'guidance']")).each_with_index do |f, i|
-            f.delete("label")
-            ins << "<tr#{id_attr(f)}><th>#{@labels['modspec']['guidance']}</th>" \
-              "<td>#{to_xml(semx_fmt_dup(origs[i]))}</td></tr>"
-          end
-          out
+      def requirement_description_parse(node, ret, out)
+        lbl = "description"
+        recommend_class(node.parent) == "recommend" and
+          lbl = "statement"
+        out << "<tr><th>#{@labels['modspec'][lbl]}</th>" \
+          "<td>#{to_xml(ret)}</td></tr>"
+        out
+      end
+
+      def requirement_guidance_parse(node, out)
+        ins = out.at(ns("./fmt-provision/table/tbody"))
+        origs = node.xpath(ns("./component[@class = 'guidance']"))
+        out.xpath(ns("./component[@class = 'guidance']")).each_with_index do |f, i|
+          f.delete("label")
+          ins << "<tr#{id_attr(f)}><th>#{@labels['modspec']['guidance']}</th>" \
+            "<td>#{to_xml(semx_fmt_dup(origs[i]))}</td></tr>"
         end
+        out
+      end
 
-        def reqt_dl(node, out)
-          node.xpath(ns("./dt")).each do |dt|
-            dd = dt.next_element
-            dd&.name == "dd" or next
-            out.add_child("<tr><th>#{to_xml(dt.children)}</th>" \
-                          "<td>#{to_xml(dd.children)}</td></tr>")
-          end
-          out
+      def reqt_dl(node, out)
+        node.xpath(ns("./dt")).each do |dt|
+          dd = dt.next_element
+          dd&.name == "dd" or next
+          out.add_child("<tr><th>#{to_xml(dt.children)}</th>" \
+                        "<td>#{to_xml(dd.children)}</td></tr>")
         end
+        out
       end
     end
   end
+end

data/lib/metanorma/modspec/table_cleanup.rb

@@ -74,33 +74,29 @@ module Metanorma
         ret
       end
 
-      # KILL
       def requirement_table_nested_cleanup(node, out, table)
-        table.xpath(ns("./tbody/tr/td/table")).each do |t|
-          x = t.at(ns("./thead/tr")) or next
-          x.at(ns("./th")).children =
-            requirement_table_nested_cleanup_hdr(node)
-          f = x.at(ns("./td/fmt-name")) and
-            f.replace(f.children)
-          t.parent.parent.replace(x)
-        end
-        table
-      end
-
-      def requirement_table_nested_cleanup(node, out, table)
-        table.xpath(ns("./tbody/tr/td/*/fmt-provision/table")).each do |t|
-          x = t.at(ns("./thead/tr")) or next
-          x.at(ns("./th")).children =
-            requirement_table_nested_cleanup_hdr(node)
-          f = x.at(ns("./td/fmt-name")) and
-            f.parent.children = to_xml(f.children).strip
-          td = x.at(ns("./td"))
-          td["id"] = t["original-id"] || t["id"]
-          if desc = t.at(ns("./tbody/tr/td/semx[@element = 'description']"))
-            p = desc.at(ns("./p")) and p.replace(p.children)
-td << " #{to_xml(desc)}"
+        rows = []
+        table.xpath(ns("./tbody/tr/td/*/fmt-provision/table"))
+          .sort_by do |t|
+            [t.at(ns(".//fmt-name//span[@class = 'fmt-element-name']"))&.text,
+             t.at(ns(".//fmt-name//semx[@element = 'autonum']"))&.text&.to_i]
+          end.each do |t|
+            x = t.at(ns("./thead/tr")) or next
+            x.at(ns("./th")).children =
+              requirement_table_nested_cleanup_hdr(node)
+            f = x.at(ns("./td/fmt-name")) and
+              f.parent.children = to_xml(f.children).strip
+            td = x.at(ns("./td"))
+            td["id"] = t["original-id"] || t["id"]
+            if desc = t.at(ns("./tbody/tr/td/semx[@element = 'description']"))
+              p = desc.at(ns("./p")) and p.replace(p.children)
+              td << " #{to_xml(desc)}"
+            end
+            rows << x
           end
-          t.parent.parent.parent.parent.replace(x)
+        table.xpath(ns("./tbody/tr[./td/*/fmt-provision/table]"))
+          .each_with_index do |t, i|
+          t.replace(rows[i])
         end
         out.xpath(ns("./*/fmt-provision")).each(&:remove)
         table
@@ -135,10 +131,10 @@ td << " #{to_xml(desc)}"
       def expand_xrefs_in_reqt(table)
         table.xpath(ns(".//xref[not(@style)][string-length() = 0]"))
           .each do |x|
-          @xrefs.anchor(x["target"], :modspec, false) or next # modspec xrefs only
-          ref = @xrefs.anchor(x["target"], :xref, false) or next
-          x << ref
-        end
+            @xrefs.anchor(x["target"], :modspec, false) or next # modspec xrefs only
+            ref = @xrefs.anchor(x["target"], :xref, false) or next
+            x << ref
+          end
       end
 
       def truncate_id_base_in_reqt(table)

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.1".freeze
+    VERSION = "0.5.4".freeze
   end
 end

data/mn-requirements.gemspec

@@ -37,8 +37,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "metanorma-standoc", ">= 2.8.0"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.5.2"
-  spec.add_development_dependency "sassc", "2.4.0"
+  spec.add_development_dependency "rubocop", "~> 1"
+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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -156,28 +156,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: sassc
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sassc-embedded
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -279,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Requirements processing and rendering according to different models