relaton-ietf 1.12.3 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11fb2dfa0df019e33ac1b60faf21a8823473d965fdc67815bb788fd2898471c
-  data.tar.gz: 4c3446caa2b71be202528aae5ab9b0c1c79f0b85ca422930986347bd51312265
+  metadata.gz: '029ac486811190a8734f2b620b92a99b5270e8f100a793901d96052c71f6dbed'
+  data.tar.gz: 2cb2fc3ef85479025d220878b3796587de1ce3622c1372f21faeaa37d581775d
 SHA512:
-  metadata.gz: 78caccd01344b810325d661c921aec1b908cbe363b39aa48534b84f3f0726231c90cc70adf82585ed3fa42c466ab2b8b409d54e73c0d02bbea58064969449169
-  data.tar.gz: 1484d8c01e99a419faef0c50be081a62b4ea1ed630dda2a5f115c23ae3a56488813ab7cadd3beeefbdbf6eeff95e2b97bf67788e497319d883381757b9996077
+  metadata.gz: 2da2657783478b1fa88cf1669fb5d5e1f556baed0d43e4efbbf8728309dc10c27a6ffd073653f80e97b3eb9619776fac8ee78264868ce2bcfb0ef8dad38f1298
+  data.tar.gz: 5828a4b7d87cc7c258c213c5a3bb6d0cd7ed11f7c60d5eaaf8ede3ed8d65213a1d7fefe7254705ce9f1355e4450e7903bfb0859067ad4d205c43f31c6fd1d9cf

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.select { |ref| ref.include? match[:series] }
+            bib_versions = versions.grep(/^#{Regexp.quote match[:series]}-\d{2}/)
             create_series match[:series], bib_versions
             series = match[:series]
           end
@@ -114,16 +114,15 @@ module RelatonIetf
     # @param [String] ref reference
     # @param [Array<String>] versions list of versions
     #
-    def create_series(ref, versions) # rubocop:disable Metrics/AbcSize
-      return if versions.size < 2
-
+    def create_series(ref, versions) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       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
       rel = vs.map { |v| version_relation v, "includes" }
       last_v = HashConverter.hash_to_bib YAML.load_file("#{@output}/#{vs.last}.#{@ext}")
       bib = IetfBibliographicItem.new(
-        title: last_v[:title], abstract: last_v[:abstract], formattedref: fref, docid: [docid], relation: rel,
+        title: last_v[:title], abstract: last_v[:abstract], formattedref: fref,
+        fetched: Date.today.to_s, docid: [docid], relation: rel
       )
       save_doc bib
     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/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.12.3".freeze
+  VERSION = "1.12.6".freeze
 end

metadata

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