metanorma-ogc 1.3.1 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c844c9413112ce478961eaee4dc1d9095cb45f7a9037e5fb2a017aa14df2570a
-  data.tar.gz: b18b7340a94b1ca58ae3e1acc4531fb27c64f65077a523ce725c5f0672beb9dc
+  metadata.gz: ad3456994609c7561163566d0be10cf0770f4f3423871dbefcf24657d5e551a7
+  data.tar.gz: 79a4f0da33d0194fb0684483977dcf75355f0660749d8bc649e710f72e31ae95
 SHA512:
-  metadata.gz: d1322f1463bcf357d6528a2db5c3ce2e8b1f2b34123aab899896afb99c8036d47396b892085676222b466602a26656ae903d9cea1857fe9c730b0d39567b254c
-  data.tar.gz: d85779466d2a1f7f973b47888520a1c633ed45b0afb07d0f2cc78ec13e5c21807ca76e8486a15535b4126a831abdfa238e7cd1b51837339582d3b5150b4bdb2b
+  metadata.gz: 35342c6a703f8a6a3bb910cdceea76ae6500d0423c248b51efd55b5a850f25be5e645c89c8fe09a1f662a817a693dea123074c434afd7bfaadb05dc7d2ad6eb2
+  data.tar.gz: a7c312698494e453a5f12ac8450d2ebe182a8b708dbaef2352a5eeec9054a3151695cd3a2efce1f7f4d0d3e05a6050278932567d9e7da7c63c28b1ba438efc55

data/.github/workflows/rake.yml

@@ -16,19 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
-        include:
-          - ruby: '3.0'
-            os: 'ubuntu-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'windows-latest'
-            experimental: true
-          - ruby: '3.0'
-            os: 'macos-latest'
-            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:
@@ -40,3 +30,14 @@ jobs:
           bundler-cache: true
 
       - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: tests-passed
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.hound.yml

@@ -1,3 +1,5 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 ruby:
-  Enabled: true
+  enabled: true
   config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,14 +1,10 @@
-# This project follows the Ribose OSS style guide.
-# https://github.com/riboseinc/oss-guides
-# All project-specific additions and overrides should be specified in this file.
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
 # local repo-specific modifications
+# ...
 
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
-Rails:
-  Enabled: true
+  TargetRubyVersion: 2.5

data/Gemfile

@@ -6,6 +6,6 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
-if File.exist? 'Gemfile.devel'
-  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
 end

data/Rakefile

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

data/lib/asciidoctor/ogc.rb

@@ -2,6 +2,5 @@ require "asciidoctor/ogc/converter"
 
 module Asciidoctor
   module Ogc
-
   end
 end

data/lib/asciidoctor/ogc/biblio.rng

@@ -787,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">

data/lib/asciidoctor/ogc/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -543,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -876,8 +884,28 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="docsubtype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -927,7 +955,24 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <element name="refterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="renderterm">
+          <zeroOrMore>
+            <choice>
+              <ref name="PureTextElement"/>
+              <ref name="stem"/>
+            </choice>
+          </zeroOrMore>
+        </element>
       </optional>
       <choice>
         <ref name="eref"/>
@@ -943,8 +988,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
+    </choice>
+  </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
     </choice>
   </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
+    </choice>
+  </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -1017,9 +1224,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/ogc/ogc.rng

@@ -79,20 +79,18 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="docsubtype">
-    <element name="docsubtype">
-      <choice>
-        <value>conceptual-model</value>
-        <value>conceptual-model-and-encoding</value>
-        <value>conceptual-model-and-implementation</value>
-        <value>encoding</value>
-        <value>extension</value>
-        <value>implementation</value>
-        <value>profile</value>
-        <value>profile-with-extension</value>
-        <value>general</value>
-      </choice>
-    </element>
+  <define name="DocumentSubtype">
+    <choice>
+      <value>conceptual-model</value>
+      <value>conceptual-model-and-encoding</value>
+      <value>conceptual-model-and-implementation</value>
+      <value>encoding</value>
+      <value>extension</value>
+      <value>implementation</value>
+      <value>profile</value>
+      <value>profile-with-extension</value>
+      <value>general</value>
+    </choice>
   </define>
   <define name="submitters">
     <element name="submitters">

data/lib/isodoc/ogc.rb

@@ -7,6 +7,5 @@ require "isodoc/ogc/xref"
 
 module IsoDoc
   module Ogc
-
   end
 end

data/lib/isodoc/ogc/metadata.rb

@@ -19,7 +19,7 @@ module IsoDoc
       "user-guide" => "UG",
       "white-paper" => "WP",
       "other" => "other",
-    }
+    }.freeze
 
     DOCSUBTYPE_ABBR = {
       "implementation" => "IMP",
@@ -31,7 +31,7 @@ module IsoDoc
       "profile" => "PF",
       "profile-with-extension" => "PFE",
       "general" => "GE",
-    }
+    }.freeze
 
     class Metadata < IsoDoc::Metadata
       def initialize(lang, script, i18n)
@@ -53,16 +53,20 @@ module IsoDoc
       def author(isoxml, _out)
         tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
-        authors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'author']/person"))
+        authors = isoxml.xpath(ns("//bibdata/contributor"\
+                                  "[role/@type = 'author']/person"))
         set(:authors, extract_person_names(authors))
-        editors = isoxml.xpath(ns("//bibdata/contributor[role/@type = 'editor']/person"))
+        editors = isoxml.xpath(ns("//bibdata/contributor"\
+                                  "[role/@type = 'editor']/person"))
         set(:editors, extract_person_names(editors))
         agency(isoxml)
       end
 
       def docid(isoxml, _out)
-        set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-internal']"))&.text)
-        set(:externalid, isoxml&.at(ns("//bibdata/docidentifier[@type = 'ogc-external']"))&.text)
+        set(:docnumber, isoxml&.at(ns("//bibdata/docidentifier"\
+                                      "[@type = 'ogc-internal']"))&.text)
+        set(:externalid, isoxml&.at(ns("//bibdata/docidentifier"\
+                                       "[@type = 'ogc-external']"))&.text)
       end
 
       def unpublished(status)
@@ -78,11 +82,12 @@ module IsoDoc
 
       def url(xml, _out)
         super
-        a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and set(:previousuri, a.text)
+        a = xml.at(ns("//bibdata/uri[@type = 'previous']")) and
+          set(:previousuri, a.text)
       end
 
-      def type_capitalise(b)
-        b.split(/[- ]/).map do |w|
+      def type_capitalise(type)
+        type.split(/[- ]/).map do |w|
           %w(SWG).include?(w) ? w : w.capitalize
         end.join(" ")
       end
@@ -98,12 +103,12 @@ module IsoDoc
         end
       end
 
-      def doctype_abbr(b)
-        IsoDoc::Ogc::DOCTYPE_ABBR[b] || b
+      def doctype_abbr(type)
+        IsoDoc::Ogc::DOCTYPE_ABBR[type] || type
       end
 
-      def docsubtype_abbr(st, t)
-        IsoDoc::Ogc::DOCSUBTYPE_ABBR[st] || st
+      def docsubtype_abbr(subtype, _type)
+        IsoDoc::Ogc::DOCSUBTYPE_ABBR[subtype] || st
       end
 
       def status_print(status)