relaton-3gpp 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd23ed3bc0f514455f602bf02265aa50838b8e902b3494dedc9471d886605cd
-  data.tar.gz: 55d3470f35c46b98b61f54708a6f36b5c2f61471a55d36c2224fe7827e524f0a
+  metadata.gz: df54ace8170262d7d798824f989d47b601aebc9a36ac9c7b23b0e7d755b3996f
+  data.tar.gz: a4dac9da0594e7537bf83b299f7af86d718ef74fc24ba5f4d74201cff5596101
 SHA512:
-  metadata.gz: 85f0b55228d20f356ac1581ee4738e32de7c40eb53dd0a16e77b0038f60537419e041cc7f380f285d6e59292db3ae337789eee0701185833f0db0d4dbd6a8496
-  data.tar.gz: 97d43826476a9d39c8cf2cd981bfc0fcd1f3a5d92923027c742b9e79d0117c78c51cb98753c8f9da4102a2e6a05e61de4ec9bde88ad738c91504b2e72145ca5a
+  metadata.gz: e0d9a1fd084613acbf2ad02340fc9a813628d816ee1f316871b41a0640ad656ae49a0254690e5caa91268719840fe8abdbc27e4a6f08cd5b325e579e3f728e36
+  data.tar.gz: e04c85ec2751fccd8335d905ec1d72110ce3524f8a360a7746dd88d5c9066af6ef7f6b76ded9b6a8c01ae560871ee6f07e5c671db291a1f4b69ecc822e11ab95

data/lib/relaton/3gpp/bibliography.rb

@@ -4,8 +4,7 @@ module Relaton
   module ThreeGpp
     # Methods for search IANA standards.
     module Bibliography
-      # SOURCE = "http://xml2rfc.tools.ietf.org/public/rfc/bibxml-3gpp-new/"
-      SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-3gpp/refs/heads/v2/"
+      SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-3gpp/v2/"
 
       # @param text [String]
       # @return [RelatonBib::BibliographicItem]
@@ -14,7 +13,6 @@ module Relaton
         row = index.search(text.sub(/^3GPP\s/, "")).min_by { |r| r[:id] }
         return unless row
 
-        # file = text.sub(/^3GPP\s/, "").gsub(/[\s,:\/]/, "_").squeeze("_").upcase
         url = "#{SOURCE}#{row[:file]}"
         resp = Net::HTTP.get_response URI(url)
         return unless resp.code == "200"
@@ -22,9 +20,9 @@ module Relaton
         item = Item.from_yaml(resp.body)
         item.fetched = Date.today.to_s
         item
-      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
-            EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-            Net::ProtocolError, Errno::ETIMEDOUT => e
+      rescue  SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
+              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+              Net::ProtocolError, Errno::ETIMEDOUT => e
         raise Relaton::RequestError, e.message
       end
 

data/lib/relaton/3gpp/data_fetcher.rb

@@ -1,5 +1,6 @@
 require "fileutils"
-require "net/ftp"
+require "net/http"
+require "uri"
 require_relative "../3gpp"
 require_relative "parser"
 
@@ -7,6 +8,7 @@ module Relaton
   module ThreeGpp
     class DataFetcher < Core::DataFetcher
       CURRENT = "current.yaml".freeze
+      CSV_URL = "https://www.3gpp.org/ftp/Information/Databases/3GPPBibliography.csv".freeze
 
       def log_error(msg)
         Util.error msg
@@ -19,7 +21,8 @@ module Relaton
       #
       # Parse documents
       #
-      # @param [String] source source of documents, status-smg-3gpp for updare or status-smg-3gpp-force for renewal
+      # @param [String] source source of documents, status-smg-3gpp for updare
+      #   or status-smg-3gpp-force for renewal
       #
       def fetch(source) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         renewal = source == "status-smg-3GPP-force"
@@ -27,10 +30,10 @@ module Relaton
         return unless file && File.exist?(file) && File.size(file) > 20_000_000
 
         if renewal
-          FileUtils.rm_f Dir.glob(File.join(@output, "/*")) # if renewal && dbs["2001-04-25_schedule"].any?
+          FileUtils.rm_f Dir.glob(File.join(@output, "/*"))
           index.remove_all # if renewal
         end
-        CSV.open(file, "r:bom|utf-8", headers: true).each do |row|
+        CSV.open(file, "r:bom|utf-8", headers: true, col_sep: ";").each do |row|
           save_doc Parser.parse(row, @errors)
         end
         File.write CURRENT, @current.to_yaml, encoding: "UTF-8"
@@ -39,7 +42,7 @@ module Relaton
       end
 
       #
-      # Get file from FTP. If file does not exist or changed, return nil
+      # Get file via HTTPS. If file has not changed, return nil
       #
       # @param [Boolean] renewal force to update all documents
       #
@@ -48,39 +51,56 @@ module Relaton
       def get_file(renewal) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
         @current = YAML.load_file CURRENT if File.exist? CURRENT
         @current ||= {}
+        uri = URI(CSV_URL)
         n = 0
         begin
-          ftp = Net::FTP.new("www.3gpp.org", open_timeout: 30)
-          ftp.resume = true
-          ftp.login
-          ftp.chdir "/Information/Databases/"
-          file_path = ftp.list("*.csv").first
-          return unless file_path
-
-          d, t, _, file = file_path.split
-          dt = DateTime.strptime("#{d} #{t}", "%m-%d-%y %I:%M%p")
-          if !renewal && file == @current["file"] && !@current["date"].empty? && dt == DateTime.parse(@current["date"])
+          last_modified = head_last_modified(uri)
+          return unless last_modified
+
+          dt = DateTime.parse(last_modified)
+          if !renewal && !@current["date"].to_s.empty? &&
+              dt == DateTime.parse(@current["date"])
             return
           end
 
           tmp_file = File.join Dir.tmpdir, "3gpp.csv"
-          ftp.get(file, tmp_file)
-        rescue Net::OpenTimeout, Net::ReadTimeout => e
+          download(uri, tmp_file)
+        rescue Net::OpenTimeout, Net::ReadTimeout, SocketError => e
           n += 1
           retry if n < 5
           raise e
         end
-        @current["file"] = file
         @current["date"] = dt.to_s
         tmp_file
       end
 
+      def head_last_modified(uri)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https",
+                                            open_timeout: 30, read_timeout: 30) do |http|
+          resp = http.request(Net::HTTP::Head.new(uri.request_uri))
+          raise "HTTP #{resp.code} from #{uri}" unless resp.is_a?(Net::HTTPSuccess)
+
+          resp["last-modified"]
+        end
+      end
+
+      def download(uri, tmp_file)
+        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https",
+                                            open_timeout: 30, read_timeout: 120) do |http|
+          http.request(Net::HTTP::Get.new(uri.request_uri)) do |resp|
+            raise "HTTP #{resp.code} from #{uri}" unless resp.is_a?(Net::HTTPSuccess)
+
+            File.open(tmp_file, "wb") { |f| resp.read_body { |chunk| f.write(chunk) } }
+          end
+        end
+      end
+
       #
       # Save document to file
       #
       # @param [RelatonW3c::W3cBibliographicItem, nil] bib bibliographic item
       #
-      def save_doc(bib) # rubocop:disable Metrics/MethodLength
+      def save_doc(bib) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         return unless bib
 
         bib1 = bib
@@ -106,7 +126,7 @@ module Relaton
       def merge_duplication(bib, file)
         hash = YAML.load_file file
         existed = Item.from_hash hash
-        changed = update_source bib, existed
+        changed = update_source? bib, existed
         bib1, bib2, chng = transposed_relation bib, existed
         changed ||= chng
         chng = add_contributor(bib1, bib2)
@@ -122,7 +142,7 @@ module Relaton
       #
       # @return [Boolean] true if link has been updated
       #
-      def update_source(bib1, bib2)
+      def update_source?(bib1, bib2)
         if bib1.source.any? && bib2.source.empty?
           bib2.source = bib1.source
           true
@@ -143,8 +163,9 @@ module Relaton
       #   related bibliographic item, true if relation has been added
       #
       def transposed_relation(bib, existed) # rubocop:disable Metrics/CyclomaticComplexity
-        return [bib, existed, false] if bib.date.none? && existed.date.none? ||
-          bib.date.any? && existed.date.none?
+        if (bib.date.none? && existed.date.none?) || (bib.date.any? && existed.date.none?)
+          return [bib, existed, false]
+        end
         return [existed, bib, true] if bib.date.none? && existed.date.any?
 
         check_transposed_date bib, existed
@@ -186,7 +207,7 @@ module Relaton
         bib1.relation << rel
       end
 
-      def add_contributor(bib1, bib2) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
+      def add_contributor(bib1, bib2) # rubocop:disable Metrics/MethodLength,Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         changed = false
 
         bib2.contributor.each do |bc|

data/lib/relaton/3gpp/item_data.rb

@@ -1,6 +1,15 @@
 module Relaton
   module ThreeGpp
     class ItemData < Bib::ItemData
+      def create_id(without_date: false)
+        return id if id && !id.empty?
+
+        docid = find_primary_docid
+        return unless docid
+
+        pubid = without_date ? docid.content.sub(/:\d{4}$/, "") : docid.content
+        self.id = pubid.to_s.sub(/\A3GPP\s+/, "").gsub(/\W+/, "")
+      end
     end
   end
 end

data/lib/relaton/3gpp/parser.rb

@@ -205,7 +205,13 @@ module Relaton
       end
 
       def other_contribs
-        contribs = @row["Responsible Secondary"].strip.split(", ").map do |wg|
+        secondary = @row["Responsible Secondary"]
+        if secondary.nil? || secondary.strip.empty?
+          @errors[:editorial_group_contributor_other] &&= true
+          return []
+        end
+
+        contribs = secondary.strip.split(", ").map do |wg|
           editorial_group_contributor(wg, "other")
         end
         @errors[:editorial_group_contributor_other] &&= contribs.empty?

data/lib/relaton/3gpp/version.rb

@@ -2,6 +2,6 @@
 
 module Relaton
   module ThreeGpp
-    VERSION = "2.1.1"
+    VERSION = "2.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-12 00:00:00.000000000 Z
+date: 2026-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv