mn-requirements 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ba672c0841ee7afdaa25c8eb3cd423b7d2033555610508dd548a3a59ca131e
-  data.tar.gz: 595088ec2f1c850dc6654e97a4daa593a5bbca658797a3016f24335af9738bb5
+  metadata.gz: 01bee8304acc8f185870fb5f6960e2a7393d096acc9cdf9ea4e87918baf297e0
+  data.tar.gz: 11412398e35579a0e3022250101a3629409b7f784da526d152de6a1a69c00e33
 SHA512:
-  metadata.gz: fba1dff3fce4185612b7edefa7518e1968b622b52aac5dc27f1373af2ee09990921e0cf0c009faca3a36f649ea600790b72bc887d0a5a90315f821c5449d9941
-  data.tar.gz: 7c38a1b25ee9aa29501437afb90947ba208038b571b63195529c8ac27afe82d7b9811b98f08605a07ed5b4130b9689b0fadcd038ddb6b3d25ef0e80e1bc7af99
+  metadata.gz: e9d3f86cd517967140e1febd7c7852d55dd3b1b4b8c74d1159c335d42717fc51c960218caf5631d9f135701b8f812b830685ad5224ac9dbc4249ee24a0cfcda9
+  data.tar.gz: 7cc6c088de6e4ea5ae8050844ccf0d9cf49369bf63b89ffa4892316539d57d5ae89074fe184191a4e78e940d59efef1abc09e3bd88805125ff734aeb7f11f735

data/lib/metanorma/default/cleanup.rb

@@ -104,17 +104,22 @@ module Metanorma
       end
 
       def requirement_metadata1_set_insert(reqt, ins)
-        return ins if ins
-
+        ins and return ins
         reqt.children.first.previous = " "
         reqt.children.first
       end
 
+      def unwrap_para(ddef)
+        e = ddef.elements and e.size == 1 && e.first.name == "p" and
+          ddef = e.first
+        ddef.children.to_xml
+      end
+
       def reqt_dl_to_classif(ins, reqt, dlist)
         if a = reqt.at("./classification[last()]") then ins = a end
         dlist.xpath("./dt[text()='classification']").each do |e|
-          val = e.at("./following::dd/p") || e.at("./following::dd")
-          req_classif_parse(val.children.to_xml).each do |r|
+          val = e.at("./following::dd").text.strip
+          req_classif_parse(val).each do |r|
             ins.next = "<classification><tag>#{r[0]}</tag>" \
                        "<value>#{r[1]}</value></classification>"
             ins = ins.next
@@ -136,9 +141,9 @@ module Metanorma
       end
 
       def reqt_dl_to_classif2(term, ins)
-        val = term.at("./following::dd/p") || e.at("./following::dd")
+        val = unwrap_para(term.at("./following::dd"))
         ins.next = "<classification><tag>#{term.text}</tag>" \
-                   "<value>#{val.children.to_xml}</value></classification>"
+                   "<value>#{val}</value></classification>"
         ins.next
       end
     end

data/lib/metanorma/default/default.rb

@@ -92,7 +92,7 @@ module Metanorma
             requirement_elems(node, ex)
             wrap_in_para(node, ex)
           end
-        end.join("\n")
+        end
       end
 
       def validate(_reqt, _log)

data/lib/metanorma/modspec/table_cleanup.rb

@@ -54,8 +54,7 @@ module Metanorma
       def gather_consec_table_rows(trow, hdr)
         ret = []
         trow.xpath("./following-sibling::xmlns:tr").each do |r|
-          break unless r.at(ns("./th[text() = '#{hdr}']"))
-
+          r.at(ns("./th[text() = '#{hdr}']")) or break
           ret << r.remove.at(ns("./td")).children.to_xml
         end
         ret
@@ -78,8 +77,7 @@ module Metanorma
       end
 
       def strip_id_base(elem, base)
-        return elem.children if base.nil?
-
+        base.nil? and return elem.children
         elem.children.to_xml.delete_prefix(base)
       end
 
@@ -98,7 +96,8 @@ module Metanorma
       def expand_xrefs_in_reqt(table)
         table.xpath(ns(".//xref[not(@style)][normalize-space(text()) = '']"))
           .each do |x|
-          x << @xrefs.anchor(x["target"], :xref, false)
+          ref = @xrefs.anchor(x["target"], :xref, false) or next
+          x << ref
         end
       end
 

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -27,7 +27,7 @@ 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_dependency "metanorma-utils", ">= 0.10.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -40,4 +40,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
+  spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-06-03 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: xml-c14n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Requirements processing and rendering according to different models
 
   '