relaton-iho 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f42703d14350d77f2b7f27e05bcd39eb2368b93e41663958334510b4f39de72
-  data.tar.gz: 4858a670fa0dbb5c1d12fd2401ebbce7ef44c9dd57d5f3a30498abb700f2b82d
+  metadata.gz: 9081030fd9879044f6a850380bd33459ce7ecdd76869c37364b0364e5b4069cd
+  data.tar.gz: e65329781f6306a9eda0850bbff0951d348aaff0359067de4d9c9636dcf31ebb
 SHA512:
-  metadata.gz: adf0bec1036948bb9501671ca7116aad714d9accdeeb4ab973c7aec4d64bdf74ffb0a7dc9952d007a19d7ddb6a133d2f146190e4c6c06cd823e5bf8cc80ce7a2
-  data.tar.gz: e08a8892bdc5f10e359fcba761c8f0bd1757bfe91abb7e906fa866c7697a03f97c1cbc0d8bb90da92a228d89208efebb20bf23228439d58a89be9f6e99131245
+  metadata.gz: 584611520dcf2fc502065c40755d328b720026811164bdf265a16e121b2e26e1f77f81ae06e42ca71ba37fd16214ee52ed149a9f3c8529cb2074d895cad3302f
+  data.tar.gz: 68bee2e7910c5863aae0411af064c6825f124fff7a996550fdf983f5300bd45deeae128a6aeeac2e3da39bf272c8efe9e3af4c9e0117c7451bbf8aa0a2146fd0

data/lib/relaton_iho/config.rb

@@ -0,0 +1,10 @@
+module RelatonIho
+  module Config
+    include RelatonBib::Config
+  end
+  extend Config
+
+  class Configuration < RelatonBib::Configuration
+    PROGNAME = "relaton-iho".freeze
+  end
+end

data/lib/relaton_iho/iho_bibliography.rb

@@ -14,21 +14,26 @@ module RelatonIho
       # @return [RelatonIho::IhoBibliographicItem, nil] the IHO standard or nil if not found
       #
       def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        warn "[relaton-iho] (\"#{text}\") fetching..."
+        Util.warn "(#{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).max_by { |r| r[:id] }
-        return unless row
+        unless row
+          Util.warn "(#{text}) not found"
+          return
+        end
 
         uri = URI("#{ENDPOINT}#{row[:file]}")
         resp = Net::HTTP.get_response uri
-        return unless resp.code == "200"
+        unless resp.code == "200"
+          raise RelatonBib::RequestError, "Could not access #{uri}: HTTP #{resp.code}"
+        end
 
         yaml = RelatonBib.parse_yaml resp.body, [Date]
         hash = HashConverter.hash_to_bib yaml
         hash[:fetched] = Date.today.to_s
         item = IhoBibliographicItem.new(**hash)
-        warn "[relaton-iho] (\"#{text}\") found #{item.docidentifier.first.id}"
+        Util.warn "(#{text}) found `#{item.docidentifier.first.id}`"
         item
       rescue SocketError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,

data/lib/relaton_iho/util.rb

@@ -0,0 +1,9 @@
+module RelatonIho
+  module Util
+    extend RelatonBib::Util
+
+    def self.logger
+      RelatonIho.configuration.logger
+    end
+  end
+end

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.16.0".freeze
+  VERSION = "1.16.1".freeze
 end

data/lib/relaton_iho.rb

@@ -3,6 +3,8 @@ require "yaml"
 require "relaton_bib"
 require "relaton/index"
 require "relaton_iho/version"
+require "relaton_iho/config"
+require "relaton_iho/util"
 require "relaton_iho/iho_bibliography"
 require "relaton_iho/hash_converter"
 require "relaton_iho/xml_parser"
@@ -17,9 +19,9 @@ module RelatonIho
   # Returns hash of XML reammar
   # @return [String]
   def self.grammar_hash
-    gem_path = File.expand_path "..", __dir__
-    grammars_path = File.join gem_path, "grammars", "*"
-    grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
-    Digest::MD5.hexdigest grammars
+    # gem_path = File.expand_path "..", __dir__
+    # grammars_path = File.join gem_path, "grammars", "*"
+    # grammars = Dir[grammars_path].sort.map { |gp| File.read gp }.join
+    Digest::MD5.hexdigest RelatonIho::VERSION + RelatonBib::VERSION # grammars
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-03 00:00:00.000000000 Z
+date: 2023-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: relaton-bib
@@ -62,6 +62,7 @@ files:
 - grammars/relaton-iho.rng
 - lib/relaton_iho.rb
 - lib/relaton_iho/comment_periond.rb
+- lib/relaton_iho/config.rb
 - lib/relaton_iho/editorial_group.rb
 - lib/relaton_iho/eg.yml
 - lib/relaton_iho/hash_converter.rb
@@ -69,6 +70,7 @@ files:
 - lib/relaton_iho/iho_bibliography.rb
 - lib/relaton_iho/iho_group.rb
 - lib/relaton_iho/processor.rb
+- lib/relaton_iho/util.rb
 - lib/relaton_iho/version.rb
 - lib/relaton_iho/xml_parser.rb
 - relaton_iho.gemspec