relaton 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d217d10128648eabc4dbeed414e931b6bb4bfcb9f51f74a11e49fdc0af513c6e
-  data.tar.gz: 8eb975a6ebbbee9176de5b8f20e928cd6512b04c29c412f9b3dbe8006a6383f8
+  metadata.gz: d130b4485dbbf753e79494a4d586acf8fd85df120d4e2f1f35aa5c7380e05811
+  data.tar.gz: 1872fc4d88f29de709f81dfca39132d1c7fb244b9069661d8c7c4bca70a80977
 SHA512:
-  metadata.gz: '09009418c348753e9ef2222c8887120dc12e467e83c30cc2053d711ff53726cd57885ea07cd8bc21d15bd7174415cd977e2f225db13c1451444e97cffa49ebfd'
-  data.tar.gz: d6da61ac6052d8bd15fde15cd03916e6521f7ebc11e62ff4a51600316b2d058eb1ccd2a4378fbc6403625599e484d372bf077abbe27a6ebb169b4272add17aa5
+  metadata.gz: 1209e92a74b33acc54fcc1f391ec4beb1833cb2886375188f16ff8feb6c7c12c6f2e56978b3a77b442599fafa5bfbc4b4edfec6305e422afdb97cbc3e07190a0
+  data.tar.gz: f5a8c37e80afa5b80d7779735d54f685e9ba85a2bea6acd2ad3a4608b4e74d75c76248b6989af7df05df1f50f975b0ab85397355c90c2c2f50bc00159fc7d5fe

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]
+    results << [doc, 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

@@ -17,6 +17,7 @@ module Relaton
       @static_db = open_cache_biblio File.expand_path("../relaton/static_cache",
                                                       __dir__)
       @queues = {}
+      @semaphore = Mutex.new
     end
 
     # Move global or local caches to anothe dirs
@@ -99,16 +100,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 = {}, &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|
+            args[3].call fetch(*args[0..2])
+          rescue RelatonBib::RequestError => e
+            args[3].call e
+          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, block]
       else yield nil
       end
     end
@@ -371,14 +376,20 @@ module Relaton
         return bib_retval(bibentry, stdclass)
       end
 
-      db.delete(id) unless db.valid_entry?(id, year)
+      @semaphore.synchronize do
+        db.delete(id) unless db.valid_entry?(id, year)
+      end
       if altdb
         return bib_retval(altdb[id], stdclass) if opts[:fetch_db]
 
-        db.clone_entry id, altdb if altdb.valid_entry? id, year
-        db[id] ||= new_bib_entry(searchcode, year, opts, stdclass, db: db,
-                                                                   id: id)
-        altdb.clone_entry(id, db) if !altdb.valid_entry?(id, year)
+        @semaphore.synchronize do
+          db.clone_entry id, altdb if altdb.valid_entry? id, year
+        end
+        entry = new_bib_entry(searchcode, year, opts, stdclass, db: db, id: id) unless db[id]
+        @semaphore.synchronize do
+          db[id] ||= entry
+          altdb.clone_entry(id, db) if !altdb.valid_entry?(id, year)
+        end
       else
         return bib_retval(db[id], stdclass) if opts[:fetch_db]
 
@@ -409,7 +420,7 @@ module Relaton
       if args[:db] && args[:id] &&
           bib_id && args[:id] !~ %r{#{Regexp.quote("(#{bib_id})")}}
         bid = std_id(bib.docidentifier.first.id, nil, {}, stdclass).first
-        args[:db][bid] ||= bib_entry bib
+        @semaphore.synchronize { args[:db][bid] ||= bib_entry bib }
         "redirection #{bid}"
       else bib_entry bib
       end

data/lib/relaton/registry.rb

@@ -9,7 +9,7 @@ module Relaton
       relaton_gb relaton_iec relaton_ietf relaton_iso relaton_itu relaton_nist
       relaton_ogc relaton_calconnect relaton_omg relaton_un relaton_w3c
       relaton_ieee relaton_iho relaton_bipm relaton_ecma relaton_cie relaton_bsi
-      relaton_cen
+      relaton_cen relaton_iana
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

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

data/relaton.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-cie", "~> 1.9.0"
   spec.add_dependency "relaton-ecma", "~> 1.9.0"
   spec.add_dependency "relaton-gb", "~> 1.9.0"
+  spec.add_dependency "relaton-iana", "~> 1.9.0"
   spec.add_dependency "relaton-iec", "~> 1.9.0"
   spec.add_dependency "relaton-ieee", "~> 1.9.0"
   spec.add_dependency "relaton-ietf", "~> 1.9.0"

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) do |r|
+            queue << [r, 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/registry_spec.rb

@@ -87,6 +87,10 @@ RSpec.describe Relaton::Registry do
     it "CEN" do
       expect(Relaton::Registry.instance.by_type("CEN")).to be_instance_of RelatonCen::Processor
     end
+
+    it "IANA" do
+      expect(Relaton::Registry.instance.by_type("IANA")).to be_instance_of RelatonIana::Processor
+    end
   end
 
   it "find processot by dataset" do

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
@@ -246,13 +246,13 @@ RSpec.describe Relaton::Db do
   end
 
   it "get W3C reference" do
-    w3c_fr = /\.relaton\/w3c\/bibliography\.yml/
-    expect(File).to receive(:exist?).with(w3c_fr).and_return false
-    expect(File).to receive(:exist?).and_call_original.at_least :once
-    expect(File).to receive(:write).with w3c_fr, kind_of(String), kind_of(Hash)
+    # w3c_fr = /\.relaton\/w3c\/bibliography\.yml/
+    # expect(File).to receive(:exist?).with(w3c_fr).and_return false
+    # expect(File).to receive(:exist?).and_call_original.at_least :once
+    # expect(File).to receive(:write).with w3c_fr, kind_of(String), kind_of(Hash)
     # expect(File).to receive(:write).and_call_original.at_least :once
     VCR.use_cassette "w3c_json_ld11" do
-      bib = @db.fetch "W3C JSON-LD 1.1", nil, {}
+      bib = @db.fetch "W3C REC-json-ld11-20200716", nil, {}
       expect(bib).to be_instance_of RelatonW3c::W3cBibliographicItem
     end
   end
@@ -299,6 +299,13 @@ RSpec.describe Relaton::Db do
     end
   end
 
+  it "get IANA reference" do
+    VCR.use_cassette "iana_service_names_port_numbers" do
+      bib = @db.fetch "IANA service-names-port-numbers"
+      expect(bib).to be_instance_of RelatonBib::BibliographicItem
+    end
+  end
+
   context "get combined documents" do
     context "ISO" do
       it "included" do
@@ -306,10 +313,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 +325,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