mn-requirements 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0badc555e06715baca7220440eb81778bf749207c6ff43e15e1c8e0417679cd3
-  data.tar.gz: dff076524388287b831304ea8abb1806880d0e960335991bd27b395f58ffdec8
+  metadata.gz: 45bfa485d0ed37004f7be357184feaf264d3f1511c81d4c238fe76efbcb55160
+  data.tar.gz: b33033cc464bdd80ff7b504d19484ae2e14ff676d286cb3482f74747fd910201
 SHA512:
-  metadata.gz: 1cb0ad289dd8ffef0bf50e94b70cf8cbb08b52132dd7326fbda1ee4e23c13f3836af0ec23532ef3a88537e1621e82625a0a09d0fcde8e24e30a9eee87dbf0812
-  data.tar.gz: 1870ea682f4e7120da000da28e6473bf064161bb8c54fcc30e0a8f1679f77a9b6a3981eadca48b5b316ceaa3239f420e0acdd6458f3a365f9d2ec290ee7e299b
+  metadata.gz: 81250e40928eb52e237ce4804509a2b4d2278eac1e2238b8b32c2badb16fe29bdecb8b59c76a2c7e441ec5a839a5a51bdbc92a2ecfe5e07d79e895085f5ea4b6
+  data.tar.gz: 0b55d47abceb725787f91e85615a01b54e957a713c1ba9aba79278956c0ad8d1f43990e7e1f3ab311f7ec21007b48eb472ea51ef25bc750541609be9179eeaf2

data/lib/metanorma/modspec/isodoc.rb

@@ -152,125 +152,123 @@ module Metanorma
       end
 
       def id_attr(node)
-        node["id"] ? " id='#{node['id']}'" : ""
+        id = node["id"] || node["original-id"]
+        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
+          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
+      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).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)
-          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
+      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
-
-        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/requirements/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   class Requirements
-    VERSION = "0.5.0".freeze
+    VERSION = "0.5.2".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.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-04-25 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