relaton-omg 1.9.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b95f791d4851dab63d7b6fc07b66e77103829244efb6446ff13c1a2352f9ed47
-  data.tar.gz: 85f1f3203efe994bab78befe1b17abafaf32987d5d26cf200d3ed232e4c2c8d3
+  metadata.gz: 5bdab8ba35f329c71ab5d5727467507fbc7f3f39d2ae590049fe011de62afd07
+  data.tar.gz: ad7cc4e71c4658dfdcd895829a1326d92931b9a22ab84a79f7efce0603a96594
 SHA512:
-  metadata.gz: c12d783cd2b8811b4070984c648e91ffbf91db58ea0a349c3aa0567670a9d1adfb3ab9ec2f1284c61db7f87abc20369be1492138b952d2ce643034bfaaacf45c
-  data.tar.gz: 1fbf5161688d72b4ef47cfd4ba96d691ae98f2705fd85f086842de011bd81228eca558ade9e6cfb32be1684573de85670ea67a3a08a5d0548c3c852734fe0317
+  metadata.gz: 85840d46dc0218f3bb865ad897998b1b16448ea28243138ee3bdeeed3d1fcc923512a3d1cce2788683135f72dddab8d625eeee79ffdf9118f2b2c3f60749f03e
+  data.tar.gz: c652e13e1597a3b09790fc7c662228561593329136d5abbb2dc175feb128650454ecd84b615c28e9f04d7d9dd4ab864ad1b0f5b31cd02b713c00f58d43435a07

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # 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:

data/README.adoc

@@ -43,12 +43,12 @@ Reference format is `OMG + {ACRONYM} + {VERSION}`
 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
 ----
@@ -81,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]
 ----
@@ -90,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'
@@ -102,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

@@ -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"/>
@@ -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

@@ -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.9.0".freeze
+  VERSION = "1.11.0".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.9.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.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.11.0
 description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email: