relaton-ogc 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a38c9dc676ea585e444e7cfcb06e216b5a862db7684777e294299c4ed493ff
-  data.tar.gz: be628a96ced2f4c262477043da015e5f7acb392995316fde66a7e4818e55c0bf
+  metadata.gz: ae341d281586acccf073502fcd3c6a365318e281541294783c9d1dc58e641f3f
+  data.tar.gz: f90b4586a0738444aced05be6288ead41293ba9931fc2dedc45b656be81b5321
 SHA512:
-  metadata.gz: 0242ef19a2b5498eafef4b0fa4eff285d03942d87b0e7f7ee12767a94379acd7ced4657190688b1fd74690f5d9eda7eb59d3ef6779fd1b9836d44f5fb65a34cd
-  data.tar.gz: 4faaeb44bfdb72466f126ffff9aba347084e71f96d4321a9b732f053fafa54e24dd51f4580e33fae1853b68d01c362105673ab57784ac2014ada34350929a5f4
+  metadata.gz: 6f3bc34127f4e1e263fe0f258a265d492001fa9da483eed7c70aed22aec4b80beb5f987f82d8da6c0c455eb630919bb367206a8b76ad78cebe53e04b398ee79b
+  data.tar.gz: 9c4fc6e1f66b79767a2f68a8e74816c545c602b932d8677f6ee03dbcd01dec532a44fb515871fba073b919dce75c6681eec48cdcf010b2f0831ccdf6d63dc522

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -1164,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_ogc/hit_collection.rb

@@ -52,10 +52,15 @@ module RelatonOgc
     #
     # fetch data form server and save it to file.
     #
-    def fetch_data
-      resp = Faraday.new(ENDPOINT, headers: { "If-None-Match" => etag }).get
+    def fetch_data # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      h = {}
+      h["If-None-Match"] = etag if etag
+      resp = Faraday.new(ENDPOINT, headers: h).get
       # return if there aren't any changes since last fetching
-      raise RelatonBib::RequestError, "Could not access #{ENDPOINT}" unless resp.status == 200
+      return if resp.status == 304
+      unless resp.status == 200
+        raise RelatonBib::RequestError, "Could not access #{ENDPOINT}"
+      end
 
       FileUtils.mkdir_p DATADIR unless Dir.exist? DATADIR
       self.etag = resp[:etag]

data/lib/relaton_ogc/ogc_bibliography.rb

@@ -54,9 +54,9 @@ module RelatonOgc
           return { ret: item } if !year
 
           item.date.select { |d| d.type == "published" }.each do |d|
-            return { ret: item } if year.to_i == d.on.year
+            return { ret: item } if year.to_i == d.on(:year)
 
-            missed_years << d.on.year
+            missed_years << d.on(:year)
           end
         end
         { years: missed_years }

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.0".freeze
 end

data/relaton_ogc.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.0.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.5.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-09 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.0
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email: