relaton-bib 1.9.11 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f1dc44ef7d2716e9dab35fdb81005962960fb608d388b2d556073758f3cf25
-  data.tar.gz: e31e80c8a248a626bf83bc85e0f3d781544e5461c65e805d1a8ff45025808caa
+  metadata.gz: df627fef24296d28c6a6802972a545ce575e89065efc41d07a1783c05fa9d1ad
+  data.tar.gz: aff5fe6709c54247e238523cbb49b04137723dc2264e79c054415b1ed29bd706
 SHA512:
-  metadata.gz: 90256a1674ec5311fd7fedb5d0822a5cb10bb9ecaf6c7f5865d74b9a28e6b4feaa969fae327610726720524010db1f1d290dbad48902a3b6e4a86e468542179f
-  data.tar.gz: 29cfeccc2388db9096b094274653800499a4a40a52b7102e9283e64030e921edd37a93ea8c70f92cd2056ac654a2e8b9a4184ca08a05863365f12fa6c15e6305
+  metadata.gz: e787baf783f229454cbf25423e6ed998476df6d3a4a70654f43c6385be9e74f92913f5526f6d589b5e5c3a23de2123e578109bac9cef79d76734c9c67a6100b1
+  data.tar.gz: e1977eb5ab24edd762217c6799319adfb4da51decf4cd9d1cf0660d1e2102eeb568a47a734a9bff40e45748c6fa08efd17f1e094d76fc8285bfb59e100b42637

data/lib/relaton_bib/bibliographic_item.rb

@@ -766,7 +766,8 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     #
     def render_bibxml(builder)
-      target = link.detect { |l| l.type == "src" } || link.detect { |l| l.type == "doi" }
+      target = link.detect { |l| l.type == "src" } ||
+        link.detect { |l| l.type == "doi" }
       bxml = if docnumber&.match(/^BCP/) || docidentifier[0].id.include?("BCP")
                render_bibxml_refgroup(builder)
              else
@@ -781,7 +782,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     #
     def render_bibxml_refgroup(builder)
-      builder.referencegroup(anchor: anchor) do |b|
+      builder.referencegroup(**ref_attrs) do |b|
         relation.each do |r|
           r.bibitem.to_bibxml(b) if r.type == "includes"
         end
@@ -794,7 +795,7 @@ module RelatonBib
     # @param [Nokogiri::XML::Builder] builder
     #
     def render_bibxml_ref(builder)
-      builder.reference(anchor: anchor) do |xml|
+      builder.reference(**ref_attrs) do |xml|
         xml.front do
           xml.title title[0].title.content if title.any?
           render_seriesinfo xml
@@ -807,18 +808,22 @@ module RelatonBib
       end
     end
 
-    def anchor
-      did = docidentifier.detect { |di| di.type == "rfc-anchor" }
-      return did.id if did
+    def ref_attrs
+      discopes = %w[anchor docName number]
+      attrs = docidentifier.each_with_object({}) do |di, h|
+        next unless discopes.include?(di.scope)
 
-      type = docidentifier[0].type
-      "#{type}.#{docnumber}"
+        h[di.scope.to_sym] = di.id
+      end
+      return attrs if attrs.any?
+
+      docidentifier.first&.tap do |di|
+        return { anchor: di.id }
+      end
     end
 
     def render_keyword(builder)
-      keyword.each do |kw|
-        builder.keyword kw.content
-      end
+      keyword.each { |kw| builder.keyword kw.content }
     end
 
     def render_workgroup(builder)

data/lib/relaton_bib/bibxml_parser.rb

@@ -45,7 +45,7 @@ module RelatonBib
     end
 
     # @param attrs [Hash]
-    # @return [RelatonBib::IetfBibliographicItem]
+    # @return [RelatonBib::BibliographicItem]
     def bib_item(**attrs)
       # attrs[:place] = ["Fremont, CA"]
       BibliographicItem.new(**attrs)
@@ -67,16 +67,39 @@ module RelatonBib
     #
     def docids(reference, ver) # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/AbcSize
       ret = []
-      sfid = reference.at("./seriesInfo[@name='#{self::FLAVOR}']",
-                          "./front/seriesInfo[@name='#{self::FLAVOR}']")
-      if sfid
-        ret << DocumentIdentifier.new(type: sfid[:name], id: sfid[:value])
-      elsif self::FLAVOR && (id = (reference[:anchor] || reference[:docName] || reference[:number]))
-        ret << DocumentIdentifier.new(type: self::FLAVOR, id: id.sub(/^(RFC)/, "\\1 "))
+      # sfid = reference.at("./seriesInfo[@name='#{self::FLAVOR}']",
+      #                     "./front/seriesInfo[@name='#{self::FLAVOR}']")
+      # if sfid
+      #   type = sfid[:name]
+      #   id = sfid[:value]
+      #   # scope = "series"
+      # else # if self::FLAVOR
+        # id, scope = if reference[:anchor] then [reference[:anchor], "anchor"]
+        #             elsif reference[:docName] then [reference[:docName], "docName"]
+        #             elsif reference[:number] then [reference[:number], "number"]
+        #             end
+      id = reference["anchor"] || reference["docName"] || reference["number"]
+      type_match = id&.match(/^(3GPP|W3C|[A-Z]{2,})(?:\.(?=[A-Z])|(?=\d))/)
+      type = self::FLAVOR || (type_match && type_match[1])
+      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: type, id: pid)
       end
-      if (id = reference[:anchor])
-        ret << DocumentIdentifier.new(type: "rfc-anchor", id: id)
+      %w[anchor docName number].each do |atr|
+        if reference[atr]
+          ret << DocumentIdentifier.new(id: reference[atr], type: type, scope: atr)
+        end
       end
+      # end
+      # if id
+      #   ret << DocumentIdentifier.new(type: type, id: id)
+      #   ret << DocumentIdentifier.new(type: type, id: id, scope: scope) if scope
+      # end
+      # if (id = reference[:anchor])
+      #   ret << DocumentIdentifier.new(type: "rfc-anchor", id: id)
+      # end
       ret + reference.xpath("./seriesInfo", "./front/seriesInfo").map do |si|
         next unless SERIESINFONAMES.include? si[:name]
 
@@ -139,7 +162,8 @@ module RelatonBib
     # @return [Array<RelatonBib::FormattedString>]
     def abstracts(ref)
       ref.xpath("./front/abstract").map do |a|
-        c = a.children.to_s.gsub(/\s*(<\/?)t(>)\s*/, '\1p\2').gsub(/\n/, "").squeeze " "
+        c = a.children.to_s.gsub(/\s*(<\/?)t(>)\s*/, '\1p\2')
+          .gsub(/[\t\n]/, " ").squeeze " "
         FormattedString.new(content: c, language: language(ref), script: "Latn",
                             format: "text/html")
       end
@@ -244,7 +268,7 @@ module RelatonBib
     # @rerurn [RelatonBib::Address]
     def address(postal) # rubocop:disable Metrics/CyclomaticComplexity
       street = [
-        (postal.at("./postalLine") || postal.at("./street"))&.text
+        (postal.at("./postalLine") || postal.at("./street"))&.text,
       ].compact
       Address.new(
         street: street,

data/lib/relaton_bib/document_identifier.rb

@@ -20,7 +20,7 @@ module RelatonBib
     def remove_part
       case @type
       when "Chinese Standard" then @id.sub!(/\.\d+/, "")
-      when "ISO", "IEC" then @id.sub!(/-[^:]+/, "")
+      when "ISO", "IEC", "BSI" then @id.sub!(/-[^:]+/, "")
       when "URN" then remove_urn_part
       end
     end
@@ -28,7 +28,7 @@ module RelatonBib
     def remove_date
       case @type
       when "Chinese Standard" then @id.sub!(/-[12]\d\d\d/, "")
-      when "ISO", "IEC" then @id.sub!(/:[12]\d\d\d/, "")
+      when "ISO", "IEC", "BSI" then @id.sub!(/:[12]\d\d\d/, "")
       when "URN"
         @id.sub!(/^(urn:iec:std:[^:]+:[^:]+:)[^:]*/, '\1')
       end
@@ -69,8 +69,8 @@ module RelatonBib
     # @param prefix [String]
     # @param count [Integer] number of docids
     # @return [String]
-    def to_asciibib(prefix = "", count = 1)
-      pref = prefix.empty? ? prefix : prefix + "."
+    def to_asciibib(prefix = "", count = 1) # rubocop:disable Metrics/CyclomaticComplexity
+      pref = prefix.empty? ? prefix : "#{prefix}."
       return "#{pref}docid:: #{id}\n" unless type || scope
 
       out = count > 1 ? "#{pref}docid::\n" : ""

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.11".freeze
+  VERSION = "1.9.15".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bib
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.9.15
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug