mn-requirements 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e6c91b33ab3f3b3eb4ce26df120009dfe92441024891d766115421023630ea
-  data.tar.gz: 800e1d60081b242bd3aa921004839ac0cabbcde5102a6d8c29d1d652e22b5cfc
+  metadata.gz: 333a04af44a0a5f5f1d5eab78dcd03e017ef31496a149040d516083d1b59d00f
+  data.tar.gz: 2cc3b4028414b0a623e8b81e49b5f89845c09d856a08c9b71fcc60348f3241fc
 SHA512:
-  metadata.gz: ad9db2b90feb438a6e146cc943585ccaf81b525147b9556860f11175976e65c247b44d2d084cfcae43b9d89fbba7d9b7bab8fef00f5d2051ea7ed1fd450b0c77
-  data.tar.gz: 4d875db98cb7ef2942ead616f49268314a12e592aecd5422b7f586fd98cf8fdf485d752e2fdf522dd9dc4640aab1f5e9e12e5c79dff6debbd9f17687396b3b32
+  metadata.gz: 1bed26229a755a97e10394112feeee667273fa0b924033300b85b411f341d07912c28946ada743401784b60764c5d1b6a57836ae316b24d1093b57875f64f24c
+  data.tar.gz: ab52fa615cb6db3999a1fff035dbd30143e27f6f4a8eed2153e403a7f79ed257437892be78b61160dea9ce6d4a0fa59d1edf59c008b6006338a23aa57909b7b1

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/isodoc-yaml/i18n-ar.yaml

@@ -24,3 +24,4 @@ requirements:
     indirectdependency: التبعية غير المباشرة
     identifier: المعرف
     included_in: مدرج في
+    statement: بيان

data/lib/isodoc-yaml/i18n-de.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: Indirekte Abhängigkeit
     identifier: Kennung
     included_in: Enthalten in
-
+    statement: Aussage

data/lib/isodoc-yaml/i18n-en.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: Indirect Dependency
     identifier: Identifier
     included_in: Included in
-
+    statement: Statement

data/lib/isodoc-yaml/i18n-es.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: Dependencia indirecta
     identifier: Identificador
     included_in: Incluido en
-
+    statement: Declaración

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: Dépendance indirecte
     identifier: Identifiant
     included_in: Inclus dans
-
+    statement: Déclaration

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: Косвенная зависимость
     identifier: Идентификатор
     included_in: Входит в
-
+    statement: Утверждение

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -24,4 +24,4 @@ requirements:
     indirectdependency: 间接依赖
     identifier: 标识符
     included_in: 包含在
-
+    statement: 陈述

data/lib/metanorma/modspec/isodoc.rb

@@ -51,7 +51,7 @@ module Metanorma
         return ret unless title &&
           node.ancestors("requirement, recommendation, permission").empty?
 
-        ret += l10n(": ") if name
+        ret += l10n(": ") unless !name || name.text.empty?
         ret += title.children.to_xml
         ret
       end
@@ -67,8 +67,8 @@ module Metanorma
 
       def recommend_title(node, out)
         label = node.at(ns("./identifier")) or return
-        out.add_child("<tr><td>#{@labels['modspec']['identifier']}</td>"\
-                      "<td><tt>#{label.children.to_xml}</tt></td>")
+        out.add_child("<tr><td scope='colgroup' colspan='2'>"\
+                      "<tt>#{label.children.to_xml}</tt></td>")
       end
 
       def recommendation_attributes1(node)

data/lib/metanorma/modspec/reqt_label.rb

@@ -65,7 +65,8 @@ module Metanorma
         docxml.xpath(ns("//requirement | //recommendation | //permission"))
           .each_with_object({}) do |r, m|
             id = r.at(ns("./identifier")) or next
-            m[id.text] = r["id"]
+            m[id.text] =
+              { id: r["id"], lbl: @xrefs.anchor(r["id"], :xref, false) }
           end
       end
 
@@ -77,7 +78,7 @@ module Metanorma
 
             subj = r.at(ns("./classification[tag = 'target']/value"))
             id = r.at(ns("./identifier")) or next
-            lbl = @xrefs.anchor(@reqt_ids[id.text.strip], :xref, false)
+            lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
             next unless subj && lbl
 
             m[subj.text] = { lbl: lbl, id: r["id"] }
@@ -98,7 +99,7 @@ module Metanorma
             r.xpath(ns("./requirement | ./recommendation | ./permission"))
               .each do |r1|
               id1 = r1.at(ns("./identifier")) or next
-              lbl = @xrefs.anchor(@reqt_ids[id.text.strip], :xref, false)
+              lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
               next unless lbl
 
               m[id1.text] = { lbl: lbl, id: r["id"] }
@@ -113,7 +114,7 @@ module Metanorma
 
       def recommendation_id(ident)
         test = @reqt_ids[ident&.strip] or return ident&.strip
-        "<xref target='#{test}'>#{ident.strip}</xref>"
+        "<xref target='#{test[:id]}'>#{test[:lbl]}</xref>"
       end
     end
   end

data/lib/metanorma/modspec/xrefs.rb

@@ -57,6 +57,7 @@ module Metanorma
       def postprocess_anchor_struct(block, anchor)
         super
         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.merge(options[:labels] || {})["requirements"]
-      @models = {}
-      model_names.each { |k| @models[k] = create(k) }
+      @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
+      @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.0".freeze
+    VERSION = "0.1.3".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.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-30 00:00:00.000000000 Z
+date: 2022-09-05 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
@@ -254,7 +226,7 @@ homepage: https://github.com/metanorma/mn-requirements
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -269,8 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Requirements processing and rendering according to different models
 test_files: []