relaton-bib 1.9.11 → 1.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3f1dc44ef7d2716e9dab35fdb81005962960fb608d388b2d556073758f3cf25
-  data.tar.gz: e31e80c8a248a626bf83bc85e0f3d781544e5461c65e805d1a8ff45025808caa
+  metadata.gz: 791772f93f6ec77db4778d4b983bd5b8238342ce83e3b1ebc7ab57f249a13d20
+  data.tar.gz: fffd96ca42623382338182a6cb6532fde99c18ebddfd516808f49eb493d31cd6
 SHA512:
-  metadata.gz: 90256a1674ec5311fd7fedb5d0822a5cb10bb9ecaf6c7f5865d74b9a28e6b4feaa969fae327610726720524010db1f1d290dbad48902a3b6e4a86e468542179f
-  data.tar.gz: 29cfeccc2388db9096b094274653800499a4a40a52b7102e9283e64030e921edd37a93ea8c70f92cd2056ac654a2e8b9a4184ca08a05863365f12fa6c15e6305
+  metadata.gz: b5440de1b9a0555946b6be63f5c557d9f91b54c247d5876e5f8aaf4e74bfefa1f91d526a1453c99a401e2d82e03ed07af66e2f950a4e0f51d844e9ba0738c427
+  data.tar.gz: 8addf5e0b704189efdb1a6f871553c79ef23d1c38c324e728d9e72151a9c7317029340f3b0f4ad25b394a6acfcee679532c3f323a37aab0b0946bb33ce88461a

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,27 @@ 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
+      # did = docidentifier.detect { |di| di.type == "rfc-anchor" }
+      return attrs if attrs.any?
+
+      docidentifier.first&.tap do |di|
+        return { anchor: di.id }
+      end
     end
 
+    # def id_to_ref_attr(id)
+    #   id.sub(/^(RFC|BCP)\s/, '\1').sub(/^(\d?[A-Z]+)\s/, '\1.')
+    # 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)
@@ -70,13 +70,21 @@ module RelatonBib
       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 "))
-      end
-      if (id = reference[:anchor])
-        ret << DocumentIdentifier.new(type: "rfc-anchor", id: id)
+        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&.match(/^(3GPP|W3C|[A-Z]{2,})(?:\.(?=[A-Z])|(?=\d))/)
+        type = self::FLAVOR || ($~ && $~[1])
       end
+      ret << DocumentIdentifier.new(type: type, id: id, scope: scope) if id
+      # 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 +147,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 +253,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/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.11".freeze
+  VERSION = "1.9.12".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.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug