relaton-ogc 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6caf5d4a4e6f5eee6440ccb8df2aa2eb0f7d9c87231907c14f4a97d020d4ce38
-  data.tar.gz: 52284626d784706eaf4cd11d41d4b83fbb260d20a64e4dd5393e42b58fd1beee
+  metadata.gz: 3e0c167aee5738996ba54d4e53e9b528db53d837b519b6784b5fba212674ec70
+  data.tar.gz: a9c45d212c851a64c8bc195ad9d7d98f58a62284a9a57d05ce701589474bef81
 SHA512:
-  metadata.gz: de11232ae5d75f861587972c69ae12f6f484e03b42a7433b7a63185e7384cf72100b1de2ebb37a3e4d4d2db2b10219379aa237353f062e1a29134eb064691e8a
-  data.tar.gz: 924433e70dec7d09682436ded02b31fc3af8bbf1f8b07f037ff4e1f6b876539e9f7f1b37d6338186f5837e53af48524cd81875ec19d0791a6315deb8f86066c0
+  metadata.gz: c6c41f000b72a4ae126a7a2df77cf2d216c90f9378a9569b7a1b7e77c9970ae65b2c9b45fe54e32b4acf3695c66691b89a93a88bfd2a658b5b22407b79f58d97
+  data.tar.gz: 643cd929a4c34d44676777005c04aa44e1034491f138e54300f53e710153cb26f28cd59da58d5d3b62c435164906e09ffe0bdd730e4e91d425fec9b738d509a3

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:

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 Rails:
   Enabled: false

data/grammars/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/grammars/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -199,6 +204,18 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="dt">
+      <element name="dt">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="TextElement"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="example">
       <element name="example">
         <attribute name="id">
@@ -543,6 +560,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -890,6 +910,14 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="subdoctype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -939,7 +967,34 @@
   <define name="concept">
     <element name="concept">
       <optional>
-        <attribute name="term"/>
+        <attribute name="ital">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="ref">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <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"/>
@@ -965,6 +1020,9 @@
       </attribute>
       <attribute name="name"/>
       <attribute name="action"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
       <zeroOrMore>
         <choice>
           <ref name="TextElement"/>
@@ -1191,13 +1249,17 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="identifier"/>
+    </optional>
+    <optional>
+      <attribute name="prefix"/>
+    </optional>
     <text/>
   </define>
   <define name="ics">
@@ -1459,26 +1521,26 @@
     <optional>
       <ref name="section-title"/>
     </optional>
-    <group>
+    <choice>
       <choice>
         <group>
-          <zeroOrMore>
+          <oneOrMore>
             <ref name="BasicBlock"/>
-          </zeroOrMore>
+          </oneOrMore>
           <zeroOrMore>
             <ref name="note"/>
           </zeroOrMore>
         </group>
         <ref name="amend"/>
       </choice>
-      <zeroOrMore>
+      <oneOrMore>
         <choice>
           <ref name="clause-subsection"/>
           <ref name="terms"/>
           <ref name="definitions"/>
         </choice>
-      </zeroOrMore>
-    </group>
+      </oneOrMore>
+    </choice>
   </define>
   <define name="Annex-Section">
     <optional>

data/grammars/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/relaton_ogc/editorial_group.rb

@@ -74,7 +74,7 @@ module RelatonOgc
     # @return {RelatonIsoBib::IsoSubgroup}
     def subgroup(group)
       if group.is_a?(Hash)
-        RelatonIsoBib::IsoSubgroup.new(**group)
+        RelatonBib::WorkGroup.new(**group)
       else group
       end
     end

data/lib/relaton_ogc/scrapper.rb

@@ -34,7 +34,7 @@ module RelatonOgc
     class << self
       # papam hit [Hash]
       # @return [RelatonOgc::OrcBibliographicItem]
-      def parse_page(hit)
+      def parse_page(hit) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         type = fetch_type(hit["type"])
         OgcBibliographicItem.new(
           fetched: Date.today.to_s,

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.8.0".freeze
+  VERSION = "1.9.0".freeze
 end

data/lib/relaton_ogc/xml_parser.rb

@@ -9,7 +9,7 @@ module RelatonOgc
       # @param item_hash [Hash]
       # @return [RelatonOgc::OgcBibliographicItem]
       def bib_item(item_hash)
-        OgcBibliographicItem.new **item_hash
+        OgcBibliographicItem.new(**item_hash)
       end
 
       # Override RelatonIsoBib::XMLParser.item_data method.
@@ -35,7 +35,7 @@ module RelatonOgc
         sc = iso_subgroup eg&.at("subcommittee")
         wg = iso_subgroup eg&.at("workgroup")
         EditorialGroup.new(
-          committee: committe, subcommittee: sc, workgroup: wg
+          committee: committe, subcommittee: sc, workgroup: wg,
         )
       end
     end

data/relaton_ogc.gemspec

@@ -23,18 +23,17 @@ Gem::Specification.new do |spec|
   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.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.1"
-  spec.add_dependency "relaton-iso-bib", "~> 1.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-08-26 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.8.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.0
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="