relaton 1.18.2 → 1.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e166e4b98b190a6286f8d6ea532e65977a901c2ff5a7f1e26f1ca1412ab92230
-  data.tar.gz: c07830c2b5f15bef3190b1ea07916731e8befeb9c224c6a1f4749872d8b73285
+  metadata.gz: 5a133026bf858511b0385b639ec7cc96ab0f855c31a5446d1d118d009eda235d
+  data.tar.gz: b9b89a70476bf01a6c9ca710047ccf13f4531174dafa12e5b37908bdf668d44c
 SHA512:
-  metadata.gz: bb61c2add854d65c4113a0130f4ddd562b1bb73aa564897c665334d56dcf7645ad2a22f73a5b081a403e0ea522b22780c0a1ec9fed81905cbc5eee47ca40824e
-  data.tar.gz: 53633d5bde382e7c57c2af957a1b60b1dbb82fa89cd64d341271b5330c8f634cf8bd3b38527e721fc6ceae8f64fc165bfeb1ef99fb42480ad7cf47c59111ea6c
+  metadata.gz: d35962b592b2eb4ed65261bed9638d304bd91ffc09baf1cb40c7e245692381b28d6d4985fe321d326d09770afa738ea3cce1e15ab499501d4221228559051140
+  data.tar.gz: 46d9116df1ae0f23d7aea5763908bb4b5ac3ec3073d2bbd8b67578c94b85ab5ab89f327747f420ca2226409955ff78de41a4eeabd7992cb32383491386a45b99

data/lib/relaton/config.rb

@@ -1,18 +1,25 @@
 module Relaton
   module Config
-    include RelatonBib::Config
+    def configure
+      yield configuration if block_given?
+    end
+
+    def configuration
+      @configuration ||= self::Configuration.new
+    end
   end
   extend Config
 
-  class Configuration < RelatonBib::Configuration
-    PROGNAME = "relaton".freeze
+  class Configuration # < RelatonBib::Configuration
 
     attr_accessor :use_api, :api_host
 
     def initialize
-      super
+      # super
       @use_api = false
       @api_host = "https://api.relaton.org"
     end
   end
+
+  extend Config
 end

data/lib/relaton/db.rb

@@ -112,7 +112,7 @@ module Relaton
           rescue RelatonBib::RequestError => e
             args[3].call e
           rescue StandardError => e
-            Util.error "ERROR: `#{args[0]}` -- #{e.message}"
+            Util.error "`#{args[0]}` -- #{e.message}"
             args[3].call nil
           end
           @queues[stdclass] = { queue: SizedQueue.new(threads * 2), workers_pool: wp }
@@ -435,8 +435,8 @@ module Relaton
       return fetch_entry(code, year, opts, stdclass, **args) if !entry || opts[:no_cache]
 
       if entry&.match?(/^not_found/)
-        Util.warn "(#{code}) not found in cache, if you wish to " \
-                  "ignore cache please use `no-cache` option."
+        Util.info "not found in cache, if you wish to " \
+                  "ignore cache please use `no-cache` option.", key: code
         return
       end
       entry
@@ -522,7 +522,7 @@ module Relaton
         next if db.check_version?(fdir)
 
         FileUtils.rm_rf(fdir, secure: true)
-        Util.warn "WARNING: cache #{fdir}: version is obsolete and cache is cleared."
+        Util.info "cache #{fdir}: version is obsolete and cache is cleared."
       end
       db
     end

data/lib/relaton/db_cache.rb

@@ -20,7 +20,7 @@ module Relaton
       return unless new_dir && @ext == "xml"
 
       if File.exist? new_dir
-        Util.warn "WARNING: target directory exists `#{new_dir}`"
+        Util.info "target directory exists `#{new_dir}`"
         return
       end
 
@@ -216,6 +216,7 @@ module Relaton
       File.open file, File::RDWR | File::CREAT, encoding: "UTF-8" do |f|
         Timeout.timeout(10) { f.flock File::LOCK_EX }
         f.write content
+        f.flock File::LOCK_UN
       end
     end
   end

data/lib/relaton/registry.rb

@@ -10,7 +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 relaton_ccsds relaton_etsi relaton_isbn
+      relaton_xsf relaton_ccsds relaton_etsi relaton_isbn relaton/plateau
     ].freeze
 
     include Singleton
@@ -30,9 +30,7 @@ module Relaton
         require "#{b}/processor"
         register Kernel.const_get "#{camel_case(b)}::Processor"
       rescue LoadError => e
-        Util.error("Error: backend #{b} not present")
-        Util.error("Error: #{e.message}")
-        Util.error("Error: #{e.backtrace.join "\n"}")
+        Util.error "backend #{b} not present\n#{e.message}\n#{e.backtrace.join "\n"}"
       end
     end
 
@@ -97,18 +95,21 @@ module Relaton
     # @return [Symbol, nil] standard class name
     #
     def class_by_ref(ref)
+      ref = ref.match(/^\w+\((.*)\)$/) ? Regexp.last_match(1) : ref
       @processors.each do |class_name, processor|
-        return class_name if /^(urn:)?#{processor.prefix}(?!\w)/i.match?(ref) ||
+        return class_name if /^(urn:)?#{processor.prefix}\b/i.match?(ref) ||
           processor.defaultprefix.match(ref)
       end
-      Util.warn "`#{ref}` does not have a recognised prefix"
+      Util.info "`#{ref}` does not have a recognised prefix", key: ref
       nil
     end
 
     private
 
     def camel_case(gem_name)
-      gem_name.split("_").map(&:capitalize).join
+      gem_name.split("/").map do |part|
+        part.split("_").map(&:capitalize).join
+      end.join("::")
     end
   end
 end

data/lib/relaton/util.rb

@@ -1,9 +1,6 @@
 module Relaton
   module Util
     extend RelatonBib::Util
-
-    def self.logger
-      Relaton.configuration.logger
-    end
+    PROGNAME = "relaton".freeze
   end
 end

data/lib/relaton/version.rb

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

data/relaton.gemspec

@@ -29,31 +29,32 @@ Gem::Specification.new do |spec|
   # spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   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.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"
-  spec.add_dependency "relaton-cie", "~> 1.18.0"
-  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.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.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"
-  spec.add_dependency "relaton-oasis", "~> 1.18.0"
-  spec.add_dependency "relaton-ogc", "~> 1.18.0"
-  spec.add_dependency "relaton-omg", "~> 1.18.0"
-  spec.add_dependency "relaton-un", "~> 1.18.0"
-  spec.add_dependency "relaton-w3c", "~> 1.18.0"
-  spec.add_dependency "relaton-xsf", "~> 1.18.0"
+  spec.add_dependency "relaton-3gpp", "~> 1.19.0"
+  spec.add_dependency "relaton-bipm", "~> 1.19.0"
+  spec.add_dependency "relaton-bsi", "~> 1.19.1"
+  spec.add_dependency "relaton-calconnect", "~> 1.19.0"
+  spec.add_dependency "relaton-ccsds", "~> 1.19.0"
+  spec.add_dependency "relaton-cen", "~> 1.19.0"
+  spec.add_dependency "relaton-cie", "~> 1.19.0"
+  spec.add_dependency "relaton-doi", "~> 1.19.0"
+  spec.add_dependency "relaton-ecma", "~> 1.19.0"
+  spec.add_dependency "relaton-etsi", "~> 1.19.0"
+  spec.add_dependency "relaton-gb", "~> 1.19.0"
+  spec.add_dependency "relaton-iana", "~> 1.19.0"
+  spec.add_dependency "relaton-iec", "~> 1.19.0"
+  spec.add_dependency "relaton-ieee", "~> 1.19.0"
+  spec.add_dependency "relaton-ietf", "~> 1.19.0"
+  spec.add_dependency "relaton-iho", "~> 1.19.0"
+  spec.add_dependency "relaton-isbn", "~> 1.19.0"
+  spec.add_dependency "relaton-iso", "~> 1.19.0"
+  spec.add_dependency "relaton-itu", "~> 1.19.0"
+  spec.add_dependency "relaton-jis", "~> 1.19.0"
+  spec.add_dependency "relaton-nist", "~> 1.19.0"
+  spec.add_dependency "relaton-oasis", "~> 1.19.0"
+  spec.add_dependency "relaton-ogc", "~> 1.19.0"
+  spec.add_dependency "relaton-omg", "~> 1.19.0"
+  spec.add_dependency "relaton-plateau", "~> 1.19.0"
+  spec.add_dependency "relaton-un", "~> 1.19.0"
+  spec.add_dependency "relaton-w3c", "~> 1.19.0"
+  spec.add_dependency "relaton-xsf", "~> 1.19.0"
 end

data/spec/relaton/config_spec.rb

@@ -3,8 +3,8 @@ describe Relaton do
 
   it "configure" do
     described_class.configure do |conf|
-      conf.logger = :logger
+      conf.use_api = true
     end
-    expect(described_class.configuration.logger).to eq :logger
+    expect(described_class.configuration.use_api).to be true
   end
 end

data/spec/relaton/db_spec.rb

@@ -1,7 +1,14 @@
 RSpec.describe Relaton::Db do
-  before(:each) do
-    Relaton.instance_variable_set :@configuration, nil
+  before(:each) do |example|
+    # Relaton.instance_variable_set :@configuration, nil
     FileUtils.rm_rf %w[testcache testcache2]
+
+    if example.metadata[:vcr]
+      # Force to download index file
+      require "relaton/index"
+      allow_any_instance_of(Relaton::Index::Type).to receive(:actual?).and_return(false)
+      allow_any_instance_of(Relaton::Index::FileIO).to receive(:check_file).and_return(nil)
+    end
   end
 
   subject { Relaton::Db.new nil, nil }
@@ -28,8 +35,8 @@ RSpec.describe Relaton::Db do
           expect(subject).to_not receive(:fetch_entry)
           entry = subject.send :new_bib_entry, "ISO 123", nil, {}, :relaton_iso, db: db, id: "ISO(ISO 123)"
           expect(entry).to be_nil
-        end.to output("[relaton] (ISO 123) not found in cache, if you wish " \
-                      "to ignore cache please use `no-cache` option.\n").to_stderr
+        end.to output("[relaton] INFO: (ISO 123) not found in cache, if you wish " \
+                      "to ignore cache please use `no-cache` option.\n").to_stderr_from_any_process
       end
 
       it "ignore cache" do
@@ -125,9 +132,10 @@ RSpec.describe Relaton::Db do
 
     it "warn if moving in existed dir" do
       expect(File).to receive(:exist?).with("new_cache_dir").and_return true
+      allow(File).to receive(:exist?).and_call_original
       expect do
         expect(db.mv("new_cache_dir")).to be_nil
-      end.to output(/\[relaton\] WARNING: target directory exists/).to_stderr
+      end.to output(/\[relaton\] INFO: target directory exists/).to_stderr_from_any_process
     end
 
     it "clear" do
@@ -221,12 +229,10 @@ RSpec.describe Relaton::Db do
       expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
 
-    it "when no local db" do
+    it "when no local db", vcr: "iso_19115_1" 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
+      bib = db.fetch("ISO 19115-1", nil, {})
+      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
     end
 
     it "document with net retries" do
@@ -241,12 +247,10 @@ RSpec.describe Relaton::Db do
     end
   end
 
-  it "fetch std" do
+  it "fetch std", vcr: "iso_19115_1_std" do
     db = Relaton::Db.new "testcache", nil
-    VCR.use_cassette "iso_19115_1_std" do
-      bib = db.fetch_std("ISO 19115-1", nil, :relaton_iso, {})
-      expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-    end
+    bib = db.fetch_std("ISO 19115-1", nil, :relaton_iso, {})
+    expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
   end
 
   context "async fetch" do
@@ -281,12 +285,10 @@ RSpec.describe Relaton::Db do
       end
     end
 
-    it "prefix not found" do
+    it "prefix not found", vcr: "rfc_unsuccess" do
       result = ""
-      VCR.use_cassette "rfc_unsuccess" do
-        subject.fetch_async("ABC 123456") { |r| queue << r }
-        Timeout.timeout(5) { result = queue.pop }
-      end
+      subject.fetch_async("ABC 123456") { |r| queue << r }
+      Timeout.timeout(5) { result = queue.pop }
       expect(result).to be_nil
     end
 
@@ -299,7 +301,7 @@ RSpec.describe Relaton::Db do
 
     it "handle other errors" do
       expect(subject).to receive(:fetch).and_raise Errno::EACCES
-      log_io = Relaton.configuration.logger.instance_variable_get(:@logdev)
+      log_io = Relaton.logger_pool[:default].instance_variable_get(:@logdev)
       expect(log_io).to receive(:write).with("[relaton] ERROR: `ISO REF` -- Permission denied\n")
       subject.fetch_async("ISO REF") { |r| queue << r }
       result = Timeout.timeout(5) { queue.pop }

data/spec/relaton/registry_spec.rb

@@ -4,8 +4,8 @@ RSpec.describe Relaton::Registry do
   it "outputs backend not present" do
     stub_const "Relaton::Registry::SUPPORTED_GEMS", ["not_supported_gem"]
     expect { Relaton::Registry.clone.instance }.to output(
-      /backend not_supported_gem not present/,
-    ).to_stderr
+      /\[relaton\] ERROR: backend not_supported_gem not present/,
+    ).to_stderr_from_any_process
   end
 
   it "finds ISO processor" do
@@ -127,6 +127,42 @@ RSpec.describe Relaton::Registry do
     it "ISBN" do
       expect(Relaton::Registry.instance.by_type("ISBN")).to be_instance_of RelatonIsbn::Processor
     end
+
+    context "PLATEAU" do
+      let(:processor) { Relaton::Registry.instance.by_type("PLATEAU") }
+      before { processor }
+
+      it "finds processor" do
+        expect(processor).to be_instance_of Relaton::Plateau::Processor
+      end
+
+      it "fetch data" do
+        expect(Relaton::Plateau::Fetcher).to receive(:fetch).with("plateau-handbooks", output: "dir", format: "xml")
+        processor.fetch_data "plateau-handbooks", output: "dir", format: "xml"
+      end
+
+      it "from_xml" do
+        expect(Relaton::Plateau::XMLParser).to receive(:from_xml).with(:xml).and_return :bibitem
+        expect(processor.from_xml(:xml)).to eq :bibitem
+      end
+
+      it "hash_to_bib" do
+        expect(Relaton::Plateau::HashConverter).to receive(:hash_to_bib).with(:hash).and_return bib: :bib
+        expect(Relaton::Plateau::BibItem).to receive(:new).with(bib: :bib).and_return :bibitem
+        expect(processor.hash_to_bib(:hash)).to eq :bibitem
+      end
+
+      it "grammar_hash" do
+        expect(processor.grammar_hash).to be_instance_of String
+      end
+
+      it "remove_index_file" do
+        index = double "index"
+        expect(index).to receive(:remove_file)
+        expect(Relaton::Index).to receive(:find_or_create).and_return index
+        processor.remove_index_file
+      end
+    end
   end
 
   it "find processot by dataset" do

data/spec/relaton/util_spec.rb

@@ -1,5 +1,2 @@
 describe Relaton::Util do
-  it "#respond_to_missing?" do
-    expect(described_class.respond_to?(:warn)).to be true
-  end
 end

data/spec/relaton_spec.rb

@@ -7,8 +7,8 @@ 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/,
-    ).to_stderr
+      /\[relaton\] INFO: \(XYZ XYZ\) `XYZ XYZ` does not have a recognised prefix/,
+    ).to_stderr_from_any_process
   end
 
   context "gets an ISO reference" do
@@ -373,6 +373,15 @@ RSpec.describe Relaton::Db do
     expect(bib.docidentifier.first.id).to eq "ISBN 978-0-580-50101-4"
   end
 
+  it "get PLATEAU reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "PLATEAU Hanbook #01", type: "PLATEAU")
+    item = Relaton::Plateau::BibItem.new docid: [docid]
+    expect(Relaton::Plateau::Bibliography).to receive(:get).with("PLATEAU Hanbook #01", nil, {}).and_return item
+    bib = @db.fetch "PLATEAU Hanbook #01"
+    expect(bib).to be_instance_of Relaton::Plateau::BibItem
+    expect(bib.docidentifier.first.id).to eq "PLATEAU Hanbook #01"
+  end
+
   context "get combined documents" do
     context "ISO" do
       it "included" do