relaton-ietf 1.12.4 → 1.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18af96dce8ec5c7579aec1dc247517bdb6d04c5425c8f64e00c3f71c5357c94b
-  data.tar.gz: be74165b6a45cd3aa1f21ea100dbe6664be78687f23cc0c54bb280b6b2a2d0a2
+  metadata.gz: f2fd674003889725827b1fabaa8f17e203d89c3db34c94a00dda7cbac76217c1
+  data.tar.gz: 0bacd63b9c7593281255b93aaef453378a1e9cc60f1e1fe0cfb0b2c7b5f438d4
 SHA512:
-  metadata.gz: 7adc1f2cf07a3e571b554d19dac1663088761da74ce483f410e99db180cfb749e499443ec8a0b151eef73e93930ce3c03900b194aac2cf2e56e1e29ec33240ff
-  data.tar.gz: 37a1074f67177a69c0e01926114f2b36ef450802c75ad1b120a6d78513e77c92916c88257bda82ae90b2b573c1b67a9bc45c6ec2d92a615a4ade473297b3e909
+  metadata.gz: d054a537dc2f99f682a874f5945fa96dd80e097beacd2e2174167cfa4a0679d0f4402b3e77d24b5e99cb4e51542d42323c8c9d853d1e0b304896e084e19f3366
+  data.tar.gz: 72a6c35c33589156f569248d4b10979047f3459f90c37e8013c69ec1ff89a87e6238c1ddd599bee4aec6246e22051a788a99de6fc1eabe526557e9a750b21ce4

data/lib/relaton_ietf/data_fetcher.rb

@@ -67,7 +67,7 @@ module RelatonIetf
       versions = Dir["bibxml-ids/*.xml"].each_with_object([]) do |path, vers|
         file = File.basename path, ".xml"
         if file.include?("D.draft-")
-          vers << file.sub(/^reference\.I-D\./, "")
+          vers << file.sub(/^reference\.I-D\./, "").downcase
           /(?<ver>\d+)$/ =~ file
         end
         bib = BibXMLParser.parse(File.read(path, encoding: "UTF-8"))
@@ -92,7 +92,7 @@ module RelatonIetf
         match = /(?<series>draft-.+)-(?<ver>\d{2})\.#{@ext}$/.match file
         if match
           if series != match[:series]
-            bib_versions = versions.grep(/^#{match[:series]}-\d{2}/)
+            bib_versions = versions.grep(/^#{Regexp.quote match[:series]}-\d{2}/)
             create_series match[:series], bib_versions
             series = match[:series]
           end
@@ -115,8 +115,6 @@ module RelatonIetf
     # @param [Array<String>] versions list of versions
     #
     def create_series(ref, versions) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-      return if versions.size < 2
-
       vs = versions.sort_by { |v| v.match(/\d+$/).to_s.to_i }
       fref = RelatonBib::FormattedRef.new content: ref
       docid = RelatonBib::DocumentIdentifier.new type: "Internet-Draft", id: ref, primary: true

data/lib/relaton_ietf/processor.rb

@@ -6,7 +6,7 @@ module RelatonIetf
     def initialize # rubocop:disable Lint/MissingSuper
       @short = :relaton_ietf
       @prefix = "IETF"
-      @defaultprefix = /^(IETF|RFC|BCP|FYI|STD)\s/
+      @defaultprefix = /^((IETF|RFC|BCP|FYI|STD)\s|I-D[.\s])/
       @idtype = "IETF"
       @datasets = %w[ietf-rfcsubseries ietf-internet-drafts ietf-rfc-entries]
     end

data/lib/relaton_ietf/rfc_entry.rb

@@ -151,8 +151,8 @@ module RelatonIetf
     # @return [Array<RelatonBib::ContributionInfo>] document contributors
     #
     def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
-      @doc.xpath("./xmlns:author").map do |contributor| # rubocop:disable Metrics/BlockLength
-        n = contributor.at("./xmlns:name").text
+      @doc.xpath("./xmlns:author").map do |contrib| # rubocop:disable Metrics/BlockLength
+        n = contrib.at("./xmlns:name").text
         case n
         when "ISO"
           entity = RelatonBib::Organization.new(abbrev: n, name: "International Organization for Standardization")
@@ -186,17 +186,28 @@ module RelatonIetf
         when "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union"
           entity = RelatonBib::Organization.new(abbrev: "CCITT", name: n)
         else
-          # int, snm = n.split
           /^(?:(?<int>(?:\p{Lu}+(?:-\w|\(\w\))?\.{0,2}[-\s]?)+)\s)?(?<snm>[[:alnum:]\s'-.]+)$/ =~ n
           surname = RelatonBib::LocalizedString.new(snm, "en", "Latn")
           name = RelatonBib::LocalizedString.new(n, "en", "Latn")
           fname = RelatonBib::FullName.new(completename: name, initial: initials(int), surname: surname)
           entity = RelatonBib::Person.new(name: fname)
         end
-        RelatonBib::ContributionInfo.new(entity: entity, role: [{ type: "author" }])
+        RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib))
       end
     end
 
+    #
+    # Parse contributors role
+    #
+    # @param [Nokogiri::XML::Node] contrib <description>
+    #
+    # @return [Array<Hash>] contributors role
+    #
+    def parse_role(contrib)
+      type = contrib.at("./xmlns:title")&.text&.downcase || "author"
+      [{ type: type }]
+    end
+
     #
     # Ctreat initials
     #

data/lib/relaton_ietf/scrapper.rb

@@ -31,7 +31,7 @@ module RelatonIetf
               when /^RFC/ then RFC
               when /^(?:BCP|FYI|STD)/ then RSS
               when /^I-D/
-                ref.sub!(/^I-D\./, "")
+                ref.sub!(/^I-D[.\s]/, "")
                 IDS
               else return
               end

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.12.4".freeze
+  VERSION = "1.12.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml