relaton 1.16.1 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7be94378a2b5db79e7d691b60adecffc374cca416925cc5a04468d983487c30
-  data.tar.gz: c720f3b6d60d1515267c9b2b7936f2585dc1c72095688f06ce3060b0dd13fcb8
+  metadata.gz: 4c48cfe6f0f4984a5141f07a08d0aad1350910f07b87c3f6e028b91a1b81df17
+  data.tar.gz: 328a7973781a7c2061977fba41d914da92a459adc0c4e73d1827ac66149cbe4a
 SHA512:
-  metadata.gz: 19abb6e8fcd9a2580ca2f421b96d0b0476fec2e2b62123f5d7d91df6da276d33d172fb935199a6c40e6e8878f2b036760b9ccc68dd5b698d13c60f3b388c6cb9
-  data.tar.gz: 84cf9a0feaba73525ac77ea313bc2a74098788156b6920649a32994abe8e9f795536e2fbe368bf4c86e1cee75021d8ea6693d535e5f9853c1fa5047fed4c04b7
+  metadata.gz: dfe07c36cc548cd44b664834062eaace4acb9a605b666373fa13eb5049e39ead615718151510750100632169add0195bc6414e309b5ecbe7268c1b4bbf0e8b2a
+  data.tar.gz: bdf5d46cc33412f1428882a10b343bf7e4a4042c45b67622fe1d8afcd02999f45786e3faccdba279f68c7b2a631f7f6d7671023e12a5f6d079033968521340af

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

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
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

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

data/relaton.gemspec

@@ -27,31 +27,32 @@ Gem::Specification.new do |spec|
   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(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "relaton-3gpp", "~> 1.16.0"
-  spec.add_dependency "relaton-bipm", "~> 1.16.0"
-  spec.add_dependency "relaton-bsi", "~> 1.16.0"
-  spec.add_dependency "relaton-calconnect", "~> 1.16.0"
-  spec.add_dependency "relaton-ccsds", "~> 1.16.0"
-  spec.add_dependency "relaton-cen", "~> 1.16.0"
-  spec.add_dependency "relaton-cie", "~> 1.16.0"
-  spec.add_dependency "relaton-doi", "~> 1.16.0"
-  spec.add_dependency "relaton-ecma", "~> 1.16.0"
-  spec.add_dependency "relaton-gb", "~> 1.16.0"
-  spec.add_dependency "relaton-iana", "~> 1.16.0"
-  spec.add_dependency "relaton-iec", "~> 1.16.0"
-  spec.add_dependency "relaton-ieee", "~> 1.16.0"
-  spec.add_dependency "relaton-ietf", "~> 1.16.0"
-  spec.add_dependency "relaton-iho", "~> 1.16.0"
-  spec.add_dependency "relaton-iso", "~> 1.16.0"
-  spec.add_dependency "relaton-itu", "~> 1.16.0"
-  spec.add_dependency "relaton-jis", "~> 1.16.0"
-  spec.add_dependency "relaton-nist", "~> 1.16.0"
-  spec.add_dependency "relaton-oasis", "~> 1.16.0"
-  spec.add_dependency "relaton-ogc", "~> 1.16.0"
-  spec.add_dependency "relaton-omg", "~> 1.16.0"
-  spec.add_dependency "relaton-un", "~> 1.16.0"
-  spec.add_dependency "relaton-w3c", "~> 1.16.0"
-  spec.add_dependency "relaton-xsf", "~> 1.16.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"
 end

data/spec/relaton/processor_spec.rb

@@ -32,4 +32,42 @@ RSpec.describe Relaton::Processor do
       expect { subject.grammar_hash }.to raise_error StandardError
     end
   end
+
+  context "ETSI processor" 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
+    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
+    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
+    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
+    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
+    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
+    end
+  end
 end

data/spec/relaton/registry_spec.rb

@@ -119,11 +119,18 @@ 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
   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,15 @@ 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
+
   context "get combined documents" do
     context "ISO" do
       it "included" do

data/spec/vcr_cassetes/3gpp_tr_00_01u_umts_3_0_0.yml

@@ -29,7 +29,7 @@ http_interactions:
       Content-Type:
       - application/zip
       Etag:
-      - W/"412e4200abff37f56f5d0d54fc88e9b34250281dadc34cec531c3fafd5be5e31"
+      - W/"00ba60ede6ba6c00777bd7dc8dd881204051390a43dd819085e033ed9c254f5c"
       Strict-Transport-Security:
       - max-age=31536000
       X-Content-Type-Options:
@@ -39,21 +39,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - CD9A:2000:A02E34:C8AACE:65103ACB
+      - 11E4:4F03:4125C0:503C5F:656F52FF
       Accept-Ranges:
       - bytes
       Date:
-      - Sun, 24 Sep 2023 13:34:05 GMT
+      - Tue, 05 Dec 2023 16:42:40 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780097-PDK
+      - cache-pdk-kpdk1780129-PDK
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1695562446.735257,VS0,VE250
+      - S1701794560.721009,VS0,VE285
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -61,16 +61,16 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 45d49ca1c15e12a68b44f6719551e045ba6a2164
+      - f683743f80297a5c7399717914acb4a5a05fd219
       Expires:
-      - Sun, 24 Sep 2023 13:39:05 GMT
+      - Tue, 05 Dec 2023 16:47:40 GMT
       Source-Age:
       - '0'
     body:
       encoding: UTF-8
       base64_string: |
-        UEsDBBQAAAAIABJyNldm2jZFNLUHABZeUAANABwAaW5kZXgtdjEueWFtbFVU
-        CQADxKENZYmiDWV1eAsAAQTpAwAABH8AAACM/cGuLTuOJArO31fkD0TeLblc
+        UEsDBBQAAAAIADpyb1dm2jZFNLUHABZeUAANABwAaW5kZXgtdjEueWFtbFVU
+        CQADENNUZX3TVGV1eAsAAQTpAwAABH8AAACM/cGuLTuOJArO31fkD0TeLblc
         Lt1pVQI96AQebkQANTt4qMyHfkD1qGpQ/fd9li+XRK1FM+PoIuJssyWXKJIi
         Kepvf/vb//G3f/nz//mPP//lH3/9y8/Pv/6kf/75z3//x9//OP719//4P/7l
         X/78v/+f//Gff/7Lf/xf/+v/+uMff/16/8mv15/8uv/kX/9//9f/939AjqQ5
@@ -11296,10 +11296,10 @@ http_interactions:
         rrxmUhWRmbSOyEyqIjKT1hGZSVVEZtI6IjOpishMWkdkJlURmUkqIv8ru70S
         Z9ntlShFt1eiLLu9EqWomSbKsmb6RtFjvKxTflAWU9AH5WMG+qAsJo4Pyse8
         saB8TGMLykYoRc00UZY10w+KGpdlz1iiFJXXRFlWXhOlqLwmSqq8/h9QSwEC
-        HgMUAAAACAAScjZXZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
-        ZXgtdjEueWFtbFVUBQADxKENZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQAB
+        HgMUAAAACAA6cm9XZto2RTS1BwAWXlAADQAYAAAAAAABAAAApIEAAAAAaW5k
+        ZXgtdjEueWFtbFVUBQADENNUZXV4CwABBOkDAAAEfwAAAFBLBQYAAAAAAQAB
         AFMAAAB7tQcAAAA=
-  recorded_at: Sun, 24 Sep 2023 13:34:06 GMT
+  recorded_at: Tue, 05 Dec 2023 16:42:40 GMT
 - request:
     method: get
     uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
@@ -11341,21 +11341,21 @@ http_interactions:
       X-Xss-Protection:
       - 1; mode=block
       X-Github-Request-Id:
-      - B68A:1CA3:A85674:D0D6EB:65103ACE
+      - D61C:48FC:4B5092:59D776:656F5302
       Accept-Ranges:
       - bytes
       Date:
-      - Sun, 24 Sep 2023 13:34:09 GMT
+      - Tue, 05 Dec 2023 16:42:43 GMT
       Via:
       - 1.1 varnish
       X-Served-By:
-      - cache-pdk-kpdk1780141-PDK
+      - cache-pdk-kpdk1780024-PDK
       X-Cache:
       - MISS
       X-Cache-Hits:
       - '0'
       X-Timer:
-      - S1695562449.997647,VS0,VE147
+      - S1701794563.329136,VS0,VE154
       Vary:
       - Authorization,Accept-Encoding,Origin
       Access-Control-Allow-Origin:
@@ -11363,9 +11363,9 @@ http_interactions:
       Cross-Origin-Resource-Policy:
       - cross-origin
       X-Fastly-Request-Id:
-      - 6db14bf6dacd022648c2c54d19a2cdcd67ecf039
+      - 45c52a8b760e95b1664943a6195e6ec4f0a50f44
       Expires:
-      - Sun, 24 Sep 2023 13:39:09 GMT
+      - Tue, 05 Dec 2023 16:47:43 GMT
       Source-Age:
       - '0'
     body:
@@ -11406,5 +11406,5 @@ http_interactions:
         bWVldGluZzogU01HLTI4CiAgZnJlZXplX3N0YWdlMl9tZWV0aW5nOiBTTUct
         MjgKICBmcmVlemVfc3RhZ2UzX21lZXRpbmc6IFNNRy0yOAogIGNsb3NlX21l
         ZXRpbmc6IFNQLTI4CiAgcHJvamVjdF9lbmQ6ICcxOTk5LTAyLTEyJwo=
-  recorded_at: Sun, 24 Sep 2023 13:34:09 GMT
+  recorded_at: Tue, 05 Dec 2023 16:42:43 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:
-      - Sun, 24 Sep 2023 13:38:26 GMT
+      - Tue, 05 Dec 2023 16:43:26 GMT
       X-Amzn-Requestid:
-      - 3f98a03b-7a95-4f90-a5d8-80dcb9899661
+      - 88968a1b-e582-47e4-8e08-ffc11fefacb0
       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:
-      - Lw5GiFK5IAMFpyw=
+      - PensrHqYIAMEh2A=
       Access-Control-Allow-Methods:
       - GET, POST, OPTIONS
       X-Amzn-Trace-Id:
-      - Root=1-65103bc3-27387f320c831262045ec746;Sampled=0;lineage=521d48d5:0
+      - Root=1-656f531d-251edaf641248c0a0f364242;Sampled=0;lineage=521d48d5:0
       X-Cache:
       - Miss from cloudfront
       Via:
-      - 1.1 5c954353b2079c920cfb6b9e1a5fe37a.cloudfront.net (CloudFront)
+      - 1.1 812defed1167ca00304e9ce555dcf6e2.cloudfront.net (CloudFront)
       X-Amz-Cf-Pop:
       - ATL51-C1
       X-Amz-Cf-Id:
-      - Mh6l5ATcthstOObTjYeskwFmoDwKSqTj_nH55apkK3Dv_Vo4tyUylA==
+      - QlVdV_CYpctbsOSHcjpChAXOOdlfeMWFOR2a0SPBh_LCkSo93IauLg==
     body:
       encoding: UTF-8
       base64_string: |
@@ -117,5 +117,5 @@ http_interactions:
         dHJ1Y3R1cmVkaWRlbnRpZmllciB0eXBlPSJJU08iPgogICAgICA8cHJvamVj
         dC1udW1iZXI+SVNPIDE5MTE1PC9wcm9qZWN0LW51bWJlcj4KICAgIDwvc3Ry
         dWN0dXJlZGlkZW50aWZpZXI+CiAgPC9leHQ+CjwvYmliZGF0YT4=
-  recorded_at: Sun, 24 Sep 2023 13:38:26 GMT
+  recorded_at: Tue, 05 Dec 2023 16:43:25 GMT
 recorded_with: VCR 6.2.0