relaton 1.15.4 → 1.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8fa98a0ea566742e2821f059c138d8406580d9a3d6503038b136dacf3099b9a
-  data.tar.gz: 6a18b2bdcf7940ef4e31c8852c5cc4fd8aaa85c44ab301978b2f0fb4e63548cd
+  metadata.gz: 660a04548bc776f45c6675c93929f092b9b09bf787f9c5327a0e77c4657396d6
+  data.tar.gz: 524d02188fb9b718b051a9278f367b5ba96b1cc9b7e3f22e0ef289dc2e637104
 SHA512:
-  metadata.gz: 92339583a34c6ba9e0f9a8adffc3cc61f17bd8eb6e5f117a3d297eb1215c1f93e5e641f99e0b0780ff8dc0a682ae29d7044d49faf1de86ac140d56f706b383cc
-  data.tar.gz: a3cbcc6781710a5cca884bbf8bac41406d934d15d58f6eccdcf44e10e9b2a0330265419ff3ce167e4b16e35a539c29c6af3b5ed5014e8e5dc590dc130ac59239
+  metadata.gz: a888ab93816385d62c1a16e75dfdeeced6138793f89bd37b4b9570642c9ba6ab9fe2046185f514f0083e3a3293af4644b4e3232ef32c3786a58cc1c8afdb872a
+  data.tar.gz: 715fdef1a7536b2cb8e42f89bb0aaa32ff11684e38787acc58afbebd94ff93c8c017166af1b518b92e53af2fbb9375ae7907d672081aa25694d9c77d0e111744

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/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.15.4".freeze
+  VERSION = "1.15.5".freeze
 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/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/zip
       Etag:
-      - W/"31b8f0fe0cac93e4664952a8fa9f226d5cfc3e7868f73e89adaec83faf68edea"
+      - W/"15c57459dcf3d700d40495db041ca9831bea6bb240d07bb5a9508489f4231a7f"
       Strict-Transport-Security:
       - max-age=31536000
       X-Content-Type-Options:
@@ -39,21 +39,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - D594:0F1C:2A65ED:30C110:64B73CAE
+      - C69A:69C7:AED261:C6DC63:64C53486
       Accept-Ranges:
       - bytes
       Date:
-      - Wed, 19 Jul 2023 01:30:23 GMT
+      - Sat, 29 Jul 2023 15:47:19 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-atl18463-ATL
+      - cache-iad-kcgs7200022-IAD
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1689730223.962476,VS0,VE160
+      - S1690645640.757024,VS0,VE152
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -61,16 +61,16 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 2076c270463a55fded43aba88a3a78ba61a2bcd9
+      - 76f4c465d73b6bb64ca9e85a06690e6d0e6b4c6a
       Expires:
-      - Wed, 19 Jul 2023 01:35:23 GMT
+      - Sat, 29 Jul 2023 15:52:19 GMT
       Source-Age:
       - '0'
     body:
       encoding: UTF-8
       base64_string: |
-        UEsDBBQAAAAIAG9y8VZm2jZFNLUHABZeUAANABwAaW5kZXgtdjEueWFtbFVU
-        CQAD8k21ZHJOtWR1eAsAAQTpAwAABHsAAACM/cGuLTuOJArO31fkD0TeLblc
+        UEsDBBQAAAAIAO5x/FZm2jZFNLUHABZeUAANABwAaW5kZXgtdjEueWFtbFVU
+        CQADgM3DZPDNw2R1eAsAAQTpAwAABHsAAACM/cGuLTuOJArO31fkD0TeLblc
         Lt1pVQI96AQebkQANTt4qMyHfkD1qGpQ/fd9li+XRK1FM+PoIuJssyWXKJIi
         Kepvf/vb//G3f/nz//mPP//lH3/9y8/Pv/6kf/75z3//x9//OP719//4P/7l
         X/78v/+f//Gff/7Lf/xf/+v/+uMff/16/8mv15/8uv/kX/9//9f/939AjqQ5
@@ -11296,10 +11296,10 @@ http_interactions:
         rrxmUhWRmbSOyEyqIjKT1hGZSVVEZtI6IjOpishMWkdkJlURmUkqIv8ru70S
         Z9ntlShFt1eiLLu9EqWomSbKsmb6RtFjvKxTflAWU9AH5WMG+qAsJo4Pyse8
         saB8TGMLykYoRc00UZY10w+KGpdlz1iiFJXXRFlWXhOlqLwmSqq8/h9QSwEC
-        HgMUAAAACABvcvFWZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
-        ZXgtdjEueWFtbFVUBQAD8k21ZHV4CwABBOkDAAAEewAAAFBLBQYAAAAAAQAB
+        HgMUAAAACADucfxWZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
+        ZXgtdjEueWFtbFVUBQADgM3DZHV4CwABBOkDAAAEewAAAFBLBQYAAAAAAQAB
         AFMAAAB7tQcAAAA=
-  recorded_at: Wed, 19 Jul 2023 01:30:23 GMT
+  recorded_at: Sat, 29 Jul 2023 15:47:20 GMT
 - request:
     method: get
     uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
@@ -11341,21 +11341,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - 617A:0272:2B42D5:319CAB:64B73CB2
+      - 3588:4477:9C13AD:B41D5C:64C5348B
       Accept-Ranges:
       - bytes
       Date:
-      - Wed, 19 Jul 2023 01:30:26 GMT
+      - Sat, 29 Jul 2023 15:47:23 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-atl18458-ATL
+      - cache-iad-kcgs7200034-IAD
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1689730226.423000,VS0,VE149
+      - S1690645643.136097,VS0,VE135
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -11363,9 +11363,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - ae1b6ac3a5afa888156b194b082a136833a34376
+      - 6afc467a2227ed85c58ed42c0bb25df92ab8027e
       Expires:
-      - Wed, 19 Jul 2023 01:35:26 GMT
+      - Sat, 29 Jul 2023 15:52:23 GMT
       Source-Age:
       - '0'
     body:
@@ -11406,5 +11406,5 @@ http_interactions:
         bWVldGluZzogU01HLTI4CiAgZnJlZXplX3N0YWdlMl9tZWV0aW5nOiBTTUct
         MjgKICBmcmVlemVfc3RhZ2UzX21lZXRpbmc6IFNNRy0yOAogIGNsb3NlX21l
         ZXRpbmc6IFNQLTI4CiAgcHJvamVjdF9lbmQ6ICcxOTk5LTAyLTEyJwo=
-  recorded_at: Wed, 19 Jul 2023 01:30:26 GMT
+  recorded_at: Sat, 29 Jul 2023 15:47:23 GMT
 recorded_with: VCR 6.2.0

data/spec/vcr_cassetes/api_relaton_org.yml

@@ -27,27 +27,27 @@ http_interactions:
       Connection:
       - keep-alive
       Date:
-      - Wed, 19 Jul 2023 01:31:14 GMT
+      - Sat, 29 Jul 2023 15:48:02 GMT
       X-Amzn-Requestid:
-      - a25e4af7-908c-41da-973b-65767742bb34
+      - 330853d3-ec28-4588-9aa2-372ef02c4a70
       Access-Control-Allow-Origin:
       - "*"
       Access-Control-Allow-Headers:
       - Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token
       X-Amz-Apigw-Id:
-      - ISZw7EeIIAMFuow=
+      - I1UptG0AoAMFoPQ=
       Access-Control-Allow-Methods:
       - GET, POST, OPTIONS
       X-Amzn-Trace-Id:
-      - Root=1-64b73cd2-0b2032c770b88fc13693e381;Sampled=0;lineage=521d48d5:0
+      - Root=1-64c534a4-555c478b697cc6d6081afe9f;Sampled=0;lineage=521d48d5:0
       X-Cache:
       - Miss from cloudfront
       Via:
-      - 1.1 27e347e11d87bd5249a0ba1815737e5c.cloudfront.net (CloudFront)
+      - 1.1 52e2243a8168629f98bb0607016f7224.cloudfront.net (CloudFront)
       X-Amz-Cf-Pop:
       - ATL51-C1
       X-Amz-Cf-Id:
-      - 5uUJywQRTRpfRxa9zMvn3OEBH0vx992vWYh-ypepBBGyy6behrFPfw==
+      - Ke1TVShWUJU_5veEOUEhW9I6EKvlGGvtDmraRpsn77Nkum6GeeOypQ==
     body:
       encoding: UTF-8
       base64_string: |
@@ -117,5 +117,5 @@ http_interactions:
         dHJ1Y3R1cmVkaWRlbnRpZmllciB0eXBlPSJJU08iPgogICAgICA8cHJvamVj
         dC1udW1iZXI+SVNPIDE5MTE1PC9wcm9qZWN0LW51bWJlcj4KICAgIDwvc3Ry
         dWN0dXJlZGlkZW50aWZpZXI+CiAgPC9leHQ+CjwvYmliZGF0YT4=
-  recorded_at: Wed, 19 Jul 2023 01:31:14 GMT
+  recorded_at: Sat, 29 Jul 2023 15:48:02 GMT
 recorded_with: VCR 6.2.0