relaton-3gpp 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54738dbc6d23452b7685329da5f52ba2196a82ea0f1e05bb9b26e6ae6e1d4041
-  data.tar.gz: 168cf0029d68af44d35a62c1ebd964ba0d23df56b3f6caab3ef7fa085ac01441
+  metadata.gz: df54ace8170262d7d798824f989d47b601aebc9a36ac9c7b23b0e7d755b3996f
+  data.tar.gz: a4dac9da0594e7537bf83b299f7af86d718ef74fc24ba5f4d74201cff5596101
 SHA512:
-  metadata.gz: ee5c52cc7ba3f52a7b5ed138ba2f0dae231703151170ec1dec041541381b59b493f55341afb1226de266d905710f303f43f352891de101614aba2a8f5409d238
-  data.tar.gz: 345b4a68391146d9d5a853c9878e344f1dcc2586dd902cd92361d674d8fb61c9b65de354c8e8937c75e6cd6a6c30472a21d35dd8de88d3d9e8b139006b6d61e2
+  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

@@ -9,7 +9,6 @@ module Relaton
     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
@@ -22,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"
@@ -30,7 +30,7 @@ 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, col_sep: ";").each do |row|
@@ -58,9 +58,8 @@ module Relaton
           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"])
+          if !renewal && !@current["date"].to_s.empty? &&
+              dt == DateTime.parse(@current["date"])
             return
           end
 
@@ -71,7 +70,6 @@ module Relaton
           retry if n < 5
           raise e
         end
-        @current["file"] = CSV_FILE
         @current["date"] = dt.to_s
         tmp_file
       end
@@ -102,7 +100,7 @@ module Relaton
       #
       # @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
@@ -128,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)
@@ -144,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
@@ -165,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
@@ -208,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Ribose Inc.