relaton 1.15.0 → 1.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5881725c3b42ac5fa5a25c1bf29f85f864561ea7328bfb2d1b842cd9f5ad9944
-  data.tar.gz: a712d45a2e065e75c98e0cb35b282325cb0d76eab0f3d8f9ecf39c468c4a4ba0
+  metadata.gz: b6254d1d82a460fa2a410054f3c8dc2e924d00f71ec555691109407c8cf0921a
+  data.tar.gz: c75c01f97ba34e83b71dc17dd3ed15f80dd619fe31c98f3dd592e3f7616ecf28
 SHA512:
-  metadata.gz: 3b05040fb095e90626e9653c519973e0f7888d98b8ce9a83bc4388db63c6dda903ee691d5a45aba00512395bcbbc8fae05e1077d9fc79efa2376e2181ea9a0a1
-  data.tar.gz: 12845e1d6eff0692893a65c64060011f7f99dd53dfc7ba3e313130c8af023e4324431a49cf182c498bc96044828c0555f005647ec7a6b3d548a15da2a0e7fafa
+  metadata.gz: a86a05f6af47607c6287f090522a3cf865d669076fb199e9a061db0604036c1ad34b46e6625fe0eafb9d76547f030e27ce6e10eae41bebd58ee4c0ae871b0038
+  data.tar.gz: dc68c7c8db23fe91c6968ed3443dba32f683c5f8856bd12d84e1a1b278651a680fe0c1ef6a44986891f9e24ca0864443e426f578bb26f1333f646fe8326bdb13

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

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

@@ -27,6 +27,9 @@ module Relaton
     def clear
       @db&.clear
       @local_db&.clear
+      @registry.processors.each_value do |p|
+        p.remove_index_file if p.respond_to? :remove_index_file
+      end
     end
 
     ##
@@ -110,7 +113,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.15.0".freeze
+  VERSION = "1.15.2".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.15.0"
+  spec.add_dependency "relaton-iso", "~> 1.15.3"
   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
@@ -165,10 +166,11 @@ RSpec.describe Relaton::Db do
 
   it "doesn't use cache" do
     db = Relaton::Db.new nil, nil
-    VCR.use_cassette "iso_19115_1" do
-      bib = db.fetch("ISO 19115-1", nil, {})
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new id: "ISO 19115-1", type: "ISO"
+    item = RelatonIsoBib::IsoBibliographicItem.new docid: [docid]
+    expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 19115-1", nil, {}).and_return item
+    bib = db.fetch("ISO 19115-1", nil, {})
+    expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
   end
 
   it "fetch when no local db" do
@@ -203,33 +205,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 +258,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

@@ -12,20 +12,11 @@ RSpec.describe Relaton::Db do
 
   context "gets an ISO reference" do
     it "and caches it" do
-      VCR.use_cassette "iso_19115_1" do
-        bib = @db.fetch("ISO 19115-1", nil, {})
-        expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include "<project-number part=\"1\">" \
-          "ISO 19115</project-number>"
-        expect(File.exist?("testcache")).to be true
-        expect(File.exist?("testcache2")).to be true
-        testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number part=\"1\">" \
-          "ISO 19115</project-number>"
-        testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number part=\"1\">" \
-          "ISO 19115</project-number>"
-      end
+      docid = RelatonBib::DocumentIdentifier.new(id: "ISO 19115-1", type: "ISO")
+      item = RelatonIsoBib::IsoBibliographicItem.new docid: [docid], fetched: Date.today.to_s
+      expect(RelatonIso::IsoBibliography).to receive(:get).with("ISO 19115-1", nil, {}).and_return item
+      bib = @db.fetch("ISO 19115-1", nil, {})
+      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
       bib = @db.fetch("ISO 19115-1", nil, {})
       expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
@@ -34,8 +25,9 @@ RSpec.describe Relaton::Db do
       VCR.use_cassette "iso_19133_2005" do
         bib = @db.fetch("ISO 19133:2005")
         expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-        expect(bib.to_xml).to include '<bibitem id="ISO19133-2005" ' \
-                                      'type="standard" schema-version="v1.2.1">'
+        xml = bib.to_xml
+        expect(xml).to include 'id="ISO19133-2005"'
+        expect(xml).to include 'type="standard"'
         testcache = Relaton::DbCache.new "testcache"
         expect(
           testcache.valid_entry?("ISO(ISO 19133:2005)", Date.today.year.to_s),
@@ -68,41 +60,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
 
@@ -191,7 +182,7 @@ RSpec.describe Relaton::Db do
     VCR.use_cassette "rfc_8341" do
       bib = @db.fetch "RFC 8341", nil, {}
       expect(bib).to be_instance_of RelatonIetf::IetfBibliographicItem
-      expect(bib.to_xml).to include "<bibitem id=\"RFC8341\" type=\"standard\" schema-version=\"v1.2.1\">"
+      expect(bib.to_xml).to match(/<bibitem id="RFC8341" type="standard" schema-version="v[\d.]+">/)
       expect(File.exist?("testcache")).to be true
       expect(File.exist?("testcache2")).to be true
       testcache = Relaton::DbCache.new "testcache"
@@ -244,17 +235,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 +260,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
@@ -286,10 +283,11 @@ RSpec.describe Relaton::Db do
   end
 
   it "get BSI reference" do
-    VCR.use_cassette "bsi_bs_en_iso_8848" do
-      bib = @db.fetch "BSI BS EN ISO 8848"
-      expect(bib).to be_instance_of RelatonBsi::BsiBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "BSI BS EN ISO 8848", type: "BSI")
+    item = RelatonBsi::BsiBibliographicItem.new docid: [docid]
+    expect(RelatonBsi::BsiBibliography).to receive(:get).with("BSI BS EN ISO 8848", nil, {}).and_return item
+    bib = @db.fetch "BSI BS EN ISO 8848"
+    expect(bib).to be_instance_of RelatonBsi::BsiBibliographicItem
   end
 
   it "get CEN reference" do
@@ -300,10 +298,11 @@ RSpec.describe Relaton::Db do
   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 RelatonIana::IanaBibliographicItem
-    end
+    docid = RelatonBib::DocumentIdentifier.new(id: "IANA service-names-port-numbers", type: "IANA")
+    item = RelatonIana::IanaBibliographicItem.new docid: [docid]
+    expect(RelatonIana::IanaBibliography).to receive(:get).with("IANA service-names-port-numbers", nil, {}).and_return item
+    bib = @db.fetch "IANA service-names-port-numbers"
+    expect(bib).to be_instance_of RelatonIana::IanaBibliographicItem
   end
 
   it "get 3GPP reference" do
@@ -314,15 +313,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
@@ -359,49 +363,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"
@@ -14,6 +14,7 @@ VCR.configure do |c|
     re_record_interval: 7 * 24 * 3600,
     record: :once,
     allow_playback_repeats: true,
+    preserve_exact_body_bytes: true,
   }
   c.hook_into :webmock
   c.configure_rspec_metadata!