mn-requirements 0.2.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed29bf407c16d8890bb04abf9028498f568a8d42cb2d232aab1f2312ccd045c3
-  data.tar.gz: 7cb6924aa3b79542533047703be36e769b4e69b299c052868232ed81764b45c0
+  metadata.gz: ba924dc80c3e45c7164b660a0415fc57f9e504a353eef2520394e10457cdbcc4
+  data.tar.gz: 5e365fbe452fc974b49df62dd50f026ebf59138a4a944ae20df769c2072192ca
 SHA512:
-  metadata.gz: bb1c844f85032d0fac0c678259ca2983debbbe55f7cbf308d155aac2f7f8169142ec2f838a57c0329dd6f9aa1d007e4040c7e3cf0bdf33205b41b6cdc737e40b
-  data.tar.gz: 49b72dcb20a45e87f82fa0b64bdc7db99374f2cf2c1c0bb031543cef803306e17e240b015c9a6a120a9714d5f8064dc4d18d72adad71d27e4864f91d24f88778
+  metadata.gz: aad5df40295c9009f021eae54be6e57a0976ead82165cd1299eb55587e8d313577be4c9bf06f78a42e2d2868bc568ad3d8de904203034656e9e8902727b079f3
+  data.tar.gz: 9a23a9809a2f6d24a1ab1db10409a4fd232076f42e8060d5efa60789454b958f08df548a949e9e2eced622f80a8e8d30b7c34eb1d943cbf2213de5e3e89884f0

data/lib/metanorma/default/default.rb

@@ -95,7 +95,9 @@ module Metanorma
         end.join("\n")
       end
 
-      def validate(reqt, log); end
+      def validate(_reqt, _log)
+        []
+      end
     end
   end
 end

data/lib/metanorma/modspec/reqt_label.rb

@@ -23,7 +23,7 @@ module Metanorma
 
       def recommendation_label_xref(elem, label, xrefs, type)
         id = @reqtlabels[label]
-        number = xrefs.anchor(id, :xref, false)
+        number = xrefs.anchor(id, :modspec, false)
         number.nil? and return type
         elem.ancestors("requirement, recommendation, permission").empty? and
           return number
@@ -73,7 +73,7 @@ module Metanorma
         docxml.reqt_iter do |r, m|
           id = r.at(ns("./identifier")) or next
           m[id.text] =
-            { id: r["id"], lbl: @xrefs.anchor(r["id"], :xref, false) }
+            { id: r["id"], lbl: @xrefs.anchor(r["id"], :modspec, false) }
         end
       end
 
@@ -85,7 +85,7 @@ module Metanorma
         %w(conformanceclass verification).include?(reqt["type"]) or return
         subj = reqt_extract_target(reqt)
         id = reqt.at(ns("./identifier")) or return
-        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
+        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :modspec, false)
         (subj && lbl) or return
         acc[subj.text] = { lbl: lbl, id: reqt["id"] }
       end
@@ -121,7 +121,7 @@ module Metanorma
 
       def reqt_links_class1(id, parent_reqt, reqt, acc)
         id1 = reqt.at(ns("./identifier")) or return acc
-        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :xref, false)
+        lbl = @xrefs.anchor(@reqt_ids[id.text.strip][:id], :modspec, false)
         lbl or return acc
         acc[id1.text] = { lbl: lbl, id: parent_reqt["id"] }
         acc

data/lib/metanorma/modspec/validate.rb

@@ -4,10 +4,12 @@ module Metanorma
   class Requirements
     class Modspec < Default
       def validate(reqt, log)
+        @fatalerrors = []
         @log ||= log
         @ids ||= reqt_links(reqt.document)
         reqt_cycles_validate
         reqt_link_validate(reqt)
+        @fatalerrors
       end
 
       def nested_reqt?(reqt)
@@ -112,17 +114,26 @@ module Metanorma
           .each_with_object({ id: {}, class: {}, label: {} }) do |r, m|
             next if nested_reqt?(r)
 
-            reqt_links1(r, m)
+            reqt_links1(r, m, type2validate(r), reqt_links_struct(r))
           end
       end
 
-      def reqt_links1(reqt, hash)
-        type = type2validate(reqt)
-        a = reqt_links_struct(reqt)
-        hash[:id][reqt["id"]] = a
+      def reqt_links1(reqt, hash, type, struct)
+        hash[:id][reqt["id"]] = struct
         hash[:class][type] ||= []
-        hash[:class][type] << a
-        hash[:label][a[:label]] = reqt["id"]
+        hash[:class][type] << struct
+        reqt_links1_label(reqt, hash, struct)
+      end
+
+      def reqt_links1_label(reqt, hash, struct)
+        return hash unless struct[:label]
+
+        if hash[:label][struct[:label]]
+          msg = "Modspec identifier #{struct[:label]} is used more than once"
+          @log.add("Requirements", reqt, msg)
+          @fatalerrors << msg
+        end
+        hash[:label][struct[:label]] = reqt["id"]
         hash
       end
 

data/lib/metanorma/modspec/xrefs.rb

@@ -72,10 +72,10 @@ module Metanorma
       def postprocess_anchor_struct(block, anchor)
         super
         anchor[:xref_bare] = anchor[:xref]
-        if l = block.at(ns("./identifier"))&.text
+        l = block.at(ns("./identifier")) and
           anchor[:xref] += l10n(": ") +
-            "<tt><xref style='id' target='#{block['id']}'>#{l}</xref></tt>"
-        end
+            "<tt><xref style='id' target='#{block['id']}'>#{l.text}</xref></tt>"
+        anchor[:modspec] = anchor[:xref]
         anchor
       end
     end

data/lib/metanorma/requirements/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-11 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Requirements processing and rendering according to different models