relaton 2.1.0 → 2.2.0.pre.alpha.1

data/lib/relaton/db.rb

@@ -1,9 +1,16 @@
+require "relaton/bib"
+require "yaml"
+require "net/http"
+require "nokogiri"
+require "fileutils"
+require "date"
+
 module Relaton
   class Db
     # @param global_cache [String] directory of global DB
     # @param local_cache [String] directory of local DB
     def initialize(global_cache, local_cache)
-      @registry = Relaton::Registry.instance
+      @registry = Registry.instance
       gpath = global_cache && File.expand_path(global_cache)
       @db = open_cache_biblio(gpath)
       lpath = local_cache && File.expand_path(local_cache)
@@ -53,14 +60,7 @@ module Relaton
     #  after this date (inclusive, formats: "YYYY", "YYYY-MM",
     #  or "YYYY-MM-DD")
     #
-    # @return [nil, RelatonBib::BibliographicItem,
-    #   RelatonIsoBib::IsoBibliographicItem, RelatonItu::ItuBibliographicItem,
-    #   RelatonIetf::IetfBibliographicItem, RelatonIec::IecBibliographicItem,
-    #   RelatonIeee::IeeeBibliographicItem, RelatonNist::NistBibliongraphicItem,
-    #   RelatonGb::GbbibliographicItem, RelatonOgc::OgcBibliographicItem,
-    #   RelatonCalconnect::CcBibliographicItem, RelatinUn::UnBibliographicItem,
-    #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
-    #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
+    # @return [nil, RelatonBib::BibliographicItem, ...]
     ##
     def fetch(text, year = nil, opts = {})
       reference = text.strip
@@ -132,24 +132,6 @@ module Relaton
       end
     end
 
-    # @param code [String]
-    # @param year [String, NilClass]
-    # @param stdclass [Symbol, NilClass]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    # @option opts [Integer] :retries (1) Number of network retries
-    #
-    # @return [nil, RelatonBib::BibliographicItem,
-    #   RelatonIsoBib::IsoBibliographicItem, RelatonItu::ItuBibliographicItem,
-    #   RelatonIetf::IetfBibliographicItem, RelatonIec::IecBibliographicItem,
-    #   RelatonIeee::IeeeBibliographicItem, RelatonNist::NistBibliongraphicItem,
-    #   RelatonGb::GbbibliographicItem, RelatonOgc::OgcBibliographicItem,
-    #   RelatonCalconnect::CcBibliographicItem, RelatinUn::UnBibliographicItem,
-    #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
-    #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     def fetch_std(code, year = nil, stdclass = nil, opts = {})
       std = nil
       @registry.processors.each do |name, processor|
@@ -194,28 +176,14 @@ module Relaton
 
     private
 
-    # @param (see #fetch_api)
-    # @return (see #fetch_api)
     def fetch_doc(code, year, opts, processor)
-      if Relaton.configuration.use_api then fetch_api(code, year, opts,
-                                                      processor)
+      if Db.configuration.use_api then fetch_api(code, year, opts, processor)
       else processor.get(code, year, opts)
       end
     end
 
-    #
-    # @param code [String]
-    # @param year [String]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    #
-    # @param processor [Relaton::Processor]
-    # @return [RelatonBib::BibliographicItem, nil]
     def fetch_api(code, year, opts, processor)
-      url = "#{Relaton.configuration.api_host}" \
+      url = "#{Db.configuration.api_host}" \
             "/api/v1/document?#{params(code, year, opts)}"
       rsp = Net::HTTP.get_response URI(url)
       processor.from_xml rsp.body if rsp.code == "200"
@@ -223,36 +191,16 @@ module Relaton
       processor.get(code, year, opts)
     end
 
-    #
-    # Make string of parametrs
-    #
-    # @param [String] code
-    # @param [String] year
-    # @param [Hash] opts
-    #
-    # @return [String]
-    #
     def params(code, year, opts)
       opts.merge(code: code, year: year).map { |k, v| "#{k}=#{v}" }.join "&"
     end
 
-    # @param file [String] file path
-    # @param xml [String] content in XML 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_xml(file, xml, text, edition, year)
       return unless text.nil? || match_xml_text?(xml, text)
 
       search_edition_year(file, xml, edition, year)
     end
 
-    # @param file [String] file path
-    # @param content [String] content in XML or YAML format
-    # @param edition [String, nil] edition to filter
-    # @param year [Integer, nil] year to filter
-    # @return [BibliographicItem, nil]
     def search_edition_year(file, content, edition, year) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       processor = @registry.processor_by_ref(file.split("/")[-2])
       item = if file.match?(/xml$/) then processor.from_xml(content)
@@ -264,14 +212,6 @@ module Relaton
         end)
     end
 
-    #
-    # Look up text in the XML elements attributes and content
-    #
-    # @param xml [String] content in XML format
-    # @param text [String, nil] text to serach
-    #
-    # @return [Boolean]
-    #
     def match_xml_text?(xml, text)
       esc = Regexp.escape(text)
       pat = "((?<attr>=((?<apstr>')|\"" \
@@ -281,18 +221,6 @@ module Relaton
         .match?(xml)
     end
 
-    # @param code [String]
-    # @param year [String, nil]
-    # @param stdslass [String]
-    #
-    # @param opts [Hash] options
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    # @option opts [Integer] :retries (1) Number of network retries
-    #
-    # @return [nil, Relaton::Bib::ItemData
-    #
     def combine_doc(code, year, opts, stdclass) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       return if stdclass == :relaton_bipm
 
@@ -323,19 +251,6 @@ module Relaton
       end
     end
 
-    # TODO: i18n
-    # Fofmat ID
-    # @param code [String]
-    # @param year [String]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    # @option opts [Integer] :retries (1) Number of network retries
-    #
-    # @param stdClass [Symbol]
-    # @return [Array<String>] docid and code
     def std_id(code, year, opts, stdclass)
       prefix, code = strip_id_wrapper(code, stdclass)
       ret = code
@@ -348,59 +263,23 @@ module Relaton
       ["#{prefix}(#{ret.strip})", code]
     end
 
-    # Find prefix and clean code
-    # @param code [String]
-    # @param stdClass [Symbol]
-    # @return [Array]
     def strip_id_wrapper(code, stdclass)
       prefix = @registry[stdclass].prefix
       code =
         if code.is_a?(String)
-          code.sub("\u2013", "-").sub(/^#{prefix}\((.+)\)$/, "\\1")
+          code.sub("–", "-").sub(/^#{prefix}\((.+)\)$/, "\\1")
         else code.to_s
         end
       [prefix, code]
     end
 
-    #
-    # @param entry [String, nil] XML string
-    # @param stdclass [Symbol]
-    #
-    # @return [nil, RelatonBib::BibliographicItem,
-    #   RelatonIsoBib::IsoBibliographicItem, RelatonItu::ItuBibliographicItem,
-    #   RelatonIetf::IetfBibliographicItem, RelatonIec::IecBibliographicItem,
-    #   RelatonIeee::IeeeBibliographicItem, RelatonNist::NistBibliongraphicItem,
-    #   RelatonGb::GbbibliographicItem, RelatonOgc::OgcBibliographicItem,
-    #   RelatonCalconnect::CcBibliographicItem, RelatinUn::UnBibliographicItem,
-    #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
-    #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     def bib_retval(entry, stdclass)
       if entry && !entry.match?(/^not_found/)
         @registry[stdclass].from_xml(entry)
       end
     end
 
-    # @param code [String]
-    # @param year [String]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    # @option opts [Integer] :retries (1) Number of network retries
-    #
-    # @param stdclass [Symbol]
-    # @return [nil, RelatonBib::BibliographicItem,
-    #   RelatonIsoBib::IsoBibliographicItem, RelatonItu::ItuBibliographicItem,
-    #   RelatonIetf::IetfBibliographicItem, RelatonIec::IecBibliographicItem,
-    #   RelatonIeee::IeeeBibliographicItem, RelatonNist::NistBibliongraphicItem,
-    #   RelatonGb::GbbibliographicItem, RelatonOgc::OgcBibliographicItem,
-    #   RelatonCalconnect::CcBibliographicItem, RelatinUn::UnBibliographicItem,
-    #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
-    #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
     def check_bibliocache(code, year, opts, stdclass) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      # When date filters are present, check if the base
-      # (non-date-filtered) cache entry satisfies the range
       if opts[:publication_date_before] || opts[:publication_date_after]
         base_opts = opts.except(
           :publication_date_before, :publication_date_after
@@ -447,27 +326,6 @@ module Relaton
       bib_retval(db[id], stdclass)
     end
 
-    #
-    # Create new bibliographic entry if it doesn't exist in database
-    #
-    # @param code [String]
-    # @param year [String]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean, nil] :all_parts If true then all-parts reference is
-    #   requested
-    # @option opts [Boolean, nil] :keep_year If true then undated reference
-    #   should return actual reference with year
-    # @option opts [Integer] :retries (1) Number of network retries
-    # @option opts [Boolean] :no_cache If true then don't use cache
-    #
-    # @param stdclass [Symbol]
-    # @param db [Relaton::DbCache,`nil]
-    # @param id [String, nil] docid
-    #
-    # @return [String] bibliographic entry
-    #   XML or "redirection ID" or "not_found YYYY-MM-DD" string
-    #
     def new_bib_entry(code, year, opts, stdclass, **args)
       entry = @semaphore.synchronize { args[:db] && args[:db][args[:id]] }
       if !entry || opts[:no_cache]
@@ -493,21 +351,9 @@ module Relaton
       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 && bib.docidentifier.first&.content
 
-      # when ref isn't equal to bib's id then return a redirection to bib's id
       quoted = Regexp.quote("(#{bib_id})")
       if args[:db] && args[:id] && bib_id &&
           args[:id] !~ /#{quoted}/
@@ -518,21 +364,6 @@ module Relaton
       end
     end
 
-    #
-    # @param code [String]
-    # @param year [String]
-    #
-    # @param opts [Hash]
-    # @option opts [Boolean] :all_parts If all-parts reference is required
-    # @option opts [Boolean] :keep_year If undated reference should return
-    #   actual reference with year
-    #
-    # @param processor [Relaton::Processor]
-    # @param retries [Integer] remain Number of network retries
-    #
-    # @raise [RelatonBib::RequestError]
-    # @return [RelatonBib::BibliographicItem]
-    #
     def net_retry(code, year, opts, processor, retries)
       fetch_doc code, year, opts, processor
     rescue Relaton::RequestError => e
@@ -541,15 +372,6 @@ module Relaton
       net_retry(code, year, opts, processor, retries - 1)
     end
 
-    # @param bib [RelatonBib::BibliographicItem,
-    #   RelatonIsoBib::IsoBibliographicItem, RelatonItu::ItuBibliographicItem,
-    #   RelatonIetf::IetfBibliographicItem, RelatonIec::IecBibliographicItem,
-    #   RelatonIeee::IeeeBibliographicItem, RelatonNist::NistBibliongraphicItem,
-    #   RelatonGb::GbbibliographicItem, RelatonOgc::OgcBibliographicItem,
-    #   RelatonCalconnect::CcBibliographicItem, RelatinUn::UnBibliographicItem,
-    #   RelatonBipm::BipmBibliographicItem, RelatonIho::IhoBibliographicItem,
-    #   RelatonOmg::OmgBibliographicItem, RelatonW3c::W3cBibliographicItem]
-    # @return [String] XML or "not_found mm-dd-yyyy"
     def bib_entry(bib)
       if bib.respond_to?(:to_xml)
         bib.to_xml(bibdata: true)
@@ -558,12 +380,6 @@ module Relaton
       end
     end
 
-    # Check if an XML entry's published date falls within the requested range.
-    # Range semantics: [after, before) — inclusive start, exclusive end.
-    #
-    # @param entry [String] XML string
-    # @param opts [Hash]
-    # @return [Boolean]
     def pub_date_in_range?(entry, opts) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       doc = Nokogiri::XML(entry)
       date_str = doc.at("//date[@type='published']/on")&.text
@@ -581,9 +397,6 @@ module Relaton
       true
     end
 
-    # @param str [String] date string in "YYYY", "YYYY-MM",
-    #   or "YYYY-MM-DD" format
-    # @return [Date, nil]
     def parse_pub_date(str)
       case str
       when /^\d{4}-\d{1,2}-\d{1,2}/ then Date.parse(str)
@@ -594,12 +407,10 @@ module Relaton
       nil
     end
 
-    # @param dir [String, nil] DB directory
-    # @return [Relaton::DbCache, NilClass]
     def open_cache_biblio(dir) # rubocop:disable Metrics/MethodLength
       return nil if dir.nil?
 
-      db = DbCache.new dir
+      db = Cache.new dir
 
       Dir["#{dir}/*/"].each do |fdir|
         next if db.check_version?(fdir)
@@ -610,9 +421,6 @@ module Relaton
       db
     end
 
-    # @param qwp [Hash]
-    # @option qwp [Queue] :queue The queue of references to fetch
-    # @option qwp [Relaton::WorkersPool] :workers_pool The pool of workers
     def process_queue(qwp)
       while args = qwp[:queue].pop; qwp[:workers_pool] << args end
     end
@@ -632,7 +440,7 @@ module Relaton
         globalname = global_bibliocache_name if opts[:global_cache]
         localname = local_bibliocache_name(opts[:local_cache])
         flush_caches globalname, localname if opts[:flush_caches]
-        Relaton::Db.new(globalname, localname)
+        new(globalname, localname)
       end
 
       def flush_caches(gcache, lcache)
@@ -653,3 +461,10 @@ module Relaton
     end
   end
 end
+
+require_relative "db/version"
+require_relative "db/util"
+require_relative "db/config"
+require_relative "db/workers_pool"
+require_relative "db/cache"
+require_relative "db/registry"

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "2.1.0".freeze
+  VERSION = "2.2.0.pre.alpha.1".freeze
 end

data/lib/relaton.rb

@@ -1,10 +1,2 @@
-require "relaton/bib"
-require "relaton/util"
-require "relaton/config"
-require "yaml"
-
-require_relative "relaton/workers_pool"
-require_relative "relaton/db"
-require_relative "relaton/db_cache"
-require_relative "relaton/version"
-require_relative "relaton/registry"
+require "relaton/version"
+require "relaton/db"

data/relaton.gemspec

@@ -10,14 +10,20 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "The Relaton core for importing, managing and caching " \
-                       "bibliographic references to technical standards."
+  spec.summary       = "Relaton: bibliographic references to technical " \
+                       "standards — database, registry, cache, and all " \
+                       "flavor plugins bundled in one gem."
   spec.description   = <<~DESCRIPTION
-      The Relaton core for importing, managing and caching bibliographic
+    Relaton is the central database, registry, and cache for bibliographic
     references to technical standards in the Relaton/XML bibliographic
-    model.
+    model. It provides the Relaton::Db API, a plugin registry that lazily
+    loads flavor gems (relaton-iso, relaton-ietf, etc.) on demand, and a
+    file-based cache for fetched references.
 
-    This gem is in active development.
+    Installing this gem also pulls in every Relaton flavor plugin so you
+    can fetch references from any supported standards body out of the
+    box. The CLI (relaton-cli) is intentionally NOT a dependency —
+    install it separately when you need command-line access.
   DESCRIPTION
 
   spec.homepage      = "https://github.com/relaton/relaton"
@@ -26,36 +32,41 @@ 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.required_ruby_version = Gem::Requirement.new(">= 3.2.0")
-
-  spec.add_dependency "relaton-3gpp", "~> 2.1.0"
-  spec.add_dependency "relaton-bipm", "~> 2.1.0"
-  spec.add_dependency "relaton-bsi", "~> 2.1.0"
-  spec.add_dependency "relaton-calconnect", "~> 2.1.0"
-  spec.add_dependency "relaton-ccsds", "~> 2.1.0"
-  spec.add_dependency "relaton-cen", "~> 2.1.0"
-  spec.add_dependency "relaton-cie", "~> 2.1.0"
-  spec.add_dependency "relaton-doi", "~> 2.1.0"
-  spec.add_dependency "relaton-ecma", "~> 2.1.0"
-  spec.add_dependency "relaton-etsi", "~> 2.1.0"
-  spec.add_dependency "relaton-gb", "~> 2.1.0"
-  spec.add_dependency "relaton-iana", "~> 2.1.0"
-  spec.add_dependency "relaton-iec", "~> 2.1.0"
-  spec.add_dependency "relaton-ieee", "~> 2.1.0"
-  spec.add_dependency "relaton-ietf", "~> 2.1.0"
-  spec.add_dependency "relaton-iho", "~> 2.1.0"
-  spec.add_dependency "relaton-isbn", "~> 2.1.0"
-  spec.add_dependency "relaton-iso", "~> 2.1.0"
-  spec.add_dependency "relaton-itu", "~> 2.1.0"
-  spec.add_dependency "relaton-jis", "~> 2.1.0"
-  spec.add_dependency "relaton-nist", "~> 2.1.0"
-  spec.add_dependency "relaton-oasis", "~> 2.1.0"
-  spec.add_dependency "relaton-ogc", "~> 2.1.0"
-  spec.add_dependency "relaton-omg", "~> 2.1.0"
-  spec.add_dependency "relaton-plateau", "~> 2.1.0"
-  spec.add_dependency "relaton-un", "~> 2.1.0"
-  spec.add_dependency "relaton-w3c", "~> 2.1.0"
-  spec.add_dependency "relaton-xsf", "~> 2.1.0"
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
+
+  spec.add_dependency "relaton-bib", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-core", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-index", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-logger", "~> 2.2.0.pre.alpha.1"
+
+  spec.add_dependency "relaton-3gpp", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-bipm", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-bsi", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-calconnect", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-ccsds", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-cen", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-cie", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-doi", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-ecma", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-etsi", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-gb", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iana", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iec", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-ieee", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-ietf", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iho", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-isbn", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-iso", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-itu", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-jis", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-nist", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-oasis", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-ogc", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-omg", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-plateau", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-un", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-w3c", "~> 2.2.0.pre.alpha.1"
+  spec.add_dependency "relaton-xsf", "~> 2.2.0.pre.alpha.1"
+
   spec.metadata["rubygems_mfa_required"] = "true"
 end

data/spec/relaton/config_spec.rb

@@ -1,4 +1,4 @@
-describe Relaton do
+describe Relaton::Db do
   after { described_class.instance_variable_set :@configuration, nil }
 
   it "configure" do

data/spec/relaton/db_cache_spec.rb

@@ -1,7 +1,7 @@
 require "fileutils"
 require "timeout"
 
-RSpec.describe Relaton::DbCache do
+RSpec.describe Relaton::Db::Cache do
   it "creates default caches" do
     cache_path = File.expand_path("~/.relaton/cache")
     FileUtils.mv cache_path, "relaton1/cache", force: true
@@ -21,8 +21,8 @@ RSpec.describe Relaton::DbCache do
     file = File.open(file_name, File::RDWR | File::CREAT, encoding: "UTF-8") # rubocop:disable Style/FileOpen
     file.flock File::LOCK_EX
     command = <<~RBY
-      require "relaton"
-      cache = Relaton::DbCache.new "testcache"
+      require "relaton/db"
+      cache = Relaton::Db::Cache.new "testcache"
       cache["ISO(ISO 123)"] = "test 1"
     RBY
     pid = spawn RbConfig.ruby, "-e #{command}"
@@ -38,7 +38,7 @@ RSpec.describe Relaton::DbCache do
 
   context "delete file from cache" do
     it "delete redirect file and its original" do
-      cache = Relaton::DbCache.new "testcache"
+      cache = Relaton::Db::Cache.new "testcache"
       cache["ISO(ISO 123)"] = "test 1"
       cache["ISO(123)"] = "redirection ISO(ISO 123)"
       expect(File.exist?("testcache/iso/iso_123.xml")).to be true

data/spec/relaton/db_spec.rb

@@ -1,6 +1,6 @@
 RSpec.describe Relaton::Db do
   before(:each) do |example|
-    # Relaton.instance_variable_set :@configuration, nil
+    # Relaton::Db.instance_variable_set :@configuration, nil
     FileUtils.rm_rf %w[testcache testcache2]
 
     if example.metadata[:vcr]
@@ -39,7 +39,7 @@ RSpec.describe Relaton::Db do
                                :relaton_iso, db: db, id: "ISO(ISO 123)"
           expect(entry).to be_nil
         end.to output(
-          "[relaton] INFO: (ISO 123) not found in cache, " \
+          "[relaton-db] INFO: (ISO 123) not found in cache, " \
           "if you wish to ignore cache please use " \
           "`no-cache` option.\n",
         ).to_stderr_from_any_process
@@ -350,7 +350,7 @@ RSpec.describe Relaton::Db do
       expect do
         expect(db.mv("new_cache_dir")).to be_nil
       end.to output(
-        /\[relaton\] INFO: target directory exists/,
+        /\[relaton-db\] INFO: target directory exists/,
       ).to_stderr_from_any_process
     end
 
@@ -453,7 +453,13 @@ RSpec.describe Relaton::Db do
       expect(bib).to be_instance_of Relaton::Iso::ItemData
     end
 
-    it "when no local db", vcr: "iso_19115_1" do
+    it "when no local db" do
+      docid = Relaton::Bib::Docidentifier.new(content: "ISO 19115-1",
+                                              type: "ISO")
+      item = Relaton::Iso::ItemData.new(docidentifier: [docid],
+                                        fetched: Date.today.to_s)
+      expect(Relaton::Iso::Bibliography).to receive(:get)
+        .with("ISO 19115-1", nil, {}).and_return item
       db = Relaton::Db.new "testcache", nil
       bib = db.fetch("ISO 19115-1", nil, {})
       expect(bib).to be_instance_of Relaton::Iso::ItemData
@@ -481,7 +487,12 @@ RSpec.describe Relaton::Db do
     end
   end
 
-  it "fetch std", vcr: "iso_19115_1_std" do
+  it "fetch std" do
+    docid = Relaton::Bib::Docidentifier.new(content: "ISO 19115-1", type: "ISO")
+    item = Relaton::Iso::ItemData.new(docidentifier: [docid],
+                                      fetched: Date.today.to_s)
+    expect(Relaton::Iso::Bibliography).to receive(:get)
+      .with("ISO 19115-1", nil, {}).and_return item
     db = Relaton::Db.new "testcache", nil
     bib = db.fetch_std("ISO 19115-1", nil, :relaton_iso, {})
     expect(bib).to be_instance_of Relaton::Iso::ItemData
@@ -537,7 +548,7 @@ RSpec.describe Relaton::Db do
       expect(subject).to receive(:fetch).and_raise Errno::EACCES
       log_io = Relaton.logger_pool[:default].instance_variable_get(:@logdev)
       expect(log_io).to receive(:write).with(
-        "[relaton] ERROR: `ISO REF` -- Permission denied\n",
+        "[relaton-db] ERROR: `ISO REF` -- Permission denied\n",
       )
       subject.fetch_async("ISO REF") { |r| queue << r }
       result = Timeout.timeout(5) { queue.pop }
@@ -547,7 +558,7 @@ RSpec.describe Relaton::Db do
     it "use threads number from RELATON_FETCH_PARALLEL" 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(Relaton::Db::WorkersPool).to receive(:new).with(1).and_call_original
       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 }