relaton-ogc 1.4.0 → 1.6.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e0fa8b5d0b490c0f9202c6810b4e14b86d159d8f1597117585a1483abaf017
-  data.tar.gz: 89ec958bb6e7a8fcdc7d396f3acbf50c42c6cdf6ca1162368796450412c659a3
+  metadata.gz: 3487044fb3801af6c296c4a68993b4810da56d51c70aaae849e905f133995467
+  data.tar.gz: 9b2090662526e3af7bb5ceccd4c7439dabf78881a0bb83d8115d95cd677713d1
 SHA512:
-  metadata.gz: 2e73e39acf5542e32647ad6a37a3dde030303a9b1a53c771c611a31fb825ddfdda5cc9c3ceb80e4f8ed51649c2d061c9dfaa0cba704609499ef8da29823f045b
-  data.tar.gz: 750aa6c94fffa2f464cccc6e6cd00fc1f4e26dd81c86351877bac886188a9f69566e95764df814ba918f6922b02cf29289699e29175d3ea8f35ff0e1cfc342d9
+  metadata.gz: 660c7b886d72f716a4c3f9b2797f1254615785b0d184fb030eeb348de802d0fc11889e21efa311052c9fbb4b275998d93d4faf65841b58d541ce14f5dbbc0e76
+  data.tar.gz: 852ad063d378e0d23b7de6301b00b5755dc2e8657028375662efd850b4d63acccaae5d78e8835cf0e845567e79a1d7c5816101a40f8063c240c790c1ec159486

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

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -864,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>

data/grammars/ogc.rng

@@ -104,6 +104,13 @@
   </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"/>

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_bibliographic_item.rb

@@ -36,11 +36,14 @@ module RelatonOgc
       hash
     end
 
-    # @param builder [Nokogiri::XML::Builder]
     # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] :bibdata
-    def to_xml(builder = nil, **opts)
-      super do |b|
+    # @option opts [Symbol, NilClass] :date_format (:short), :full
+    # @option opts [String, Symbol] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      super **opts do |b|
         b.ext do
           b.doctype doctype if doctype
           b.docsubtype docsubtype if docsubtype

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.4.0".freeze
+  VERSION = "1.6.pre1".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.4.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.6.pre"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.pre1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.pre
 description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
@@ -230,9 +230,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.6
 signing_key: