relaton-bib 1.10.1 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 882b6680091bd4bf9ba97871af6aab74dede4be12e1e6981d5e7a9a274e65659
-  data.tar.gz: 5ecf64a911e0cad8ca924b3fe3626b54ef60295f89f58a8e59895c415390d502
+  metadata.gz: 826acb78507045bc31dd931b706331e248a682507b1454df64d957f97a856fce
+  data.tar.gz: 2a8bd874712691f4586d0a0d75f4c102731d592abf484ddd70a97cc7a2d72c24
 SHA512:
-  metadata.gz: 31ebec09d58af3173fc687dcbf8cfddb34b859110d05a11bc32ed144aefe0b8b57da36395ee002aad57802c32c3804aac33098d2d7d322ee442941567add638b
-  data.tar.gz: 828fbafc60fb7a16b876ece52b1631870ef8fdda63dce780f6a35e30907fab3f76684e02b2991db1e0ba159a61081a5e7198d6d470f1bee529ee72c61ccab921
+  metadata.gz: ff8a95d1afc8c44ce738e6c48cefa65d87fe2f5f2d431e5d5933d8ded66ba577797e55933b8f8082f6dc21841ec68dc3de16c8579d7b5a5af539229f183700c2
+  data.tar.gz: a2a7c1b255cffefcc84c93542062ff42a34b4b6e3c6b1077cb3f6a49c4c2002724ab6cb2f20d54a53fd6a06c423a7a0b43b762ebc0417be30bb85055116cc4a5

data/lib/relaton_bib/bibliographic_item.rb

@@ -809,9 +809,21 @@ module RelatonBib
           render_abstract xml
         end
         render_seriesinfo xml
+        render_format xml
       end
     end
 
+    def render_format(builder)
+      link.select { |l| l.type == "TXT" }.each do |l|
+        builder.format type: l.type, target: l.content
+      end
+    end
+
+    #
+    # Create reference attributes
+    #
+    # @return [Hash<Symbol=>String>] attributes
+    #
     def ref_attrs
       discopes = %w[anchor docName number]
       attrs = docidentifier.each_with_object({}) do |di, h|
@@ -826,24 +838,42 @@ module RelatonBib
       end
     end
 
+    #
+    # Render keyword
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_keyword(builder)
       keyword.each { |kw| builder.keyword kw.content }
     end
 
+    #
+    # Render workgroup
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_workgroup(builder)
       editorialgroup&.technical_committee&.each do |tc|
         builder.workgroup tc.workgroup.name
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
+    #
+    # Render abstract
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_abstract(builder)
       return unless abstract.any?
 
       builder.abstract { |xml| xml << abstract[0].content.gsub(/(<\/?)p(>)/, '\1t\2') }
     end
 
-    # @param [Nokogiri::XML::Builder] builder
+    #
+    # Render date
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_date(builder)
       dt = date.detect { |d| d.type == "published" }
       return unless dt
@@ -860,7 +890,11 @@ module RelatonBib
       # end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
+    #
+    # Render seriesinfo
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_seriesinfo(builder)
       docidentifier.each do |di|
         if BibXMLParser::SERIESINFONAMES.include? di.type
@@ -877,7 +911,11 @@ module RelatonBib
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
+    #
+    # Render authors
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    #
     def render_authors(builder)
       contributor.each do |c|
         builder.author do |xml|
@@ -890,8 +928,12 @@ module RelatonBib
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
-    # @param [RelatonBib::ContributionInfo] contrib
+    #
+    # Render address
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    # @param [RelatonBib::ContributionInfo] contrib contributor
+    #
     def render_address(builder, contrib)
       # addr = contrib.entity.contact.reject do |cn|
       #   cn.is_a?(Address) && cn.postcode.nil?
@@ -913,8 +955,12 @@ module RelatonBib
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
-    # @param [Array<RelatonBib::Address, RelatonBib::Contact>] addr
+    #
+    # Render contact
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    # @param [Array<RelatonBib::Address, RelatonBib::Contact>] addr contact
+    #
     def render_contact(builder, addr)
       %w[phone email uri].each do |type|
         cont = addr.detect { |cn| cn.is_a?(Contact) && cn.type == type }
@@ -922,8 +968,12 @@ module RelatonBib
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
-    # @param [RelatonBib::Person] person
+    #
+    # Render person
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    # @param [RelatonBib::Person] person person
+    #
     def render_person(builder, person)
       render_organization builder, person.affiliation.first&.organization
       if person.name.completename
@@ -946,8 +996,12 @@ module RelatonBib
       end
     end
 
-    # @param [Nokogiri::XML::Builder] builder
-    # @param [RelatonBib::Organization] org
+    #
+    # Render organization
+    #
+    # @param [Nokogiri::XML::Builder] builder xml builder
+    # @param [RelatonBib::Organization] org organization
+    #
     def render_organization(builder, org)
       # return unless org
 

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
 
     #
@@ -338,7 +365,7 @@ module RelatonBib
       # return 1 if !mon || mon.empty?
       return mon if /^\d+$/.match? mon
 
-      Date::MONTHNAMES.index(mon).to_s.rjust 2, "0"
+      Date::MONTHNAMES.index { |m| m&.include? mon }.to_s.rjust 2, "0"
     end
 
     #

data/lib/relaton_bib/document_relation.rb

@@ -42,7 +42,7 @@ module RelatonBib
     # @param locality [Array<RelatonBib::Locality, RelatonBib::LocalityStack>]
     # @param source_locality [Array<RelatonBib::SourceLocality,
     #   RelatonBib::SourceLocalityStack>]
-    def initialize(type:, description: nil, bibitem:, locality: [],
+    def initialize(type:, bibitem:, description: nil, locality: [],
                    source_locality: [])
       type = "obsoletes" if type == "Now withdrawn"
       unless self.class::TYPES.include? type

data/lib/relaton_bib/person.rb

@@ -13,8 +13,8 @@ module RelatonBib
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :initial
 
-    # @return [RelatonBib::LocalizedString]
-    attr_accessor :surname
+    # @return [RelatonBib::LocalizedString, nil]
+    attr_accessor :surname, :completename
 
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :addition
@@ -22,15 +22,14 @@ module RelatonBib
     # @return [Array<RelatonBib::LocalizedString>]
     attr_accessor :prefix
 
-    # @return [RelatonBib::LocalizedString]
-    attr_reader :completename
-
-    # @param surname [RelatonBib::LocalizedString]
+    # @param surname [RelatonBib::LocalizedString, nil] surname or completename
+    #   should be present
     # @param forename [Array<RelatonBib::LocalizedString>]
     # @param initial [Array<RelatonBib::LocalizedString>]
     # @param addition [Array<RelatonBib::LocalizedString>]
     # @param prefix [Array<RelatonBib::LocalizedString>]
-    # @param completename [RelatonBib::LocalizedString]
+    # @param completename [RelatonBib::LocalizedString, nil] completename or
+    #   surname should be present
     def initialize(**args)
       unless args[:surname] || args[:completename]
         raise ArgumentError, "Should be given :surname or :completename"

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.10.1".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.1
+  version: 1.10.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-08 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug