relaton-bib 1.9.12 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 791772f93f6ec77db4778d4b983bd5b8238342ce83e3b1ebc7ab57f249a13d20
-  data.tar.gz: fffd96ca42623382338182a6cb6532fde99c18ebddfd516808f49eb493d31cd6
+  metadata.gz: e2b24daf1fbc819c9ca59c5c38be90c9a644d79c3f73a9a3d6462b30955a22fb
+  data.tar.gz: 0d370baf6ac11940a43d417661b1d306d1134d110507d371745078ad4e98a57c
 SHA512:
-  metadata.gz: b5440de1b9a0555946b6be63f5c557d9f91b54c247d5876e5f8aaf4e74bfefa1f91d526a1453c99a401e2d82e03ed07af66e2f950a4e0f51d844e9ba0738c427
-  data.tar.gz: 8addf5e0b704189efdb1a6f871553c79ef23d1c38c324e728d9e72151a9c7317029340f3b0f4ad25b394a6acfcee679532c3f323a37aab0b0946bb33ce88461a
+  metadata.gz: e63d120ba07f6b82b3ccce826f152fab3c85414a777962fbc8fed3102c4e565971e23ca5eeabca54852b41dcd9eb2dfc14d09249e5fb5a417b93dad2d4f62484
+  data.tar.gz: b0ee4c21adbd9a68443752b4c34bfe6b27ebeab891e8be029ec7de30ab4f8a13b1bcb7c64f30ba47c1b65e47b22741fbe6b756792a2106e0ac029c17c760687d

data/lib/relaton_bib/bibliographic_item.rb

@@ -815,18 +815,13 @@ 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|
-        return { anchor: di.id }
+        return { anchor: di.id.gsub(" ", ".") }
       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,36 @@ 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])
+      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
-      ret << DocumentIdentifier.new(type: type, id: id, scope: scope) if 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

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.12".freeze
+  VERSION = "1.9.16".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.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug