relaton-omg 1.7.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ff0255fdcc11229f8bc0b5a401489235b437e8db134d51040755721654257e0
-  data.tar.gz: 81aaff0319047cad7841b8dc1e7454fd8cd1e86464422c895e6d42112155f8c2
+  metadata.gz: b95f791d4851dab63d7b6fc07b66e77103829244efb6446ff13c1a2352f9ed47
+  data.tar.gz: 85f1f3203efe994bab78befe1b17abafaf32987d5d26cf200d3ed232e4c2c8d3
 SHA512:
-  metadata.gz: 77d8ed9f152ba3c1b14401396ad3b7e64af93bd9854ccddedb17a3e476841df7b638faf1ea2bcdfc980c537decda19fb865a0ab446fce45d7d7896d57e62b3ee
-  data.tar.gz: 1708b0080cabdcbadad991edeb5cb793a407ba8dddf30792eea81a6ecc30754ee5c2f315539d337bb22a0d88647c66d2274f39e04fa00fb25014763659facb91
+  metadata.gz: c12d783cd2b8811b4070984c648e91ffbf91db58ea0a349c3aa0567670a9d1adfb3ab9ec2f1284c61db7f87abc20369be1492138b952d2ce643034bfaaacf45c
+  data.tar.gz: 1fbf5161688d72b4ef47cfd4ba96d691ae98f2705fd85f086842de011bd81228eca558ade9e6cfb32be1684573de85670ea67a3a08a5d0548c3c852734fe0317

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/README.adoc

@@ -33,6 +33,11 @@ Or install it yourself as:
 
 === Search document
 
+Reference format is `OMG + {ACRONYM} + {VERSION}`
+
+- `ACRONYM` is an acronym from the list of specs https://www.omg.org/spec/#all
+- `VERSION` (optional) if omitted then the lastes version is fetched
+
 [source,ruby]
 ----
 require 'relaton_omg'

data/grammars/biblio.rng

@@ -124,7 +124,7 @@
           <value>application/tei+xml</value>
           <value>text/x-asciidoc</value>
           <value>text/markdown</value>
-          <value>application/x-isodoc+xml</value>
+          <value>application/x-metanorma+xml</value>
           <text/>
         </choice>
       </attribute>
@@ -452,6 +452,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +462,7 @@
   <define name="org-identifier">
     <element name="identifier">
       <attribute name="type">
-        <choice>
-          <value>orcid</value>
-          <value>uri</value>
-        </choice>
+        <data type="string" datatypeLibrary=""/>
       </attribute>
       <text/>
     </element>
@@ -789,6 +787,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1106,7 +1105,7 @@
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>
-      <value>cited</value>
+      <value>cites</value>
       <value>isCitedIn</value>
     </choice>
   </define>

data/lib/relaton_omg/scrapper.rb

@@ -13,8 +13,8 @@ module RelatonOmg
         url += "/" + version if version
         doc = Nokogiri::HTML OpenURI.open_uri(URI(url))
         OmgBibliographicItem.new **item(doc, acronym)
-      rescue OpenURI::HTTPError => e
-        if e.io.status[0] == "404"
+      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.}
           return
         end
@@ -60,7 +60,7 @@ module RelatonOmg
       end
 
       def fetch_abstract(doc)
-        content = doc.at('//section[@id="document-metadata"]/p').text
+        content = doc.at('//section[@id="document-metadata"]/div/div/p').text
         [{ content: content, language: "en", script: "Latn" }]
       end
 
@@ -69,7 +69,7 @@ module RelatonOmg
       end
 
       def version(doc)
-        doc.at('//dt[.="Version:"]/following-sibling::dd/p/text()').text.strip
+        doc.at('//dt[.="Version:"]/following-sibling::dd/p/span').text
       end
 
       def fetch_date(doc)

data/lib/relaton_omg/version.rb

@@ -1,3 +1,3 @@
 module RelatonOmg
-  VERSION = "1.7.1".freeze
+  VERSION = "1.9.0".freeze
 end

data/relaton_omg.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
                        "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ogn"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/relaton/relaton-ogn"
@@ -27,14 +27,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "byebug"
-  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  # 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 "relaton-bib", "~> 1.7.0"
+  spec.add_dependency "relaton-bib", "~> 1.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.9.0
 description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
@@ -166,14 +166,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem