relaton-ogc 1.12.0 → 1.14.0

data/grammars/{ogc.rng → relaton-ogc.rng}

@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0">
-  <!--
-    Currently we inherit from a namespaced grammar, isostandard. Until we inherit from isodoc,
-    we cannot have a new default namespace: we will end up with a grammar with two different
-    namespaces, one for isostandard and one for csand additions. And we do not want that.
-  -->
-  <include href="isodoc.rng">
-    <start>
-      <ref name="ogc-standard"/>
-    </start>
+  <include href="biblio-standoc.rng">
     <define name="DocumentType">
       <choice>
         <value>abstract-specification-topic</value>
@@ -26,6 +18,20 @@
         <value>user-guide</value>
         <value>white-paper</value>
         <value>test-suite</value>
+        <value>draft-standard</value>
+      </choice>
+    </define>
+    <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="editorialgroup">
@@ -40,6 +46,9 @@
       </element>
     </define>
     <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
       <optional>
         <ref name="doctype"/>
       </optional>
@@ -51,52 +60,7 @@
         <ref name="ics"/>
       </zeroOrMore>
     </define>
-    <define name="preface">
-      <element name="preface">
-        <optional>
-          <ref name="abstract"/>
-        </optional>
-        <ref name="foreword"/>
-        <optional>
-          <ref name="submitters"/>
-        </optional>
-      </element>
-    </define>
-    <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>
   </include>
-  <define name="TextElement" combine="choice">
-    <ref name="hi"/>
-  </define>
-  <define name="PureTextElement" combine="choice">
-    <ref name="hi"/>
-  </define>
-  <define name="hi">
-    <element name="hi">
-      <zeroOrMore>
-        <choice>
-          <ref name="PureTextElement"/>
-          <ref name="stem"/>
-        </choice>
-      </zeroOrMore>
-    </element>
-  </define>
-  <define name="submitters">
-    <element name="submitters">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="committee">
     <element name="committee">
       <choice>
@@ -116,36 +80,4 @@
       <ref name="IsoWorkgroup"/>
     </element>
   </define>
-  <define name="ogc-standard">
-    <element name="ogc-standard">
-      <attribute name="version"/>
-      <attribute name="type">
-        <choice>
-          <value>semantic</value>
-          <value>presentation</value>
-        </choice>
-      </attribute>
-      <ref name="bibdata"/>
-      <zeroOrMore>
-        <ref name="termdocsource"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="misccontainer"/>
-      </optional>
-      <optional>
-        <ref name="boilerplate"/>
-      </optional>
-      <ref name="preface"/>
-      <oneOrMore>
-        <ref name="sections"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="annex"/>
-      </zeroOrMore>
-      <ref name="bibliography"/>
-      <zeroOrMore>
-        <ref name="indexsect"/>
-      </zeroOrMore>
-    </element>
-  </define>
 </grammar>

data/lib/relaton_ogc/ogc_bibliographic_item.rb

@@ -25,6 +25,15 @@ module RelatonOgc
       super
     end
 
+    #
+    # Fetches flavof schema version
+    #
+    # @return [String] schema version
+    #
+    def ext_schema
+      @ext_schema ||= schema_versions["relaton-model-ogc"]
+    end
+
     # @param hash [Hash]
     # @return [RelatonOgc::OgcBibliographicItem]
     def self.from_hash(hash)
@@ -45,14 +54,15 @@ module RelatonOgc
     # @option opts [Symbol, NilClass] :date_format (:short), :full
     # @option opts [String, Symbol] :lang language
     # @return [String] XML
-    def to_xml(**opts)
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize
       super(**opts) do |b|
-        b.ext do
+        ext = b.ext do
           b.doctype doctype if doctype
           b.subdoctype subdoctype if subdoctype
           editorialgroup&.to_xml b
           ics.each { |i| i.to_xml b }
         end
+        ext["schema-version"] = ext_schema unless opts[:embedded]
       end
     end
 

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.12.0".freeze
+  VERSION = "1.14.0".freeze
 end

data/relaton_ogc.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.14.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-25 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.14.0
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
@@ -159,6 +159,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -170,10 +171,10 @@ files:
 - bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
+- grammars/biblio-standoc.rng
 - grammars/biblio.rng
-- grammars/isodoc.rng
-- grammars/ogc.rng
-- grammars/reqt.rng
+- grammars/relaton-ogc-compile.rng
+- grammars/relaton-ogc.rng
 - lib/relaton_ogc.rb
 - lib/relaton_ogc/data_fetcher.rb
 - lib/relaton_ogc/editorial_group.rb
@@ -191,7 +192,7 @@ homepage: https://github.com/relaton/relaton-ogc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -206,8 +207,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'