relaton-bib 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791772f93f6ec77db4778d4b983bd5b8238342ce83e3b1ebc7ab57f249a13d20
-  data.tar.gz: fffd96ca42623382338182a6cb6532fde99c18ebddfd516808f49eb493d31cd6
+  metadata.gz: 89950d6f16ecee59114ef4adeb31673bdb32584d6ba3c3ae20591b76e1c3f522
+  data.tar.gz: c4da2965dae170674c58a3c1c8d879e23fcb5339df8db54da09ec5b6149c772e
 SHA512:
-  metadata.gz: b5440de1b9a0555946b6be63f5c557d9f91b54c247d5876e5f8aaf4e74bfefa1f91d526a1453c99a401e2d82e03ed07af66e2f950a4e0f51d844e9ba0738c427
-  data.tar.gz: 8addf5e0b704189efdb1a6f871553c79ef23d1c38c324e728d9e72151a9c7317029340f3b0f4ad25b394a6acfcee679532c3f323a37aab0b0946bb33ce88461a
+  metadata.gz: 68a1d32eecd5aa1646d852ffb0074f09dfb306bf3251cac7d4983945a89f991149c3e959dae6c54ce2efe93c2dad4345230b2fa627db50b9e88fea2f34e933f0
+  data.tar.gz: 6a69d4380d9fb2b8d3cfa0012509d56bea2de0c48672bd10f8033e5b5dc0c5f858aca650829ecdcf3aaa222f3e600bfc1e832cc61ac006448ffa4f74d6b1a034

data/lib/relaton_bib/bibliographic_item.rb

@@ -815,7 +815,6 @@ module RelatonBib
 
         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|
@@ -823,10 +822,6 @@ module RelatonBib
       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 { |kw| builder.keyword kw.content }
     end

data/lib/relaton_bib/bibxml_parser.rb

@@ -67,21 +67,31 @@ 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
-        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])
+      # 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])
+      ret << DocumentIdentifier.new(type: type, id: id) if id
+      %w[anchor docName number].each do |atr|
+        if reference[atr]
+          ret << DocumentIdentifier.new(id: reference[atr], type: type, scope: atr)
+        end
       end
-      ret << DocumentIdentifier.new(type: type, id: id, scope: scope) if id
+      # 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

data/lib/relaton_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonBib
-  VERSION = "1.9.12".freeze
+  VERSION = "1.9.13".freeze
 end

metadata

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