relaton-omg 1.10.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25e974b4ee6e3252b54de2b60046e8f6a663da8243e7faf4bf7a3534a5df2000
-  data.tar.gz: 7dd39b0a40d2b466182f3cbbb330f71fa52d1b7a3b35e27a7dd1211bffc88d03
+  metadata.gz: a9123661919e1997f9de01973768d2917658fffd128101550d4610a09bb4a2ba
+  data.tar.gz: b6c37ef10b2369fe8cf404ea3b1235deda5ffe4425fa4727f156745318b96e48
 SHA512:
-  metadata.gz: 7257fc7500c4c82d086a961e42c51cbb73b718c138bd70902d70f7bbb74ad84242414b4f81149a0573c444f3da8c5fc343ebdbb324ac48b3060b8a405a8c2cd6
-  data.tar.gz: 89e56ff2c08ffe8e4fcca291ff9ab0fa527992aeb16229c137d7686a412e6678b3e0e27dbec506c03fa60c016e11bdd891088663d9bf63ba5a671944d610a0e8
+  metadata.gz: 349b1a17c8d0edeffea739781d4a883836e83e7cd8f166d27a2778d1b2f2d8dc25cba78e6ecd0e44845ebe9633d454396d2584897d8b62536dbde67994881d71
+  data.tar.gz: a4598a213af30fa78df50993170ae40e15427197d86e54fd61b5a0741b517ea8a7e05f11f73a1c436e1657b2bee998b01885226f32821f81f72e2d1f9a872d81

data/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/lib/relaton_omg/scrapper.rb

@@ -2,18 +2,18 @@ require "nokogiri"
 
 module RelatonOmg
   module Scrapper
-    URL_PATTERN = "https://www.omg.org/spec/"
+    URL_PATTERN = "https://www.omg.org/spec/".freeze
 
     class << self
-      def scrape_page(ref)
+      def scrape_page(ref) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         %r{OMG (?<acronym>[^\s]+)\s?(?<version>.*)} =~ ref
         return unless acronym
 
         url = URL_PATTERN + acronym
-        url += "/" + version if version
-        doc = Nokogiri::HTML OpenURI.open_uri(URI(url))
+        url += "/#{version}" if version
+        doc = Nokogiri::HTML OpenURI.open_uri(url, open_timeout: 10)
         OmgBibliographicItem.new(**item(doc, acronym))
-      rescue OpenURI::HTTPError, URI::InvalidURIError => e
+      rescue OpenURI::HTTPError, URI::InvalidURIError, Net::OpenTimeout => e
         if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
           warn %{[relaton-omg] no document found for "#{ref}" reference.}
           return
@@ -116,7 +116,7 @@ module RelatonOmg
 
       def fetch_license(doc)
         doc.xpath(
-          '//dt/span/a[contains(., "IPR Mode")]/../../following-sibling::dd/span'
+          '//dt/span/a[contains(., "IPR Mode")]/../../following-sibling::dd/span',
         ).map { |l| l.text.match(/[\w\s-]+/).to_s.strip }
       end
     end

data/lib/relaton_omg/version.rb

@@ -1,3 +1,3 @@
 module RelatonOmg
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.2".freeze
 end

data/relaton_omg.gemspec

@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.10.1"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email: