mn-requirements 0.1.2 → 0.1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8395e5702b3fc8bc4a1e45df0523941bc47f7a5c1f680af6012309241b288b1
-  data.tar.gz: 444a5b592596385cbf2792355bafa5cc223e611323320d7fef4d4b1d48cd0336
+  metadata.gz: 5279645cfb3c8b0bd7218196d8d6c1398f1ca3031fd04d6a9187faa1b6378da4
+  data.tar.gz: eb6ab1d3a683760dfc44888114cd9bd96d41ef25248a94693193d667c65fa3a8
 SHA512:
-  metadata.gz: 59654678fcc2a6109f24e08221cac1d1396a5c727c54850861cb7d01fd6c47d22657cc6e7e2b89a2f57692eb9d4d5961468dc1cf36185f229df9c691476f4246
-  data.tar.gz: a601f1ee24d575599b72c9c2d48147dc1dedfe09d79bd00f158ba47980e42b718d5a00e544a42537db6b1c61b0d44812ebee5e98b3a0cbe08fd296c695a5855a
+  metadata.gz: 9be02fb8de6319a90cb9a75ac344e113d55a992c658e6e3b56299e02a04a01a5c00a0aa903e593cf3deb7ce11fc660e249c9e7dc0cf2f3b600e8aba6721369d1
+  data.tar.gz: 97291b88c1ab408bfa8e81ceb3d27f68c55edbb752fa70f19c0f01730671dd1d9109e3859f41557e51e46fdcbe12d2e1cf0fc19126a5cd218e467d4a3b6ca4a0

data/.github/workflows/rake.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/graphviz-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -15,10 +15,10 @@ on:
 
 jobs:
   release:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
-      event_name: ${{ github.event_name }}
     secrets:
       rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
 

data/.rubocop.yml

@@ -8,6 +8,3 @@ inherit_from:
 
 AllCops:
   TargetRubyVersion: 2.5
-
-Metrics/MethodLength:
-  CountAsOne: ['array', 'heredoc']

data/lib/metanorma/modspec/isodoc.rb

@@ -126,10 +126,12 @@ module Metanorma
         return node unless node.at(ns("./component[@class = 'step']"))
 
         d = node.at(ns("./component[@class = 'step']"))
-        d = d.replace("<ol class='steps'><li>#{d.children.to_xml}</li></ol>")
+        id = d["id"] ? " id='#{d['id']}'" : ""
+        d = d.replace("<ol class='steps'><li#{id}>#{d.children.to_xml}</li></ol>")
           .first
         node.xpath(ns("./component[@class = 'step']")).each do |f|
-          f = f.replace("<li>#{f.children.to_xml}</li>").first
+          id = f["id"] ? " id='#{f['id']}'" : ""
+          f = f.replace("<li#{id}>#{f.children.to_xml}</li>").first
           d << f
         end
         node
@@ -137,7 +139,8 @@ module Metanorma
 
       def recommendation_attributes1_component(node, out)
         node = recommendation_steps(node)
-        out << "<tr><td>#{node['label']}</td><td>#{node.children}</td></tr>"
+        id = node["id"] ? " id='#{node['id']}'" : ""
+        out << "<tr#{id}><td>#{node['label']}</td><td>#{node.children}</td></tr>"
         out
       end
 
@@ -168,7 +171,8 @@ module Metanorma
           return reqt_dl(node.first_element_child, out)
         node.name == "component" and
           return recommendation_attributes1_component(node, out)
-        out.add_child("<tr><td colspan='2'></td></tr>").first
+        id = node["id"] ? " id='#{node['id']}'" : ""
+        out.add_child("<tr#{id}><td colspan='2'></td></tr>").first
           .at(ns(".//td")) <<
           (preserve_in_nested_table?(node) ? node : node.children)
         out

data/lib/metanorma/modspec/xrefs.rb

@@ -56,8 +56,8 @@ module Metanorma
 
       def postprocess_anchor_struct(block, anchor)
         super
+        anchor[:xref_bare] = anchor[:xref]
         if l = block.at(ns("./identifier"))&.text
-          anchor[:xref_bare] = anchor[:xref]
           anchor[:xref] += l10n(": ") + "<tt>#{l}</tt>"
         end
         anchor

data/lib/metanorma/requirements/selector.rb

@@ -1,19 +1,22 @@
 require_relative "../default/default"
 require_relative "../modspec/modspec"
 require_relative "../../isodoc/i18n"
+require "metanorma-utils"
 
 module Metanorma
   class Requirements
     attr_accessor :i18n, :labels
 
+    Hash.include Metanorma::Utils::Hash
+
     def initialize(options)
       @default = options[:default]
       @i18n = i18n_klass(options[:lang] || "en",
                          options[:script] || "Latn",
                          options[:i18nhash])
       @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
-      @models = {}
-      model_names.each { |k| @models[k] = create(k) }
+      @models =
+        model_names.each_with_object({}) { |k, m| m[k] = create(k) }
     end
 
     def model_names

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -24,15 +24,13 @@ 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.0"
-  spec.add_dependency "metanorma-utils", "~> 1.3.2"
+  spec.add_dependency "isodoc-i18n", "~> 1.0.7"
+  spec.add_dependency "metanorma-utils", "~> 1.4.0"
 
   spec.add_development_dependency "debug"
   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 "isodoc", "~> 2"
-  spec.add_development_dependency "metanorma-standoc", "~> 2"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1.5.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -94,34 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement