relaton 1.19.0 → 1.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f0ddaf211c05222758cc04c4183f57c326c45d3a3edb2ae24e1abb6c394db5f
-  data.tar.gz: 9757e439532532367945ce41b14f5b7941f8e141615c5a8f690422d9f8b77654
+  metadata.gz: 7df2abbb732f8ab1fedc92f73e6f313af63075e1cf8f5e0cab2883d7abeaa448
+  data.tar.gz: 8915346acdf65d4a129da2b982b07429a5d4c5352874c230adf3189c670d677c
 SHA512:
-  metadata.gz: 3ad04fc9310b0d477df6243411f9aa2e5740a47e231eec23d45270d60aecf5633e600fd629d2e315b7b284bc7a3304c0df7370a7418c64181b7ac46565b65c5a
-  data.tar.gz: 2bd8e7681cb05369277bfc3f84f9741d75fe79a44d311863e2b563010bb94b14c8414903e0941ced1b67448032a5a3d94172c1773f605f58b80b27be421b6d9a
+  metadata.gz: 3978d4e5a0e4ab36f49998140d18b9d57e3bce51c943c294fabf04ca16314ebe55cd470fc4de791d9a0c5c274cff0b7fdb889a3d3ca0ebb868cc4a4bcb154d86
+  data.tar.gz: 86462982a81ebde5250a3b3c2b95d5f6b9859af635a2a624276af15272f7479a95372de8336d9507ddd150e2af9c684b35de3c85e5ffc29ec4044ffefb79ff5d

data/lib/relaton/db.rb

@@ -28,6 +28,7 @@ module Relaton
       @db&.clear
       @local_db&.clear
       @registry.processors.each_value do |p|
+        require p.short.to_s
         p.remove_index_file if p.respond_to? :remove_index_file
       end
     end
@@ -59,7 +60,7 @@ module Relaton
     def fetch(text, year = nil, opts = {})
       reference = text.strip
       stdclass = @registry.class_by_ref(reference) || return
-      processor = @registry.processors[stdclass]
+      processor = @registry[stdclass]
       ref = if processor.respond_to?(:urn_to_code)
               processor.urn_to_code(reference)&.first
             else reference
@@ -105,7 +106,7 @@ module Relaton
       stdclass = @registry.class_by_ref ref
       if stdclass
         unless @queues[stdclass]
-          processor = @registry.processors[stdclass]
+          processor = @registry[stdclass]
           threads = ENV["RELATON_FETCH_PARALLEL"]&.to_i || processor.threads
           wp = WorkersPool.new(threads) do |args|
             args[3].call fetch(*args[0..2])
@@ -157,7 +158,7 @@ module Relaton
     def docid_type(code)
       stdclass = @registry.class_by_ref(code) or return [nil, code]
       _, code = strip_id_wrapper(code, stdclass)
-      [@registry.processors[stdclass].idtype, code]
+      [@registry[stdclass].idtype, code]
     end
 
     # @param key [String]
@@ -293,7 +294,7 @@ module Relaton
       else return
       end
 
-      doc = @registry.processors[stdclass].hash_to_bib docid: { id: code }
+      doc = @registry[stdclass].hash_to_bib docid: { id: code }
       ref = refs[0]
       updates = check_bibliocache(refs[0], year, opts, stdclass)
       if updates
@@ -336,7 +337,7 @@ module Relaton
     # @param stdClass [Symbol]
     # @return [Array]
     def strip_id_wrapper(code, stdclass)
-      prefix = @registry.processors[stdclass].prefix
+      prefix = @registry[stdclass].prefix
       code = code.sub(/\u2013/, "-").sub(/^#{prefix}\((.+)\)$/, "\\1")
       [prefix, code]
     end
@@ -355,7 +356,7 @@ module Relaton
     #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     def bib_retval(entry, stdclass)
       if entry && !entry.match?(/^not_found/)
-        @registry.processors[stdclass].from_xml(entry)
+        @registry[stdclass].from_xml(entry)
       end
     end
 
@@ -443,7 +444,7 @@ module Relaton
     end
 
     def fetch_entry(code, year, opts, stdclass, **args)
-      processor = @registry.processors[stdclass]
+      processor = @registry[stdclass]
       bib = net_retry(code, year, opts, processor, opts.fetch(:retries, 1))
 
       entry = check_entry(bib, stdclass, **args)

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
@@ -26,7 +26,6 @@ module Relaton
       # Util.info("Info: detecting backends:")
 
       SUPPORTED_GEMS.each do |b|
-        require b
         require "#{b}/processor"
         register Kernel.const_get "#{camel_case(b)}::Processor"
       rescue LoadError => e
@@ -61,7 +60,7 @@ module Relaton
     # @return [Relaton::Processor, nil]
     #
     def find_processor_by_dataset(dataset)
-      processors.values.detect { |p| p.datasets&.include? dataset }
+      require_gem(processors.values.detect { |p| p.datasets&.include? dataset })
     end
 
     #
@@ -73,7 +72,18 @@ module Relaton
     #   RelatonGb::Processor, RelatonOgc::Processor,
     #   RelatonCalconnect::Processor]
     def by_type(type)
-      processors.values.detect { |v| v.prefix == type&.upcase }
+      require_gem(processors.values.detect { |v| v.prefix == type&.upcase })
+    end
+
+    def [](stdclass)
+      require_gem processors[stdclass]
+    end
+
+    def require_gem(processor)
+      return unless processor
+
+      require processor.short.to_s
+      processor
     end
 
     #
@@ -84,7 +94,7 @@ module Relaton
     # @return [Relaton::Processor] processor
     #
     def processor_by_ref(ref)
-      @processors[class_by_ref(ref)]
+      require_gem processors[class_by_ref(ref)]
     end
 
     #
@@ -95,7 +105,7 @@ module Relaton
     # @return [Symbol, nil] standard class name
     #
     def class_by_ref(ref)
-      ref = ref.match(/^\w+\((.*)\)$/) ? Regexp.last_match(1) : ref
+      ref = ref =~ /^\w+\((.*)\)$/ ? Regexp.last_match(1) : ref
       @processors.each do |class_name, processor|
         return class_name if /^(urn:)?#{processor.prefix}\b/i.match?(ref) ||
           processor.defaultprefix.match(ref)
@@ -107,7 +117,9 @@ module Relaton
     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/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.19.0".freeze
+  VERSION = "1.19.2".freeze
 end

data/relaton.gemspec

@@ -53,6 +53,7 @@ Gem::Specification.new do |spec|
   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"

data/spec/relaton/processor_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe Relaton::Processor do
     end
 
     it "fetch_data method should be implemented" do
-      expect { subject.fetch_data "cource", {} }.to raise_error StandardError
+      expect { subject.fetch_data "source", {} }.to raise_error StandardError
     end
 
     it "from_xml method should be implemented" do
@@ -43,7 +43,7 @@ RSpec.describe Relaton::Processor do
 
       it "get method should call get method of #{flavor}" do
         expect(bibliography).to receive(:get).with("code", nil, {}).and_return :item
-        expect(processor.get "code", nil, {}).to eq :item
+        expect(processor.get("code", nil, {})).to eq :item
       end
 
       it "grammar_hash method should call grammar_hash method of #{flavor}" do
@@ -58,7 +58,7 @@ RSpec.describe Relaton::Processor do
 
       it "fetch_data method should call fetch_data method of #{flavor}" do
         expect(fetcher_class).to receive(:fetch).with(output: "dir", format: "bibxml").and_return :item
-        expect(processor.fetch_data source, output: "dir", format: "bibxml").to eq :item
+        expect(processor.fetch_data(source, output: "dir", format: "bibxml")).to eq :item
       end
     end
 
@@ -68,7 +68,7 @@ RSpec.describe Relaton::Processor do
 
       it "from_xml method should call from_xml method of #{flavor}" do
         expect(parser_class).to receive(:from_xml).with("xml").and_return :item
-        expect(processor.from_xml "xml").to eq :item
+        expect(processor.from_xml("xml")).to eq :item
       end
     end
 

data/spec/relaton/registry_spec.rb

@@ -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_spec.rb

@@ -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
@@ -481,7 +490,7 @@ RSpec.describe Relaton::Db do
     it "should clear cache if version is changed" do
       expect(File.read("testcache/iso/version", encoding: "UTF-8")).not_to eq "new_version"
       expect(File.read("testcache2/iso/version", encoding: "UTF-8")).not_to eq "new_version"
-      processor = double
+      processor = double "processor", short: :relaton_iso
       expect(processor).to receive(:grammar_hash).and_return("new_version").exactly(2).times
       expect(Relaton::Registry.instance).to receive(:by_type).and_return(processor).exactly(2).times
       Relaton::Db.new "testcache", "testcache2"