mn-requirements 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41cb14a86e3b4fc25c64a3ac59332f35da0d111de2e8d66194273fa5d92b370b
-  data.tar.gz: 340e4d252c1a0e2a27de24be51cec9036900a9f461b80739d3b3f086f9183f01
+  metadata.gz: 754071e6a128c01af6fd2526dce1b8cbbecb043e9e9a4f76877ba076a5edf573
+  data.tar.gz: 8937c93e2818e1c5a8ba3b69320e740b7f271e372660f6f4ad5e9a58e491edc6
 SHA512:
-  metadata.gz: 7ebe357fa3c17264a716910853b96d1513fe93e7d7039a8faf2f83ff0f28197ea47dbf670498de9ed0a9dad6bee4e417e176a49a483db7007b1065404fbdcda3
-  data.tar.gz: 17642bf0e4b3094e42a0c925aa9a4ff7ac7ed187dd735290b93964906b1eb49c151e4b5ea3523124d107591afbb7a30b2337323c632262dcd4c274dca82b2e1c
+  metadata.gz: ffd53201ea85a67bfe53b14a6e96696c6d0581ff2a56205e35756c15f7713ca184fef57e547767ce0f5bd96b8bacc284cf9852153e1cc848cc1cda57bb9971bc
+  data.tar.gz: e350c1ca4121ac9bdcbece442b2a93d544eeed699d262e169ef883cff52deac2fddb47c308274e9377a178d711a26a44097498f9e8cc7419f370b2e1810407e4

data/Gemfile

@@ -4,8 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-gemspec
+group :development, :test do
+  gem "rspec"
+end
 
 if File.exist? "Gemfile.devel"
   eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end
+
+gemspec

data/lib/metanorma/default/isodoc.rb

@@ -95,16 +95,32 @@ module Metanorma
       end
 
       def requirement_component_parse(node, out)
-        return out if node["exclude"] == "true"
-
+        node["exclude"] == "true" and return out
         ret = node.dup
         if reqt_subpart?(node.name)
           ret["type"] = reqt_component_type(node)
           ret.name = "div"
         end
+        descr_classif_render(ret)
         out << ret
         out
       end
+
+      def descr_classif_render(reqt)
+        reqt.at(ns("./classification")) or return
+        ins = reqt.at(ns("./classification")).before("<dl/>").previous
+        descr_classif_extract(reqt, ins)
+      end
+
+      def descr_classif_extract(desc, ins)
+        dlist = desc.xpath(ns("./classification"))
+        dlist.each do |x|
+          x.at(ns("./tag")).name = "dt"
+          x.at(ns("./value")).name = "dd"
+          ins << x.children
+          x.remove
+        end
+      end
     end
   end
 end

data/lib/metanorma/modspec/isodoc.rb

@@ -184,6 +184,7 @@ module Metanorma
 
       def requirement_component_parse(node, out)
         node["exclude"] == "true" and return out
+        descr_classif_render(node)
         node.elements.size == 1 && node.first_element_child.name == "dl" and
           return reqt_dl(node.first_element_child, out)
         node.name == "component" and

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.4".freeze
+    VERSION = "0.3.6".freeze
   end
 end

data/mn-requirements.gemspec

@@ -32,7 +32,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"
+  spec.add_development_dependency "metanorma-standoc", ">= 2.7.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.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-09 00:00:00.000000000 Z
+date: 2023-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement