relaton 1.9.5 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d130b4485dbbf753e79494a4d586acf8fd85df120d4e2f1f35aa5c7380e05811
-  data.tar.gz: 1872fc4d88f29de709f81dfca39132d1c7fb244b9069661d8c7c4bca70a80977
+  metadata.gz: bb5d556ea27ab2cb41c462a7dfb830f8213d864ea36514e7f29e16ece78aae0a
+  data.tar.gz: eca59ebbcc1c8146390b4855b5c3db6f30fedb3d559fa8d311719384b7abb7a3
 SHA512:
-  metadata.gz: 1209e92a74b33acc54fcc1f391ec4beb1833cb2886375188f16ff8feb6c7c12c6f2e56978b3a77b442599fafa5bfbc4b4edfec6305e422afdb97cbc3e07190a0
-  data.tar.gz: f5a8c37e80afa5b80d7779735d54f685e9ba85a2bea6acd2ad3a4608b4e74d75c76248b6989af7df05df1f50f975b0ab85397355c90c2c2f50bc00159fc7d5fe
+  metadata.gz: aa88c787664a54a665f82642988ed4ed8dcc24ca03fa1d7d56da33dca2f9e654a498a3261dfa20f53a4521ebd8a8440e2406bb6146e332c6e158ee8ca83c1566
+  data.tar.gz: 9c3918ab27ea01547a91e467b72a4f5a8d8654b4cab9022dc8c80422d7369c0d73cf34454b89544ae84ad62fce700bc5a23af0c696a2f13cf6645fa070266475

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:

data/docs/README.adoc

@@ -178,6 +178,7 @@ x = db.fetch_db("ISO 5749")
 => nil
 
 # Fetching asynchronously
+# RELATON_FETCH_PARALLEL environment variable can be used to ovveride default number of parallel fetches
 
 # prepare queue for results
 results = Queue.new

data/lib/relaton/db.rb

@@ -105,7 +105,8 @@ module Relaton
       if stdclass
         unless @queues[stdclass]
           processor = @registry.processors[stdclass]
-          wp = WorkersPool.new(processor.threads) do |args|
+          threads = ENV["RELATON_FETCH_PARALLEL"]&.to_i || processor.threads
+          wp = WorkersPool.new(threads) do |args|
             args[3].call fetch(*args[0..2])
           rescue RelatonBib::RequestError => e
             args[3].call e

data/lib/relaton/registry.rb

@@ -9,7 +9,7 @@ module Relaton
       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_ecma relaton_cie relaton_bsi
-      relaton_cen relaton_iana
+      relaton_cen relaton_iana relaton_3gpp
     ].freeze
 
     include Singleton

data/lib/relaton/version.rb

@@ -1,3 +1,3 @@
 module Relaton
-  VERSION = "1.9.5".freeze
+  VERSION = "1.10.0".freeze
 end

data/lib/relaton/workers_pool.rb

@@ -4,9 +4,9 @@ module Relaton
   # Workers poll.
   class WorkersPool
     def initialize(workers = 2, &_block)
-      num_workers = workers < 2 ? 2 : workers
-      @queue = SizedQueue.new(num_workers * 2)
-      @threads = Array.new num_workers do
+      # num_workers = workers < 2 ? 2 : workers
+      @queue = SizedQueue.new(workers * 2)
+      @threads = Array.new workers do
         Thread.new do
           while item = @queue.pop; yield(item) end
         end

data/relaton.gemspec

@@ -29,25 +29,26 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "relaton-bipm", "~> 1.9.0"
-  spec.add_dependency "relaton-bsi", "~> 1.9.0"
-  spec.add_dependency "relaton-calconnect", "~> 1.9.0"
-  spec.add_dependency "relaton-cen", "~> 1.9.0"
-  spec.add_dependency "relaton-cie", "~> 1.9.0"
-  spec.add_dependency "relaton-ecma", "~> 1.9.0"
-  spec.add_dependency "relaton-gb", "~> 1.9.0"
-  spec.add_dependency "relaton-iana", "~> 1.9.0"
-  spec.add_dependency "relaton-iec", "~> 1.9.0"
-  spec.add_dependency "relaton-ieee", "~> 1.9.0"
-  spec.add_dependency "relaton-ietf", "~> 1.9.0"
-  spec.add_dependency "relaton-iho", "~> 1.9.0"
-  spec.add_dependency "relaton-iso", "~> 1.9.0"
-  spec.add_dependency "relaton-itu", "~> 1.9.0"
-  spec.add_dependency "relaton-nist", ">= 1.9.2"
-  spec.add_dependency "relaton-ogc", "~> 1.9.0"
-  spec.add_dependency "relaton-omg", "~> 1.9.0"
-  spec.add_dependency "relaton-un", "~> 1.9.0"
-  spec.add_dependency "relaton-w3c", "~> 1.9.0"
+  spec.add_dependency "relaton-3gpp", "~> 1.10.0"
+  spec.add_dependency "relaton-bipm", "~> 1.10.0"
+  spec.add_dependency "relaton-bsi", "~> 1.10.0"
+  spec.add_dependency "relaton-calconnect", "~> 1.10.0"
+  spec.add_dependency "relaton-cen", "~> 1.10.0"
+  spec.add_dependency "relaton-cie", "~> 1.10.0"
+  spec.add_dependency "relaton-ecma", "~> 1.10.0"
+  spec.add_dependency "relaton-gb", "~> 1.10.0"
+  spec.add_dependency "relaton-iana", "~> 1.10.0"
+  spec.add_dependency "relaton-iec", "~> 1.10.0"
+  spec.add_dependency "relaton-ieee", "~> 1.10.0"
+  spec.add_dependency "relaton-ietf", "~> 1.10.0"
+  spec.add_dependency "relaton-iho", "~> 1.10.0"
+  spec.add_dependency "relaton-iso", "~> 1.10.0"
+  spec.add_dependency "relaton-itu", "~> 1.10.0"
+  spec.add_dependency "relaton-nist", ">= 1.10.0"
+  spec.add_dependency "relaton-ogc", "~> 1.10.0"
+  spec.add_dependency "relaton-omg", "~> 1.10.0"
+  spec.add_dependency "relaton-un", "~> 1.10.0"
+  spec.add_dependency "relaton-w3c", "~> 1.10.0"
 
   spec.add_development_dependency "byebug", "~> 11.0"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

data/spec/relaton/db_spec.rb

@@ -184,6 +184,16 @@ RSpec.describe Relaton::Db do
       end
       expect(result).to be_nil
     end
+
+    it "use threads number from RELATON_FETCH_PARALLEL" do
+      expect(ENV).to receive(:[]).with("RELATON_FETCH_PARALLEL").and_return(1)
+      allow(ENV).to receive(:[]).and_call_original
+      expect(Relaton::WorkersPool).to receive(:new).with(1).and_call_original
+      VCR.use_cassette "threads_from_env" do
+        db.fetch_async("ITU-T G.993.5") { |r| queue << r }
+        Timeout.timeout(50) { queue.pop }
+      end
+    end
   end
 
   context "fetch documents form static cache" do

data/spec/relaton/registry_spec.rb

@@ -91,6 +91,10 @@ RSpec.describe Relaton::Registry do
     it "IANA" do
       expect(Relaton::Registry.instance.by_type("IANA")).to be_instance_of RelatonIana::Processor
     end
+
+    it "3GPP" do
+      expect(Relaton::Registry.instance.by_type("3GPP")).to be_instance_of Relaton3gpp::Processor
+    end
   end
 
   it "find processot by dataset" do

data/spec/relaton_spec.rb

@@ -59,10 +59,10 @@ RSpec.describe Relaton::Db do
       end
     end
 
-    it "gets sn ISO/CD reference" do
-      VCR.use_cassette "iso_cd_14093" do
-        bib = @db.fetch "ISO/CD 14093"
-        expect(bib.docidentifier[0].id).to eq "ISO/CD 14093"
+    it "gets sn ISO/DIS reference" do
+      VCR.use_cassette "iso_dis_14093" do
+        bib = @db.fetch "ISO/DIS 14093"
+        expect(bib.docidentifier[0].id).to eq "ISO/DIS 14093"
       end
     end
   end
@@ -196,10 +196,10 @@ RSpec.describe Relaton::Db do
       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>"
+        "type=\"RFC\" scope=\"anchor\">RFC8341</docidentifier>"
       testcache = Relaton::DbCache.new "testcache2"
       expect(testcache["IETF(RFC 8341)"]).to include "<docidentifier "\
-        "type=\"IETF\">RFC 8341</docidentifier>"
+        "type=\"RFC\" scope=\"anchor\">RFC8341</docidentifier>"
     end
   end
 
@@ -306,6 +306,13 @@ RSpec.describe Relaton::Db do
     end
   end
 
+  it "get 3GPP reference" do
+    VCR.use_cassette "3gpp_tr_00_01u_umts_3_0_0" do
+      bib = @db.fetch "3GPP TR 00.01U:UMTS/3.0.0"
+      expect(bib).to be_instance_of Relaton3gpp::BibliographicItem
+    end
+  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

@@ -0,0 +1,127 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://raw.githubusercontent.com/relaton/relaton-data-3gpp/main/data/TR_00.01U_UMTS_3.0.0.yaml
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Host:
+      - raw.githubusercontent.com
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '562'
+      Cache-Control:
+      - max-age=300
+      Content-Security-Policy:
+      - default-src 'none'; style-src 'unsafe-inline'; sandbox
+      Content-Type:
+      - text/plain; charset=utf-8
+      Etag:
+      - W/"c7d5e5fe82f7acf338ee2018e084c4b51759b05adec00dac3a8ceff6ce47a97d"
+      Strict-Transport-Security:
+      - max-age=31536000
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - deny
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Github-Request-Id:
+      - 9280:7295:770162:8EDD19:61F6F080
+      Accept-Ranges:
+      - bytes
+      Date:
+      - Sun, 30 Jan 2022 20:09:36 GMT
+      Via:
+      - 1.1 varnish
+      X-Served-By:
+      - cache-sof1510048-SOF
+      X-Cache:
+      - MISS
+      X-Cache-Hits:
+      - '0'
+      X-Timer:
+      - S1643573376.020860,VS0,VE247
+      Vary:
+      - Authorization,Accept-Encoding,Origin
+      Access-Control-Allow-Origin:
+      - "*"
+      X-Fastly-Request-Id:
+      - 11243678148887ceff7f71189e363376c324a668
+      Expires:
+      - Sun, 30 Jan 2022 20:14:36 GMT
+      Source-Age:
+      - '0'
+    body:
+      encoding: ASCII-8BIT
+      string: |
+        ---
+        id: 3GPPTR00.01U-UMTS/3.0.0
+        title:
+        - type: main
+          content: Work programme for the standardization of Universal Mobile Telecommunications
+            System (UMTS)
+          format: text/plain
+        link:
+        - content: http://www.3gpp.org/ftp/Specs/archive/00_series/00.01U/0001U-300.zip
+          type: src
+        type: standard
+        docid:
+        - id: 3GPP TR 00.01U:UMTS/3.0.0
+          type: 3GPP
+        docnumber: TR 00.01U:UMTS/3.0.0
+        contributor:
+        - person:
+            name:
+              completename:
+                content: RAPELI, Juha
+                language:
+                - en
+                script:
+                - Latn
+            affiliation:
+            - organization:
+                name:
+                - PHILIPS CONSUMER COMMUNICATION
+          role:
+          - author
+        language:
+        - en
+        script:
+        - Latn
+        docstatus:
+          stage:
+            value: withdrawn
+        fetched: '2022-01-24'
+        doctype: TR
+        editorialgroup:
+        - name: SMG5
+          type: prime
+        radiotechnology: 3G
+        release:
+          version2g: '3'
+          version3g: '3'
+          defunct: true
+          freeze_meeting: SMG-28
+          freeze_stage1_meeting: SMG-28
+          freeze_stage2_meeting: SMG-28
+          freeze_stage3_meeting: SMG-28
+          close_meeting: SP-28
+          project_end: '1999-02-12'
+    http_version:
+  recorded_at: Sun, 30 Jan 2022 20:09:36 GMT
+recorded_with: VCR 5.1.0