mn-requirements 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33414d3ac6b85f24c09e8dd8555f26e776b5c1ddd67aaf0a15217e0b9466e324
-  data.tar.gz: '098df5f8bba64b14bfef2ceead84bc5cc230f4601a33329092f382fcc9bce7d2'
+  metadata.gz: a2ba672c0841ee7afdaa25c8eb3cd423b7d2033555610508dd548a3a59ca131e
+  data.tar.gz: 595088ec2f1c850dc6654e97a4daa593a5bbca658797a3016f24335af9738bb5
 SHA512:
-  metadata.gz: b7fe62355d49df8647545cdacff491d6d7aa4696f8f680ef468839930b5c12614706f80e8adf99fa4ab2f48b42a03adf4a282acdafc23d52ceabe4d2e8093fa5
-  data.tar.gz: 1a7babef01ab00b531200e100b8feaf99f4a817dc14e7c9e7c0c200525443d71d0a8fa0dcee17dfdced1197104067c4e254b707f1f69d04581cd5a32dd01395a
+  metadata.gz: fba1dff3fce4185612b7edefa7518e1968b622b52aac5dc27f1373af2ee09990921e0cf0c009faca3a36f649ea600790b72bc887d0a5a90315f821c5449d9941
+  data.tar.gz: 7c38a1b25ee9aa29501437afb90947ba208038b571b63195529c8ac27afe82d7b9811b98f08605a07ed5b4130b9689b0fadcd038ddb6b3d25ef0e80e1bc7af99

data/Gemfile

@@ -6,6 +6,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? "Gemfile.devel"
-  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
-end
+eval_gemfile("Gemfile.devel") rescue nil

data/lib/metanorma/modspec/cleanup.rb

@@ -72,6 +72,15 @@ module Metanorma
         requirement_metadata_to_requirement(reqt)
         requirement_subparts_to_blocks(reqt)
         requirement_target_identifiers(reqt)
+        requirement_anchor_identifier(reqt)
+      end
+
+      def requirement_anchor_identifier(reqt)
+        Metanorma::Utils::guid_anchor?(reqt["id"]) or return
+        id = reqt.at("./identifier") or return
+        anchor = id.text.strip
+        anchor.empty? and return
+        reqt["id"] = Metanorma::Utils::to_ncname(anchor)
       end
 
       def requirement_target_identifiers(reqt)

data/lib/metanorma/modspec/reqt_label.rb

@@ -11,7 +11,6 @@ module Metanorma
       def recommendation_label(elem, type, xrefs)
         @xrefs ||= xrefs.dup
         init_lookups(elem.document)
-
         label = elem.at(ns("./identifier"))&.text
         if inject_crossreference_reqt?(elem, label)
           recommendation_label_xref(elem, label, xrefs, type)
@@ -182,7 +181,6 @@ module Metanorma
 
       def truncate_id_base_outside_reqts(docxml)
         @modspecidentifierbase or return
-
         (docxml.xpath(ns("//xref[@style = 'id']")) - docxml
           .xpath(ns("//requirement//xref | //permission//xref | " \
                     "//recommendation//xref"))).each do |x|

data/lib/metanorma/modspec/table_cleanup.rb

@@ -1,3 +1,5 @@
+require "uri"
+
 module Metanorma
   class Requirements
     class Modspec < Default
@@ -6,9 +8,25 @@ module Metanorma
         requirement_table_consec_rows_cleanup(node, table)
         node.ancestors("requirement, recommendation, permission").empty? and
           truncate_id_base_in_reqt(table)
+        cell2link(table)
         table
       end
 
+      def cell2link(table)
+        table.xpath(ns(".//td")).each do |td|
+          td.elements.empty? or next
+          uri?(td.text.strip) or next
+          td.children = "<link target='#{td.text.strip}'/>"
+        end
+      end
+
+      def uri?(string)
+        uri = URI.parse(string)
+        %w(http https).include?(uri.scheme)
+      rescue URI::BadURIError, URI::InvalidURIError
+        false
+      end
+
       def requirement_table_consec_rows_cleanup(_node, table)
         table.xpath(ns("./tbody/tr")).each do |tr|
           conflate_table_rows?(tr) or next
@@ -19,7 +37,6 @@ module Metanorma
       def conflate_table_rows?(trow)
         tr1 = trow.next or return
         tr1.name == "tr" or return
-
         th = trow.at(ns("./th"))&.text
         th && th == tr1.at(ns("./th"))&.text
       end

data/lib/metanorma/modspec/validate.rb

@@ -4,12 +4,10 @@ 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)
@@ -130,8 +128,7 @@ module Metanorma
 
         if hash[:label][struct[:label]]
           msg = "Modspec identifier #{struct[:label]} is used more than once"
-          @log.add("Requirements", reqt, msg)
-          @fatalerrors << msg
+          @log.add("Requirements", reqt, msg, severity: 0)
         end
         hash[:label][struct[:label]] = reqt["id"]
         hash

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -27,12 +27,13 @@ Gem::Specification.new do |spec|
 
   # precise version is on relaton-render
   spec.add_dependency "isodoc-i18n", ">= 1.1.0"
+  spec.add_dependency "metanorma-utils", ">= 0.7.7"
 
   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 "metanorma-standoc"
+  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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.7
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -236,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Requirements processing and rendering according to different models