relaton 1.5.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c602c43941a3fbaa3f63c647a229ddde4830a9ae5eebcb077a426bc3cc0d11
-  data.tar.gz: 91d909efdc5b986ca1c1dce75405a930952ab622252c5478a90b6522a4479c24
+  metadata.gz: 47b3cd2f3a5066e5b9bd67b07f02f6811593210e53e16438e5e0ccf32275be11
+  data.tar.gz: 677a08b28aff3139512ddc4f37ba0b7cc98f871f3faa80dad3e8fcd224771089
 SHA512:
-  metadata.gz: 97a86284b6b88172bcc59f67ca8264f4247b07d8b209f23a336362a50f9e71e3be6bbee89cd77d26d5cad59824fe1e37ff6ad0a89f9c62b42a554245785047b5
-  data.tar.gz: 79448ae393f6b4e98a746987d83b8f0f8278b7c05268453be948a9c69b34584226d8d54f03aea8b81c62d2018a6a67e7a05cb5c6eba68a7a73880c4df671c971
+  metadata.gz: b9379dace67bfc0ac7793b261b9c94306b1425e3794a9b66228cba139b9229b3326a93800da954f26de5c23020cf816655c05af85c592297cbe0b513cddfaa28
+  data.tar.gz: 4aaeca235b959c2ec05ce03660639acd65899fdf1af0e96e9ccb5bfa6b6d26a42b9dbb69f1168f7904d36bd29c958ab9cfec3c34a1dc9c107e11c811ec262db1

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/docs/README.adoc

@@ -62,6 +62,8 @@ e.g. `get("ISO 19115-1", "2014", all_parts: true)` is transformed into a referen
 
 == Usage
 
+=== Create DB
+
 [source,ruby]
 ----
 require "relaton"
@@ -93,7 +95,12 @@ db = Relaton::Db.new("globalcache", "localcache")
  @local_db=#<Relaton::DbCache:0x007faabc8fa5c0 @dir="localcache", @ext="xml">,
  @local_db_name="localcache",
 ...
+----
+
+=== Fetch documens
 
+[source,ruby]
+----
 x = db.fetch("IEEE 19011")
 [relaton-ieee] ("IEEE 19011") fetching...
 [relaton-ieee] WARNING: no match found online for IEEE 19011. The code must be exactly like it is on the standards website.
@@ -116,10 +123,72 @@ x = db.fetch("ISO 19115", nil, all_parts: true)
 [relaton-iso] ("ISO 19115") found ISO 19115 (all parts)
 => #<RelatonIsoBib::IsoBibliographicItem:0x007fb1d0ae8bf0
 ...
+----
+
+=== Fetch combined documents
+
+This functionality works only for ISO, IEC, ITU, and NIST documents.
+
+==== Fetch included documents
+[source,ruby]
+----
+bib = db.fetch "ISO 19115-1 + Amd 1"
+[relaton-iso] ("ISO 19115-1") fetching...
+[relaton-iso] ("ISO 19115-1") found ISO 19115-1:2014
+[relaton-iso] ("ISO 19115-1/Amd 1") fetching...
+[relaton-iso] ("ISO 19115-1/Amd 1") found ISO 19115-1:2014/Amd 1:2018
+=> #<RelatonIsoBib::IsoBibliographicItem:0x007f95a929a748
+
+bib.docidentifier[0].id
+=> "ISO 19115-1 + Amd 1"
+
+bib.relation[0].type
+=> "updates"
+
+bib.relation[0].bibitem.docidentifier[0].id
+=> "ISO 19115-1"
+
+bib.relation[1].type
+=> "derivedFrom"
+
+bib.relation[1].bibitem.docidentifier[0].id
+=> "ISO 19115-1/Amd 1:2018"
+
+bib.docidentifier[0].id
+=> "ISO 19115-1, Amd 1"
+
+bib.relation[0].type
+=> "updates"
 
+bib.relation[0].bibitem.docidentifier[0].id
+=> "ISO 19115-1"
+
+bib.relation[1].type
+=> "complements"
+
+bib.relation[1].description
+=> "amendment"
+
+bib.relation[1].bibitem.docidentifier[0].id
+=> "ISO 19115-1/Amd 1:2018"
+----
+
+==== Fetch applied documents
+[source,ruby]
+----
+bib = db.fetch "ISO 19115-1, Amd 1"
+----
+
+=== Get document type
+[source,ruby]
+----
 db.docid_type("CN(GB/T 1.1)")
 => ["Chinese Standard", "GB/T 1.1"]
+----
 
+=== Serializing
+[source,ruby]
+----
 x.to_xml
 => "<bibitem id="ISO19115(allparts)" type="standard">
       ...
@@ -146,11 +215,14 @@ db.load_entry("ISO(ISO 19011)")
 => "<bibdata type="standard">
       ...
     <?bibdata>"
+----
 
+=== Entry manipulation
+[source,ruby]
+----
 db.save_entry("ISO(ISO 19011)", nil)
 => nil
 
 db.load_entry("ISO(ISO 19011)")
 => nil
-
 ----

data/lib/relaton/config.rb

@@ -15,7 +15,7 @@ module Relaton
     attr_accessor :logs
 
     def initialize
-      @logs ||= %i(warning error)
+      @logs = %i(warning error)
     end
   end
 

data/lib/relaton/db.rb

@@ -28,9 +28,34 @@ module Relaton
     #   RelatonNist::NistBibliongraphicItem, RelatonGb::GbbibliographicItem]
     def fetch(code, year = nil, opts = {})
       stdclass = standard_class(code) || return
+      cd = combine_doc code, year, opts, stdclass
+      return cd if cd
+
       check_bibliocache(code, year, opts, stdclass)
     end
 
+    def combine_doc(code, year, opts, stdclass)
+      if (refs = code.split " + ").size > 1
+        reltype = "derivedFrom"
+        reldesc = nil
+      elsif (refs = code.split ", ").size > 1
+        reltype = "complements"
+        reldesc = RelatonBib::FormattedString.new content: "amendment"
+      else return
+      end
+
+      doc = @registry.processors[stdclass].hash_to_bib docid: { id: code }
+      ref = refs[0]
+      updates = check_bibliocache(ref, year, opts, stdclass)
+      doc.relation << RelatonBib::DocumentRelation.new(bibitem: updates, type: "updates") if updates
+      refs[1..-1].each_with_object(doc) do |c, d|
+        bib = check_bibliocache("#{ref}/#{c}", year, opts, stdclass)
+        if bib
+          d.relation << RelatonBib::DocumentRelation.new(type: reltype, description: reldesc, bibitem: bib)
+        end
+      end
+    end
+
     # @param code [String]
     # @param year [String, NilClass]
     # @param stdclass [Symbol, NilClass]
@@ -40,9 +65,8 @@ module Relaton
       @registry.processors.each do |name, processor|
         std = name if processor.prefix == stdclass
       end
-      unless std
-        std = standard_class(code) or return nil
-      end
+      std = standard_class(code) or return nil unless std
+
       check_bibliocache(code, year, opts, std)
     end
 
@@ -97,9 +121,9 @@ module Relaton
         m << v.prefix
       end
       warn <<~WARN
-       #{code} does not have a recognised prefix: #{allowed.join(', ')}.
-       See https://github.com/relaton/relaton/ for instructions on prefixing and wrapping document identifiers to disambiguate them.
-       WARN
+        #{code} does not have a recognised prefix: #{allowed.join(', ')}.
+        See https://github.com/relaton/relaton/ for instructions on prefixing and wrapping document identifiers to disambiguate them.
+      WARN
     end
 
     # TODO: i18n
@@ -133,8 +157,8 @@ module Relaton
     # @return [NilClass, RelatonIsoBib::IsoBibliographicItem,
     #   RelatonItu::ItuBibliographicItem, RelatonIetf::IetfBibliographicItem,
     #   RelatonNist::NistBibliongraphicItem, RelatonGb::GbbibliographicItem]
-    def bib_retval(entry, stdclass, id)
-      entry =~ /^not_found/ ? nil : @registry.processors[stdclass].from_xml(entry)
+    def bib_retval(entry, stdclass, _id)
+      entry.match?(/^not_found/) ? nil : @registry.processors[stdclass].from_xml(entry)
     end
 
     # @param code [String]
@@ -145,7 +169,7 @@ module Relaton
     #   RelatonItu::ItuBibliographicItem, RelatonIetf::IetfBibliographicItem,
     #   RelatonNist::NistBibliongraphicItem, RelatonGb::GbbibliographicItem,
     #   RelatonOgc::OgcBibliographicItem, RelatonCalconnect::CcBibliographicItem]
-    def check_bibliocache(code, year, opts, stdclass)
+    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]
       return @registry.processors[stdclass].hash_to_bib YAML.safe_load(yaml) if yaml
@@ -176,7 +200,7 @@ module Relaton
     # @param db [Relaton::DbCache,`NilClass]
     # @param id [String] docid
     # @return [String]
-    def new_bib_entry(code, year, opts, stdclass, **args)
+    def new_bib_entry(code, year, opts, stdclass, **args) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
       bib = @registry.processors[stdclass].get(code, year, opts)
       bib_id = bib&.docidentifier&.first&.id
 

data/lib/relaton/db_cache.rb

@@ -26,7 +26,7 @@ module Relaton
       prefix_dir = "#{@dir}/#{prefix(key)}"
       FileUtils::mkdir_p prefix_dir unless Dir.exist? prefix_dir
       set_version prefix_dir
-      File.write "#{filename(key)}.#{ext(value)}", value, encoding: "utf-8"
+      file_safe_write "#{filename(key)}.#{ext(value)}", value
     end
 
     # @param value [String]
@@ -65,7 +65,7 @@ module Relaton
       value = self[key]
       return unless value
 
-      if value =~ /^not_found/
+      if value.match? /^not_found/
         value.match(/\d{4}-\d{2}-\d{2}/).to_s
       else
         doc = Nokogiri::XML value
@@ -106,7 +106,7 @@ module Relaton
     def set_version(fdir)
       file_version = "#{fdir}/version"
       unless File.exist? file_version
-        File.write file_version, grammar_hash(fdir), encoding: "utf-8"
+        file_safe_write file_version, grammar_hash(fdir)
       end
       self
     end
@@ -159,7 +159,7 @@ module Relaton
     def filename(key)
       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
@@ -189,6 +189,15 @@ module Relaton
       key.downcase.match(/^[^\(]+(?=\()/).to_s
     end
 
+    # @param file [String]
+    # @content [String]
+    def file_safe_write(file, content)
+      File.open file, File::RDWR | File::CREAT, encoding: "UTF-8" do |f|
+        Timeout.timeout(1) { f.flock File::LOCK_EX }
+        f.write content
+      end
+    end
+
     class << self
       private
 
@@ -209,7 +218,7 @@ module Relaton
       # local_cache: local cache name; none created if nil; "relaton" created
       # if empty global_cache: boolean to create global_cache
       # flush_caches: flush caches
-      def init_bib_caches(opts)
+      def init_bib_caches(opts) # rubocop:disable Metrics/CyclomaticComplexity
         globalname = global_bibliocache_name if opts[:global_cache]
         localname = local_bibliocache_name(opts[:local_cache])
         localname = "relaton" if localname&.empty?

data/lib/relaton/registry.rb

@@ -8,7 +8,7 @@ module Relaton
     SUPPORTED_GEMS = %w[
       relaton_gb relaton_iec relaton_ietf relaton_iso relaton_itu relaton_nist
       relaton_ogc relaton_calconnect relaton_omg relaton_un relaton_w3c
-      relaton_ieee relaton_iho relaton_bipm
+      relaton_ieee relaton_iho relaton_bipm relaton_ecma
     ].freeze
 
     include Singleton
@@ -57,9 +57,10 @@ module Relaton
     # Find processor by type
     #
     # @param type [String]
-    # @return [RelatonIso::Processor, RelatonIec::Processor, RelatonNist::Processor,
-    #   RelatonIetf::Processot, RelatonItu::Processor, RelatonGb::Processor,
-    #   RelatonOgc::Processor, RelatonCalconnect::Processor]
+    # @return [RelatonIso::Processor, RelatonIec::Processor,
+    #   RelatonNist::Processor, RelatonIetf::Processot, RelatonItu::Processor,
+    #   RelatonGb::Processor, RelatonOgc::Processor,
+    #   RelatonCalconnect::Processor]
     def by_type(type)
       processors.values.detect { |v| v.prefix == type&.upcase }
     end

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.5.0".freeze
+  VERSION = "1.7.2".freeze
 end

data/relaton.gemspec

@@ -30,20 +30,21 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   # spec.add_dependency "algoliasearch"
-  spec.add_dependency "relaton-bipm", "~> 1.5.0"
-  spec.add_dependency "relaton-calconnect", "~> 1.5.0"
-  spec.add_dependency "relaton-gb", "~> 1.5.0"
-  spec.add_dependency "relaton-iec", "~> 1.5.0"
-  spec.add_dependency "relaton-ieee", "~> 1.5.0"
-  spec.add_dependency "relaton-ietf", "~> 1.5.0"
-  spec.add_dependency "relaton-iho", "~> 1.5.0"
-  spec.add_dependency "relaton-iso", "~> 1.5.0"
-  spec.add_dependency "relaton-itu", "~> 1.5.0"
-  spec.add_dependency "relaton-nist", "~> 1.5.0"
-  spec.add_dependency "relaton-ogc", "~> 1.5.0"
-  spec.add_dependency "relaton-omg", "~> 1.5.0"
-  spec.add_dependency "relaton-un", "~> 1.5.0"
-  spec.add_dependency "relaton-w3c", "~> 1.5.0"
+  spec.add_dependency "relaton-bipm", "~> 1.7.0"
+  spec.add_dependency "relaton-calconnect", "~> 1.7.0"
+  spec.add_dependency "relaton-ecma", "1.7.pre1"
+  spec.add_dependency "relaton-gb", "~> 1.7.0"
+  spec.add_dependency "relaton-iec", ">= 1.7.3"
+  spec.add_dependency "relaton-ieee", "~> 1.7.0"
+  spec.add_dependency "relaton-ietf", "~> 1.7.0"
+  spec.add_dependency "relaton-iho", "~> 1.7.0"
+  spec.add_dependency "relaton-iso", ">= 1.7.1"
+  spec.add_dependency "relaton-itu", ">= 1.7.2"
+  spec.add_dependency "relaton-nist", ">= 1.7.1"
+  spec.add_dependency "relaton-ogc", "~> 1.7.0"
+  spec.add_dependency "relaton-omg", "~> 1.7.0"
+  spec.add_dependency "relaton-un", "~> 1.7.0"
+  spec.add_dependency "relaton-w3c", "~> 1.7.0"
 
   spec.add_development_dependency "byebug", "~> 11.0"
   spec.add_development_dependency "debase"

data/spec/relaton/db_cache_spec.rb

@@ -1,13 +1,38 @@
+require "fileutils"
+require "timeout"
+
 RSpec.describe Relaton::DbCache do
   it "creates default caches" do
     cache_path = File.expand_path("~/.relaton/cache")
     FileUtils.mv cache_path, "relaton1/cache", force: true
     FileUtils.rm_rf %w(relaton)
     Relaton::DbCache.init_bib_caches(
-      global_cache: true, local_cache: "", flush_caches: true,
+      global_cache: true, local_cache: "", flush_caches: true
     )
     expect(File.exist?(cache_path)).to be true
     expect(File.exist?("relaton")).to be true
     FileUtils.mv "relaton1/cache", cache_path if File.exist? "relaton1"
   end
+
+  it "write same file by concurent processes" do
+    dir = "testcache/iso"
+    FileUtils.mkdir_p dir unless File.exist? dir
+    file_name = File.join dir, "iso_123.xml"
+    file = File.open file_name, File::RDWR | File::CREAT, encoding: "UTF-8"
+    file.flock File::LOCK_EX
+    command = <<~RBY
+      require "relaton"
+      cache = Relaton::DbCache.new "testcache"
+      cache["ISO(ISO 123)"] = "test 1"
+    RBY
+    pid = spawn RbConfig.ruby, "-e #{command}"
+    sleep 0.1
+    file.write "test 2"
+    file.flock File::LOCK_UN
+    file.close
+    Process.waitpid pid, 0
+    expect($?.exitstatus).to eq 0
+    expect(File.read(file_name)).to eq "test 1"
+    FileUtils.rm_rf "testcache"
+  end
 end

data/spec/relaton/regirtry_spec.rb

@@ -2,13 +2,13 @@ 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/,
+      /backend not_supported_gem not present/
     ).to_stdout
   end
 
   it "finds ISO processor" do
-    expect(Relaton::Registry.instance.find_processor("relaton_iso")).
-      to be_instance_of RelatonIso::Processor
+    expect(Relaton::Registry.instance.find_processor("relaton_iso"))
+      .to be_instance_of RelatonIso::Processor
   end
 
   it "returns supported processors" do
@@ -70,4 +70,8 @@ RSpec.describe Relaton::Registry do
   it "finds processor by type" do
     expect(Relaton::Registry.instance.by_type("BIPM")).to be_instance_of RelatonBipm::Processor
   end
+
+  it "finds processor by type" do
+    expect(Relaton::Registry.instance.by_type("ECMA")).to be_instance_of RelatonEcma::Processor
+  end
 end

data/spec/relaton_spec.rb

@@ -5,7 +5,9 @@ RSpec.describe Relaton::Db do
   end
 
   it "rejects an illegal reference prefix" do
-    expect { @db.fetch("XYZ XYZ", nil, {}) }.to output(/does not have a recognised prefix/).to_stderr
+    expect { @db.fetch("XYZ XYZ", nil, {}) }.to output(
+      /does not have a recognised prefix/
+    ).to_stderr
   end
 
   context "gets an ISO reference" do
@@ -13,13 +15,16 @@ RSpec.describe Relaton::Db do
       VCR.use_cassette "iso_19115_1" do
         bib = @db.fetch("ISO 19115-1", nil, {})
         expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include "<project-number>ISO 19115</project-number>"
+        expect(bib.to_xml(bibdata: true)).to include "<project-number>"\
+          "ISO 19115</project-number>"
         expect(File.exist?("testcache")).to be true
         expect(File.exist?("testcache2")).to be true
         testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number>ISO 19115</project-number>"
+        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number>"\
+          "ISO 19115</project-number>"
         testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number>ISO 19115</project-number>"
+        expect(testcache["ISO(ISO 19115-1)"]).to include "<project-number>"\
+          "ISO 19115</project-number>"
       end
       bib = @db.fetch("ISO 19115-1", nil, {})
       expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
@@ -29,9 +34,12 @@ RSpec.describe Relaton::Db do
       VCR.use_cassette "19133_2005" do
         bib = @db.fetch("ISO 19133:2005")
         expect(bib).to be_instance_of RelatonIsoBib::IsoBibliographicItem
-        expect(bib.to_xml).to include '<bibitem id="ISO19133-2005" type="standard">'
+        expect(bib.to_xml).to include '<bibitem id="ISO19133-2005" '\
+          'type="standard">'
         testcache = Relaton::DbCache.new "testcache"
-        expect(testcache.valid_entry?("ISO(ISO 19133:2005)", Date.today.year.to_s)).to eq Date.today.year.to_s
+        expect(
+          testcache.valid_entry?("ISO(ISO 19133:2005)", Date.today.year.to_s)
+        ).to eq Date.today.year.to_s
       end
     end
 
@@ -60,6 +68,13 @@ RSpec.describe Relaton::Db do
   end
 
   context "NIST references" do
+    before(:each) do
+      nist_fr = /\.relaton\/nist\/pubs-export\.zip/
+      expect(File).to receive(:exist?).with(nist_fr).and_return false
+      expect(File).to receive(:exist?).and_call_original.at_least :once
+      # expect(FileUtils).to receive(:mv).with kind_of(String), nist_fr
+    end
+
     it "gets FISP" do
       VCR.use_cassette "fisp_140" do
         bib = @db.fetch "NIST FIPS 140"
@@ -119,13 +134,19 @@ RSpec.describe Relaton::Db do
       VCR.use_cassette "gb_t_20223_2006" do
         bib = @db.fetch "CN(GB/T 20223)", "2006", {}
         expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include "<project-number>GB/T 20223</project-number>"
+        expect(bib.to_xml(bibdata: true)).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
         expect(File.exist?("testcache")).to be true
         expect(File.exist?("testcache2")).to be true
         testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
         testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
       end
     end
 
@@ -133,13 +154,19 @@ RSpec.describe Relaton::Db do
       VCR.use_cassette "gb_t_20223_2006" do
         bib = @db.fetch "CN(GB/T 20223-2006)", nil, {}
         expect(bib).to be_instance_of RelatonGb::GbBibliographicItem
-        expect(bib.to_xml(bibdata: true)).to include "<project-number>GB/T 20223</project-number>"
+        expect(bib.to_xml(bibdata: true)).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
         expect(File.exist?("testcache")).to be true
         expect(File.exist?("testcache2")).to be true
         testcache = Relaton::DbCache.new "testcache"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
         testcache = Relaton::DbCache.new "testcache2"
-        expect(testcache["CN(GB/T 20223:2006)"]).to include "<project-number>GB/T 20223</project-number>"
+        expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
       end
     end
   end
@@ -152,9 +179,11 @@ 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=\"IETF\">RFC 8341</docidentifier>"
+      expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
+        "type=\"IETF\">RFC 8341</docidentifier>"
       testcache = Relaton::DbCache.new "testcache2"
-      expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier type=\"IETF\">RFC 8341</docidentifier>"
+      expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
+        "type=\"IETF\">RFC 8341</docidentifier>"
     end
   end
 
@@ -166,6 +195,13 @@ RSpec.describe Relaton::Db do
   end
 
   it "get Calconnect refrence and cache it" do
+    cc_fr = /\.relaton\/calconnect\/bibliography\.yml/
+    expect(File).to receive(:exist?).with(cc_fr).and_return false
+    expect(File).to receive(:exist?).with(/etag\.txt/).and_return false
+    expect(File).to receive(:exist?).and_call_original.at_least :once
+    expect(File).to receive(:write).with(cc_fr, kind_of(String), kind_of(Hash))
+      .at_most :once
+    expect(File).to receive(:write).and_call_original.at_least :once
     VCR.use_cassette "cc_dir_10005_2019", match_requests_on: [:path] do
       bib = @db.fetch "CC/DIR 10005:2019", nil, {}
       expect(bib).to be_instance_of RelatonCalconnect::CcBibliographicItem
@@ -187,6 +223,11 @@ 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 JSON-LD 1.1", nil, {}
       expect(bib).to be_instance_of RelatonW3c::W3cBibliographicItem
@@ -207,6 +248,89 @@ RSpec.describe Relaton::Db do
     end
   end
 
+  it "get ECMA reference" do
+    VCR.use_cassette "ecma_6" do
+      bib = @db.fetch "ECMA-6"
+      expect(bib).to be_instance_of RelatonBib::BibliographicItem
+    end
+  end
+
+  context "get combined documents" do
+    context "ISO" do
+      it "included" do
+        VCR.use_cassette "iso_combined_included" do
+          bib = @db.fetch "ISO 19115-1 + Amd 1"
+          expect(bib.docidentifier[0].id).to eq "ISO 19115-1 + Amd 1"
+          expect(bib.relation[0].type).to eq "updates"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
+          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/Amd 1:2018"
+        end
+      end
+
+      it "applied" do
+        VCR.use_cassette "iso_combined_applied" do
+          bib = @db.fetch "ISO 19115-1, Amd 1"
+          expect(bib.docidentifier[0].id).to eq "ISO 19115-1, Amd 1"
+          expect(bib.relation[0].type).to eq "updates"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ISO 19115-1"
+          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/Amd 1:2018"
+        end
+      end
+    end
+
+    context "IEC" do
+      it "included" do
+        VCR.use_cassette "iec_combined_included" do
+          bib = @db.fetch "IEC 60027-1, Amd 1, Amd 2"
+          expect(bib.docidentifier[0].id).to eq "IEC 60027-1, Amd 1, Amd 2"
+          expect(bib.relation[0].type).to eq "updates"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "IEC 60027-1"
+          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 "IEC 60027-1/AMD1:1997"
+          expect(bib.relation[2].type).to eq "complements"
+          expect(bib.relation[2].description.content).to eq "amendment"
+          expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "IEC 60027-1/AMD2:2005"
+        end
+      end
+    end
+
+    context "ITU" do
+      it "included" do
+        VCR.use_cassette "itu_combined_included" do
+          bib = @db.fetch "ITU-T G.989.2, Amd 1, Amd 2"
+          expect(bib.docidentifier[0].id).to eq "ITU-T G.989.2, Amd 1, Amd 2"
+          expect(bib.relation[0].type).to eq "updates"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2"
+          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 "ITU-T G.989.2/Amd 1"
+          expect(bib.relation[2].type).to eq "complements"
+          expect(bib.relation[2].description.content).to eq "amendment"
+          expect(bib.relation[2].bibitem.docidentifier[0].id).to eq "ITU-T G.989.2/Amd 2"
+        end
+      end
+    end
+
+    context "HIST" do
+      it "included" do
+        VCR.use_cassette "hist_cmbined_included" do
+          bib = @db.fetch "NIST SP 800-38A, Add"
+          expect(bib.docidentifier[0].id).to eq "NIST SP 800-38A, Add"
+          expect(bib.relation[0].type).to eq "updates"
+          expect(bib.relation[0].bibitem.docidentifier[0].id).to eq "SP 800-38A"
+          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 "SP 800-38A-Add"
+        end
+      end
+    end
+  end
+
   context "version control" do
     before(:each) { @db.save_entry "iso(test_key)", value: "test_value" }
 
@@ -222,8 +346,10 @@ RSpec.describe Relaton::Db do
       expect(File.exist?("testcache")).to be true
       expect(File.exist?("testcache2")).to be true
       processor = double
-      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
+      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
       db = Relaton::Db.new "testcache", "testcache2"
       testcache = db.instance_variable_get :@db
       expect(testcache.all).not_to be_any