metanorma-ogc 2.2.5 → 2.2.6

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.6".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.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-11-07 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