relaton 1.9.0 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a47a3437f5f8afb131ea6cf2a0cf1714875f45e3bd3881c17bc8c7ab9cc2101
-  data.tar.gz: b2a25232edd0d71d5597c06c011362771326bdf3369272e9ca5c862b76947427
+  metadata.gz: 250207e6a1eaa872380c5b959d727be909d99874797832a4288a058259e96bb2
+  data.tar.gz: df287ddd627ff37b9ecbcd3207a4eb8216690b9d3df9db2a9b31ff2a3648a363
 SHA512:
-  metadata.gz: 2c99ab3fe479d11714a2848656076685057f9169d59d548530a60e8405d8be23d7f1a04b79744e6fbd112d4495e2cf5d1451d7e3f769fa0bb8844874281dee72
-  data.tar.gz: 48d30e142c8a611f97ebc9eb0aed6f3619ec2784e9856b1e659473b52c48fdae77c131c29241087c8a31e59623ed3830e383d75103fe42e18416a0a06c251c66
+  metadata.gz: 75eecbdaa0c5d6bc954b790eecba13d987974be787181332343b23558534543fb4107366444fe49aab6fea2e54830dc46051449f482d494a9afad0f3bd502abf
+  data.tar.gz: 159b1e402d0b8521634598412edb68cf8e468009d24e96be56f678df98a62099b568d8de04c77a10ed72faed770f4d87d536fd1e152fa24f39786540d5e51643

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

@@ -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 = {}, &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

data/lib/relaton/processor.rb

@@ -1,9 +1,16 @@
 module Relaton
   class Processor
+    # @rerurn [Symbol]
     attr_reader :short
-    attr_reader :prefix
+
+    # @return [String]
+    attr_reader :prefix, :idtype
+
+    # @return [Regexp]
     attr_reader :defaultprefix
-    attr_reader :idtype
+
+    # @return [Array<String>]
+    attr_reader :datasets
 
     def initialize
       raise "This is an abstract class!"
@@ -13,6 +20,10 @@ module Relaton
       raise "This is an abstract class!"
     end
 
+    def fetch_data(_source, _opts)
+      raise "This is an abstract class!"
+    end
+
     def from_xml(_xml)
       raise "This is an abstract class!"
     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
@@ -54,6 +54,17 @@ module Relaton
       processors.keys
     end
 
+    #
+    # Search a rpocessos by dataset name
+    #
+    # @param [String] dataset
+    #
+    # @return [Relaton::Processor, nil]
+    #
+    def find_processor_by_dataset(dataset)
+      processors.values.detect { |p| p.datasets&.include? dataset }
+    end
+
     #
     # Find processor by type
     #

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.9.0".freeze
+  VERSION = "1.9.4".freeze
 end

data/relaton.gemspec

@@ -36,13 +36,14 @@ 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-iec", ">= 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"
   spec.add_dependency "relaton-iho", "~> 1.9.0"
-  spec.add_dependency "relaton-iso", ">= 1.9.0"
-  spec.add_dependency "relaton-itu", ">= 1.9.0"
-  spec.add_dependency "relaton-nist", ">= 1.9.0"
+  spec.add_dependency "relaton-iso", "~> 1.9.0"
+  spec.add_dependency "relaton-itu", "~> 1.9.0"
+  spec.add_dependency "relaton-nist", ">= 1.9.2"
   spec.add_dependency "relaton-ogc", "~> 1.9.0"
   spec.add_dependency "relaton-omg", "~> 1.9.0"
   spec.add_dependency "relaton-un", "~> 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/processor_spec.rb

@@ -16,6 +16,10 @@ RSpec.describe Relaton::Processor do
       expect { subject.get "code", nil, {} }.to raise_error StandardError
     end
 
+    it "fetch_data method should be implemented" do
+      expect { subject.fetch_data "cource", {} }.to raise_error StandardError
+    end
+
     it "from_xml method should be implemented" do
       expect { subject.from_xml "" }.to raise_error StandardError
     end

data/spec/relaton/{regirtry_spec.rb → registry_spec.rb}

@@ -87,5 +87,15 @@ 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
+    expect(Relaton::Registry.instance
+      .find_processor_by_dataset("nist-tech-pubs"))
+      .to be_instance_of RelatonNist::Processor
   end
 end

data/spec/relaton_spec.rb

@@ -59,10 +59,10 @@ RSpec.describe Relaton::Db do
       end
     end
 
-    it "gets sn ISO/AWI reference" do
-      VCR.use_cassette "iso_awi_14093" do
-        bib = @db.fetch "ISO/AWI 14093"
-        expect(bib.docidentifier[0].id).to eq "ISO/AWI 14093"
+    it "gets sn ISO/CD reference" do
+      VCR.use_cassette "iso_cd_14093" do
+        bib = @db.fetch "ISO/CD 14093"
+        expect(bib.docidentifier[0].id).to eq "ISO/CD 14093"
       end
     end
   end
@@ -204,6 +204,13 @@ RSpec.describe Relaton::Db do
   end
 
   it "get OGC refrence and cache it" do
+    cc_fr = /\.relaton\/ogc\/bibliography\.json/
+    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
+    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
@@ -239,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
@@ -292,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
@@ -299,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
 
@@ -311,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