relaton-iho 1.14.1 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940290660744c08549c90e2f28aa593c809ac0621d312a89047c249630b92da3
-  data.tar.gz: e22ece93142456284a0419b0ecb9d88fc8b3da64b449a2a8b4b535b407bddb1c
+  metadata.gz: 7240754831c7c3f7755ca76ab9146e04ab8f47a49ab5f06510b995964bac12fc
+  data.tar.gz: 6c27b77afad2d493912506de26b7d22c1a9bba8c3e3d44d49c03420bdf8a5ed6
 SHA512:
-  metadata.gz: 5be56d9a8af28df3f02489c954c40005beb54424d1410250f23d989ae9b6ef9e64ee8acd33a60e898416407bf9c52f4be108bfa0e9c8a18c04ec5e5360097a34
-  data.tar.gz: 4940eec0bb2191fcd3de1300b4af177c9d877f1b907897cc106c6d8c83af3d6aa04cdb3cfc22118b21dc2f041695866d96fc483016d8154a18f5207040c2af4a
+  metadata.gz: 583f3052bdce69fc00b5b784ac697311d3094de006f5eaf1474ecc974095ec8e9bc6884c00787f4f4225c5e9bef903b24a473caa9d2bbd8881863265e3b69e2d
+  data.tar.gz: 1038cb049fccc2606c6c7a112dbf36d554c27225952701ac77b4d27e8d819926210854d1d6befa37e12017cc4b2f4778d44c4122073cc3a81f64653071b21ec8

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/README.adoc

@@ -39,16 +39,26 @@ $ gem install relaton-iho
 
 === Search for a standard using keywords
 
+Reference can be specified with or without an edition. References without an edition will return the latest edition of the standard. References with an edition will return the standard with the specified edition.
+
 [source,ruby]
 ----
 require 'relaton_iho'
 => true
 
-item = RelatonIho::IhoBibliography.search("B-11")
-[relaton-iho] ("B-11") fetching...
-[relaton-iho] ("B-11") found B-11
+# Search for a standard using a reference without an edition
+item = RelatonIho::IhoBibliography.search("IHO B-11")
+[relaton-iho] ("IHO B-11") fetching...
+[relaton-iho] ("IHO B-11") found B-11
 => #<RelatonIho::IhoBibliographicItem:0x007fe74fc80800
 ...
+
+# Search for a standard using a reference with an edition
+item = RelatonIho::IhoBibliography.search("IHO B-11 1.0.0")
+[relaton-iho] ("IHO B-11 1.0.0") fetching...
+[relaton-iho] ("IHO B-11 1.0.0") found B-11
+=> #<RelatonIho::IhoBibliographicItem:0x00007fe79d0ed698
+...
 ----
 
 === XML serialization

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_iho/iho_bibliography.rb

@@ -17,7 +17,7 @@ module RelatonIho
         warn "[relaton-iho] (\"#{text}\") fetching..."
         ref = text.sub(/^IHO\s/, "").sub(/^([[:alpha:]]+)(\d+)/, '\1-\2')
         index = Relaton::Index.find_or_create :IHO, url: "#{ENDPOINT}index.zip"
-        row = index.search(ref).first
+        row = index.search(ref).max_by { |r| r[:id] }
         return unless row
 
         uri = URI("#{ENDPOINT}#{row[:file]}")

data/lib/relaton_iho/processor.rb

@@ -36,5 +36,12 @@ module RelatonIho
     def grammar_hash
       @grammar_hash ||= ::RelatonIho.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create(:IHO, url: true).remove_file
+    end
   end
 end

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.14.1".freeze
+  VERSION = "1.14.3".freeze
 end

data/relaton_iho.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.0"
 
   s.add_dependency "relaton-bib", "~> 1.14.0"
-  s.add_dependency "relaton-index", "~> 0.1.0"
+  s.add_dependency "relaton-index", "~> 0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 description: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem
   model'
 email:
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem