relaton 1.17.0 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 161865c4183f2125b3967ecf451cfc0473253d933b3f84d35684bef6b30a94dd
-  data.tar.gz: 678698b76ead0a46765e462622df3e4670331843e563b043e644bb2210c44414
+  metadata.gz: 18c8244f75e034cd05320232fae767d59e10bd6de5f2983dad701ed8ddcbef59
+  data.tar.gz: b384e225f15c0fb4600f8bd245e6ee4a5c2820bbaf3fc865a308972e358a3fd6
 SHA512:
-  metadata.gz: ab8d13611095fc725320d7aa4d5ec6ef1b81ec987ce91853fc312980391e7b42f64c986ef8b47f1609a7021eef9a7bdacaf5fa6d32606a64a03801ee99029ab0
-  data.tar.gz: 30f38ad4cb1b49c175f4616de286d2a94ff5bddf53712221fe0d915b2cb51795db2ab976c6c5cd2ca6e812e2788ad00e613d2ce9cc824067a8ab5096e6d16c72
+  metadata.gz: c83e2b59913fead7d8a7fee650ed739330c3f7cbccfc63eec6d9530e7ca433e3bd026f2c7a15a61735b0b2e72d4106fd7ddd6ddc9a4e3cd00be349c2c288a497
+  data.tar.gz: 49ff93fb5f75841a9ae70dae67c437e3b04fa29977dd96cc9a6470ad5dee4183ccf99951a8aa950551b0811a08c3b03f12eb7b3bcbcd7565b039e167fe8e1a23

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_xsf relaton_ccsds relaton_etsi relaton_isbn
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.17.0".freeze
+  VERSION = "1.17.2".freeze
 end

data/relaton.gemspec

@@ -38,12 +38,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "relaton-cie", "~> 1.17.0"
   spec.add_dependency "relaton-doi", "~> 1.17.0"
   spec.add_dependency "relaton-ecma", "~> 1.17.0"
+  spec.add_dependency "relaton-etsi", "~> 1.17.0"
   spec.add_dependency "relaton-gb", "~> 1.17.0"
   spec.add_dependency "relaton-iana", "~> 1.17.0"
   spec.add_dependency "relaton-iec", "~> 1.17.0"
   spec.add_dependency "relaton-ieee", "~> 1.17.0"
   spec.add_dependency "relaton-ietf", "~> 1.17.0"
   spec.add_dependency "relaton-iho", "~> 1.17.0"
+  spec.add_dependency "relaton-isbn", "~> 1.17.0"
   spec.add_dependency "relaton-iso", "~> 1.17.0"
   spec.add_dependency "relaton-itu", "~> 1.17.0"
   spec.add_dependency "relaton-jis", "~> 1.17.0"

data/spec/relaton/processor_spec.rb

@@ -32,4 +32,82 @@ RSpec.describe Relaton::Processor do
       expect { subject.grammar_hash }.to raise_error StandardError
     end
   end
+
+  context "flavor processors" do
+    before { Relaton::Registry.instance }
+
+    shared_examples "common processor methods" do |flavor, namespace, bibmodule|
+      let(:processor) { Relaton::Registry.instance.by_type flavor }
+      let(:flavor_module) { Object.const_get namespace }
+      let(:bibliography) { Object.const_get "#{namespace}::#{bibmodule}" }
+
+      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
+      end
+
+      it "grammar_hash method should call grammar_hash method of #{flavor}" do
+        expect(flavor_module).to receive(:grammar_hash).and_return :hash
+        expect(processor.grammar_hash).to eq :hash
+      end
+    end
+
+    shared_examples "fetch_data method" do |flavor, fetcher, source|
+      let(:processor) { Relaton::Registry.instance.by_type flavor }
+      let(:fetcher_class) { Object.const_get fetcher }
+
+      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
+      end
+    end
+
+    shared_examples "from_xml method" do |flavor, parser|
+      let(:processor) { Relaton::Registry.instance.by_type flavor }
+      let(:parser_class) { Object.const_get parser }
+
+      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
+      end
+    end
+
+    shared_examples "hash_to_bib method" do |flavor, converter, bibitem|
+      let(:processor) { Relaton::Registry.instance.by_type flavor }
+      let(:converter_class) { Object.const_get converter }
+      let(:bibitem_class) { Object.const_get bibitem }
+
+      it "hash_to_bib method should call hash_to_bib method of #{flavor}" do
+        expect(converter_class).to receive(:hash_to_bib).with(:hash).and_return title: "title"
+        expect(bibitem_class).to receive(:new).with(title: "title").and_return :item
+        expect(processor.hash_to_bib(:hash)).to eq :item
+      end
+    end
+
+    shared_examples "remove_index_file method" do |flavor, file|
+      let(:processor) { Relaton::Registry.instance.by_type flavor }
+
+      it "remove index file" do
+        index = double "index"
+        expect(index).to receive(:remove_file)
+        expect(Relaton::Index).to receive(:find_or_create)
+          .with(flavor.downcase.to_sym, url: true, file: file).and_return index
+        processor.remove_index_file
+      end
+    end
+
+    context "ETSI processor" do
+      it_behaves_like "common processor methods", "ETSI", "RelatonEtsi", "Bibliography"
+      it_behaves_like "fetch_data method", "ETSI", "RelatonEtsi::DataFetcher", "etsi-csv"
+      it_behaves_like "from_xml method", "ETSI", "RelatonEtsi::XMLParser"
+      it_behaves_like "hash_to_bib method", "ETSI", "RelatonEtsi::HashConverter", "RelatonEtsi::BibliographicItem"
+      it_behaves_like "remove_index_file method", "ETSI", "index-v1.yaml"
+    end
+
+    context "ISBN processor" do
+      it_behaves_like "common processor methods", "ISBN", "RelatonIsbn", "OpenLibrary"
+      it_behaves_like "from_xml method", "ISBN", "RelatonBib::XMLParser"
+      it_behaves_like "hash_to_bib method", "ISBN", "RelatonBib::HashConverter", "RelatonBib::BibliographicItem"
+    end
+  end
 end

data/spec/relaton/registry_spec.rb

@@ -119,11 +119,22 @@ RSpec.describe Relaton::Registry do
     it "CCSDS" do
       expect(Relaton::Registry.instance.by_type("CCSDS")).to be_instance_of RelatonCcsds::Processor
     end
+
+    it "ETSI" do
+      expect(Relaton::Registry.instance.by_type("ETSI")).to be_instance_of RelatonEtsi::Processor
+    end
+
+    it "ISBN" do
+      expect(Relaton::Registry.instance.by_type("ISBN")).to be_instance_of RelatonIsbn::Processor
+    end
   end
 
   it "find processot by dataset" do
-    expect(Relaton::Registry.instance
-      .find_processor_by_dataset("nist-tech-pubs"))
+    expect(Relaton::Registry.instance.find_processor_by_dataset("nist-tech-pubs"))
       .to be_instance_of RelatonNist::Processor
   end
+
+  it "find processor by dataset" do
+    expect(Relaton::Registry.instance.find_processor_by_dataset "etsi-csv").to be_instance_of RelatonEtsi::Processor
+  end
 end

data/spec/relaton_spec.rb

@@ -138,45 +138,45 @@ RSpec.describe Relaton::Db do
   end
 
   context "get GB reference" do
-    # it "and cache it" 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 <<~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 <<~XML
-    #       <project-number>GB/T 20223</project-number>
-    #     XML
-    #     testcache = Relaton::DbCache.new "testcache2"
-    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-    #       <project-number>GB/T 20223</project-number>
-    #     XML
-    #   end
-    # end
-
-    # it "with year" 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 <<~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 <<~XML
-    #       <project-number>GB/T 20223</project-number>
-    #     XML
-    #     testcache = Relaton::DbCache.new "testcache2"
-    #     expect(testcache["CN(GB/T 20223:2006)"]).to include <<~XML
-    #       <project-number>GB/T 20223</project-number>
-    #     XML
-    #   end
-    # end
+    it "and cache it" 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 <<~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 <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
+        testcache = Relaton::DbCache.new "testcache2"
+        expect(testcache["CN(GB/T 20223-2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
+      end
+    end
+
+    it "with year" 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 <<~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 <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
+        testcache = Relaton::DbCache.new "testcache2"
+        expect(testcache["CN(GB/T 20223-2006)"]).to include <<~XML
+          <project-number>GB/T 20223</project-number>
+        XML
+      end
+    end
   end
 
   it "get RFC reference and cache it" do
@@ -355,6 +355,24 @@ RSpec.describe Relaton::Db do
     expect(bib.docidentifier.first.id).to eq "XEP 0001"
   end
 
+  it "get ETSI reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "ETSI EN 300 175-8", type: "ETSI")
+    item = RelatonEtsi::BibliographicItem.new docid: [docid]
+    expect(RelatonEtsi::Bibliography).to receive(:get).with("ETSI EN 300 175-8", nil, {}).and_return item
+    bib = @db.fetch "ETSI EN 300 175-8"
+    expect(bib).to be_instance_of RelatonEtsi::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "ETSI EN 300 175-8"
+  end
+
+  it "get ISBN reference" do
+    docid = RelatonBib::DocumentIdentifier.new(id: "ISBN 978-0-580-50101-4", type: "ISBN")
+    item = RelatonBib::BibliographicItem.new docid: [docid]
+    expect(RelatonIsbn::OpenLibrary).to receive(:get).with("ISBN 978-0-580-50101-4", nil, {}).and_return item
+    bib = @db.fetch "ISBN 978-0-580-50101-4"
+    expect(bib).to be_instance_of RelatonBib::BibliographicItem
+    expect(bib.docidentifier.first.id).to eq "ISBN 978-0-580-50101-4"
+  end
+
   context "get combined documents" do
     context "ISO" do
       it "included" do

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -39,21 +39,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - 6ACA:263D:D71965:10FED1A:6563F706
+      - EA0A:234C:6136C2:76A26F:657CBECC
       Accept-Ranges:
       - bytes
       Date:
-      - Mon, 27 Nov 2023 01:55:22 GMT
+      - Fri, 15 Dec 2023 21:02:05 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780035-PDK
+      - cache-pdk-kpdk1780087-PDK
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1701050122.300647,VS0,VE158
+      - S1702674125.021523,VS0,VE264
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -61,9 +61,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 4fe800c6af7705f1b714a8e04007433d2c95ef7b
+      - 7cf65cbbcbdaeb1dfc42be6245dcb99d105b95c2
       Expires:
-      - Mon, 27 Nov 2023 02:00:22 GMT
+      - Fri, 15 Dec 2023 21:07:05 GMT
       Source-Age:
       - '0'
     body:
@@ -11299,7 +11299,7 @@ http_interactions:
         HgMUAAAACAA6cm9XZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
         ZXgtdjEueWFtbFVUBQADENNUZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQAB
         AFMAAAB7tQcAAAA=
-  recorded_at: Mon, 27 Nov 2023 01:55:22 GMT
+  recorded_at: Fri, 15 Dec 2023 21:02:05 GMT
 - request:
     method: get
     uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
@@ -11313,6 +11313,8 @@ http_interactions:
       - "*/*"
       User-Agent:
       - Ruby
+      Host:
+      - raw.githubusercontent.com
   response:
     status:
       code: 200
@@ -11339,21 +11341,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - FA38:9DA8:161F5FD:1B269AA:6563F70E
+      - B8D8:0424:5FE216:754B4B:657CBED0
       Accept-Ranges:
       - bytes
       Date:
-      - Mon, 27 Nov 2023 01:55:26 GMT
+      - Fri, 15 Dec 2023 21:02:08 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780083-PDK
+      - cache-pdk-kpdk1780090-PDK
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1701050126.978850,VS0,VE223
+      - S1702674129.629585,VS0,VE137
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -11361,9 +11363,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - b95b0612421e75a14fddd2d60ac6a4c7103edc2a
+      - e5a350b43167b7f3d41e7f2809b0d4869346f491
       Expires:
-      - Mon, 27 Nov 2023 02:00:26 GMT
+      - Fri, 15 Dec 2023 21:07:08 GMT
       Source-Age:
       - '0'
     body:
@@ -11404,5 +11406,5 @@ http_interactions:
         bWVldGluZzogU01HLTI4CiAgZnJlZXplX3N0YWdlMl9tZWV0aW5nOiBTTUct
         MjgKICBmcmVlemVfc3RhZ2UzX21lZXRpbmc6IFNNRy0yOAogIGNsb3NlX21l
         ZXRpbmc6IFNQLTI4CiAgcHJvamVjdF9lbmQ6ICcxOTk5LTAyLTEyJwo=
-  recorded_at: Mon, 27 Nov 2023 01:55:26 GMT
+  recorded_at: Fri, 15 Dec 2023 21:02:08 GMT
 recorded_with: VCR 6.2.0

data/spec/vcr_cassetes/api_relaton_org.yml

@@ -13,6 +13,8 @@ http_interactions:
       - "*/*"
       User-Agent:
       - Ruby
+      Host:
+      - api.relaton.org
   response:
     status:
       code: 200
@@ -25,27 +27,27 @@ http_interactions:
       Connection:
       - keep-alive
       Date:
-      - Mon, 27 Nov 2023 01:56:09 GMT
+      - Fri, 15 Dec 2023 21:02:54 GMT
       X-Amzn-Requestid:
-      - 0335c18a-9e5a-453a-bd05-2d4493ff348f
+      - d5797694-3f7c-4b5c-b0b4-4e258aa6421b
       Access-Control-Allow-Origin:
       - "*"
       Access-Control-Allow-Headers:
       - Content-Type,X-Amz-Date,Authorization,X-Api-Key,X-Amz-Security-Token
       X-Amz-Apigw-Id:
-      - PCOOoGFXIAMEpVw=
+      - QALFSHcAoAMEfnQ=
       Access-Control-Allow-Methods:
       - GET, POST, OPTIONS
       X-Amzn-Trace-Id:
-      - Root=1-6563f72a-6cd241bc287ba8a67a95a7ee;Sampled=0;lineage=521d48d5:0
+      - Root=1-657cbeee-0e87a651219ca2fd35614c22;Sampled=0;lineage=521d48d5:0
       X-Cache:
       - Miss from cloudfront
       Via:
-      - 1.1 0a576c2dd3353021ea1e162ded4d3a7c.cloudfront.net (CloudFront)
+      - 1.1 fc1009b8e45427207e2a571827e9dd24.cloudfront.net (CloudFront)
       X-Amz-Cf-Pop:
       - ATL51-C1
       X-Amz-Cf-Id:
-      - YH0okkeNR7fj-Qv5Ljpr72dITOlVsS60NyvmUppIDvIm6GujDop0lw==
+      - _diMw4SxewdLl3Da5yx4iI-ZOXbCTRmzU6L0JQUGRIumlHu4ejmYCg==
     body:
       encoding: UTF-8
       base64_string: |
@@ -115,5 +117,5 @@ http_interactions:
         dHJ1Y3R1cmVkaWRlbnRpZmllciB0eXBlPSJJU08iPgogICAgICA8cHJvamVj
         dC1udW1iZXI+SVNPIDE5MTE1PC9wcm9qZWN0LW51bWJlcj4KICAgIDwvc3Ry
         dWN0dXJlZGlkZW50aWZpZXI+CiAgPC9leHQ+CjwvYmliZGF0YT4=
-  recorded_at: Mon, 27 Nov 2023 01:56:09 GMT
+  recorded_at: Fri, 15 Dec 2023 21:02:54 GMT
 recorded_with: VCR 6.2.0