relaton 1.14.2 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba19ef4231f91cd1c73a0a12ea6b94767c806ea8e2cd1f3189417b8516885815
-  data.tar.gz: 3d31d937b29d24a7bbd9edd8ecd481d87b9f913e1083afe761c36ef8d986bf4d
+  metadata.gz: 92d8d26812ae600e09e7b84beb548768db73c0e0837389feb0cf55c84ec4314f
+  data.tar.gz: d7737f947638fbe5eb17456c2e41e0b1b567434db39cbbc2f0c1644378765c9a
 SHA512:
-  metadata.gz: c578292b8a0fc0f943e8e881bcaba046b38d9042b9ab6213748e1bf627296ae950ecfb7e9486612cfb8ae24659d7416fcb5fe6c2a305eecdf2b6dcab748d73b8
-  data.tar.gz: 38c2a08b85107d690507fd09ed674276e493d95ffcaba9bef7454a9a7338f848d9c971d46be6cc4256b8317c5d67125360946cd5ee352b845ff92c1cd28a4861
+  metadata.gz: 94b13ec45ed1b2f2313212ec1eecd5e25f60cf5017874f342100a2702b141cbb0f09bc275b34ccc1f5afbc6bbfd66f89d19febda44828f7e1f33046ee5c18fce
+  data.tar.gz: bc7c20aa21f7c7552a6cc191cce868786949939b7f66c939f69f825b887da48233ed2bde348e837c4388e37164d858edcd6e06702376063d690086872f8011e9

data/docs/README.adoc

@@ -1,9 +1,7 @@
 = Relaton
 
 image:https://img.shields.io/gem/v/relaton.svg["Gem Version", link="https://rubygems.org/gems/relaton"]
-image:https://github.com/relaton/relaton/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/relaton/relaton/actions?workflow=macos"]
-image:https://github.com/relaton/relaton/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/relaton/relaton/actions?workflow=windows"]
-image:https://github.com/relaton/relaton/workflows/ubuntu/badge.svg["Build Status (Ubuntu)", link="https://github.com/relaton/relaton/actions?workflow=ubuntu"]
+image:https://github.com/relaton/relaton/workflows/rake/badge.svg["Build Status", link="https://github.com/relaton/relaton/actions?workflow=rake"]
 image:https://codeclimate.com/github/relaton/relaton/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/relaton/relaton"]
 image:https://img.shields.io/github/issues-pr-raw/relaton/relaton.svg["Pull Requests", link="https://github.com/relaton/relaton/pulls"]
 image:https://img.shields.io/github/commits-since/relaton/relaton/latest.svg["Commits since latest",link="https://github.com/relaton/relaton/releases"]

data/lib/relaton/db.rb

@@ -110,7 +110,7 @@ module Relaton
             Util.log "[relaton] ERROR: #{args[0]} -- #{e.message}", :error
             args[3].call nil
           end
-          @queues[stdclass] = { queue: Queue.new, workers_pool: wp }
+          @queues[stdclass] = { queue: SizedQueue.new(threads * 2), workers_pool: wp }
           Thread.new { process_queue @queues[stdclass] }
         end
         @queues[stdclass][:queue] << [ref, year, opts, block]

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_iana relaton_3gpp relaton_oasis relaton_doi
+      relaton_cen relaton_iana relaton_3gpp relaton_oasis relaton_doi relaton_jis
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.14.2".freeze
+  VERSION = "1.15.1".freeze
 end

data/relaton.gemspec

@@ -43,8 +43,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-ieee", "~> 1.14.0"
   spec.add_dependency "relaton-ietf", "~> 1.14.0"
   spec.add_dependency "relaton-iho", "~> 1.14.0"
-  spec.add_dependency "relaton-iso", "~> 1.14.0"
+  spec.add_dependency "relaton-iso", "~> 1.15.0"
   spec.add_dependency "relaton-itu", "~> 1.14.0"
+  spec.add_dependency "relaton-jis", "~> 1.14.0"
   spec.add_dependency "relaton-nist", "~> 1.14.0"
   spec.add_dependency "relaton-oasis", "~> 1.14.0"
   spec.add_dependency "relaton-ogc", "~> 1.14.0"

data/spec/relaton/db_spec.rb

@@ -8,6 +8,7 @@ RSpec.describe Relaton::Db do
       it "create bibitem from YAML content" do
         h = { "docid" => [{ "id" => "ISO 123", type: "ISO", "primary" => true }] }
         expect(YAML).to receive(:safe_load).with(:content).and_return h
+        allow(YAML).to receive(:safe_load).and_call_original
         item = subject.send :search_edition_year, "iso/item.yaml", :content, nil, nil
         expect(item).to be_instance_of RelatonIsoBib::IsoBibliographicItem
       end
@@ -203,33 +204,27 @@ RSpec.describe Relaton::Db do
               "ITU-T Y.1911", "ITU-T Y.2012", "ITU-T Y.2206", "ITU-T O.172",
               "ITU-T G.780/Y.1351", "ITU-T G.711", "ITU-T G.1011"]
       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, ref] }
-        end
-        Timeout.timeout(60) { refs.size.times { results << queue.pop } }
+      refs.each do |ref|
+        expect(db).to receive(:fetch).with(ref, nil, {}).and_return :result
+        db.fetch_async(ref) { |r| queue << [r, ref] }
       end
+      Timeout.timeout(60) { refs.size.times { results << queue.pop } }
       results.each do |result|
-        expect(result[0]).to be_instance_of RelatonItu::ItuBibliographicItem
+        expect(result[0]).to be :result
       end
     end
 
     it "BIPM i18n" do
-      expect(File).to receive(:exist?).with(/index\.yaml/).and_return false
-      allow(File).to receive(:exist?).and_call_original
-      # refs = ["CGPM Resolution 1889-00", "CGPM Résolution 1889-00",
-      #         "CGPM Réunion 9", "CGPM Meeting 9"]
       refs = ["CGPM -- Resolution (1889)", "CGPM -- Résolution (1889)",
               "CGPM -- Réunion 9 (1948)", "CGPM -- Meeting 9 (1948)"]
       results = []
-      VCR.use_cassette "bipm_i18n_async_fetch", match_requests_on: %i[method uri body] do
-        refs.each do |ref|
-          db.fetch_async(ref) { |r| queue << [r, ref] }
-        end
-        Timeout.timeout(60) { refs.size.times { results << queue.pop } }
+      refs.each do |ref|
+        expect(db).to receive(:fetch).with(ref, nil, {}).and_return :result
+        db.fetch_async(ref) { |r| queue << [r, ref] }
       end
+      Timeout.timeout(60) { refs.size.times { results << queue.pop } }
       results.each do |result|
-        expect(result[0]).to be_instance_of RelatonBipm::BipmBibliographicItem
+        expect(result[0]).to be :result
       end
     end
 
@@ -262,10 +257,9 @@ RSpec.describe Relaton::Db do
       expect(ENV).to receive(:[]).with("RELATON_FETCH_PARALLEL").and_return(1)
       allow(ENV).to receive(:[]).and_call_original
       expect(Relaton::WorkersPool).to receive(:new).with(1).and_call_original
-      VCR.use_cassette "threads_from_env" do
-        db.fetch_async("ITU-T G.993.5") { |r| queue << r }
-        Timeout.timeout(50) { queue.pop }
-      end
+      expect(db).to receive(:fetch).with("ITU-T G.993.5", nil, {})
+      db.fetch_async("ITU-T G.993.5") { |r| queue << r }
+      Timeout.timeout(50) { queue.pop }
     end
   end
 end

data/spec/relaton/registry_spec.rb

@@ -105,6 +105,10 @@ RSpec.describe Relaton::Registry do
       expect(Relaton::Registry.instance.by_type("DOI")).to be_instance_of RelatonDoi::Processor
       expect(Relaton::Registry.instance.processor_by_ref("doi:10.1000/182")).to be_instance_of RelatonDoi::Processor
     end
+
+    it "JIS" do
+      expect(Relaton::Registry.instance.by_type("JIS")).to be_instance_of RelatonJis::Processor
+    end
   end
 
   it "find processot by dataset" do

data/spec/relaton_spec.rb

@@ -68,41 +68,40 @@ RSpec.describe Relaton::Db do
   end
 
   context "IEC" do
+    before do
+      docid = RelatonBib::DocumentIdentifier.new(id: "IEC 60050-102:2007", type: "IEC")
+      item = RelatonIec::IecBibliographicItem.new docid: [docid]
+      expect(RelatonIec::IecBibliography).to receive(:get).with("IEC 60050-102:2007", nil, {}).and_return item
+    end
+
     it "get by reference" do
-      VCR.use_cassette "iec_60050_102_2007" do
-        bib = @db.fetch "IEC 60050-102:2007"
-        expect(bib.docidentifier[0].id).to eq "IEC 60050-102:2007"
-      end
+      bib = @db.fetch "IEC 60050-102:2007"
+      expect(bib.docidentifier[0].id).to eq "IEC 60050-102:2007"
     end
 
     it "get by URN" do
-      VCR.use_cassette "iec_60050_102_2007" do
-        bib = @db.fetch "urn:iec:std:iec:60050-102:2007:::"
-        expect(bib.docidentifier[0].id).to eq "IEC 60050-102:2007"
-      end
+      bib = @db.fetch "urn:iec:std:iec:60050-102:2007:::"
+      expect(bib.docidentifier[0].id).to eq "IEC 60050-102:2007"
     end
   end
 
   context "NIST references" do
-    before(:each) do
-      nist_fr = /\.relaton\/nist\/pubs-export\.zip/
-      expect(File).to receive(:exist?).with(nist_fr).and_return false
-      expect(File).to receive(:exist?).and_call_original.at_least :once
-      # expect(FileUtils).to receive(:mv).with kind_of(String), nist_fr
-    end
-
     it "gets FISP" do
-      VCR.use_cassette "fisp_140" do
-        bib = @db.fetch "NIST FIPS 140"
-        expect(bib).to be_instance_of RelatonNist::NistBibliographicItem
-      end
+      docid = RelatonBib::DocumentIdentifier.new(id: "NIST FIPS 140", type: "NIST")
+      item = RelatonNist::NistBibliographicItem.new docid: [docid]
+      expect(RelatonNist::NistBibliography).to receive(:get).with("NIST FIPS 140", nil, {}).and_return item
+      bib = @db.fetch "NIST FIPS 140"
+      expect(bib).to be_instance_of RelatonNist::NistBibliographicItem
+      expect(bib.docidentifier[0].id).to eq "NIST FIPS 140"
     end
 
     it "gets SP" do
-      VCR.use_cassette "sp_800_38b" do
-        bib = @db.fetch "NIST SP 800-38B"
-        expect(bib).to be_instance_of RelatonNist::NistBibliographicItem
-      end
+      docid = RelatonBib::DocumentIdentifier.new(id: "NIST SP 800-38B", type: "NIST")
+      item = RelatonNist::NistBibliographicItem.new docid: [docid]
+      expect(RelatonNist::NistBibliography).to receive(:get).with("NIST SP 800-38B", nil, {}).and_return item
+      bib = @db.fetch "NIST SP 800-38B"
+      expect(bib).to be_instance_of RelatonNist::NistBibliographicItem
+      expect(bib.docidentifier[0].id).to eq "NIST SP 800-38B"
     end
   end
 
@@ -146,45 +145,45 @@ RSpec.describe Relaton::Db do
   end
 
   context "get GB reference" do
-    it "and cache it" do
-      VCR.use_cassette "gb_t_20223_2006" do
-        bib = @db.fetch "CN(GB/T 20223)", "2006", {}
-        expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-        expect(File.exist?("testcache")).to be true
-        expect(File.exist?("testcache2")).to be true
-        testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-        testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-      end
-    end
-
-    it "with year" do
-      VCR.use_cassette "gb_t_20223_2006" do
-        bib = @db.fetch "CN(GB/T 20223-2006)", nil, {}
-        expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-        expect(File.exist?("testcache")).to be true
-        expect(File.exist?("testcache2")).to be true
-        testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-        testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-          <project-number>GB/T 20223</project-number>
-        XML
-      end
-    end
+    # it "and cache it" do
+    #   VCR.use_cassette "gb_t_20223_2006" do
+    #     bib = @db.fetch "CN(GB/T 20223)", "2006", {}
+    #     expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
+    #     expect(bib.to_xml(bibdata: true)).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #     expect(File.exist?("testcache")).to be true
+    #     expect(File.exist?("testcache2")).to be true
+    #     testcache = Relaton::DbCache.new "testcache"
+    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #     testcache = Relaton::DbCache.new "testcache2"
+    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #   end
+    # end
+
+    # it "with year" do
+    #   VCR.use_cassette "gb_t_20223_2006" do
+    #     bib = @db.fetch "CN(GB/T 20223-2006)", nil, {}
+    #     expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
+    #     expect(bib.to_xml(bibdata: true)).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #     expect(File.exist?("testcache")).to be true
+    #     expect(File.exist?("testcache2")).to be true
+    #     testcache = Relaton::DbCache.new "testcache"
+    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #     testcache = Relaton::DbCache.new "testcache2"
+    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+    #       <project-number>GB/T 20223</project-number>
+    #     XML
+    #   end
+    # end
   end
 
   it "get RFC reference and cache it" do
@@ -244,17 +243,21 @@ RSpec.describe Relaton::Db do
   end
 
   it "get UN reference" do
-    VCR.use_cassette "un_rtade_cefact_2004_32" do
-      bib = @db.fetch "UN TRADE/CEFACT/2004/32", nil, {}
-      expect(bib).to be_instance_of RelatonUn::UnBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "UN TRADE/CEFACT/2004/32", type: "UN")
+    item = RelatonUn::UnBibliographicItem.new docid: [docid], session: RelatonUn::Session.new(session_number: "1")
+    expect(RelatonUn::UnBibliography).to receive(:get).with("UN TRADE/CEFACT/2004/32", nil, {}).and_return item
+    bib = @db.fetch "UN TRADE/CEFACT/2004/32", nil, {}
+    expect(bib).to be_instance_of RelatonUn::UnBibliographicItem
+    expect(bib.docidentifier.first.id).to eq "UN TRADE/CEFACT/2004/32"
   end
 
   it "get W3C reference" do
-    VCR.use_cassette "w3c_json_ld11" do
-      bib = @db.fetch "W3C REC-json-ld11-20200716", nil, {}
-      expect(bib).to be_instance_of RelatonW3c::W3cBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "W3C REC-json-ld11-20200716", type: "W3C")
+    item = RelatonW3c::W3cBibliographicItem.new docid: [docid]
+    expect(RelatonW3c::W3cBibliography).to receive(:get).with("W3C REC-json-ld11-20200716", nil, {}).and_return item
+    bib = @db.fetch "W3C REC-json-ld11-20200716", nil, {}
+    expect(bib).to be_instance_of RelatonW3c::W3cBibliographicItem
+    expect(bib.docidentifier.first.id).to eq "W3C REC-json-ld11-20200716"
   end
 
   it "get IEEE reference" do
@@ -265,10 +268,12 @@ RSpec.describe Relaton::Db do
   end
 
   it "get IHO reference" do
-    VCR.use_cassette "iho_b_11" do
-      bib = @db.fetch "IHO B-11"
-      expect(bib).to be_instance_of RelatonIho::IhoBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "IHO B-11", type: "IHO")
+    item = RelatonIho::IhoBibliographicItem.new docid: [docid]
+    expect(RelatonIho::IhoBibliography).to receive(:get).with("IHO B-11", nil, {}).and_return item
+    bib = @db.fetch "IHO B-11"
+    expect(bib).to be_instance_of RelatonIho::IhoBibliographicItem
+    expect(bib.docidentifier.first.id).to eq "IHO B-11"
   end
 
   it "get ECMA reference" do
@@ -314,15 +319,20 @@ RSpec.describe Relaton::Db do
   end
 
   it "get OASIS reference" do
-    VCR.use_cassette "oasis_amqp_core_types_v1_0_pt1" do
-      bib = @db.fetch "OASIS amqp-core-types-v1.0-Pt1"
-      expect(bib).to be_instance_of RelatonOasis::OasisBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "OASIS amqp-core-types-v1.0-Pt1", type: "OASIS")
+    item = RelatonOasis::OasisBibliographicItem.new docid: [docid]
+    expect(RelatonOasis::OasisBibliography).to receive(:get).with("OASIS amqp-core-types-v1.0-Pt1", nil, {}).and_return item
+    bib = @db.fetch "OASIS amqp-core-types-v1.0-Pt1"
+    expect(bib).to be_instance_of RelatonOasis::OasisBibliographicItem
   end
 
-  it "get BIPM reference", vcr: "bipm_metrologia_29_6_373" do
+  it "get BIPM reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "BIPM Metrologia 29 6 373", type: "BIPM")
+    item = RelatonBipm::BipmBibliographicItem.new docid: [docid]
+    expect(RelatonBipm::BipmBibliography).to receive(:get).with("BIPM Metrologia 29 6 373", nil, {}).and_return item
     bib = @db.fetch "BIPM Metrologia 29 6 373"
     expect(bib).to be_instance_of RelatonBipm::BipmBibliographicItem
+    expect(bib.docidentifier.first.id).to eq "BIPM Metrologia 29 6 373"
   end
 
   it "get DOI reference", vcr: "doi_10_6028_nist_ir_8245" do
@@ -334,10 +344,10 @@ RSpec.describe Relaton::Db do
     context "ISO" do
       it "included" do
         VCR.use_cassette "iso_combined_included" do
-          bib = @db.fetch "ISO 19115-1 + Amd 1"
-          expect(bib.docidentifier[0].id).to eq "ISO 19115-1 + Amd 1"
+          bib = @db.fetch "ISO 19115-1:2014 + Amd 1"
+          expect(bib.docidentifier[0].id).to eq "ISO 19115-1:2014 + Amd 1"
           expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014"
           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"
@@ -346,10 +356,10 @@ RSpec.describe Relaton::Db do
 
       it "applied" do
         VCR.use_cassette "iso_combined_applied" do
-          bib = @db.fetch "ISO 19115-1, Amd 1"
-          expect(bib.docidentifier[0].id).to eq "ISO 19115-1, Amd 1"
+          bib = @db.fetch "ISO 19115-1:2014, Amd 1"
+          expect(bib.docidentifier[0].id).to eq "ISO 19115-1:2014, Amd 1"
           expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014"
           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"
@@ -359,49 +369,68 @@ RSpec.describe Relaton::Db do
 
     context "IEC" do
       it "included" do
-        VCR.use_cassette "iec_combined_included" do
-          bib = @db.fetch "IEC 60027-1, Amd 1, Amd 2"
-          expect(bib.docidentifier[0].id).to eq "IEC 60027-1, Amd 1, Amd 2"
-          expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "IEC 60027-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 "IEC 60027-1/AMD1:1997"
-          expect(bib.relation[2].type).to eq "complements"
-          expect(bib.relation[2].description.content).to eq "amendment"
-          expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "IEC 60027-1/AMD2:2005"
-        end
+        item = RelatonIec::IecBibliographicItem.new docid: [RelatonBib::DocumentIdentifier.new(id: "IEC 60027-1", type: "IEC")]
+        expect(RelatonIec::IecBibliography).to receive(:get).with("IEC 60027-1", nil, {}).and_return item
+        item1 = RelatonIec::IecBibliographicItem.new docid: [RelatonBib::DocumentIdentifier.new(id: "IEC 60027-1/AMD1:1997", type: "IEC")]
+        expect(RelatonIec::IecBibliography).to receive(:get).with("IEC 60027-1/Amd 1", nil, {}).and_return item1
+        item2 = RelatonIec::IecBibliographicItem.new docid: [RelatonBib::DocumentIdentifier.new(id: "IEC 60027-1/AMD2:2005", type: "IEC")]
+        expect(RelatonIec::IecBibliography).to receive(:get).with("IEC 60027-1/Amd 2", nil, {}).and_return item2
+        bib = @db.fetch "IEC 60027-1, Amd 1, Amd 2"
+        expect(bib.docidentifier[0].id).to eq "IEC 60027-1, Amd 1, Amd 2"
+        expect(bib.relation[0].type).to eq "updates"
+        expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "IEC 60027-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 "IEC 60027-1/AMD1:1997"
+        expect(bib.relation[2].type).to eq "complements"
+        expect(bib.relation[2].description.content).to eq "amendment"
+        expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "IEC 60027-1/AMD2:2005"
       end
     end
 
     context "ITU" do
       it "included" do
-        VCR.use_cassette "itu_combined_included" do
-          bib = @db.fetch "ITU-T G.989.2, Amd 1, Amd 2"
-          expect(bib.docidentifier[0].id).to eq "ITU-T G.989.2, Amd 1, Amd 2"
-          expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2"
-          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 "ITU-T G.989.2 Amd 1"
-          expect(bib.relation[2].type).to eq "complements"
-          expect(bib.relation[2].description.content).to eq "amendment"
-          expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2 Amd 2"
-        end
+        docid = RelatonBib::DocumentIdentifier.new(id: "ITU-T G.989.2", type: "ITU")
+        group = RelatonItu::ItuGroup.new(name: "Group")
+        ed = RelatonItu::EditorialGroup.new(bureau: "Bureau", group: group)
+        item = RelatonItu::ItuBibliographicItem.new docid: [docid], editorialgroup: ed
+        expect(RelatonItu::ItuBibliography).to receive(:get).with("ITU-T G.989.2", nil, {}).and_return item
+        docid1 = RelatonBib::DocumentIdentifier.new(id: "ITU-T G.989.2 Amd 1", type: "ITU")
+        item1 = RelatonItu::ItuBibliographicItem.new docid: [docid1], editorialgroup: ed
+        expect(RelatonItu::ItuBibliography).to receive(:get).with("ITU-T G.989.2 Amd 1", nil, {}).and_return item1
+        docid2 = RelatonBib::DocumentIdentifier.new(id: "ITU-T G.989.2 Amd 2", type: "ITU")
+        item2 = RelatonItu::ItuBibliographicItem.new docid: [docid2], editorialgroup: ed
+        expect(RelatonItu::ItuBibliography).to receive(:get).with("ITU-T G.989.2 Amd 2", nil, {}).and_return item2
+        bib = @db.fetch "ITU-T G.989.2, Amd 1, Amd 2"
+        expect(bib.docidentifier[0].id).to eq "ITU-T G.989.2, Amd 1, Amd 2"
+        expect(bib.relation[0].type).to eq "updates"
+        expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2"
+        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 "ITU-T G.989.2 Amd 1"
+        expect(bib.relation[2].type).to eq "complements"
+        expect(bib.relation[2].description.content).to eq "amendment"
+        expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2 Amd 2"
       end
     end
 
     context "NIST" do
       it "included" do
-        VCR.use_cassette "nist_combined_included" do
-          bib = @db.fetch "NIST SP 800-38A, Add"
-          expect(bib.docidentifier[0].id).to eq "NIST SP 800-38A, Add"
-          expect(bib.relation[0].type).to eq "updates"
-          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "SP 800-38A"
-          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 "SP 800-38A-Add"
-        end
+        # VCR.use_cassette "nist_combined_included" do
+        doci = RelatonBib::DocumentIdentifier.new(id: "SP 800-38A", type: "NIST")
+        item = RelatonNist::NistBibliographicItem.new docid: [doci]
+        expect(RelatonNist::NistBibliography).to receive(:get).with("NIST SP 800-38A", nil, {}).and_return item
+        docid1 = RelatonBib::DocumentIdentifier.new(id: "SP 800-38A-Add", type: "NIST")
+        item1 = RelatonNist::NistBibliographicItem.new docid: [docid1]
+        expect(RelatonNist::NistBibliography).to receive(:get).with("NIST SP 800-38A/Add", nil, {}).and_return item1
+        bib = @db.fetch "NIST SP 800-38A, Add"
+        expect(bib.docidentifier[0].id).to eq "NIST SP 800-38A, Add"
+        expect(bib.relation[0].type).to eq "updates"
+        expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "SP 800-38A"
+        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 "SP 800-38A-Add"
+        # end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "bundler/setup"
+# require "bundler/setup"
 require "fileutils"
 require "rspec/matchers"
 require "equivalent-xml"

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -23,7 +23,7 @@ http_interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '754'
+      - '1571'
       Cache-Control:
       - max-age=300
       Content-Security-Policy:
@@ -31,7 +31,7 @@ http_interactions:
       Content-Type:
       - text/plain; charset=utf-8
       Etag:
-      - W/"7c959a43129b264a7c1e12e965e5c264a2a5f981072544989a9873d021c46a8d"
+      - W/"5c52c138afbf38ea9b65dea62e48d43c568b9b5195525cf830778c2c029846a2"
       Strict-Transport-Security:
       - max-age=31536000
       X-Content-Type-Options:
@@ -41,36 +41,37 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - 7496:0207:4FD3F2:6988C4:6388D860
+      - AF94:0BB8:82E1EC:C34C77:6418BDF8
       Accept-Ranges:
       - bytes
       Date:
-      - Thu, 01 Dec 2022 16:37:52 GMT
+      - Mon, 20 Mar 2023 20:11:37 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-atl18456-ATL
+      - cache-iad-kjyo7100116-IAD
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1669912673.825654,VS0,VE158
+      - S1679343097.936255,VS0,VE191
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
       - "*"
       X-Fastly-Request-Id:
-      - cccf475f5d37d90f0494ab5079476a56f722fe36
+      - baac0cdd547b3db0edeca1c739043b643f24467b
       Expires:
-      - Thu, 01 Dec 2022 16:42:52 GMT
+      - Mon, 20 Mar 2023 20:16:37 GMT
       Source-Age:
       - '0'
     body:
       encoding: ASCII-8BIT
       string: |
         ---
-        id: 3GPPTR00.01U-UMTS/3.0.0
+        schema-version: v1.2.1
+        id: TR00.01U-UMTS-3.0.0
         title:
         - content: Work programme for the standardization of Universal Mobile Telecommunications
             System (UMTS)
@@ -103,8 +104,8 @@ http_interactions:
                 country: France
                 postcode: '06921'
           role:
-          - author
-          - publisher
+          - type: author
+          - type: publisher
         - person:
             name:
               completename:
@@ -118,7 +119,7 @@ http_interactions:
                 name:
                 - content: PHILIPS CONSUMER COMMUNICATION
           role:
-          - author
+          - type: author
         revdate: '1994-11-18'
         language:
         - en
@@ -129,11 +130,12 @@ http_interactions:
             value: withdrawn
         place:
         - Sophia Antipolis Cedex, France
-        fetched: '2022-09-21'
         doctype: TR
         editorialgroup:
         - name: SMG5
           type: prime
+        ext:
+          schema-version: v1.0.1
         radiotechnology: 3G
         release:
           version2g: '3'
@@ -145,5 +147,5 @@ http_interactions:
           freeze_stage3_meeting: SMG-28
           close_meeting: SP-28
           project_end: '1999-02-12'
-  recorded_at: Thu, 01 Dec 2022 16:37:52 GMT
+  recorded_at: Mon, 20 Mar 2023 20:11:37 GMT
 recorded_with: VCR 6.1.0