relaton 1.11.4 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd53313a7d35f6ed1adf7669962afc84282d15d232247d3facec910aaba05270
-  data.tar.gz: 304a0e1c5a44731f0a4f9a30c063df920deb8694aca702044fd1ab03a10fe5e8
+  metadata.gz: 4c30099df631e2cbb313f936f4d6a339d9a0767c6d81f3e9523f6013ce95e77a
+  data.tar.gz: 9413dc9a5806d1b7a997c68298029407a5bc5fb0daa92e8c7f19c66b8b285bd3
 SHA512:
-  metadata.gz: 4cfb3d708769580fccb31ef09a408265a4b828e70082c7f44a2fe485c2982437cf4f8b8369ada51e7e2d9d3e05c05eada5eaca8126506ea5b9224b7575727501
-  data.tar.gz: 2255f0695f06f0714e55b03d9a9ad7c2b7567d417ff184e598c462e299aeed145fb6fb143fc9e83aedf7223479addd9542a6ea3d16b17298f55621676100010f
+  metadata.gz: 33f734e4a386c381de112a99f649c54a586c1367cf91065a693235c8c7252a414a38bffa589de960c3cb4564ab08a0311557c38e08804566ac06a8baf6207de7
+  data.tar.gz: d0e46c2f6ad5ac0263de42c693db297786b583da4a9b86fe2f3db9f2807e6fdd98c9934ff892d362f1e6a53f2c6cf9a8856b66f405b7fc8270c99f198b9a46b3

data/lib/relaton/db.rb

@@ -95,9 +95,18 @@ module Relaton
       result
     end
 
+    #
     # Fetch asynchronously
-    def fetch_async(code, year = nil, opts = {}, &block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-      stdclass = @registry.class_by_ref code
+    #
+    # @param [String] ref reference
+    # @param [String] year document yer
+    # @param [Hash] opts options
+    #
+    # @return [RelatonBib::BibliographicItem, RelatonBib::RequestError, nil] bibitem if document is found,
+    #   request error if server doesn't answer, nil if document not found
+    #
+    def fetch_async(ref, year = nil, opts = {}, &block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      stdclass = @registry.class_by_ref ref
       if stdclass
         unless @queues[stdclass]
           processor = @registry.processors[stdclass]
@@ -106,11 +115,14 @@ module Relaton
             args[3].call fetch(*args[0..2])
           rescue RelatonBib::RequestError => e
             args[3].call e
+          rescue StandardError => e
+            Util.log "[relaton] ERROR: #{args[0]} -- #{e.message}", :error
+            args[3].call nil
           end
           @queues[stdclass] = { queue: Queue.new, workers_pool: wp }
           Thread.new { process_queue @queues[stdclass] }
         end
-        @queues[stdclass][:queue] << [code, year, opts, block]
+        @queues[stdclass][:queue] << [ref, year, opts, block]
       else yield nil
       end
     end
@@ -356,8 +368,8 @@ module Relaton
       else
         return bib_retval(db[id], stdclass) if opts[:fetch_db]
 
-        db[id] ||= new_bib_entry(searchcode, year, opts, stdclass, db: db,
-                                                                   id: id)
+        entry = new_bib_entry(searchcode, year, opts, stdclass, db: db, id: id) unless db[id]
+        @semaphore.synchronize { db[id] ||= entry }
       end
       bib_retval(db[id], stdclass)
     end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.11.4".freeze
+  VERSION = "1.11.5".freeze
 end

data/spec/relaton/db_spec.rb

@@ -198,6 +198,22 @@ RSpec.describe Relaton::Db do
       expect(result).to be_nil
     end
 
+    it "handle HTTP request error" do
+      expect(db).to receive(:fetch).and_raise RelatonBib::RequestError
+      db.fetch_async("ISO REF") { |r| queue << r }
+      result = Timeout.timeout(5) { queue.pop }
+      expect(result).to be_instance_of RelatonBib::RequestError
+    end
+
+    it "handle other errors" do
+      expect(db).to receive(:fetch).and_raise Errno::EACCES
+      expect do
+        db.fetch_async("ISO REF") { |r| queue << r }
+        result = Timeout.timeout(5) { queue.pop }
+        expect(result).to be_nil
+      end.to output("[relaton] ERROR: ISO REF -- Permission denied\n").to_stderr
+    end
+
     it "use threads number from RELATON_FETCH_PARALLEL" do
       expect(ENV).to receive(:[]).with("RELATON_FETCH_PARALLEL").and_return(1)
       allow(ENV).to receive(:[]).and_call_original

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.11.5
 platform: ruby
 authors:
 - Ribose Inc.