relaton 1.15.3 → 1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 561cb76a6c57fe6218af9c61fd2f4e9f8b27197837a74f31bac932c3be4f1693
-  data.tar.gz: a67f390d3666ff699c655c929c3e8f40a57625836cf29990058ea26dd5eaccec
+  metadata.gz: 660a04548bc776f45c6675c93929f092b9b09bf787f9c5327a0e77c4657396d6
+  data.tar.gz: 524d02188fb9b718b051a9278f367b5ba96b1cc9b7e3f22e0ef289dc2e637104
 SHA512:
-  metadata.gz: af3d0f60c9e68e7da9a6eff5e0cd74f829f10a55e54e0f07883f2eb13d21071290a766943a5f2eef651f22c4679359e0c5b3bb47e5d07cce315450e85d4a0093
-  data.tar.gz: 10ee523dacfbd10297e9afecc3de1db1557abca0418c4c0e80b9686144b8196daf60eb3dfc2d6e0a7491af5db120ebab3faca3a56c072fd1d71b121dd55da388
+  metadata.gz: a888ab93816385d62c1a16e75dfdeeced6138793f89bd37b4b9570642c9ba6ab9fe2046185f514f0083e3a3293af4644b4e3232ef32c3786a58cc1c8afdb872a
+  data.tar.gz: 715fdef1a7536b2cb8e42f89bb0aaa32ff11684e38787acc58afbebd94ff93c8c017166af1b518b92e53af2fbb9375ae7907d672081aa25694d9c77d0e111744

data/Gemfile

@@ -1,5 +1,19 @@
 source "https://rubygems.org"
-  
+
 # Specify your gem's dependencies in gemspec
 gemspec
 
+gem "byebug", "~> 11.0"
+gem "equivalent-xml", "~> 0.6"
+gem "guard", "~> 2.14"
+gem "guard-rspec", "~> 4.7"
+gem "pry-byebug", "~> 3.9.0"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.6"
+gem "rubocop", "~> 1.17.0"
+gem "rubocop-performance", "~> 1.11.0"
+gem "rubocop-rails", "~> 2.10.0"
+gem "simplecov", "~> 0.15"
+gem "timecop", "~> 0.9"
+gem "vcr", "~> 6"
+gem "webmock", "~> 3.18"

data/lib/relaton/db.rb

@@ -33,11 +33,11 @@ module Relaton
     end
 
     ##
-    # The class of reference requested is determined by the prefix of the code:
+    # The class of reference requested is determined by the prefix of the reference:
     # GB Standard for gbbib, IETF for ietfbib, ISO for isobib, IEC or IEV for
     #   iecbib,
     #
-    # @param code [String] the ISO standard Code to look up (e.g. "ISO 9000")
+    # @param text [String] the standard reference to look up (e.g. "ISO 9000")
     # @param year [String] the year the standard was published (optional)
     #
     # @param opts [Hash] options
@@ -55,14 +55,15 @@ module Relaton
     #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
     #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     ##
-    def fetch(code, year = nil, opts = {})
-      stdclass = @registry.class_by_ref(code) || return
+    def fetch(text, year = nil, opts = {})
+      reference = text.strip
+      stdclass = @registry.class_by_ref(reference) || return
       processor = @registry.processors[stdclass]
       ref = if processor.respond_to?(:urn_to_code)
-              processor.urn_to_code(code)&.first
-            else code
+              processor.urn_to_code(reference)&.first
+            else reference
             end
-      ref ||= code
+      ref ||= reference
       result = combine_doc ref, year, opts, stdclass
       result || check_bibliocache(ref, year, opts, stdclass)
     end

data/lib/relaton/registry.rb

@@ -10,6 +10,7 @@ module Relaton
       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_jis
+      relaton_xsf
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.15.3".freeze
+  VERSION = "1.15.5".freeze
 end

data/relaton.gemspec

@@ -52,19 +52,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-omg", "~> 1.14.0"
   spec.add_dependency "relaton-un", "~> 1.14.0"
   spec.add_dependency "relaton-w3c", "~> 1.14.0"
-
-  spec.add_development_dependency "byebug", "~> 11.0"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "guard", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "pry-byebug", "~> 3.9.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.17.0"
-  spec.add_development_dependency "rubocop-performance", "~> 1.11.0"
-  spec.add_development_dependency "rubocop-rails", "~> 2.10.0"
-  spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6"
-  spec.add_development_dependency "webmock"
+  spec.add_dependency "relaton-xsf", "~> 1.14.0"
 end

data/spec/relaton/db_spec.rb

@@ -1,9 +1,8 @@
 RSpec.describe Relaton::Db do
   before(:each) { FileUtils.rm_rf %w[testcache testcache2] }
+  subject { Relaton::Db.new nil, nil }
 
   context "instance methods" do
-    subject { Relaton::Db.new nil, nil }
-
     context "#search_edition_year" do
       it "create bibitem from YAML content" do
         h = { "docid" => [{ "id" => "ISO 123", type: "ISO", "primary" => true }] }
@@ -164,21 +163,33 @@ RSpec.describe Relaton::Db do
     expect(db.docid_type("CN(GB/T 1.1)")).to eq ["Chinese Standard", "GB/T 1.1"]
   end
 
-  it "doesn't use cache" do
-    db = Relaton::Db.new nil, nil
-    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
-    db = Relaton::Db.new "testcache", nil
-    VCR.use_cassette "iso_19115_1" do
-      bib = db.fetch("ISO 19115-1", nil, {})
+  context "#fetch" do
+    it "doesn't use cache" do
+      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 = subject.fetch("ISO 19115-1", nil, {})
       expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
+
+    it "when no local db" do
+      db = Relaton::Db.new "testcache", nil
+      VCR.use_cassette "iso_19115_1" do
+        bib = db.fetch("ISO 19115-1", nil, {})
+        expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
+      end
+    end
+
+    it "document with net retries" do
+      expect(subject.instance_variable_get(:@registry).processors[:relaton_ietf]).to receive(:get)
+        .and_raise(RelatonBib::RequestError).exactly(3).times
+      expect { subject.fetch "RFC 8341", nil, retries: 3 }.to raise_error RelatonBib::RequestError
+    end
+
+    it "strip reference" do
+      expect(subject).to receive(:combine_doc).with("ISO 19115-1", nil, {}, :relaton_iso).and_return :doc
+      expect(subject.fetch(" ISO 19115-1 ", nil, {})).to be :doc
+    end
   end
 
   it "fetch std" do
@@ -189,15 +200,7 @@ RSpec.describe Relaton::Db do
     end
   end
 
-  it "fetch document with net retries" do
-    db = Relaton::Db.new nil, nil
-    expect(db.instance_variable_get(:@registry).processors[:relaton_ietf]).to receive(:get)
-      .and_raise(RelatonBib::RequestError).exactly(3).times
-    expect { db.fetch "RFC 8341", nil, retries: 3 }.to raise_error RelatonBib::RequestError
-  end
-
   context "async fetch" do
-    let(:db) { Relaton::Db.new nil, nil }
     let(:queue) { Queue.new }
 
     it "success" do
@@ -206,8 +209,8 @@ RSpec.describe Relaton::Db do
               "ITU-T G.780/Y.1351", "ITU-T G.711", "ITU-T G.1011"]
       results = []
       refs.each do |ref|
-        expect(db).to receive(:fetch).with(ref, nil, {}).and_return :result
-        db.fetch_async(ref) { |r| queue << [r, ref] }
+        expect(subject).to receive(:fetch).with(ref, nil, {}).and_return :result
+        subject.fetch_async(ref) { |r| queue << [r, ref] }
       end
       Timeout.timeout(60) { refs.size.times { results << queue.pop } }
       results.each do |result|
@@ -220,8 +223,8 @@ RSpec.describe Relaton::Db do
               "CGPM -- Réunion 9 (1948)", "CGPM -- Meeting 9 (1948)"]
       results = []
       refs.each do |ref|
-        expect(db).to receive(:fetch).with(ref, nil, {}).and_return :result
-        db.fetch_async(ref) { |r| queue << [r, ref] }
+        expect(subject).to receive(:fetch).with(ref, nil, {}).and_return :result
+        subject.fetch_async(ref) { |r| queue << [r, ref] }
       end
       Timeout.timeout(60) { refs.size.times { results << queue.pop } }
       results.each do |result|
@@ -232,23 +235,23 @@ RSpec.describe Relaton::Db do
     it "prefix not found" do
       result = ""
       VCR.use_cassette "rfc_unsuccess" do
-        db.fetch_async("ABC 123456") { |r| queue << r }
+        subject.fetch_async("ABC 123456") { |r| queue << r }
         Timeout.timeout(5) { result = queue.pop }
       end
       expect(result).to be_nil
     end
 
     it "handle HTTP request error" do
-      expect(db).to receive(:fetch).and_raise RelatonBib::RequestError
-      db.fetch_async("ISO REF") { |r| queue << r }
+      expect(subject).to receive(:fetch).and_raise RelatonBib::RequestError
+      subject.fetch_async("ISO REF") { |r| queue << r }
       result = Timeout.timeout(5) { queue.pop }
       expect(result).to be_instance_of RelatonBib::RequestError
     end
 
     it "handle other errors" do
-      expect(db).to receive(:fetch).and_raise Errno::EACCES
+      expect(subject).to receive(:fetch).and_raise Errno::EACCES
       expect do
-        db.fetch_async("ISO REF") { |r| queue << r }
+        subject.fetch_async("ISO REF") { |r| queue << r }
         result = Timeout.timeout(5) { queue.pop }
         expect(result).to be_nil
       end.to output("[relaton] ERROR: ISO REF -- Permission denied\n").to_stderr
@@ -258,8 +261,8 @@ 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
-      expect(db).to receive(:fetch).with("ITU-T G.993.5", nil, {})
-      db.fetch_async("ITU-T G.993.5") { |r| queue << r }
+      expect(subject).to receive(:fetch).with("ITU-T G.993.5", nil, {})
+      subject.fetch_async("ITU-T G.993.5") { |r| queue << r }
       Timeout.timeout(50) { queue.pop }
     end
   end

data/spec/relaton/registry_spec.rb

@@ -109,6 +109,10 @@ RSpec.describe Relaton::Registry do
     it "JIS" do
       expect(Relaton::Registry.instance.by_type("JIS")).to be_instance_of RelatonJis::Processor
     end
+
+    it "XSF" do
+      expect(Relaton::Registry.instance.by_type("XEP")).to be_instance_of RelatonXsf::Processor
+    end
   end
 
   it "find processot by dataset" do

data/spec/relaton_spec.rb

@@ -327,6 +327,24 @@ RSpec.describe Relaton::Db do
     expect(bib).to be_instance_of RelatonBib::BibliographicItem
   end
 
+  it "get JIS reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "JIS X 0001", type: "JIS")
+    item = RelatonJis::BibliographicItem.new docid: [docid]
+    expect(RelatonJis::Bibliography).to receive(:get).with("JIS X 0001", nil, {}).and_return item
+    bib = @db.fetch "JIS X 0001"
+    expect(bib).to be_instance_of RelatonJis::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "JIS X 0001"
+  end
+
+  it "get XSF reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "XEP 0001", type: "XSF")
+    item = RelatonXsf::BibliographicItem.new docid: [docid]
+    expect(RelatonXsf::Bibliography).to receive(:get).with("XEP 0001", nil, {}).and_return item
+    bib = @db.fetch "XEP 0001"
+    expect(bib).to be_instance_of RelatonXsf::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "XEP 0001"
+  end
+
   context "get combined documents" do
     context "ISO" do
       it "included" do