relaton-bib 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5d4afe9383395a6aedab41481f8cd61e54705b875a070a6a0c96e60bf34eb35
-  data.tar.gz: ef3ad715dbe15c38ed939b7860ddc8fcda697c2937d3b92bc698432d5a682fb6
+  metadata.gz: 826acb78507045bc31dd931b706331e248a682507b1454df64d957f97a856fce
+  data.tar.gz: 2a8bd874712691f4586d0a0d75f4c102731d592abf484ddd70a97cc7a2d72c24
 SHA512:
-  metadata.gz: 345f8b3198bef26aa58297acafff8386e906075220aa73bfdfc68ca07b0435049a5ee89c77b85ef46af57b26cf073622a50d6be7e519372446de13453366c859
-  data.tar.gz: fa4ec221835cb39a95c4f39ada023a603a59e493d0170ca78785869bc8bcd13477a50484dd29470bd5d7030ecf70b4f18cce7c11edc6546f0129c36fd599e156
+  metadata.gz: ff8a95d1afc8c44ce738e6c48cefa65d87fe2f5f2d431e5d5933d8ded66ba577797e55933b8f8082f6dc21841ec68dc3de16c8579d7b5a5af539229f183700c2
+  data.tar.gz: a2a7c1b255cffefcc84c93542062ff42a34b4b6e3c6b1077cb3f6a49c4c2002724ab6cb2f20d54a53fd6a06c423a7a0b43b762ebc0417be30bb85055116cc4a5

data/lib/relaton_bib/bibxml_parser.rb

@@ -1,7 +1,7 @@
 module RelatonBib
   module BibXMLParser
     # SeriesInfo what should be saved as docidentifiers in the Relaton model.
-    SERIESINFONAMES = ["DOI", "Internet-Draft"].freeze
+    SERIESINFONAMES = ["DOI"].freeze
 
     FLAVOR = nil
 
@@ -75,27 +75,55 @@ module RelatonBib
     #
     def docids(reference, ver) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       ret = []
-      id = reference["anchor"] || reference["docName"] || reference["number"]
-      if id
-        /^(?<pref>I-D|3GPP|W3C|[A-Z]{2,})[._]?(?<num>.+)/ =~ id
-        num.sub!(/^-?0+/, "") if %w[RFC BCP FYI STD].include?(pref)
-        pid = pref ? "#{pref} #{num}" : id
-        ret << DocumentIdentifier.new(type: pubid_type(id), id: pid, primary: true)
+      si = reference.at("./seriesInfo[@name='Internet-Draft']",
+                        "./front/seriesInfo[@name='Internet-Draft']")
+      if si
+        id = si[:value]
+        id.sub!(/(?<=-)\d{2}$/, ver) if ver
+        ret << DocumentIdentifier.new(type: "Internet-Draft", id: id, primary: true)
+      else
+        id = reference["anchor"] || reference["docName"] || reference["number"]
+        ret << create_docid(id, ver) if id
       end
+
       %w[anchor docName number].each do |atr|
         if reference[atr]
-          ret << DocumentIdentifier.new(id: reference[atr], type: pubid_type(id), scope: atr)
+          type = pubid_type id
+          ret << DocumentIdentifier.new(id: reference[atr], type: type, scope: atr)
         end
       end
+
       ret + reference.xpath("./seriesInfo", "./front/seriesInfo").map do |si|
         next unless SERIESINFONAMES.include? si[:name]
 
         id = si[:value]
-        id.sub!(/(?<=-)\d{2}$/, ver) if ver && si[:name] == "Internet-Draft"
+        # id.sub!(/(?<=-)\d{2}$/, ver) if ver && si[:name] == "Internet-Draft"
         DocumentIdentifier.new(id: id, type: si[:name])
       end.compact
     end
 
+    def create_docid(id, ver) # rubocop:disable Metrics/MethodLength
+      pref, num = id_to_pref_num(id)
+      if %w[RFC BCP FYI STD].include?(pref)
+        num.sub!(/^-?0+/, "")
+        pid = "#{pref} #{num}"
+        type = pubid_type id
+      elsif %w[I-D draft].include?(pref)
+        pid = "draft-#{num}"
+        pid.sub!(/(?<=-)\d{2}$/, ver) if ver
+        type = "Internet-Draft"
+      else
+        pid = pref ? "#{pref} #{num}" : num
+        type = pubid_type id
+      end
+      DocumentIdentifier.new(type: type, id: pid, primary: true)
+    end
+
+    def id_to_pref_num(id)
+      tn = /^(?<pref>I-D|draft|3GPP|W3C|[A-Z]{2,})[._-]?(?<num>.+)/.match id
+      tn && tn.to_a[1..2]
+    end
+
     #
     # Extract document identifier type from identifier
     #
@@ -104,8 +132,7 @@ module RelatonBib
     # @return [String]
     #
     def pubid_type(id)
-      type_match = id&.match(/^(3GPP|W3C|[A-Z]{2,})(?:\.(?=[A-Z])|(?=\d))/)
-      type_match && type_match[1]
+      id_to_pref_num(id)&.first
     end
 
     #

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.10.3".freeze
+  VERSION = "1.10.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-22 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug