relaton 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e53eb8b2768e1b80e472312aa1af438457ce7115fe078256318749666261f33
-  data.tar.gz: 670a8f3815488a7b315c1e0b56f6376c16fd317cec1fb444d7c6d0dac9c92107
+  metadata.gz: bd53313a7d35f6ed1adf7669962afc84282d15d232247d3facec910aaba05270
+  data.tar.gz: 304a0e1c5a44731f0a4f9a30c063df920deb8694aca702044fd1ab03a10fe5e8
 SHA512:
-  metadata.gz: 64186cb269dbd470798c3ccbe2996ea736c909c7258bc385528626e043bee1c7d88a1a6409948392ef73203ea4715a93b8474bfd3437503a08a1e312d430a968
-  data.tar.gz: 434cbc56312aa11577c2227788eeb930ea2e85e9f5c98f37b5738e58d030bfbcf0cbffcdeb623dda7ef31ca7628bc80f7a88a63050814e3b87a0c1883abcb287
+  metadata.gz: 4cfb3d708769580fccb31ef09a408265a4b828e70082c7f44a2fe485c2982437cf4f8b8369ada51e7e2d9d3e05c05eada5eaca8126506ea5b9224b7575727501
+  data.tar.gz: 2255f0695f06f0714e55b03d9a9ad7c2b7567d417ff184e598c462e299aeed145fb6fb143fc9e83aedf7223479addd9542a6ea3d16b17298f55621676100010f

data/docs/README.adoc

@@ -331,19 +331,6 @@ items[0].docidentifier[0].id
 => "ISO 19011 (all parts)"
 ----
 
-=== Static DB
-
-This gem has a static DB which is distributed with it. Now the static contains documents:
-----
-ISO/IEC DIR 1 IEC SUP
-ISO/IEC DIR 1 ISO SUP
-ISO/IEC DIR 1
-ISO/IEC DIR 2 IEC
-ISO/IEC DIR 2 ISO
-ISO/IEC DIR IEC SUP
-ISO/IEC DIR 1 JTC SUP
-----
-
 === Get document type
 [source,ruby]
 ----

data/lib/relaton/db.rb

@@ -11,11 +11,9 @@ module Relaton
     def initialize(global_cache, local_cache)
       @registry = Relaton::Registry.instance
       gpath = global_cache && File.expand_path(global_cache)
-      @db = open_cache_biblio(gpath, type: :global)
+      @db = open_cache_biblio(gpath)
       lpath = local_cache && File.expand_path(local_cache)
-      @local_db = open_cache_biblio(lpath, type: :local)
-      @static_db = open_cache_biblio File.expand_path("../relaton/static_cache",
-                                                      __dir__)
+      @local_db = open_cache_biblio(lpath)
       @queues = {}
       @semaphore = Mutex.new
     end
@@ -87,9 +85,7 @@ module Relaton
     # @param year [Integer, nil]
     # @return [Array]
     def fetch_all(text = nil, edition: nil, year: nil)
-      result = @static_db.all do |file, yml|
-        search_yml file, yml, text, edition, year
-      end.compact
+      result = []
       db = @db || @local_db
       if db
         result += db.all do |file, xml|
@@ -187,19 +183,6 @@ module Relaton
 
     private
 
-    # @param file [String] file path
-    # @param yml [String] content in YAML format
-    # @param text [String, nil] text to serach
-    # @param edition [String, nil] edition to filter
-    # @param year [Integer, nil] year to filter
-    # @return [BibliographicItem, nil]
-    def search_yml(file, yml, text, edition, year)
-      item = search_edition_year(file, yml, edition, year)
-      return unless item
-
-      item if match_xml_text(item.to_xml(bibdata: true), text)
-    end
-
     # @param file [String] file path
     # @param xml [String] content in XML format
     # @param text [String, nil] text to serach
@@ -346,11 +329,6 @@ module Relaton
     #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     def check_bibliocache(code, year, opts, stdclass) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
       id, searchcode = std_id(code, year, opts, stdclass)
-      yaml = @static_db[id]
-      if yaml
-        return @registry.processors[stdclass].hash_to_bib YAML.safe_load(yaml)
-      end
-
       db = @local_db || @db
       altdb = @local_db && @db ? @db : nil
       if db.nil?
@@ -438,13 +416,11 @@ module Relaton
     end
 
     # @param dir [String, nil] DB directory
-    # @param type [Symbol]
     # @return [Relaton::DbCache, NilClass]
-    def open_cache_biblio(dir, type: :static) # rubocop:disable Metrics/MethodLength
+    def open_cache_biblio(dir) # rubocop:disable Metrics/MethodLength
       return nil if dir.nil?
 
-      db = DbCache.new dir, type == :static ? "yml" : "xml"
-      return db if type == :static
+      db = DbCache.new dir
 
       Dir["#{dir}/*/"].each do |fdir|
         next if db.check_version?(fdir)
@@ -452,8 +428,7 @@ module Relaton
         FileUtils.rm_rf(fdir, secure: true)
         Util.log(
           "[relaton] WARNING: cache #{fdir}: version is obsolete and cache is "\
-            "cleared.",
-          :warning
+          "cleared.", :warning
         )
       end
       db

data/lib/relaton/db_cache.rb

@@ -32,7 +32,7 @@ module Relaton
 
     # Clear database
     def clear
-      FileUtils.rm_rf Dir.glob "#{dir}/*" if @ext == "xml" # unless it's static DB
+      FileUtils.rm_rf Dir.glob "#{dir}/*"
     end
 
     # Save item
@@ -86,7 +86,7 @@ module Relaton
       value = self[key]
       return unless value
 
-      if value.match? /^not_found/
+      if value.match?(/^not_found/)
         value.match(/\d{4}-\d{2}-\d{2}/).to_s
       else
         doc = Nokogiri::XML value
@@ -115,7 +115,7 @@ module Relaton
     # @param fdir [String] dir pathe to flover cache
     # @return [TrueClass, FalseClass]
     def check_version?(fdir)
-      version_dir = fdir + "/version"
+      version_dir = "#{fdir}/version"
       return false unless File.exist? version_dir
 
       v = File.read version_dir, encoding: "utf-8"
@@ -179,9 +179,9 @@ module Relaton
     # @param key [String]
     # @return [String]
     def filename(key)
-      prefcode = key.downcase.match /^(?<prefix>[^\(]+)\((?<code>[^\)]+)/
+      prefcode = key.downcase.match(/^(?<prefix>[^(]+)\((?<code>[^)]+)/)
       fn = if prefcode
-             "#{prefcode[:prefix]}/#{prefcode[:code].gsub(/[-:\s\/\()]/, '_').squeeze('_')}"
+             "#{prefcode[:prefix]}/#{prefcode[:code].gsub(/[-:\s\/()]/, '_').squeeze('_')}"
            else
              key.gsub(/[-:\s]/, "_")
            end
@@ -208,7 +208,7 @@ module Relaton
     # @param key [String]
     # @return [String]
     def prefix(key)
-      key.downcase.match(/^[^\(]+(?=\()/).to_s
+      key.downcase.match(/^[^(]+(?=\()/).to_s
     end
 
     # @param file [String]

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.11.3".freeze
+  VERSION = "1.11.4".freeze
 end

data/relaton.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "bin"
   spec.require_paths = ["lib"]
   spec.files         = `git ls-files`.split("\n")
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  # spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
 
   spec.add_dependency "relaton-3gpp", "~> 1.11.0"

data/spec/relaton/db_spec.rb

@@ -75,9 +75,9 @@ RSpec.describe Relaton::Db do
 
     it "all documents" do
       items = db.fetch_all
-      expect(items.size).to be 9
-      expect(items[7]).to be_instance_of RelatonIec::IecBibliographicItem
-      expect(items[8]).to be_instance_of RelatonIsoBib::IsoBibliographicItem
+      expect(items.size).to be 2
+      expect(items[0]).to be_instance_of RelatonIec::IecBibliographicItem
+      expect(items[1]).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
 
     context "search for text" do
@@ -93,8 +93,8 @@ RSpec.describe Relaton::Db do
         items = db.fetch_all "123"
         expect(items.size).to eq 2
         items = db.fetch_all "ISO"
-        expect(items.size).to eq 8
-        expect(items[7].id).to eq "ISO123"
+        expect(items.size).to eq 1
+        expect(items[0].id).to eq "ISO123"
       end
 
       it "and fail" do
@@ -163,19 +163,32 @@ RSpec.describe Relaton::Db do
       results = []
       VCR.use_cassette "async_fetch", match_requests_on: %i[method uri body] do
         refs.each do |ref|
-          db.fetch_async(ref) do |r|
-            queue << [r, ref]
-          end
-        end
-        Timeout.timeout(60) do
-          refs.size.times { results << queue.pop }
+          db.fetch_async(ref) { |r| queue << [r, ref] }
         end
+        Timeout.timeout(60) { refs.size.times { results << queue.pop } }
       end
       results.each do |result|
         expect(result[0]).to be_instance_of RelatonItu::ItuBibliographicItem
       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"]
+      results = []
+      VCR.use_cassette "bipm_i18n_async_fetch" do
+        refs.each do |ref|
+          db.fetch_async(ref) { |r| queue << [r, ref] }
+        end
+        Timeout.timeout(60) { refs.size.times { results << queue.pop } }
+      end
+      results.each do |result|
+        expect(result[0]).to be_instance_of RelatonBipm::BipmBibliographicItem
+      end
+    end
+
     it "prefix not found" do
       result = ""
       VCR.use_cassette "rfc_unsuccess" do
@@ -195,50 +208,4 @@ RSpec.describe Relaton::Db do
       end
     end
   end
-
-  context "fetch documents form static cache" do
-    let(:db) { Relaton::Db.new nil, nil }
-
-    it "fetches ISO/IEC DIR 1 IEC SUP" do
-      bib = db.fetch "ISO/IEC DIR 1 IEC SUP"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR 1 IEC SUP"
-    end
-
-    it "fetches ISO/IEC DIR 1 ISO SUP" do
-      bib = db.fetch "ISO/IEC DIR 1 ISO SUP"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR 1 ISO SUP"
-    end
-
-    it "fetches ISO/IEC DIR 1" do
-      bib = db.fetch "ISO/IEC DIR 1"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR 1"
-    end
-
-    it "fetches ISO/IEC DIR 2 IEC" do
-      bib = db.fetch "ISO/IEC DIR 2 IEC"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR 2 IEC"
-    end
-
-    it "fetches ISO/IEC DIR 2 ISO" do
-      bib = db.fetch "ISO/IEC DIR 2 ISO"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR 2 ISO"
-    end
-
-    it "fetches ISO/IEC DIR IEC SUP" do
-      bib = db.fetch "ISO/IEC DIR IEC SUP"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR IEC SUP"
-    end
-
-    it "fetches ISO/IEC DIR JTC 1 SUP" do
-      bib = db.fetch "ISO/IEC DIR JTC 1 SUP"
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-      expect(bib.docidentifier.first.id).to eq "ISO/IEC DIR JTC 1 SUP"
-    end
-  end
 end

data/spec/relaton_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe Relaton::Db do
 
   it "rejects an illegal reference prefix" do
     expect { @db.fetch("XYZ XYZ", nil, {}) }.to output(
-      /does not have a recognised prefix/
+      /does not have a recognised prefix/,
     ).to_stderr
   end
 
@@ -38,7 +38,7 @@ RSpec.describe Relaton::Db do
           'type="standard">'
         testcache = Relaton::DbCache.new "testcache"
         expect(
-          testcache.valid_entry?("ISO(ISO 19133:2005)", Date.today.year.to_s)
+          testcache.valid_entry?("ISO(ISO 19133:2005)", Date.today.year.to_s),
         ).to eq Date.today.year.to_s
       end
     end
@@ -195,11 +195,13 @@ RSpec.describe Relaton::Db do
       expect(File.exist?("testcache")).to be true
       expect(File.exist?("testcache2")).to be true
       testcache = Relaton::DbCache.new "testcache"
-      expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
-        "type=\"RFC\" primary=\"true\">RFC 8341</docidentifier>"
+      expect(testcache["IETF(RFC 8341)"]).to include(
+        '<docidentifier type="IETF" primary="true">RFC 8341</docidentifier>',
+      )
       testcache = Relaton::DbCache.new "testcache2"
-      expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
-        "type=\"RFC\" primary=\"true\">RFC 8341</docidentifier>"
+      expect(testcache["IETF(RFC 8341)"]).to include(
+        '<docidentifier type="IETF" primary="true">RFC 8341</docidentifier>',
+      )
     end
   end
 
@@ -246,11 +248,6 @@ RSpec.describe Relaton::Db do
   end
 
   it "get W3C reference" do
-    # w3c_fr = /\.relaton\/w3c\/bibliography\.yml/
-    # expect(File).to receive(:exist?).with(w3c_fr).and_return false
-    # expect(File).to receive(:exist?).and_call_original.at_least :once
-    # expect(File).to receive(:write).with w3c_fr, kind_of(String), kind_of(Hash)
-    # expect(File).to receive(:write).and_call_original.at_least :once
     VCR.use_cassette "w3c_json_ld11" do
       bib = @db.fetch "W3C REC-json-ld11-20200716", nil, {}
       expect(bib).to be_instance_of RelatonW3c::W3cBibliographicItem

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -31,7 +31,7 @@ http_interactions:
       Content-Type:
       - text/plain; charset=utf-8
       Etag:
-      - W/"7b1fd8c3cc8a83e47b78d925027060ef4583c418e75be5749d38f6a37e0f01ca"
+      - W/"ba4b443468f355962dc7524aa69c4ad80bbb98e840d6137fe420b6fa3fccf2d0"
       Strict-Transport-Security:
       - max-age=31536000
       X-Content-Type-Options:
@@ -41,29 +41,29 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - FEF4:1395A:3E1BC8:42A2CE:6290BA99
+      - 7178:6974:A78BC:C192B:62AAF846
       Accept-Ranges:
       - bytes
       Date:
-      - Fri, 27 May 2022 11:48:42 GMT
+      - Thu, 16 Jun 2022 09:30:46 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-vie6371-VIE
+      - cache-vie6334-VIE
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1653652122.797835,VS0,VE233
+      - S1655371847.568153,VS0,VE230
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
       - "*"
       X-Fastly-Request-Id:
-      - 740cb118933ba3ba55fcbdb02f6f313a4eb80f39
+      - da76509a3e570d0b83c3692633c0dfea81acef96
       Expires:
-      - Fri, 27 May 2022 11:53:42 GMT
+      - Thu, 16 Jun 2022 09:35:46 GMT
       Source-Age:
       - '0'
     body:
@@ -127,7 +127,7 @@ http_interactions:
             value: withdrawn
         place:
         - Sophia Antipolis Cedex, France
-        fetched: '2022-04-30'
+        fetched: '2022-06-15'
         doctype: TR
         editorialgroup:
         - name: SMG5
@@ -143,5 +143,5 @@ http_interactions:
           freeze_stage3_meeting: SMG-28
           close_meeting: SP-28
           project_end: '1999-02-12'
-  recorded_at: Fri, 27 May 2022 11:48:41 GMT
+  recorded_at: Thu, 16 Jun 2022 09:30:46 GMT
 recorded_with: VCR 6.1.0