metanorma-ogc 2.7.7 → 2.7.9

data/lib/isodoc/ogc/presentation_sections.rb

@@ -20,8 +20,15 @@ module IsoDoc
         insert_preface_sections(doc)
       end
 
+      def section(docxml)
+        dochistory_insert(docxml)
+        @xrefs.parse docxml
+        super
+      end
+
       def insert_preface_sections(doc)
-        preface_insert(doc.at(ns("//preface//clause[@type = 'submitters' or @type = 'contributors']")),
+        preface_insert(doc.at(ns("//preface//clause[@type = 'submitters' or " \
+                                 "@type = 'contributors']")),
                        submit_orgs_append_pt(doc), doc)
         insert_submitting_orgs(doc)
         preface_insert(doc.at(ns("//preface/clause[@type = 'security']")),
@@ -29,6 +36,84 @@ module IsoDoc
         insert_keywords(doc)
       end
 
+      def dochistory_insert(docxml)
+        updates = docxml.xpath(ns(UPDATE_RELATIONS))
+        updates.empty? and return
+        fwd = annex_insert_point(docxml)
+        generate_dochistory(updates, fwd)
+      end
+
+      def annex_insert_point(docxml)
+        docxml.at(ns("//annex[last()]")) || docxml.at(ns("//sections"))
+      end
+
+      def generate_dochistory(updates, pref)
+        ret = updates.map { |u| generate_dochistory_row(u) }.flatten.join("\n")
+        pref.next = <<~XML
+          <annex #{add_id_text} obligation='informative'>
+          <title #{add_id_text}>#{@i18n.dochistory}</title>
+          <table unnumbered="true" #{add_id_text}><thead>
+          <tr #{add_id_text}><th #{add_id_text}>Date</th><th #{add_id_text}>Release</th><th #{add_id_text}>Author</th>
+            <th #{add_id_text}>Paragraph Modified</th><th #{add_id_text}>Description</th></tr>
+          </thead><tbody>#{ret}</tbody></table></annex>
+        XML
+      end
+
+      def generate_dochistory_row(item)
+        e = item.at(ns("./edition")) || item.at(ns("./version/draft"))
+        date = dochistory_date(item)
+        c = dochistory_contributors(item)
+        l = dochistory_location(item)
+        desc = dochistory_description(item)
+        <<~XML
+          <tr #{add_id_text}><td #{add_id_text}>#{date}</td><td #{add_id_text}>#{e&.text}</td><td #{add_id_text}>#{c}</td>
+            <td #{add_id_text}>#{l}</td><td #{add_id_text}>#{desc}</td></tr>
+        XML
+      end
+
+      def dochistory_date(item)
+        d = item.at(ns("./date[@type = 'updated']")) ||
+          item.at(ns("./date[@type = 'published']")) ||
+          item.at(ns("./date[@type = 'issued']")) or return ""
+        d.text.strip
+      end
+
+      def dochistory_contributors(item)
+        item.xpath(ns("./contributor")).map do |c|
+          dochistory_contributor(c)
+        end.join(", ")
+      end
+
+      def dochistory_contributor(contrib)
+        ret = contrib.at("./organization/subdivision") ||
+          contrib.at("./organization/name") ||
+          contrib.at("./person/name/abbreviation") ||
+          contrib.at("./person/name/completename")
+        ret and return ret.text
+        format_personalname(contrib)
+      end
+
+      def format_personalname(contrib)
+        Relaton::Render::Ogc::General
+          .new(template: { book: "{{ creatornames }}" })
+          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>",
+                  embedded: true)
+      end
+
+      def dochistory_description(item)
+        d = item.at(ns("./amend/description")) or return ""
+        d.children.to_xml
+      end
+
+      def dochistory_location(item)
+        t = item.at(ns("./amend/location")) or return "All"
+        xpath = "./amend/location/locality | ./amend/location/localityStack"
+        r = eref_localities(item.xpath(ns(xpath)), nil, t)
+        r.sub!(/^, /, "")
+        r == @i18n.wholeoftext and r = "All"
+        r
+      end
+
       def preface_init_insert_pt(docxml)
         docxml.at(ns("//preface")) ||
           docxml.at(ns("//sections"))
@@ -66,18 +151,18 @@ module IsoDoc
 
       def submitting_orgs_clause(orgs)
         <<~SUBMITTING
-          <clause id="_#{UUIDTools::UUID.random_create}" type="submitting_orgs">
-          <title>Submitting Organizations</title>
+          <clause #{add_id_text} type="submitting_orgs">
+          <title #{add_id_text}>Submitting Organizations</title>
           <p>The following organizations submitted this Document to the Open Geospatial Consortium (OGC):</p>
-           <ul>#{orgs.map { |m| "<li>#{m}</li>" }.join("\n")}</ul>
+           <ul #{add_id_text}>#{orgs.map { |m| "<li #{add_id_text}>#{m}</li>" }.join("\n")}</ul>
            </clause>
         SUBMITTING
       end
 
       def keyword_clause(kwords)
         <<~KEYWORDS
-          <clause id="_#{UUIDTools::UUID.random_create}" type="keywords">
-          <title>Keywords</fmt>
+          <clause #{add_id_text} type="keywords">
+          <title #{add_id_text}>Keywords</title>
           <p>The following are keywords to be used by search engines and document catalogues.</p>
           <p>#{kwords.join(', ')}</p></clause>
         KEYWORDS

data/lib/isodoc/ogc/presentation_xml_convert.rb

@@ -26,88 +26,12 @@ module IsoDoc
             a["type"] = "contributor"
         end
         super
-        dochistory_insert(docxml)
       end
 
       UPDATE_RELATIONS = <<~XPATH.freeze
         //bibdata/relation[@type = 'updatedBy' or @type = 'merges' or @type = 'splits' or @type = 'hasDraft']/bibitem
       XPATH
 
-      def dochistory_insert(docxml)
-        updates = docxml.xpath(ns(UPDATE_RELATIONS))
-        updates.empty? and return
-        fwd = annex_insert_point(docxml)
-        generate_dochistory(updates, fwd)
-      end
-
-      def annex_insert_point(docxml)
-        docxml.at(ns("//annex[last()]")) || docxml.at(ns("//sections"))
-      end
-
-      def generate_dochistory(updates, pref)
-        ret = updates.map { |u| generate_dochistory_row(u) }.flatten.join("\n")
-        pref.next = <<~XML
-          <annex id='_#{UUIDTools::UUID.random_create}' obligation='informative'>
-          <title>#{@i18n.dochistory}</title>
-          <table><thead>
-          <tr><th>Date</th><th>Release</th><th>Author</th><th>Paragraph Modified</th><th>Description</th></tr>
-          </thead><tbody>#{ret}</tbody></table></annex>
-        XML
-      end
-
-      def generate_dochistory_row(item)
-        e = item.at(ns("./edition")) || item.at(ns("./version/draft"))
-        date = dochistory_date(item)
-        c = dochistory_contributors(item)
-        l = dochistory_location(item)
-        desc = dochistory_description(item)
-        "<tr><td>#{date}</td><td>#{e&.text}</td><td>#{c}</td>" \
-          "<td>#{l}</td><td>#{desc}</td></tr>"
-      end
-
-      def dochistory_date(item)
-        d = item.at(ns("./date[@type = 'updated']")) ||
-          item.at(ns("./date[@type = 'published']")) ||
-          item.at(ns("./date[@type = 'issued']")) or return ""
-        d.text.strip
-      end
-
-      def dochistory_contributors(item)
-        item.xpath(ns("./contributor")).map do |c|
-          dochistory_contributor(c)
-        end.join(", ")
-      end
-
-      def dochistory_contributor(contrib)
-        ret = contrib.at("./organization/subdivision") ||
-          contrib.at("./organization/name") ||
-          contrib.at("./person/name/abbreviation") ||
-          contrib.at("./person/name/completename")
-        ret and return ret.text
-        format_personalname(contrib)
-      end
-
-      def format_personalname(contrib)
-        Relaton::Render::Ogc::General
-          .new(template: { book: "{{ creatornames }}" })
-          .render("<bibitem type='book'>#{contrib.to_xml}</bibitem>",
-                  embedded: true)
-      end
-
-      def dochistory_description(item)
-        d = item.at(ns("./amend/description")) or return ""
-        d.children.to_xml
-      end
-
-      def dochistory_location(item)
-        t = item.at(ns("./amend/location")) or return "All"
-        xpath = "./amend/location/locality | ./amend/location/localityStack"
-        r = eref_localities(item.xpath(ns(xpath)), nil, t)
-        r.sub!(/^, /, "")
-        r == @i18n.wholeoftext and r = "All"
-        r
-      end
-
       def bibdata_i18n(bib)
         doctype = bib&.at(ns("./ext/doctype"))
         rename_stage(bib&.at(ns("./status/stage")), doctype, bib)

data/lib/metanorma/ogc/cleanup.rb

@@ -18,10 +18,6 @@ module Metanorma
         insert_submitters(xml, sect)
       end
 
-      def add_id_txt
-        %(id="_#{UUIDTools::UUID.random_create}")
-      end
-
       def insert_security(xml, sect)
         "document"
         "standard" if %w(standard community-standard)
@@ -45,8 +41,8 @@ module Metanorma
         description = "standard" if %w(standard community-standard)
           .include?(doctype)
         <<~CLAUSE
-          <clause type='security' #{add_id_txt}>
-            <title>Security considerations</title>
+          <clause type='security' #{add_id_text}>
+            <title #{add_id_text}>Security considerations</title>
             <p>#{@i18n.security_empty.sub('%', description)}</p></clause>
         CLAUSE
       end

data/lib/metanorma/ogc/converter.rb

@@ -28,11 +28,6 @@ module Metanorma
         File.join(@libdir, "boilerplate.adoc")
       end
 
-      def makexml(node)
-        @draft = node.attributes.has_key?("draft")
-        super
-      end
-
       def doctype(node)
         d = super
         d1 = ::IsoDoc::Ogc::DOCTYPE_ABBR.invert[d] and d = d1
@@ -124,7 +119,7 @@ module Metanorma
           attrs[:type] == "contributors" and
           title = @i18n.contributors_clause
         xml.clause **attr_code(attrs) do |xml_section|
-          xml_section.title title
+          section_title(xml_section, title)
           xml_section << node.content
         end
       end
@@ -149,7 +144,7 @@ module Metanorma
       def terms_annex_parse(attrs, xml, node)
         attrs1 = attrs.merge(id: "_#{UUIDTools::UUID.random_create}")
         xml.annex **attr_code(attrs1) do |xml_section|
-          xml_section.title { |name| name << node.title }
+          section_title(xml_section, node.title)
           attrs.delete(:anchor)
           xml_section.terms **attr_code(attrs) do |terms|
             (s = node.attr("source")) && s.split(",").each do |s1|

data/lib/metanorma/ogc/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.0.6 -->
+<!-- VERSION v2.0.7 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -76,6 +76,7 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <a:documentation>Title(s) of a clause</a:documentation>
       <element name="title">
         <a:documentation>Title proper for a clause</a:documentation>
+        <ref name="RequiredId"/>
         <zeroOrMore>
           <ref name="TextElement"/>
         </zeroOrMore>
@@ -83,10 +84,19 @@ but to `@anchor`, the user-supplied cross-reference</a:documentation>
       <zeroOrMore>
         <element name="variant-title">
           <a:documentation>Alternate title for a clause</a:documentation>
+          <ref name="RequiredId"/>
           <ref name="TypedTitleString"/>
         </element>
       </zeroOrMore>
     </define>
+    <define name="tname">
+      <element name="name">
+        <ref name="RequiredId"/>
+        <oneOrMore>
+          <ref name="NestedTextElement"/>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="UlBody">
       <optional>
         <ref name="tname">
@@ -475,6 +485,7 @@ normative or informative references, some split references into sections organiz
     <!-- exclude figures? -->
     <define name="dd">
       <element name="dd">
+        <ref name="OptionalId"/>
         <zeroOrMore>
           <!-- exclude figures? -->
           <ref name="BasicBlock"/>
@@ -526,6 +537,7 @@ normative or informative references, some split references into sections organiz
       </choice>
     </define>
     <define name="TrAttributes">
+      <ref name="OptionalId"/>
       <optional>
         <attribute name="style">
           <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -595,6 +607,7 @@ gives an explicit page orientation</a:documentation>
   </include>
   <!-- end overrides -->
   <define name="FnAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="hiddenref">
         <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
@@ -604,6 +617,7 @@ This is done if the footnote reference is already presented in some other form,
     </optional>
   </define>
   <define name="TdAttributes" combine="interleave">
+    <ref name="RequiredId"/>
     <optional>
       <attribute name="style">
         <a:documentation>CSS style: only background-color supported</a:documentation>
@@ -1821,7 +1835,7 @@ used in document amendments</a:documentation>
     </element>
   </define>
   <define name="TermAttributes">
-    <ref name="OptionalId"/>
+    <ref name="RequiredId"/>
     <ref name="LocalizedStringAttributes"/>
     <ref name="BlockAttributes"/>
   </define>
@@ -2164,6 +2178,7 @@ used in document amendments</a:documentation>
   <define name="termdefinition">
     <a:documentation>The definition of a term applied in the current document</a:documentation>
     <element name="definition">
+      <ref name="RequiredId"/>
       <optional>
         <attribute name="type">
           <a:documentation>Type of definition, used to differentiate it from other definitions of the same term if present</a:documentation>
@@ -2185,6 +2200,7 @@ used in document amendments</a:documentation>
   </define>
   <define name="verbaldefinition">
     <element name="verbal-definition">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
@@ -2205,6 +2221,7 @@ used in document amendments</a:documentation>
   <define name="nonverbalrep">
     <a:documentation>Non-verbal representation of the term</a:documentation>
     <element name="non-verbal-representation">
+      <ref name="RequiredId"/>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the non-verbal representation of the term</a:documentation>

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.7.7".freeze
+    VERSION = "2.7.9".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
   spec.add_dependency "iso-639"
-  spec.add_dependency "metanorma-standoc", "~> 3.0.0"
+  spec.add_dependency "metanorma-standoc", "~> 3.1.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
@@ -39,7 +39,6 @@ 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 "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "xml-c14n"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.7.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +192,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement