relaton-3gpp 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfd23ed3bc0f514455f602bf02265aa50838b8e902b3494dedc9471d886605cd
-  data.tar.gz: 55d3470f35c46b98b61f54708a6f36b5c2f61471a55d36c2224fe7827e524f0a
+  metadata.gz: 54738dbc6d23452b7685329da5f52ba2196a82ea0f1e05bb9b26e6ae6e1d4041
+  data.tar.gz: 168cf0029d68af44d35a62c1ebd964ba0d23df56b3f6caab3ef7fa085ac01441
 SHA512:
-  metadata.gz: 85f0b55228d20f356ac1581ee4738e32de7c40eb53dd0a16e77b0038f60537419e041cc7f380f285d6e59292db3ae337789eee0701185833f0db0d4dbd6a8496
-  data.tar.gz: 97d43826476a9d39c8cf2cd981bfc0fcd1f3a5d92923027c742b9e79d0117c78c51cb98753c8f9da4102a2e6a05e61de4ec9bde88ad738c91504b2e72145ca5a
+  metadata.gz: ee5c52cc7ba3f52a7b5ed138ba2f0dae231703151170ec1dec041541381b59b493f55341afb1226de266d905710f303f43f352891de101614aba2a8f5409d238
+  data.tar.gz: 345b4a68391146d9d5a853c9878e344f1dcc2586dd902cd92361d674d8fb61c9b65de354c8e8937c75e6cd6a6c30472a21d35dd8de88d3d9e8b139006b6d61e2

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,8 @@ module Relaton
   module ThreeGpp
     class DataFetcher < Core::DataFetcher
       CURRENT = "current.yaml".freeze
+      CSV_URL = "https://www.3gpp.org/ftp/Information/Databases/3GPPBibliography.csv".freeze
+      CSV_FILE = "3GPPBibliography.csv".freeze
 
       def log_error(msg)
         Util.error msg
@@ -30,7 +33,7 @@ module Relaton
           FileUtils.rm_f Dir.glob(File.join(@output, "/*")) # if renewal && dbs["2001-04-25_schedule"].any?
           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,33 +51,52 @@ 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 && CSV_FILE == @current["file"] &&
+             !@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["file"] = CSV_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
       #

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.2"
   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.2
 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