mn-requirements 0.5.10 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e446f52e8a55fc21a99df29ce798a2a7ea84d987d07aceb23d64b5c1c77be7e3
-  data.tar.gz: f1142726f55149df21ff127df360b656cd14b9c376f7d13844ba04451239b5b1
+  metadata.gz: a9c3746379428caff796ce59625c1642ec417399c50bd0544227a80a0152ca61
+  data.tar.gz: 0ebf8d83e75efca52ea7b76b81e6aaf2f8d02236b2ad37ed670784832e1bd9e4
 SHA512:
-  metadata.gz: 2617c33c902c0caddd8ac9f47f4b9fd497ce04482ef53195d50e13776e3f2a165ec1c13f3891efb67cfdbfc11b891dcff9a598894bf344d6f97a3b538bc171b8
-  data.tar.gz: dba9959bd392290b870c539410f8d50b55203308d96b3ec786c1c6a9532bcbc7e650f89a614390425f2fe21d52853109dfd63f792729de68aab92b20345ab684
+  metadata.gz: a0f30d1674c1d097d8494eac7606d7275a1df0f180ddc9fbc8b92eb9f6ea5020f4470c603f02e1597844e884bf882f86f4ca5787bb2c6bacde9519c39ce40a39
+  data.tar.gz: 10547de736b015b3e4ca782ebee129fbfc46b0c27fbe7f946f24ac4e2e42e6323e5599e131442837f3e157714c1596443dcc703eed2596999ed20dbcf6339c18

data/.rubocop.yml

@@ -1,10 +1,22 @@
 # Auto-generated by Cimas: Do not edit it manually!
 # See https://github.com/metanorma/cimas
 inherit_from:
-  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
+
+# Rubocop plugins enabled centrally so every metanorma-org gem picks them up
+# on cimas sync — best practice belongs at the shared-template layer, not
+# per-repo. Per ronaldtse feedback on metanorma/ci#332.
+plugins:
+  - rubocop-rspec
+  - rubocop-performance
+  - rubocop-rake
 
 # local repo-specific modifications
 # ...
 
 AllCops:
-  TargetRubyVersion: 2.5
+  # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
+  # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
+  # this commit — 3.4 was above the org's stated minimum and would have
+  # applied Rubocop rules that fail-close on gems still targeting 3.3.
+  TargetRubyVersion: 3.3

data/lib/metanorma/default/isodoc.rb

@@ -1,4 +1,3 @@
-require "isodoc"
 
 module Metanorma
   class Requirements

data/lib/metanorma/modspec/table_cleanup.rb

@@ -69,31 +69,27 @@ module Metanorma
           r.at(ns("./th"))&.text&.strip == hdr or break
           td = r.remove.at(ns("./td"))
           id = td["id"] ? "<bookmark id='#{td['id']}'/>" : ""
-          ret << id + to_xml(td.children).strip
+          ret << (id + to_xml(td.children).strip)
         end
         ret
       end
 
       def requirement_table_nested_cleanup(node, out, table)
         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
+        requirement_table_nested_cleanup_sort(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)}"
           end
+          rows << x
+        end
         table.xpath(ns("./tbody/tr[./td/*/fmt-provision/table]"))
           .each_with_index do |t, i|
           t.replace(rows[i])
@@ -102,6 +98,25 @@ module Metanorma
         table
       end
 
+      def requirement_table_nested_cleanup_sort(table)
+        table.xpath(ns("./tbody/tr/td/*/fmt-provision/table"))
+          .sort_by do |t|
+            [t.at(ns(".//fmt-name//span[@class = 'fmt-element-name']"))&.text,
+             *autonum_sort_key(
+               t.at(ns(".//fmt-name//semx[@element = 'autonum']"))&.text,
+             )]
+          end
+      end
+
+      # allow autonum to be sorted numerically, but break up non-numeric text
+      # to allow for autonum values like "1a", "1b", etc. and delimited autonum
+      # values like "1.1", "1.2", etc.
+      def autonum_sort_key(text)
+        text ||= ""
+        nums = text.scan(/\d+/).map(&:to_i)
+        [nums, text]
+      end
+
       def requirement_table_nested_cleanup_hdr(node)
         label = "provision"
         node["type"] == "conformanceclass" and label = "conformancetest"

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-standoc", ">= 3.4.1"
+  spec.add_development_dependency "metanorma-standoc", ">= 3.4.2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.12
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -156,14 +155,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.1
+        version: 3.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -271,7 +270,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".hound.yml"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -307,7 +305,6 @@ homepage: https://github.com/metanorma/mn-requirements
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -322,8 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Requirements processing and rendering according to different models
 test_files: []

data/.hound.yml

@@ -1,5 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-ruby:
-  enabled: true
-  config_file: .rubocop.yml