mn-requirements 0.5.8 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2e0c4a9b0d02316fd0d4acd61a486620cd795d5524d4a26577d66b7df226b41
-  data.tar.gz: 53eee52188710a25557b1e8e47c78ede14094297a88553e337982e2bedd74260
+  metadata.gz: e446f52e8a55fc21a99df29ce798a2a7ea84d987d07aceb23d64b5c1c77be7e3
+  data.tar.gz: f1142726f55149df21ff127df360b656cd14b9c376f7d13844ba04451239b5b1
 SHA512:
-  metadata.gz: 65aca4ae0137d2e7169bfbcb74c4a82fb77cd9a68f302313d7acf6a11c714b37230d7d1885d30361f398467454a614f84bef21005bf00ecdfc6bd1ab34d3f70f
-  data.tar.gz: 17fd1772574e8e2f33dda1a6aaa15d0492f2fe7cf828f59d2dfe227ac07ccb3f87151b7a8f51852eb9491c727faffdd5e5680c1c6c0ef9374ed4844c5b573545
+  metadata.gz: 2617c33c902c0caddd8ac9f47f4b9fd497ce04482ef53195d50e13776e3f2a165ec1c13f3891efb67cfdbfc11b891dcff9a598894bf344d6f97a3b538bc171b8
+  data.tar.gz: dba9959bd392290b870c539410f8d50b55203308d96b3ec786c1c6a9532bcbc7e650f89a614390425f2fe21d52853109dfd63f792729de68aab92b20345ab684

data/lib/metanorma/default/cleanup.rb

@@ -73,7 +73,7 @@ module Metanorma
       end
 
       def requirement_metadata1_attrs
-        %w(obligation model type class)
+        %w(obligation model type class render)
       end
 
       def requirement_metadata1_tags

data/lib/metanorma/default/default.rb

@@ -3,6 +3,7 @@ require_relative "cleanup"
 require_relative "utils"
 require_relative "isodoc"
 require_relative "xrefs"
+require "metanorma-core"
 
 module Metanorma
   class Requirements
@@ -12,6 +13,7 @@ module Metanorma
         @parent = options[:parent]
         @i18n = @parent.i18n
         @labels = @parent.labels
+        @isodoc = options[:isodoc]
       end
 
       def reqt_subpart?(name)

data/lib/metanorma/default/isodoc.rb

@@ -1,3 +1,5 @@
+require "isodoc"
+
 module Metanorma
   class Requirements
     class Default
@@ -5,34 +7,9 @@ module Metanorma
         @i18n.l10n(text)
       end
 
-      # TODO: move to metanorma-utils
-def semx_fmt_dup(elem)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
-      new = Nokogiri::XML(<<~XML).root
-        <semx xmlns='#{elem.namespace.href}' element='#{elem.name}' source='#{elem['original-id'] || elem['id']}'>#{to_xml(elem.children)}</semx>
-      XML
-      strip_duplicate_ids(nil, elem, new)
-      new
-    end
-
-    def gather_all_ids(elem)
-      elem.xpath(".//*[@id]").each_with_object([]) do |i, m|
-        m << i["id"]
+      def semx_fmt_dup(elem)
+        @isodoc.semx_fmt_dup(elem)
       end
-    end
-
-    # remove ids duplicated between sem_title and pres_title
-    # index terms are assumed transferred to pres_title from sem_title
-    def strip_duplicate_ids(_node, sem_title, pres_title)
-      sem_title && pres_title or return
-      ids = gather_all_ids(pres_title)
-      sem_title.xpath(".//*[@id]").each do |x|
-        ids.include?(x["id"]) or next
-        x["original-id"] = x["id"]
-        x.delete("id")
-      end
-      sem_title.xpath(ns(".//index")).each(&:remove)
-    end
 
       def recommendation_label(elem, type, xrefs)
         label, title = recommendation_labels(elem)
@@ -40,7 +17,8 @@ def semx_fmt_dup(elem)
         num = xrefs.anchor(elem["id"], :label, false)
         num &&= "<semx element='autonum' source='#{elem['id']}'>#{num}</semx>"
         ret = num
-        /<span class='fmt-element-name'>/.match?(ret) or ret = "#{type} #{num}".strip
+        ret&.include?("<span class='fmt-element-name'>") or
+          ret = "#{type} #{num}".strip
         label || title and
           ret += recommendation_label_add(elem, label, title)
         ret
@@ -66,6 +44,34 @@ def semx_fmt_dup(elem)
       end
 
       def requirement_render1(node)
+        case node["render"]
+        when "inline" then requirement_render1_inline(node)
+        else requirement_render1_default(node)
+        end
+      end
+
+      def requirement_render1_inline(node)
+        out = recommendation_base(node, "fmt-provision")
+        lbl, body = requirement_render1_inline_prep(node)
+        if ins = body&.at(ns(".//p"))
+          ins.children.first.previous = lbl
+          out << body
+        else
+          lbl and out << lbl
+          body and out << body
+        end
+        requirement_presentation(node, out)
+      end
+
+      def requirement_render1_inline_prep(node)
+        ident = node.at(ns("./identifier")) and
+          lbl = "[#{to_xml(semx_fmt_dup(ident))}] "
+        body =  node.at(ns("./title | ./specification | ./description"))
+        body &&= semx_fmt_dup(body)
+        [lbl, body]
+      end
+
+      def requirement_render1_default(node)
         out = recommendation_base(node, "fmt-provision")
         ins = recommendation_header(node, out)
         ins = recommendation_attributes(node, ins)
@@ -99,7 +105,7 @@ def semx_fmt_dup(elem)
       def recommendation_labels(node)
         [node.at(ns("./identifier")), node.at(ns("./title"))]
           .map do |n|
-           to_xml(n&.children)
+          to_xml(n&.children)
         end
       end
 
@@ -107,7 +113,6 @@ def semx_fmt_dup(elem)
         oblig = node["obligation"] and
           out << l10n("#{@labels['default']['obligation']}: #{oblig}")
         node.xpath(ns("./subject")).each do |subj|
-          #out << l10n("#{@labels['default']['subject']}: #{subj.text}")
           out << l10n("#{@labels['default']['subject']}: #{to_xml(semx_fmt_dup(subj))}")
         end
         node.xpath(ns("./inherit")).each do |i|
@@ -120,7 +125,6 @@ def semx_fmt_dup(elem)
       end
 
       def recommendation_attr_parse(node, label)
-        #l10n("#{label}: #{to_xml(node.children)}")
         l10n("#{label}: #{to_xml(semx_fmt_dup(node))}")
       end
 

data/lib/metanorma/requirements/selector.rb

@@ -18,10 +18,18 @@ module Metanorma
       # @labels = @i18n.get.deep_merge(options[:labels] || {})["requirements"]
       @labels = @i18n.get["requirements"]
       @modspecidentifierbase = options[:modspecidentifierbase]
+      init_isodoc(options)
       @models =
         model_names.each_with_object({}) { |k, m| m[k] = create(k) }
     end
 
+    def init_isodoc(options)
+      @isodoc = Metanorma::Core::Isodoc
+        .init(options[:conv], lang: options[:lang], script: options[:script],
+                              locale: options[:locale],
+                              i18nyaml: options[:labels])
+    end
+
     def model_names
       %i[default ogc]
     end
@@ -50,8 +58,8 @@ module Metanorma
     def create(type)
       case type
       when :modspec, :ogc
-        Metanorma::Requirements::Modspec.new(parent: self)
-      else Metanorma::Requirements::Default.new(parent: self)
+        Metanorma::Requirements::Modspec.new(parent: self, isodoc: @isodoc)
+      else Metanorma::Requirements::Default.new(parent: self, isodoc: @isodoc)
       end
     end
 

data/lib/metanorma/requirements/version.rb

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

data/mn-requirements.gemspec

@@ -28,19 +28,21 @@ Gem::Specification.new do |spec|
   # precise version is on relaton-render
   spec.add_dependency "isodoc-i18n", ">= 1.2.0"
   spec.add_dependency "metanorma-utils", ">= 2.0.0"
+  spec.add_dependency "metanorma-core", ">= 0.1.0"
   spec.add_dependency "relaton-render", ">= 1.0.0"
 
+  spec.add_development_dependency "benchmark"
+  spec.add_development_dependency "canon"
   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", ">= 2.8.0"
+  spec.add_development_dependency "metanorma-standoc", ">= 3.4.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"
-spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "canon", "= 0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mn-requirements
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: isodoc-i18n
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: metanorma-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  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'
+- !ruby/object:Gem::Dependency
+  name: canon
+  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'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +156,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +262,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: 'Requirements processing and rendering according to different models
 
   '