relaton-omg 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 05ffe60d5d13aabbeaf36188da133a0bc1ef235aa47d79935cd787783cdcf3e5
-  data.tar.gz: 314cb574d9366c2e224d4701d6a84b601c8c07222c6fd8eb68b1050dc451daf7
+  metadata.gz: fefb5094555823591ad1e2193663adf0fe54bf836cd84e5888264a6c177ece91
+  data.tar.gz: 3303ea852975eebcf39cd70ed5893018c47ad359e0191ecbc90bcfcbdef73f16
 SHA512:
-  metadata.gz: 5b333cb4e949774c26b29e39bbcfd78c1999f20113037180e5d57b70b1d6fc196a4ac40d84428246eae429e221551ebcaf6fd88a4bcd0ffa42941e4517387912
-  data.tar.gz: 220a8897c4d5720ee9324eb4bc1dd7f22d100f6d3d9236cd573e6086bce8fe1a36bad5c47fdf0a2dbf563045b595cb23301a91c2c0dee04735dac78dd4a78214
+  metadata.gz: 4ac918dba0c0fb4d20a3c6f58b66d7435b830c91022761911688ae8bbc474446cda4f04b67ffc2a864df415dccc6eef02a56e69495d37ce00686a6075e73188f
+  data.tar.gz: a512281190f1fa8fafa0a937de563a689c9117427b0e7a3e238924d3250945d98fe0a9cb52ed15b746eb931a79c675a8745de0e9c0a217ae267b6824db78bad2

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,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/omg_bibliographic_item.rb

@@ -12,7 +12,7 @@ module RelatonOmg
       # @return [RelatonOmg::OmgBibliographicItem]
       def from_hash(hash)
         bib_hash = RelatonOmg::HashConverter.hash_to_bib(hash)
-        new **bib_hash
+        new(**bib_hash)
       end
 
       # @param file [String] path to XML file

data/lib/relaton_omg/scrapper.rb

@@ -2,17 +2,17 @@ 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))
-        OmgBibliographicItem.new **item(doc, acronym)
+        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
         if e.is_a?(URI::InvalidURIError) || e.io.status[0] == "404"
           warn %{[relaton-omg] no document found for "#{ref}" reference.}
@@ -24,7 +24,7 @@ module RelatonOmg
 
       private
 
-      def item(doc, acronym)
+      def item(doc, acronym) # rubocop:disable Metrics/MethodLength
         {
           id: fetch_id(doc, acronym),
           fetched: Date.today.to_s,
@@ -37,7 +37,7 @@ module RelatonOmg
           link: fetch_link(doc),
           relation: fetch_relation(doc),
           keyword: fetch_keyword(doc),
-          license: fetch_license(doc)
+          license: fetch_license(doc),
         }
       end
 
@@ -56,7 +56,7 @@ module RelatonOmg
         if (ver = version(doc))
           id << ver
         end
-        [RelatonBib::DocumentIdentifier.new(id: id.join(" "), type: "OMG")]
+        [RelatonBib::DocumentIdentifier.new(id: id.join(" "), type: "OMG", primary: true)]
       end
 
       def fetch_abstract(doc)
@@ -95,13 +95,13 @@ module RelatonOmg
         links
       end
 
-      def fetch_relation(doc)
+      def fetch_relation(doc) # rubocop:disable Metrics/MethodLength
         current_version = version(doc)
         v = doc.xpath('//h2[.="History"]/following-sibling::section/div/table/tbody/tr')
         v.reduce([]) do |mem, row|
           ver = row.at("td").text
           unless ver == current_version
-            acronym = row.at('td[3]/a')[:href].split("/")[4]
+            acronym = row.at("td[3]/a")[:href].split("/")[4]
             fref = RelatonBib::FormattedRef.new content: "OMG #{acronym} #{ver}"
             bibitem = OmgBibliographicItem.new formattedref: fref
             mem << { type: "obsoletes", bibitem: bibitem }
@@ -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.0".freeze
+  VERSION = "1.11.1".freeze
 end

data/lib/relaton_omg/xml_parser.rb

@@ -17,7 +17,7 @@ module RelatonOmg
       # @param item_hash [Hash]
       # @return [RelatonOmg::OmgBibliographicItem]
       def bib_item(item_hash)
-        OmgBibliographicItem.new **item_hash
+        OmgBibliographicItem.new(**item_hash)
       end
     end
   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.0"
+  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.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 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.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email: