relaton 1.15.2 → 1.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6254d1d82a460fa2a410054f3c8dc2e924d00f71ec555691109407c8cf0921a
-  data.tar.gz: c75c01f97ba34e83b71dc17dd3ed15f80dd619fe31c98f3dd592e3f7616ecf28
+  metadata.gz: a8fa98a0ea566742e2821f059c138d8406580d9a3d6503038b136dacf3099b9a
+  data.tar.gz: 6a18b2bdcf7940ef4e31c8852c5cc4fd8aaa85c44ab301978b2f0fb4e63548cd
 SHA512:
-  metadata.gz: a86a05f6af47607c6287f090522a3cf865d669076fb199e9a061db0604036c1ad34b46e6625fe0eafb9d76547f030e27ce6e10eae41bebd58ee4c0ae871b0038
-  data.tar.gz: dc68c7c8db23fe91c6968ed3443dba32f683c5f8856bd12d84e1a1b278651a680fe0c1ef6a44986891f9e24ca0864443e426f578bb26f1333f646fe8326bdb13
+  metadata.gz: 92339583a34c6ba9e0f9a8adffc3cc61f17bd8eb6e5f117a3d297eb1215c1f93e5e641f99e0b0780ff8dc0a682ae29d7044d49faf1de86ac140d56f706b383cc
+  data.tar.gz: a3cbcc6781710a5cca884bbf8bac41406d934d15d58f6eccdcf44e10e9b2a0330265419ff3ce167e4b16e35a539c29c6af3b5ed5014e8e5dc590dc130ac59239

data/Gemfile

@@ -1,5 +1,19 @@
 source "https://rubygems.org"
-  
+
 # Specify your gem's dependencies in gemspec
 gemspec
 
+gem "byebug", "~> 11.0"
+gem "equivalent-xml", "~> 0.6"
+gem "guard", "~> 2.14"
+gem "guard-rspec", "~> 4.7"
+gem "pry-byebug", "~> 3.9.0"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.6"
+gem "rubocop", "~> 1.17.0"
+gem "rubocop-performance", "~> 1.11.0"
+gem "rubocop-rails", "~> 2.10.0"
+gem "simplecov", "~> 0.15"
+gem "timecop", "~> 0.9"
+gem "vcr", "~> 6"
+gem "webmock", "~> 3.18"

data/lib/relaton/db_cache.rb

@@ -162,7 +162,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

data/lib/relaton/registry.rb

@@ -10,6 +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
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.15.2".freeze
+  VERSION = "1.15.4".freeze
 end

data/relaton.gemspec

@@ -52,19 +52,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-omg", "~> 1.14.0"
   spec.add_dependency "relaton-un", "~> 1.14.0"
   spec.add_dependency "relaton-w3c", "~> 1.14.0"
-
-  spec.add_development_dependency "byebug", "~> 11.0"
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "guard", "~> 2.14"
-  spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "pry-byebug", "~> 3.9.0"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "rubocop", "~> 1.17.0"
-  spec.add_development_dependency "rubocop-performance", "~> 1.11.0"
-  spec.add_development_dependency "rubocop-rails", "~> 2.10.0"
-  spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 6"
-  spec.add_development_dependency "webmock"
+  spec.add_dependency "relaton-xsf", "~> 1.14.0"
 end

data/spec/relaton/registry_spec.rb

@@ -109,6 +109,10 @@ RSpec.describe Relaton::Registry do
     it "JIS" do
       expect(Relaton::Registry.instance.by_type("JIS")).to be_instance_of RelatonJis::Processor
     end
+
+    it "XSF" do
+      expect(Relaton::Registry.instance.by_type("XEP")).to be_instance_of RelatonXsf::Processor
+    end
   end
 
   it "find processot by dataset" do

data/spec/relaton_spec.rb

@@ -214,13 +214,6 @@ 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
@@ -334,6 +327,24 @@ RSpec.describe Relaton::Db do
     expect(bib).to be_instance_of RelatonBib::BibliographicItem
   end
 
+  it "get JIS reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "JIS X 0001", type: "JIS")
+    item = RelatonJis::BibliographicItem.new docid: [docid]
+    expect(RelatonJis::Bibliography).to receive(:get).with("JIS X 0001", nil, {}).and_return item
+    bib = @db.fetch "JIS X 0001"
+    expect(bib).to be_instance_of RelatonJis::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "JIS X 0001"
+  end
+
+  it "get XSF reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "XEP 0001", type: "XSF")
+    item = RelatonXsf::BibliographicItem.new docid: [docid]
+    expect(RelatonXsf::Bibliography).to receive(:get).with("XEP 0001", nil, {}).and_return item
+    bib = @db.fetch "XEP 0001"
+    expect(bib).to be_instance_of RelatonXsf::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "XEP 0001"
+  end
+
   context "get combined documents" do
     context "ISO" do
       it "included" do