relaton 1.18.0 → 1.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7c5f3e470692974347ac474f45af281a5bb14f7733d9cbbfc21797cde40da60
-  data.tar.gz: 723005aeb2717a6f90ef1bb017e5aae78076d69f038711878dc39624c1f5fdf7
+  metadata.gz: e166e4b98b190a6286f8d6ea532e65977a901c2ff5a7f1e26f1ca1412ab92230
+  data.tar.gz: c07830c2b5f15bef3190b1ea07916731e8befeb9c224c6a1f4749872d8b73285
 SHA512:
-  metadata.gz: 747a70cc7e9d36ee839be8faa61b68b7fcc9085b01de70237ff132b04a2fd3b665be5256d2387fc308517171db7f23ec4d4015035fef2694a8472ce493e99117
-  data.tar.gz: cc2db525a28fa3711e409c61f3292206ae7626976519ce86ec3a69a9fa510649aa2a88c9750f2cc24276b7bc60eb35602d4826b630f1d122d26cdd576d4f6a34
+  metadata.gz: bb61c2add854d65c4113a0130f4ddd562b1bb73aa564897c665334d56dcf7645ad2a22f73a5b081a403e0ea522b22780c0a1ec9fed81905cbc5eee47ca40824e
+  data.tar.gz: 53633d5bde382e7c57c2af957a1b60b1dbb82fa89cd64d341271b5330c8f634cf8bd3b38527e721fc6ceae8f64fc165bfeb1ef99fb42480ad7cf47c59111ea6c

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 Rails:
   Enabled: false

data/lib/relaton/db.rb

@@ -447,15 +447,26 @@ module Relaton
       bib = net_retry(code, year, opts, processor, opts.fetch(:retries, 1))
 
       entry = check_entry(bib, stdclass, **args)
-      return entry if args[:db].nil? || args[:id].nil?
+      return entry if args[:db].nil?
 
       @semaphore.synchronize { args[:db][args[:id]] ||= entry }
+      args[:no_cache] ? bib_entry(bib) : entry
     end
 
+    #
+    # If the reference isn't equal to the document identifier
+    # then store the document in the cache and create for the reference a redirection to the document
+    #
+    # @param [<Type>] bib <description>
+    # @param [<Type>] stdclass <description>
+    # @param [<Type>] **args <description>
+    #
+    # @return [<Type>] <description>
+    #
     def check_entry(bib, stdclass, **args) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       bib_id = bib&.docidentifier&.first&.id
 
-      # when docid doesn't match bib's id then return a reference to bib's id
+      # when ref isn't equal to bib's id then return a redirection to bib's id
       if args[:db] && args[:id] && bib_id && args[:id] !~ %r{#{Regexp.quote("(#{bib_id})")}}
         bid = std_id(bib.docidentifier.first.id, nil, {}, stdclass).first
         @semaphore.synchronize { args[:db][bid] ||= bib_entry bib }

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.18.0".freeze
+  VERSION = "1.18.2".freeze
 end

data/relaton.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
   # spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.add_dependency "relaton-3gpp", "~> 1.18.0"
   spec.add_dependency "relaton-bipm", "~> 1.18.0"
-  spec.add_dependency "relaton-bsi", "~> 1.18.0"
+  spec.add_dependency "relaton-bsi", "~> 1.18.1"
   spec.add_dependency "relaton-calconnect", "~> 1.18.0"
   spec.add_dependency "relaton-ccsds", "~> 1.18.0"
   spec.add_dependency "relaton-cen", "~> 1.18.0"
@@ -39,14 +39,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-doi", "~> 1.18.0"
   spec.add_dependency "relaton-ecma", "~> 1.18.0"
   spec.add_dependency "relaton-etsi", "~> 1.18.0"
-  spec.add_dependency "relaton-gb", "~> 1.18.0"
+  spec.add_dependency "relaton-gb", "~> 1.18.2"
   spec.add_dependency "relaton-iana", "~> 1.18.0"
   spec.add_dependency "relaton-iec", "~> 1.18.0"
   spec.add_dependency "relaton-ieee", "~> 1.18.0"
   spec.add_dependency "relaton-ietf", "~> 1.18.0"
   spec.add_dependency "relaton-iho", "~> 1.18.0"
   spec.add_dependency "relaton-isbn", "~> 1.18.0"
-  spec.add_dependency "relaton-iso", "~> 1.18.0"
+  spec.add_dependency "relaton-iso", "~> 1.18.4"
   spec.add_dependency "relaton-itu", "~> 1.18.0"
   spec.add_dependency "relaton-jis", "~> 1.18.0"
   spec.add_dependency "relaton-nist", "~> 1.18.0"

data/spec/relaton/db_spec.rb

@@ -50,6 +50,38 @@ RSpec.describe Relaton::Db do
         expect(subject.send(:combine_doc, code, nil, {}, :relaton_bipm)).to be_nil
       end
     end
+
+    context "#fetch_entry" do
+      let(:db_cache) { double "db_cache" }
+
+      before do
+        expect(subject).to receive(:net_retry).with("ISO 123", nil, {}, kind_of(RelatonIso::Processor), 1).and_return :bib
+      end
+
+      it "using cache" do
+        expect(db_cache).to receive(:[]).with("ISO(ISO 123)").and_return nil
+        expect(db_cache).to receive(:[]=).with("ISO(ISO 123)", :entry)
+        expect(subject).to receive(:check_entry).with(:bib, :relaton_iso, db: db_cache, id: "ISO(ISO 123)").and_return :entry
+        entry = subject.send :fetch_entry, "ISO 123", nil, {}, :relaton_iso, db: db_cache, id: "ISO(ISO 123)"
+        expect(entry).to be :entry
+      end
+
+      it "DbCache is undefined" do
+        expect(subject).to receive(:check_entry).with(:bib, :relaton_iso, **{}).and_return :entry
+        entry = subject.send :fetch_entry, "ISO 123", nil, {}, :relaton_iso
+        expect(entry).to be :entry
+      end
+
+      it "not using cache" do
+        expect(subject).to receive(:bib_entry).with(:bib).and_return :entry
+        expect(subject).to receive(:check_entry).with(
+          :bib, :relaton_iso, db: db_cache, id: "ISO(ISO 123)", no_cache: true
+        ).and_return :entry
+        expect(db_cache).to receive(:[]).with("ISO(ISO 123)").and_return :entry
+        entry = subject.send :fetch_entry, "ISO 123", nil, {}, :relaton_iso, db: db_cache, id: "ISO(ISO 123)", no_cache: true
+        expect(entry).to be :entry
+      end
+    end
   end
 
   context "class methods" do

data/spec/relaton_spec.rb

@@ -228,14 +228,14 @@ RSpec.describe Relaton::Db do
     end
   end
 
-  it "get UN reference" do
-    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 UN reference" do
+  #   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
     docid = RelatonBib::DocumentIdentifier.new(id: "W3C REC-json-ld11-20200716", type: "W3C")
@@ -383,7 +383,7 @@ RSpec.describe Relaton::Db do
           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"
+          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014/Amd 1:2018"
         end
       end
 
@@ -395,7 +395,7 @@ RSpec.describe Relaton::Db do
           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"
+          expect(bib.relation[1].bibitem.docidentifier[0].id).to eq "ISO 19115-1:2014/Amd 1:2018"
         end
       end
     end

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -39,21 +39,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - E384:10E5:26C1F3:300C4F:6594DF80
+      - 32B7:2EA234:11492F5:13552C6:6661CFCA
       Accept-Ranges:
       - bytes
       Date:
-      - Wed, 03 Jan 2024 05:06:32 GMT
+      - Thu, 06 Jun 2024 15:03:39 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780127-PDK
+      - cache-pdk-katl1840035-PDK
       X-Cache:
-      - HIT
+      - MISS
       X-Cache-Hits:
-      - '1'
+      - '0'
       X-Timer:
-      - S1704258392.124397,VS0,VE189
+      - S1717686219.289272,VS0,VE217
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -61,9 +61,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 515ab9c3fc71f9d2e8c83836ff2293a364056a68
+      - '0476792df737acd69880ee6be6c6f6e231ef9e5d'
       Expires:
-      - Wed, 03 Jan 2024 05:11:32 GMT
+      - Thu, 06 Jun 2024 15:08:39 GMT
       Source-Age:
       - '0'
     body:
@@ -11299,7 +11299,7 @@ http_interactions:
         HgMUAAAACAA6cm9XZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
         ZXgtdjEueWFtbFVUBQADENNUZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQAB
         AFMAAAB7tQcAAAA=
-  recorded_at: Wed, 03 Jan 2024 05:06:32 GMT
+  recorded_at: Thu, 06 Jun 2024 15:03:39 GMT
 - request:
     method: get
     uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
@@ -11313,6 +11313,8 @@ http_interactions:
       - "*/*"
       User-Agent:
       - Ruby
+      Host:
+      - raw.githubusercontent.com
   response:
     status:
       code: 200
@@ -11339,21 +11341,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - EAD6:093D:1A0A6A9:1FA171A:6594DF83
+      - 74E0:618D9:438D9D:4BDD0F:6661CFCF
       Accept-Ranges:
       - bytes
       Date:
-      - Wed, 03 Jan 2024 05:06:34 GMT
+      - Thu, 06 Jun 2024 15:03:43 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780147-PDK
+      - cache-pdk-katl1840058-PDK
       X-Cache:
-      - HIT
+      - MISS
       X-Cache-Hits:
-      - '1'
+      - '0'
       X-Timer:
-      - S1704258395.643601,VS0,VE123
+      - S1717686224.653209,VS0,VE140
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -11361,9 +11363,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 041b74d548b24ba1e9e799133bd9b47c2dbb25ee
+      - e8aa88a118b77ebf245340bf762a283d74465747
       Expires:
-      - Wed, 03 Jan 2024 05:11:34 GMT
+      - Thu, 06 Jun 2024 15:08:43 GMT
       Source-Age:
       - '0'
     body:
@@ -11404,5 +11406,5 @@ http_interactions:
         bWVldGluZzogU01HLTI4CiAgZnJlZXplX3N0YWdlMl9tZWV0aW5nOiBTTUct
         MjgKICBmcmVlemVfc3RhZ2UzX21lZXRpbmc6IFNNRy0yOAogIGNsb3NlX21l
         ZXRpbmc6IFNQLTI4CiAgcHJvamVjdF9lbmQ6ICcxOTk5LTAyLTEyJwo=
-  recorded_at: Wed, 03 Jan 2024 05:06:34 GMT
+  recorded_at: Thu, 06 Jun 2024 15:03:43 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, 03 Jan 2024 05:08:07 GMT
+      - Thu, 06 Jun 2024 15:04:59 GMT
       X-Amzn-Requestid:
-      - 80e58fa0-ad1f-4773-9cde-a4478a0ce3fa
+      - 1df9b3d6-61e3-436e-b183-9fb15fea30cb
       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:
-      - Q8nCYGacIAMEIXw=
+      - Y81xqGeQIAMEbnw=
       Access-Control-Allow-Methods:
       - GET, POST, OPTIONS
       X-Amzn-Trace-Id:
-      - Root=1-6594eba8-691cf3bf1aa69aee7753ded0;Sampled=0;lineage=521d48d5:0
+      - Root=1-6661d00a-65f629d973f707461427daa4;Parent=2b510a4a08620796;Sampled=0;lineage=521d48d5:0
       X-Cache:
       - Miss from cloudfront
       Via:
-      - 1.1 af4b82f24e15a32a618ba4f9be9cbf92.cloudfront.net (CloudFront)
+      - 1.1 4b4ef7cefd8f81a1e60437d0590406b8.cloudfront.net (CloudFront)
       X-Amz-Cf-Pop:
-      - ATL51-C1
+      - ATL59-P4
       X-Amz-Cf-Id:
-      - x-w2RC78CvvzOXbsFysTkVO6p_jVVVBm1UEC07jHP0mcyzRkDRP0-Q==
+      - u-ZD8u9MreGWb0NebHDZUzWoQVJ3j3wo6jtUzeW4mwpdUIZ6I8rrig==
     body:
       encoding: UTF-8
       base64_string: |
@@ -117,5 +117,5 @@ http_interactions:
         dHJ1Y3R1cmVkaWRlbnRpZmllciB0eXBlPSJJU08iPgogICAgICA8cHJvamVj
         dC1udW1iZXI+SVNPIDE5MTE1PC9wcm9qZWN0LW51bWJlcj4KICAgIDwvc3Ry
         dWN0dXJlZGlkZW50aWZpZXI+CiAgPC9leHQ+CjwvYmliZGF0YT4=
-  recorded_at: Wed, 03 Jan 2024 05:08:07 GMT
+  recorded_at: Thu, 06 Jun 2024 15:04:59 GMT
 recorded_with: VCR 6.2.0