relaton 1.17.1 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c48cfe6f0f4984a5141f07a08d0aad1350910f07b87c3f6e028b91a1b81df17
-  data.tar.gz: 328a7973781a7c2061977fba41d914da92a459adc0c4e73d1827ac66149cbe4a
+  metadata.gz: b7c5f3e470692974347ac474f45af281a5bb14f7733d9cbbfc21797cde40da60
+  data.tar.gz: 723005aeb2717a6f90ef1bb017e5aae78076d69f038711878dc39624c1f5fdf7
 SHA512:
-  metadata.gz: dfe07c36cc548cd44b664834062eaace4acb9a605b666373fa13eb5049e39ead615718151510750100632169add0195bc6414e309b5ecbe7268c1b4bbf0e8b2a
-  data.tar.gz: bdf5d46cc33412f1428882a10b343bf7e4a4042c45b67622fe1d8afcd02999f45786e3faccdba279f68c7b2a631f7f6d7671023e12a5f6d079033968521340af
+  metadata.gz: 747a70cc7e9d36ee839be8faa61b68b7fcc9085b01de70237ff132b04a2fd3b665be5256d2387fc308517171db7f23ec4d4015035fef2694a8472ce493e99117
+  data.tar.gz: cc2db525a28fa3711e409c61f3292206ae7626976519ce86ec3a69a9fa510649aa2a88c9750f2cc24276b7bc60eb35602d4826b630f1d122d26cdd576d4f6a34

data/.github/workflows/rake.yml

@@ -10,4 +10,4 @@ on:
 
 jobs:
   rake:
-    uses: relaton/support/.github/workflows/rake.yml@master
+    uses: relaton/support/.github/workflows/rake.yml@main

data/.github/workflows/release.yml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   release:
-    uses: relaton/support/.github/workflows/release.yml@master
+    uses: relaton/support/.github/workflows/release.yml@main
     with:
       next_version: ${{ github.event.inputs.next_version }}
     secrets:

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

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.17.1".freeze
+  VERSION = "1.18.0".freeze
 end

data/relaton.gemspec

@@ -29,30 +29,31 @@ Gem::Specification.new do |spec|
   # spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "relaton-3gpp", "~> 1.17.0"
-  spec.add_dependency "relaton-bipm", "~> 1.17.0"
-  spec.add_dependency "relaton-bsi", "~> 1.17.0"
-  spec.add_dependency "relaton-calconnect", "~> 1.17.0"
-  spec.add_dependency "relaton-ccsds", "~> 1.17.0"
-  spec.add_dependency "relaton-cen", "~> 1.17.0"
-  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-iso", "~> 1.17.0"
-  spec.add_dependency "relaton-itu", "~> 1.17.0"
-  spec.add_dependency "relaton-jis", "~> 1.17.0"
-  spec.add_dependency "relaton-nist", "~> 1.17.0"
-  spec.add_dependency "relaton-oasis", "~> 1.17.0"
-  spec.add_dependency "relaton-ogc", "~> 1.17.0"
-  spec.add_dependency "relaton-omg", "~> 1.17.0"
-  spec.add_dependency "relaton-un", "~> 1.17.0"
-  spec.add_dependency "relaton-w3c", "~> 1.17.0"
-  spec.add_dependency "relaton-xsf", "~> 1.17.0"
+  spec.add_dependency "relaton-3gpp", "~> 1.18.0"
+  spec.add_dependency "relaton-bipm", "~> 1.18.0"
+  spec.add_dependency "relaton-bsi", "~> 1.18.0"
+  spec.add_dependency "relaton-calconnect", "~> 1.18.0"
+  spec.add_dependency "relaton-ccsds", "~> 1.18.0"
+  spec.add_dependency "relaton-cen", "~> 1.18.0"
+  spec.add_dependency "relaton-cie", "~> 1.18.0"
+  spec.add_dependency "relaton-doi", "~> 1.18.0"
+  spec.add_dependency "relaton-ecma", "~> 1.18.0"
+  spec.add_dependency "relaton-etsi", "~> 1.18.0"
+  spec.add_dependency "relaton-gb", "~> 1.18.0"
+  spec.add_dependency "relaton-iana", "~> 1.18.0"
+  spec.add_dependency "relaton-iec", "~> 1.18.0"
+  spec.add_dependency "relaton-ieee", "~> 1.18.0"
+  spec.add_dependency "relaton-ietf", "~> 1.18.0"
+  spec.add_dependency "relaton-iho", "~> 1.18.0"
+  spec.add_dependency "relaton-isbn", "~> 1.18.0"
+  spec.add_dependency "relaton-iso", "~> 1.18.0"
+  spec.add_dependency "relaton-itu", "~> 1.18.0"
+  spec.add_dependency "relaton-jis", "~> 1.18.0"
+  spec.add_dependency "relaton-nist", "~> 1.18.0"
+  spec.add_dependency "relaton-oasis", "~> 1.18.0"
+  spec.add_dependency "relaton-ogc", "~> 1.18.0"
+  spec.add_dependency "relaton-omg", "~> 1.18.0"
+  spec.add_dependency "relaton-un", "~> 1.18.0"
+  spec.add_dependency "relaton-w3c", "~> 1.18.0"
+  spec.add_dependency "relaton-xsf", "~> 1.18.0"
 end

data/spec/relaton/processor_spec.rb

@@ -33,41 +33,81 @@ RSpec.describe Relaton::Processor do
     end
   end
 
-  context "ETSI processor" do
+  context "flavor processors" do
     before { Relaton::Registry.instance }
-    let(:processor) { Relaton::Registry.instance.by_type "ETSI" }
 
-    it "get method should call get method of ETSI" do
-      expect(RelatonEtsi::Bibliography).to receive(:get).with("code", nil, {}).and_return :item
-      expect(processor.get "code", nil, {}).to eq :item
+    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
 
-    it "fetch_data method should call fetch_data method of ETSI" do
-      expect(RelatonEtsi::DataFetcher).to receive(:fetch).with(output: "dir", format: "bibxml").and_return :item
-      expect(processor.fetch_data "etsi-csv", output: "dir", format: "bibxml").to eq :item
+    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
 
-    it "from_xml method should call from_xml method of ETSI" do
-      expect(RelatonEtsi::XMLParser).to receive(:from_xml).with("xml").and_return :item
-      expect(processor.from_xml "xml").to eq :item
+    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
 
-    it "hash_to_bib method should call hash_to_bib method of ETSI" do
-      expect(RelatonEtsi::HashConverter).to receive(:hash_to_bib).with(:hash).and_return title: "title"
-      expect(RelatonEtsi::BibliographicItem).to receive(:new).with(title: "title").and_return :item
-      expect(processor.hash_to_bib(:hash)).to eq :item
+    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
 
-    it "grammar_hash method should call grammar_hash method of ETSI" do
-      expect(RelatonEtsi).to receive(:grammar_hash).and_return :hash
-      expect(processor.grammar_hash).to eq :hash
+    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
 
-    it "remove index file" do
-      index = double "index"
-      expect(index).to receive(:remove_file)
-      expect(Relaton::Index).to receive(:find_or_create).with(:etsi, url: true, file: "index-v1.yaml").and_return index
-      processor.remove_index_file
+    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

@@ -123,6 +123,10 @@ RSpec.describe Relaton::Registry do
     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

data/spec/relaton_spec.rb

@@ -364,6 +364,15 @@ RSpec.describe Relaton::Db do
     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:
-      - 11E4:4F03:4125C0:503C5F:656F52FF
+      - E384:10E5:26C1F3:300C4F:6594DF80
       Accept-Ranges:
       - bytes
       Date:
-      - Tue, 05 Dec 2023 16:42:40 GMT
+      - Wed, 03 Jan 2024 05:06:32 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780129-PDK
+      - cache-pdk-kpdk1780127-PDK
       X-Cache:
-      - MISS
+      - HIT
       X-Cache-Hits:
-      - '0'
+      - '1'
       X-Timer:
-      - S1701794560.721009,VS0,VE285
+      - S1704258392.124397,VS0,VE189
       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:
-      - f683743f80297a5c7399717914acb4a5a05fd219
+      - 515ab9c3fc71f9d2e8c83836ff2293a364056a68
       Expires:
-      - Tue, 05 Dec 2023 16:47:40 GMT
+      - Wed, 03 Jan 2024 05:11:32 GMT
       Source-Age:
       - '0'
     body:
@@ -11299,7 +11299,7 @@ http_interactions:
         HgMUAAAACAA6cm9XZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
         ZXgtdjEueWFtbFVUBQADENNUZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQAB
         AFMAAAB7tQcAAAA=
-  recorded_at: Tue, 05 Dec 2023 16:42:40 GMT
+  recorded_at: Wed, 03 Jan 2024 05:06:32 GMT
 - request:
     method: get
     uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
@@ -11313,8 +11313,6 @@ http_interactions:
       - "*/*"
       User-Agent:
       - Ruby
-      Host:
-      - raw.githubusercontent.com
   response:
     status:
       code: 200
@@ -11341,21 +11339,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - D61C:48FC:4B5092:59D776:656F5302
+      - EAD6:093D:1A0A6A9:1FA171A:6594DF83
       Accept-Ranges:
       - bytes
       Date:
-      - Tue, 05 Dec 2023 16:42:43 GMT
+      - Wed, 03 Jan 2024 05:06:34 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780024-PDK
+      - cache-pdk-kpdk1780147-PDK
       X-Cache:
-      - MISS
+      - HIT
       X-Cache-Hits:
-      - '0'
+      - '1'
       X-Timer:
-      - S1701794563.329136,VS0,VE154
+      - S1704258395.643601,VS0,VE123
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -11363,9 +11361,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 45c52a8b760e95b1664943a6195e6ec4f0a50f44
+      - 041b74d548b24ba1e9e799133bd9b47c2dbb25ee
       Expires:
-      - Tue, 05 Dec 2023 16:47:43 GMT
+      - Wed, 03 Jan 2024 05:11:34 GMT
       Source-Age:
       - '0'
     body:
@@ -11406,5 +11404,5 @@ http_interactions:
         bWVldGluZzogU01HLTI4CiAgZnJlZXplX3N0YWdlMl9tZWV0aW5nOiBTTUct
         MjgKICBmcmVlemVfc3RhZ2UzX21lZXRpbmc6IFNNRy0yOAogIGNsb3NlX21l
         ZXRpbmc6IFNQLTI4CiAgcHJvamVjdF9lbmQ6ICcxOTk5LTAyLTEyJwo=
-  recorded_at: Tue, 05 Dec 2023 16:42:43 GMT
+  recorded_at: Wed, 03 Jan 2024 05:06:34 GMT
 recorded_with: VCR 6.2.0

data/spec/vcr_cassetes/api_relaton_org.yml

@@ -27,27 +27,27 @@ http_interactions:
       Connection:
       - keep-alive
       Date:
-      - Tue, 05 Dec 2023 16:43:26 GMT
+      - Wed, 03 Jan 2024 05:08:07 GMT
       X-Amzn-Requestid:
-      - 88968a1b-e582-47e4-8e08-ffc11fefacb0
+      - 80e58fa0-ad1f-4773-9cde-a4478a0ce3fa
       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:
-      - PensrHqYIAMEh2A=
+      - Q8nCYGacIAMEIXw=
       Access-Control-Allow-Methods:
       - GET, POST, OPTIONS
       X-Amzn-Trace-Id:
-      - Root=1-656f531d-251edaf641248c0a0f364242;Sampled=0;lineage=521d48d5:0
+      - Root=1-6594eba8-691cf3bf1aa69aee7753ded0;Sampled=0;lineage=521d48d5:0
       X-Cache:
       - Miss from cloudfront
       Via:
-      - 1.1 812defed1167ca00304e9ce555dcf6e2.cloudfront.net (CloudFront)
+      - 1.1 af4b82f24e15a32a618ba4f9be9cbf92.cloudfront.net (CloudFront)
       X-Amz-Cf-Pop:
       - ATL51-C1
       X-Amz-Cf-Id:
-      - QlVdV_CYpctbsOSHcjpChAXOOdlfeMWFOR2a0SPBh_LCkSo93IauLg==
+      - x-w2RC78CvvzOXbsFysTkVO6p_jVVVBm1UEC07jHP0mcyzRkDRP0-Q==
     body:
       encoding: UTF-8
       base64_string: |
@@ -117,5 +117,5 @@ http_interactions:
         dHJ1Y3R1cmVkaWRlbnRpZmllciB0eXBlPSJJU08iPgogICAgICA8cHJvamVj
         dC1udW1iZXI+SVNPIDE5MTE1PC9wcm9qZWN0LW51bWJlcj4KICAgIDwvc3Ry
         dWN0dXJlZGlkZW50aWZpZXI+CiAgPC9leHQ+CjwvYmliZGF0YT4=
-  recorded_at: Tue, 05 Dec 2023 16:43:25 GMT
+  recorded_at: Wed, 03 Jan 2024 05:08:07 GMT
 recorded_with: VCR 6.2.0