relaton-3gpp 1.9.0 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb4d367d6487eb29deffcb0805e874e089ee23b296879ab64e0d0697e3d29f4
-  data.tar.gz: 520706a92250b455c31e8ed63def3573da3c67d8d7329c027186e5ab66330cbc
+  metadata.gz: ac55b70bfe3aeba203ee14ae5741da783295480690d95cbcde5633464d7e2c6f
+  data.tar.gz: a1e1b8cdef4a740ef07311f180e2be6ee31419696acf14031b53418364ef9325
 SHA512:
-  metadata.gz: 0350b940358a6fe6793e6c18361a61befd891b7efa814d73c88fd612123b174f7ffea185ccfdd65711873a3f75697108c60a15d85446a2d8091bf3f1c97c377a
-  data.tar.gz: e0a8e4c26623f84b997862ebc3c66c0f2c665dfea62cef07d0db8601431b0340d2778b782ee730d6cf248411b6056f7f5073be7823580bd7e60072ce79137b91
+  metadata.gz: f5c76b9d2ea3aeb99cac24f01ebb5759e66c9f094d81fe8d776db9c37250535b20b54abf754da38ab865571019fafc4b6f2d9a5a223a2763d4ce8ec680509233
+  data.tar.gz: d66f5472441b417a1491211b9ebb00112f0b3408ba3edd6c1d7fdc1fe9d20305b6d17e8b5e89990c5953994856889b14f9fbea85b4bf4897ba809c9243a1fe5a

data/.gitignore

@@ -11,3 +11,4 @@
 .rubocop-https---raw-githubusercontent-com-riboseinc-oss-guides-master-ci-rubocop-yml
 Gemfile.lock
 .vscode/
+.rspec_status

data/lib/relaton_3gpp/data_fetcher.rb

@@ -52,8 +52,9 @@ module Relaton3gpp
       specs = dbs["Specs_GSM+3G"]
       specrels = dbs["Specs_GSM+3G_release-info"]
       releases = dbs["Releases"]
+      tstatus = dbs["temp-status"]
       dbs["2001-04-25_schedule"].each do |row|
-        fetch_doc row, specs, specrels, releases
+        fetch_doc row, specs, specrels, releases, tstatus
       end
       File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
     end
@@ -63,18 +64,25 @@ module Relaton3gpp
     #
     # @return [String] file name
     #
-    def get_file # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+    def get_file # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
       @current = YAML.load_file CURRENT if File.exist? CURRENT
       @current ||= {}
-      ftp = Net::FTP.new("www.3gpp.org")
-      ftp.resume = true
-      ftp.login
-      ftp.chdir "/Information/Databases/Spec_Status/"
-      d, t, _, file = ftp.list("*.zip").first.split
-      dt = DateTime.strptime("#{d} #{t}", "%m-%d-%y %I:%M%p")
-      return if file == @current["file"] && dt == DateTime.parse(@current["date"])
+      n = 0
+      begin
+        ftp = Net::FTP.new("www.3gpp.org")
+        ftp.resume = true
+        ftp.login
+        ftp.chdir "/Information/Databases/Spec_Status/"
+        d, t, _, file = ftp.list("*.zip").first.split
+        dt = DateTime.strptime("#{d} #{t}", "%m-%d-%y %I:%M%p")
+        return if file == @current["file"] && dt == DateTime.parse(@current["date"])
 
-      ftp.getbinaryfile file
+        ftp.getbinaryfile file
+      rescue Net::ReadTimeout => e
+        n += 1
+        retry if n < 5
+        raise e
+      end
       @current["file"] = file
       @current["date"] = dt.to_s
       file
@@ -84,12 +92,15 @@ module Relaton3gpp
     # Fetch document
     #
     # @param [Hash] row row from mdb
-    # @param [Mdb] dbs mdb
+    # @param [Array<Hash>] specs specs
+    # @param [Array<Hash>] specrels specrels
+    # @param [Array<Hash>] releases releases
+    # @param [Array<Hash>] tstatus tstatus
     #
     # @return [Relaton3gpp::BibliographicItem, nil] bibliographic item
     #
-    def fetch_doc(row, specs, specrels, releases)
-      doc = Parser.parse row, specs, specrels, releases
+    def fetch_doc(row, specs, specrels, releases, tstatus)
+      doc = Parser.parse row, specs, specrels, releases, tstatus
       save_doc doc
     rescue StandardError => e
       warn "Error: #{e.message}"

data/lib/relaton_3gpp/parser.rb

@@ -7,8 +7,9 @@ module Relaton3gpp
     # @param [Array<Hash>] specrels Spec + Release table
     # @param [Array<Hash>] relaeases Releases table
     # @param [Array<Hash>] specs Specs table
+    # @param [Array<Hash>] tstatus temp status-table
     #
-    def initialize(row, specs, specrels, releases) # rubocop:disable Metrics/AbcSize
+    def initialize(row, specs, specrels, releases, tstatus) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
       @row = row
       @spec = specs.detect { |s| s[:Number] == row[:spec] }
       if @spec
@@ -17,6 +18,7 @@ module Relaton3gpp
         end
         @rel = releases.detect { |r| r[:Release_code] == row[:release] }
       end
+      @tstatus = tstatus.detect { |t| t[:Number] == row[:spec] }
     end
 
     #
@@ -26,11 +28,12 @@ module Relaton3gpp
     # @param [Array<Hash>] specrels Spec + Release table
     # @param [Array<Hash>] relaeases Releases table
     # @param [Array<Hash>] specs Specs table
+    # @param [Array<Hash>] tstatus temp status-table
     #
     # @return [RelatonBib:BibliographicItem, nil] bibliographic item
     #
-    def self.parse(row, specs, specrels, relaeases)
-      new(row, specs, specrels, relaeases).parse
+    def self.parse(row, specs, specrels, relaeases, tstatus)
+      new(row, specs, specrels, relaeases, tstatus).parse
     end
 
     #
@@ -60,7 +63,7 @@ module Relaton3gpp
         common_ims_spec: @spec[:ComIMS] == "1",
         # internal: @spec[:"For publication"] == "0",
         release: parse_release,
-        # contributor: contributor,
+        contributor: parse_contributor,
       )
     end
 
@@ -103,11 +106,7 @@ module Relaton3gpp
     # @return [Arra<RelatonBib::DocumentIdentifier>] docidentifier
     #
     def parse_docid
-      [
-        RelatonBib::DocumentIdentifier.new(type: "3GPP", id: "3GPP #{number}"),
-        RelatonBib::DocumentIdentifier.new(type: "rapporteurId",
-                                           id: @spec[:"rapporteur id"]),
-      ]
+      [RelatonBib::DocumentIdentifier.new(type: "3GPP", id: "3GPP #{number}")]
     end
 
     #
@@ -151,20 +150,22 @@ module Relaton3gpp
     #
     # @return [RelatonBib::EditorialGroup] editorialgroups
     #
-    def parse_editorialgroup # rubocop:disable Metrics/MethodLength
-      wgp = RelatonBib::WorkGroup.new(name: @spec[:"WG prime"], type: "prime")
-      eg = [RelatonBib::TechnicalCommittee.new(wgp)]
-      if @spec[:"WG other"]
-        wgo = RelatonBib::WorkGroup.new(name: @spec[:"WG other"], type: "other")
-        eg << RelatonBib::TechnicalCommittee.new(wgo)
+    def parse_editorialgroup # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      eg = [create_workgroup(@spec[:"WG prime"], "prime")]
+      if @spec[:"WG other"] && @spec[:"WG other"] != "-"
+        eg << create_workgroup(@spec[:"WG other"], "other")
       end
       if @spec[:"former WG"]
-        wgf = RelatonBib::WorkGroup.new(name: @spec[:"former WG"], type: "former")
-        eg << RelatonBib::TechnicalCommittee.new(wgf)
+        eg << create_workgroup(@spec[:"former WG"], "former")
       end
       RelatonBib::EditorialGroup.new eg
     end
 
+    def create_workgroup(name, type)
+      wgf = RelatonBib::WorkGroup.new(name: name, type: type)
+      RelatonBib::TechnicalCommittee.new(wgf)
+    end
+
     #
     # Parse note
     #
@@ -172,10 +173,10 @@ module Relaton3gpp
     #
     def parse_note
       n = []
-      if @specrel && @specrel[:remarks]
+      if @specrel && @specrel[:remarks] && @specrel[:remarks] != "."
         n << RelatonBib::BiblioNote.new(type: "remark", content: @specrel[:remarks])
       end
-      if @row[:comment]
+      if @row[:comment] && @row[:comment] != "."
         n << RelatonBib::BiblioNote.new(type: "comment", content: @row[:comment])
       end
       RelatonBib::BiblioNoteCollection.new n
@@ -207,38 +208,50 @@ module Relaton3gpp
       end
     end
 
+    #
+    # Parse release
+    #
+    # @return [Relaton3gpp::Release, nil] release
+    #
     def parse_release # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       if @rel
         project_start = Date.parse(@rel[:"rel-proj-start"]).to_s if @rel[:"rel-proj-start"]
         project_end = Date.parse(@rel[:"rel-proj-end"]).to_s if @rel[:"rel-proj-end"]
+        Release.new(
+          version2g: @rel[:version_2g],
+          version3g: @rel[:version_3g],
+          defunct: @rel[:defunct] == "1",
+          wpm_code_2g: @rel[:wpm_code_2g],
+          wpm_code_3g: @rel[:wpm_code_3g],
+          freeze_meeting: @rel[:"freeze meeting"],
+          freeze_stage1_meeting: @rel[:Stage1_freeze],
+          freeze_stage2_meeting: @rel[:Stage2_freeze],
+          freeze_stage3_meeting: @rel[:Stage3_freeze],
+          close_meeting: @rel[:Closed],
+          project_start: project_start,
+          project_end: project_end,
+        )
       end
-      Release.new(
-        version2g: @rel[:version_2g],
-        version3g: @rel[:version_3g],
-        defunct: @rel[:defunct] == "1",
-        wpm_code_2g: @rel[:wpm_code_2g],
-        wpm_code_3g: @rel[:wpm_code_3g],
-        freeze_meeting: @rel[:"freeze meeting"],
-        freeze_stage1_meeting: @rel[:Stage1_freeze],
-        freeze_stage2_meeting: @rel[:Stage2_freeze],
-        freeze_stage3_meeting: @rel[:Stage3_freeze],
-        close_meeting: @rel[:Closed],
-        project_start: project_start,
-        project_end: project_end,
-      )
     end
 
     #
     # Create contributor
     #
-    # @return [Array<RelatonBib::Contribution>] contributor
+    # @return [Array<RelatonBib::ContributionInfo>] contributor
     #
-    # def contributor
-    #   org = RelatonBib::Organization.new(
-    #     name: "Internet Assigned Numbers Authority", abbreviation: "IANA",
-    #   )
-    #   role = { type: "publisher" }
-    #   [RelatonBib::ContributionInfo.new(entity: org, role: [role])]
-    # end
+    def parse_contributor # rubocop:disable Metrics/MethodLength
+      return [] unless @tstatus && @tstatus[:rapporteur]
+
+      aff = []
+      if @tstatus[:"rapp org"]
+        org = RelatonBib::Organization.new(name: @tstatus[:"rapp org"])
+        cn = RelatonBib::LocalizedString.new @tstatus[:rapporteur], "en", "Latn"
+        name = RelatonBib::FullName.new(completename: cn)
+        aff << RelatonBib::Affiliation.new(organization: org)
+      end
+      person = RelatonBib::Person.new(name: name, affiliation: aff)
+      role = { type: "author" }
+      [RelatonBib::ContributionInfo.new(entity: person, role: [role])]
+    end
   end
 end

data/lib/relaton_3gpp/release.rb

@@ -39,7 +39,7 @@ module Relaton3gpp
       builder.release do
         builder.version2G @version2g if @version2g
         builder.version3G @version3g if @version3g
-        builder.defunct @defunct if @defunct
+        builder.defunct @defunct unless @defunct.nil?
         builder.send "wpm-code-2G", @wpm_code_2g if @wpm_code_2g
         builder.send "wpm-code-3G", @wpm_code_3g if @wpm_code_3g
         builder.send "freeze-meeting", @freeze_meeting if @freeze_meeting

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.9.0"
+  VERSION = "1.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml