relaton-omg 1.7.3 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b0a5ffff840bd561fa694ef65b560833675404aebbbbf5b1fe2aede4d78f9c
-  data.tar.gz: 0010cb2fca5d9d2652d8a12336e385dcc4cfff8b228af356c95eef531ab6ce99
+  metadata.gz: 25e974b4ee6e3252b54de2b60046e8f6a663da8243e7faf4bf7a3534a5df2000
+  data.tar.gz: 7dd39b0a40d2b466182f3cbbb330f71fa52d1b7a3b35e27a7dd1211bffc88d03
 SHA512:
-  metadata.gz: 0bff9107061019e111fd8e9fb20cea4b172c01977db25acf46a585c20bfcd67b166df4ffe0205b5889e7b45a9c639e2e58efa326a79e89c8a8a7bca2f9309949
-  data.tar.gz: e8b9e613d354cc0fca62e48d655f9c8dc81bd2e409fbdfea79f430c0433b416fb967162b6fb9d13dbd2211b25ba46e8910d2637ae0216dfc27293adff51b8c88
+  metadata.gz: 7257fc7500c4c82d086a961e42c51cbb73b718c138bd70902d70f7bbb74ad84242414b4f81149a0573c444f3da8c5fc343ebdbb324ac48b3060b8a405a8c2cd6
+  data.tar.gz: 89e56ff2c08ffe8e4fcca291ff9ab0fa527992aeb16229c137d7686a412e6678b3e0e27dbec506c03fa60c016e11bdd891088663d9bf63ba5a671944d610a0e8

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

@@ -2,9 +2,11 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 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,17 +33,22 @@ 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'
 => true
 
-item = RelatonOmg::OmgBibliography.search 'OMG AMI4CCM 1.0'
+item = RelatonOmg::OmgBibliography.get 'OMG AMI4CCM 1.0'
 => #<RelatonOmg::OmgBibliographicItem:0x007fda17eab2f0
 ...
 
 # Return nil if document doesn't exist.
-RelatonOmg::OmgBibliography.search 'OMG 1111'
+RelatonOmg::OmgBibliography.get 'OMG 1111'
 [relaton-omg] no document found for "OMG 1111" reference.
 => nil
 ----
@@ -76,7 +81,18 @@ item.to_xml
   </bibitem>"
 ----
 
-=== Create bibliographic item form XML
+=== Typed links
+
+OMG documents may have `src` and `pdf` link types.
+
+[source,ruby]
+----
+item.link
+=> [#<RelatonBib::TypedUri:0x00007fa897a72208 @content=#<Addressable::URI:0x80c URI:https://www.omg.org/spec/AMI4CCM/1.0/About-AMI4CCM/>, @type="src">,
+ #<RelatonBib::TypedUri:0x00007fa897a71600 @content=#<Addressable::URI:0x820 URI:https://www.omg.org/spec/AMI4CCM/1.0/PDF>, @type="pdf">]
+----
+
+=== Create bibliographic item from XML
 
 [source,ruby]
 ----
@@ -85,7 +101,7 @@ item = RelatonOmg::OmgBibliographicItem.from_xml 'spec/fixtures/omg_ami4ccm_1_0.
 ...
 ----
 
-=== Create bibliographic item form Hash
+=== Create bibliographic item from Hash
 [source,ruby]
 ----
 hash = YAML.load_file 'spec/fixtures/omg_ami4ccm_1_0.yaml'
@@ -97,7 +113,7 @@ item = RelatonOmg::OmgBibliographicItem.from_hash hash
 ...
 ----
 
-=== Create bibliographic item form YAML
+=== Create bibliographic item from YAML
 [source,ruby]
 ----
 item = RelatonOmg::OmgBibliographicItem.from_yaml 'spec/fixtures/omg_ami4ccm_1_0.yaml'

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>
@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -401,9 +398,9 @@
       <choice>
         <!-- iso191606 TODO -->
         <group>
-          <oneOrMore>
+          <zeroOrMore>
             <ref name="street"/>
-          </oneOrMore>
+          </zeroOrMore>
           <ref name="city"/>
           <optional>
             <ref name="state"/>
@@ -452,6 +449,7 @@
       <attribute name="type">
         <choice>
           <value>isni</value>
+          <value>orcid</value>
           <value>uri</value>
         </choice>
       </attribute>
@@ -461,10 +459,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 +784,7 @@
       <value>adapted</value>
       <value>vote-started</value>
       <value>vote-ended</value>
+      <value>announced</value>
     </choice>
   </define>
   <define name="bdate">
@@ -829,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1106,7 +1107,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/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

@@ -12,7 +12,7 @@ module RelatonOmg
         url = URL_PATTERN + acronym
         url += "/" + version if version
         doc = Nokogiri::HTML OpenURI.open_uri(URI(url))
-        OmgBibliographicItem.new **item(doc, acronym)
+        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 }

data/lib/relaton_omg/version.rb

@@ -1,3 +1,3 @@
 module RelatonOmg
-  VERSION = "1.7.3".freeze
+  VERSION = "1.10.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

@@ -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.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2022-02-08 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.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.1
 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