metanorma-ogc 2.2.5 → 2.2.7

data/lib/metanorma/ogc/biblio.rng

@@ -188,6 +188,11 @@
           <value>adapter</value>
           <value>translator</value>
           <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
         </choice>
       </attribute>
       <zeroOrMore>

data/lib/metanorma/ogc/cleanup.rb

@@ -30,12 +30,12 @@ module Metanorma
       def insert_security(xml, sect)
         description = "document"
         description = "standard" if %w(standard community-standard)
-          .include?(sect&.at("//bibdata/ext/doctype")&.text)
+          .include?(sect.at("//bibdata/ext/doctype")&.text)
         preface = sect.at("//preface") ||
           sect.add_previous_sibling("<preface/>").first
-        sect = xml&.at("//clause[@type = 'security']")&.remove ||
-          "<clause type='security' #{add_id}>"\
-          "<title>Security considerations</title>"\
+        sect = xml.at("//clause[@type = 'security']")&.remove ||
+          "<clause type='security' #{add_id}>" \
+          "<title>Security considerations</title>" \
           "<p>#{@i18n.security_empty.sub(/%/, description)}</p></clause>"
         preface.add_child sect
       end
@@ -68,19 +68,19 @@ module Metanorma
         replace_title(xml, "//definitions[@type = 'abbreviated_terms']",
                       @i18n&.abbrev)
         replace_title(xml, "//definitions[not(@type)]", @i18n&.symbolsabbrev)
-        replace_title(xml, "//sections//terms#{SYMnoABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMnoABBR} | " \
                            "//sections//clause[.//terms]#{SYMnoABBR}",
                       @i18n&.termsdefsymbols, true)
-        replace_title(xml, "//sections//terms#{ABBRnoSYM} | "\
+        replace_title(xml, "//sections//terms#{ABBRnoSYM} | " \
                            "//sections//clause[.//terms]#{ABBRnoSYM}",
                       @i18n&.termsdefabbrev, true)
-        replace_title(xml, "//sections//terms#{SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{SYMABBR} | " \
                            "//sections//clause[.//terms]#{SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms#{NO_SYMABBR} | "\
+        replace_title(xml, "//sections//terms#{NO_SYMABBR} | " \
                            "//sections//clause[.//terms]#{NO_SYMABBR}",
                       @i18n&.termsdefsymbolsabbrev, true)
-        replace_title(xml, "//sections//terms[not(.//definitions)] | "\
+        replace_title(xml, "//sections//terms[not(.//definitions)] | " \
                            "//sections//clause[.//terms][not(.//definitions)]",
                       @i18n&.termsdef, true)
       end
@@ -101,7 +101,7 @@ module Metanorma
       end
 
       def normref_cleanup(xmldoc)
-        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = "\
+        r1 = xmldoc.at("//references[title[translate(text(), 'R', 'r') = " \
                        "'Normative references']]")
         r2 = xmldoc.at("//references[title[text() = 'References']]")
         if r1 && r2
@@ -118,7 +118,7 @@ module Metanorma
           r["obligation"] = "normative" unless r["obligation"]
         end
         xml.xpath(::Metanorma::Standoc::Utils::SUBCLAUSE_XPATH).each do |r|
-          o = r&.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
+          o = r.at("./ancestor::*/@obligation")&.text and r["obligation"] = o
         end
       end
 
@@ -145,12 +145,12 @@ module Metanorma
 
       PUBLISHER = "./contributor[role/@type = 'publisher']/organization".freeze
 
-      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or "\
+      OTHERIDS = "@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or " \
                  "@type = 'ISBN'".freeze
 
       def pub_class(bib)
         return 1 if bib.at("#{PUBLISHER}[abbreviation = 'OGC']")
-        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial "\
+        return 1 if bib.at("#{PUBLISHER}[name = 'Open Geospatial " \
                            "Consortium']")
         return 2 if bib.at("./docidentifier[@type][not(#{OTHERIDS})]")
 
@@ -173,7 +173,7 @@ module Metanorma
         num = if ids[:num].nil? then ids[:abbrid]
               else sprintf("%09d", ids[:num].to_i)
               end
-        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: "\
+        "#{pubclass} :: #{ids[:type]} :: #{sortkey3} :: #{num} :: " \
           "#{sprintf('%09d', ids[:partid])} :: #{ids[:id]} :: #{title}"
       end
 

data/lib/metanorma/ogc/converter.rb

@@ -42,7 +42,7 @@ module Metanorma
                   change-request-supporting-document community-practice
                   community-standard discussion-paper engineering-report
                   reference-model release-notes standard user-guide white-paper
-                  technical-paper test-suite}.include? d
+                  technical-paper test-suite draft-standard}.include? d
           @warned_doctype or
             @log.add("Document Attributes", nil,
                      "'#{d}' is not a legal document type: reverting to 'standard'")
@@ -83,7 +83,7 @@ module Metanorma
       end
 
       def clause_parse(attrs, xml, node)
-        case node&.attr("heading")&.downcase || node.title.downcase
+        case node.attr("heading")&.downcase || node.title.downcase
         when "submitters" then return submitters_parse(attrs, xml, node)
         when "conformance" then attrs = attrs.merge(type: "conformance")
         when "security considerations"

data/lib/metanorma/ogc/front.rb

@@ -85,16 +85,20 @@ module Metanorma
         return unless node.attr("committee")
 
         xml.editorialgroup do |a|
-          a.committee(node.attr("committee") || "technical")
-          node.attr("subcommittee") and
-            a.subcommittee(node.attr("subcommittee"),
+          metadata_committee1(node, a)
+        end
+      end
+
+      def metadata_committee1(node, xml)
+        xml.committee(node.attr("committee") || "technical")
+        node.attr("subcommittee") and
+          xml.subcommittee(node.attr("subcommittee"),
                            **attr_code(type: node.attr("subcommittee-type"),
                                        number: node.attr("subcommittee-number")))
-          (node.attr("workgroup") || node.attr("workinggroup")) and
-            a.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
+        (node.attr("workgroup") || node.attr("workinggroup")) and
+          xml.workgroup(node.attr("workgroup") || node.attr("workinggroup"),
                         **attr_code(type: node.attr("workgroup-type"),
                                     number: node.attr("workgroup-number")))
-        end
       end
 
       def externalid(node)
@@ -170,7 +174,7 @@ module Metanorma
                     conceptual-model-and-implementation encoding extension
                     implementation profile profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "implementation"
           end
@@ -178,7 +182,7 @@ module Metanorma
           unless %w{general encoding extension profile
                     profile-with-extension}.include? s
             @log.add("Document Attributes", nil,
-                     "'#{s}' is not a permitted subtype of Standard: "\
+                     "'#{s}' is not a permitted subtype of Standard: " \
                      "reverting to 'implementation'")
             s = "general"
           end

data/lib/metanorma/ogc/isodoc.rng

@@ -177,11 +177,7 @@
         </optional>
         <optional>
           <attribute name="style">
-            <choice>
-              <value>basic</value>
-              <value>full</value>
-              <value>short</value>
-            </choice>
+            <ref name="XrefStyleType"/>
           </attribute>
         </optional>
         <ref name="XrefBody"/>
@@ -1031,6 +1027,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1045,6 +1042,7 @@
             <ref name="stem"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1058,6 +1056,7 @@
             <ref name="PureTextElement"/>
             <ref name="index"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
             <ref name="xref"/>
             <ref name="hyperlink"/>
           </choice>
@@ -1153,7 +1152,7 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <ref name="BibliographicItem"/>
+      <ref name="ReducedBibliographicItem"/>
     </element>
   </define>
   <define name="image" combine="choice">
@@ -1195,6 +1194,7 @@
       <ref name="add"/>
       <ref name="del"/>
       <ref name="span"/>
+      <ref name="erefstack"/>
     </choice>
   </define>
   <define name="add">
@@ -1202,6 +1202,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1214,6 +1215,7 @@
       <choice>
         <ref name="PureTextElement"/>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="stem"/>
         <ref name="keyword"/>
         <ref name="xref"/>
@@ -1278,6 +1280,7 @@
       </optional>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -1970,6 +1973,7 @@
       </element>
       <choice>
         <ref name="eref"/>
+        <ref name="erefstack"/>
         <ref name="xref"/>
         <ref name="termref"/>
       </choice>
@@ -2525,6 +2529,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
           <oneOrMore>
             <element name="coords">
@@ -2572,6 +2577,7 @@
             <ref name="xref"/>
             <ref name="hyperlink"/>
             <ref name="eref"/>
+            <ref name="erefstack"/>
           </choice>
         </element>
       </zeroOrMore>
@@ -2620,6 +2626,15 @@
       <ref name="PureTextElement"/>
     </oneOrMore>
   </define>
+  <define name="XrefConnectiveType">
+    <choice>
+      <value>and</value>
+      <value>or</value>
+      <value>from</value>
+      <value>to</value>
+      <value/>
+    </choice>
+  </define>
   <define name="XrefTarget">
     <element name="location">
       <attribute name="target">
@@ -2628,16 +2643,35 @@
         </data>
       </attribute>
       <attribute name="connective">
-        <choice>
-          <value>and</value>
-          <value>or</value>
-          <value>from</value>
-          <value>to</value>
-          <value/>
-        </choice>
+        <ref name="XrefConnectiveType"/>
       </attribute>
     </element>
   </define>
+  <define name="XrefStyleType">
+    <choice>
+      <value>basic</value>
+      <value>full</value>
+      <value>short</value>
+      <value>id</value>
+    </choice>
+  </define>
+  <define name="erefTypeWithConnective">
+    <optional>
+      <attribute name="connective">
+        <ref name="XrefConnectiveType"/>
+      </attribute>
+    </optional>
+    <ref name="erefType"/>
+  </define>
+  <define name="erefstack">
+    <element name="erefstack">
+      <oneOrMore>
+        <element name="eref">
+          <ref name="erefTypeWithConnective"/>
+        </element>
+      </oneOrMore>
+    </element>
+  </define>
   <start>
     <ref name="standard-document"/>
   </start>

data/lib/metanorma/ogc/relaton-ogc.rng

@@ -18,6 +18,7 @@
         <value>user-guide</value>
         <value>white-paper</value>
         <value>test-suite</value>
+        <value>draft-standard</value>
       </choice>
     </define>
     <define name="DocumentSubtype">

data/lib/metanorma/ogc/validate.rb

@@ -32,10 +32,12 @@ module Metanorma
 
       def stage_type_validate(stage, doctype)
         err = case doctype
-              when "standard", "abstract-specification-topic"
+              when "standard", "abstract-specification-topic", "draft-standard"
                 %w(draft work-item-draft).include?(stage)
               when "community-standard"
                 %w(draft swg-draft).include?(stage)
+              when "best-practice", "community-practice"
+                %w(draft swg-draft work-item-draft).include?(stage)
               else %w(swg-draft oab-review public-rfc tc-vote
                       work-item-draft deprecated rescinded).include?(stage)
               end
@@ -44,22 +46,20 @@ module Metanorma
       end
 
       def version_validate(xmldoc)
-        version = xmldoc&.at("//bibdata/edition")&.text
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
+        version = xmldoc.at("//bibdata/edition")&.text
+        doctype = xmldoc.at("//bibdata/ext/doctype")&.text
         if %w(engineering-report discussion-paper).include? doctype
-          version.nil? or
-            @log.add("Document Attributes", nil,
-                     "Version not permitted for #{doctype}")
+          version.nil? or @log.add("Document Attributes", nil,
+                                   "Version not permitted for #{doctype}")
         else
-          version.nil? and
-            @log.add("Document Attributes", nil,
-                     "Version required for #{doctype}")
+          version.nil? and @log.add("Document Attributes", nil,
+                                    "Version required for #{doctype}")
         end
       end
 
       def execsummary_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        sect = xmldoc&.at("//clause[@type = 'executivesummary']")
+        doctype = xmldoc.at("//bibdata/ext/doctype")&.text
+        sect = xmldoc.at("//clause[@type = 'executivesummary']")
         doctype == "engineering-report" && sect.nil? and
           @log.add("Style", nil,
                    "Executive Summary required for Engineering Reports!")
@@ -91,7 +91,7 @@ module Metanorma
             val: ["./self::clause[@type = 'conformance']"],
           },
           {
-            msg: "Normative References must be followed by "\
+            msg: "Normative References must be followed by " \
                  "Terms and Definitions",
             val: ["./self::terms | .//terms"],
           },
@@ -110,7 +110,7 @@ module Metanorma
 
       def sections_sequence_validate(root)
         return unless STANDARDTYPE.include?(
-          root&.at("//bibdata/ext/doctype")&.text,
+          root.at("//bibdata/ext/doctype")&.text,
         )
 
         names = root.xpath("//sections/* | //bibliography/*")
@@ -126,7 +126,7 @@ module Metanorma
                    "Document must contain at least one clause")
           return
         end
-        root.at("//references | //clause[descendant::references]"\
+        root.at("//references | //clause[descendant::references]" \
                 "[not(parent::clause)]") or
           @log.add("Style", nil, "Normative References are mandatory")
       end
@@ -138,7 +138,7 @@ module Metanorma
           @log.add("Style", nil, "Keywords are missing!")
         root.at("//foreword") or @log.add("Style", nil,
                                           "Preface is missing!")
-        root.at("//bibdata/contributor[role/@type = 'author']/organization/"\
+        root.at("//bibdata/contributor[role/@type = 'author']/organization/" \
                 "name") or
           @log.add("Style", nil, "Submitting Organizations is missing!")
         root.at("//submitters") or @log.add("Style", nil,

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "2.2.5".freeze
+    VERSION = "2.2.7".freeze
   end
 end

data/metanorma-ogc.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.license       = "BSD-2-Clause"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|.github)/}) \
+    || f.match(%r{Rakefile|bin/rspec})
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.add_dependency "iso-639"
   spec.add_dependency "metanorma-standoc", "~> 2.2.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso-639
@@ -215,9 +215,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/automerge.yml"
-- ".github/workflows/rake.yml"
-- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -225,10 +222,6 @@ files:
 - Gemfile
 - LICENSE
 - README.adoc
-- Rakefile
-- bin/console
-- bin/rspec
-- bin/setup
 - lib/isodoc/ogc.rb
 - lib/isodoc/ogc/base_convert.rb
 - lib/isodoc/ogc/biblio.rb
@@ -266,6 +259,7 @@ files:
 - lib/isodoc/ogc/ogc.community-practice.xsl
 - lib/isodoc/ogc/ogc.community-standard.xsl
 - lib/isodoc/ogc/ogc.discussion-paper.xsl
+- lib/isodoc/ogc/ogc.draft-standard.xsl
 - lib/isodoc/ogc/ogc.engineering-report.xsl
 - lib/isodoc/ogc/ogc.other.xsl
 - lib/isodoc/ogc/ogc.policy.xsl
@@ -314,14 +308,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Metanorma for the Open Geospatial Consortium.

data/.github/workflows/automerge.yml

@@ -1,31 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-# source: https://github.com/marketplace/actions/merge-pull-requests#usage
-name: automerge
-on:
-  pull_request:
-    types:
-      - labeled
-      - unlabeled
-      - synchronize
-      - opened
-      - edited
-      - ready_for_review
-      - reopened
-      - unlocked
-  pull_request_review:
-    types:
-      - submitted
-  check_suite:
-    types:
-      - completed
-  status: {}
-jobs:
-  automerge:
-    runs-on: ubuntu-latest
-    steps:
-      - id: automerge
-        name: automerge
-        uses: "pascalgn/automerge-action@v0.15.3"
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/rake.yml

@@ -1,15 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: rake
-
-on:
-  push:
-    branches: [ master, main ]
-    tags: [ v* ]
-  pull_request:
-
-jobs:
-  notify:
-    uses: metanorma/ci/.github/workflows/mn-processor-rake.yml@main
-    secrets:
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -1,24 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: release
-
-on:
-  workflow_dispatch:
-    inputs:
-      next_version:
-        description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
-        required: true
-        default: 'skip'
-  push:
-    tags: [ v* ]
-
-jobs:
-  release:
-    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
-    with:
-      next_version: ${{ github.event.inputs.next_version }}
-    secrets:
-      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
-      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-

data/Rakefile

@@ -1,8 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-require "isodoc/gem_tasks"
-
-IsoDoc::GemTasks.install
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "metanorma/ogc"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/rspec

@@ -1,17 +0,0 @@
-#!/usr/bin/env ruby
-
-# This file was generated by Bundler.
-#
-# The application 'rspec' is installed as part of a gem, and
-# this file is here to facilitate running it.
-#
-
-require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
-  "../../Gemfile", Pathname.new(__FILE__).realpath
-)
-
-require "rubygems"
-require "bundler/setup"
-
-load Gem.bin_path("rspec-core", "rspec")

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here