relaton-ietf 1.12.2 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51a0a92632baaeef663f07d26c692121d027673a0ab55ac75be6d4b8d2ed7995
-  data.tar.gz: 0f89bdc4e3c3540a07d13c8a358c067951c662af3aa2dd44d78b229c204c9c24
+  metadata.gz: 0eddad3431b1f0aade4e139456c33ae9cd067eaec9dd38b64257be00e285efd7
+  data.tar.gz: 156d9d50c7964ec4167526fc1f31460134c717fbd48c4dd41b7d4bc42450c094
 SHA512:
-  metadata.gz: 7129d5d8825e51a9b4eb9340fe897bddd008e8017de20e6c358fe0d8cb6a1d753577f36bdbe9fcd8eb87b0f8438e84aa44c6e2426cacd176189e321a26d64bcc
-  data.tar.gz: 2064f8d3f4838ec4f976f6a3e5dc257badf87db2eb0e5051e66b9256fc906f179fdc63452873052cf3720b00b28f530de9f3aef4e1fefae9a605f89dd89c9e6b
+  metadata.gz: ab78ea185c4bf6e7be09f78a7457f36ac3f1951b46bc0b2c3c33b6465fcdee9cdad00cb69f3fc606144bba3efe2e94e765a340933d129a67dfd29aa6c8dfa14f
+  data.tar.gz: 8e5e48e4257c89edcca19c85e54d5ef2dfc8a941ebed64cd3b826f63373774d25f2ef6b9c65ae2752e36fb7efa118874be489e5ee9f6faefceae674d9919e4dd

data/lib/relaton_ietf/data_fetcher.rb

@@ -33,7 +33,7 @@ module RelatonIetf
     def self.fetch(source, output: "data", format: "yaml")
       t1 = Time.now
       puts "Started at: #{t1}"
-      FileUtils.mkdir_p output unless Dir.exist? output
+      FileUtils.mkdir_p output # unless Dir.exist? output
       new(source, output, format).fetch
       t2 = Time.now
       puts "Stopped at: #{t2}"
@@ -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(/^#{match[:series]}-\d{2}/)
             create_series match[:series], bib_versions
             series = match[:series]
           end
@@ -114,7 +114,7 @@ module RelatonIetf
     # @param [String] ref reference
     # @param [Array<String>] versions list of versions
     #
-    def create_series(ref, versions) # rubocop:disable Metrics/AbcSize
+    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 }
@@ -123,7 +123,8 @@ module RelatonIetf
       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/ietf_bibliography.rb

@@ -21,7 +21,8 @@ module RelatonIetf
         warn "[relaton-ietf] (\"#{code}\") fetching..."
         result = search code
         if result
-          warn "[relaton-ietf] (\"#{code}\") found #{result.docidentifier.first.id}"
+          docid = result.docidentifier.detect(&:primary) || result.docidentifier.first
+          warn "[relaton-ietf] (\"#{code}\") found #{docid.id}"
         else
           warn "[relaton-ietf] (\"#{code}\") not found"
         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

@@ -5,18 +5,17 @@ module RelatonIetf
   module Scrapper
     extend Scrapper
 
-    IDS = "https://raw.githubusercontent.com/ietf-ribose/relaton-data-ids/main/data/"
-    RFC = "https://raw.githubusercontent.com/ietf-ribose/relaton-data-rfcs/main/data/"
-    RSS = "https://raw.githubusercontent.com/ietf-ribose/relaton-data-rfcsubseries/main/data/"
+    IDS = "https://raw.githubusercontent.com/relaton/relaton-data-ids/main/data/"
+    RFC = "https://raw.githubusercontent.com/relaton/relaton-data-rfcs/main/data/"
+    RSS = "https://raw.githubusercontent.com/relaton/relaton-data-rfcsubseries/main/data/"
 
     # @param text [String]
-    # @param is_relation [TrueClass, FalseClass]
     # @return [RelatonIetf::IetfBibliographicItem]
-    def scrape_page(text, is_relation: false)
+    def scrape_page(text)
       # Remove initial "IETF " string if specified
       ref = text.gsub(/^IETF /, "")
       ref.sub!(/(?<=^(?:RFC|BCP|FYI|STD))\s(\d+)/) { $1.rjust 4, "0" }
-      rfc_item ref, is_relation
+      rfc_item ref
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
            Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
            Net::ProtocolError, SocketError
@@ -26,9 +25,8 @@ module RelatonIetf
     private
 
     # @param ref [String]
-    # @param is_relation [Boolen, nil]
     # @return [RelatonIetf::IetfBibliographicItem]
-    def rfc_item(ref, is_relation)
+    def rfc_item(ref) # rubocop:disable Metrics/MethodLength
       ghurl = case ref
               when /^RFC/ then RFC
               when /^(?:BCP|FYI|STD)/ then RSS

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.12.2".freeze
+  VERSION = "1.12.5".freeze
 end

metadata

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