relaton 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d217d10128648eabc4dbeed414e931b6bb4bfcb9f51f74a11e49fdc0af513c6e
-  data.tar.gz: 8eb975a6ebbbee9176de5b8f20e928cd6512b04c29c412f9b3dbe8006a6383f8
+  metadata.gz: 00617ed8db3b679a9c44d7b8854b17c16d48f10b84a30bbc2e175113d02e9025
+  data.tar.gz: 198a87943ebe8f2ffdeabfc0c1ec12a9499ec9642d90ca393a8c26440f3acf3f
 SHA512:
-  metadata.gz: '09009418c348753e9ef2222c8887120dc12e467e83c30cc2053d711ff53726cd57885ea07cd8bc21d15bd7174415cd977e2f225db13c1451444e97cffa49ebfd'
-  data.tar.gz: d6da61ac6052d8bd15fde15cd03916e6521f7ebc11e62ff4a51600316b2d058eb1ccd2a4378fbc6403625599e484d372bf077abbe27a6ebb169b4272add17aa5
+  metadata.gz: 2bf33ca669f3b719eea8e9add8a107e9f54e86ffcfda53d3845fe5dd109f08cde651b08024dda622f5d3438f8dce51d142c8b1f886e5b45b7ef481242b9212ea
+  data.tar.gz: bf242855dfb87ff3920907cf69616b2831c8ce35e65342327d0cfee3182b252bbceca244fbd30cdb097f09befc90769c9c4b72847b52cea852ddd3dc9c2d7441

data/docs/README.adoc

@@ -182,20 +182,21 @@ x = db.fetch_db("ISO 5749")
 # prepare queue for results
 results = Queue.new
 
-# references ot fetch
+# references to fetch
 refs = ["ISO 19011", "ISO 19115"]
 
 # fetch documents
 refs.each do |ref|
-  db.fetch_async(ref) do |doc|
-    results << [ref, doc]
+  db.fetch_async(ref, ref: ref) do |doc, other_args|
+    results << [doc, other_args[:ref]]
   end
 end
 
-# wait until documets fetching
+# wait until all the documents fetching
 refs.size.times do
-  ref, doc = results.pop
-  # do thatever you need with result x
+  doc, ref = results.pop
+  # do whatever you need with the result
+  # in case request error doc will be instance of Relaton::RequestError
 end
 ----
 

data/lib/relaton/db.rb

@@ -99,16 +99,20 @@ module Relaton
     end
 
     # Fetch asynchronously
-    def fetch_async(code, year = nil, opts = {}, &_block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+    def fetch_async(code, year = nil, opts = {}, **others, &_block) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       stdclass = standard_class code
       if stdclass
         unless @queues[stdclass]
           processor = @registry.processors[stdclass]
-          wp = WorkersPool.new(processor.threads) { |args| yield fetch(*args) }
+          wp = WorkersPool.new(processor.threads) do |args|
+            yield fetch(*args[0..2]), **args[3]
+          rescue RelatonBib::RequestError => e
+            yield e, **args[3]
+          end
           @queues[stdclass] = { queue: Queue.new, workers_pool: wp }
           Thread.new { process_queue @queues[stdclass] }
         end
-        @queues[stdclass][:queue] << [code, year, opts]
+        @queues[stdclass][:queue] << [code, year, opts, others]
       else yield nil
       end
     end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.9.1".freeze
+  VERSION = "1.9.2".freeze
 end

data/spec/relaton/db_spec.rb

@@ -163,14 +163,16 @@ RSpec.describe Relaton::Db do
       results = []
       VCR.use_cassette "async_fetch", match_requests_on: %i[method uri body] do
         refs.each do |ref|
-          db.fetch_async(ref) { |r| queue << r }
+          db.fetch_async(ref, ref: ref) do |r, otherargs|
+            queue << [r, otherargs[:ref]]
+          end
         end
         Timeout.timeout(60) do
           refs.size.times { results << queue.pop }
         end
       end
       results.each do |result|
-        expect(result).to be_instance_of RelatonItu::ItuBibliographicItem
+        expect(result[0]).to be_instance_of RelatonItu::ItuBibliographicItem
       end
     end
 

data/spec/relaton_spec.rb

@@ -205,12 +205,12 @@ RSpec.describe Relaton::Db do
 
   it "get OGC refrence and cache it" do
     cc_fr = /\.relaton\/ogc\/bibliography\.json/
-    expect(File).to receive(:exist?).with(cc_fr).and_return false
-    expect(File).to receive(:exist?).with(/etag\.txt/).and_return false
+    allow(File).to receive(:exist?).with(cc_fr).and_return false
+    allow(File).to receive(:exist?).with(/etag\.txt/).and_return false
     expect(File).to receive(:exist?).and_call_original.at_least :once
     expect(File).to receive(:write).with(cc_fr, kind_of(String), kind_of(Hash))
       .at_most :once
-    expect(File).to receive(:write).and_call_original.at_least :once
+    allow(File).to receive(:write).and_call_original
     VCR.use_cassette "ogc_19_025r1" do
       bib = @db.fetch "OGC 19-025r1", nil, {}
       expect(bib).to be_instance_of RelatonOgc::OgcBibliographicItem
@@ -306,10 +306,10 @@ RSpec.describe Relaton::Db do
           bib = @db.fetch "ISO 19115-1 + Amd 1"
           expect(bib.docidentifier[0].id).to eq "ISO 19115-1 + Amd 1"
           expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
           expect(bib.relation[1].type).to eq "derivedFrom"
           expect(bib.relation[1].description).to be_nil
-          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014/Amd 1:2018"
+          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1/Amd 1:2018"
         end
       end
 
@@ -318,10 +318,10 @@ RSpec.describe Relaton::Db do
           bib = @db.fetch "ISO 19115-1, Amd 1"
           expect(bib.docidentifier[0].id).to eq "ISO 19115-1, Amd 1"
           expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
           expect(bib.relation[1].type).to eq "complements"
           expect(bib.relation[1].description.content).to eq "amendment"
-          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014/Amd 1:2018"
+          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1/Amd 1:2018"
         end
       end
     end