relaton-ietf 1.12.1 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cf110d52536e064eeb65a445b01fc893d7b45a99b29597e0f5390138c791126
-  data.tar.gz: 30854b388a406da682dc14ac8d2eedb1cc9b456a2fcf7f7169d6369de809fb24
+  metadata.gz: 18af96dce8ec5c7579aec1dc247517bdb6d04c5425c8f64e00c3f71c5357c94b
+  data.tar.gz: be74165b6a45cd3aa1f21ea100dbe6664be78687f23cc0c54bb280b6b2a2d0a2
 SHA512:
-  metadata.gz: 512af293f0837447589f2f32244f3fd0377342c497ef82dddaa34c1f8d1b8b1ae1a982388fdbf18ef7d29a173dafeb44783d2d3b5afd6f1cc3dee6d85f2c3f43
-  data.tar.gz: c3b113d4a011718681d93150b1d2374e67708fda81b3c9adfe7e6abc8891c16250f1ad99c71e50e2585852fa6f9fa425ea91da690acc01e0536865e7f536c558
+  metadata.gz: 7adc1f2cf07a3e571b554d19dac1663088761da74ce483f410e99db180cfb749e499443ec8a0b151eef73e93930ce3c03900b194aac2cf2e56e1e29ec33240ff
+  data.tar.gz: 37a1074f67177a69c0e01926114f2b36ef450802c75ad1b120a6d78513e77c92916c88257bda82ae90b2b573c1b67a9bc45c6ec2d92a615a4ade473297b3e909

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/hash_converter.rb

@@ -14,7 +14,7 @@ module RelatonIetf
       def editorialgroup_hash_to_bib(ret)
         return unless ret[:editorialgroup]
 
-        technical_committee = array(ret[:editorialgroup]).map do |wg|
+        technical_committee = RelatonBib.array(ret[:editorialgroup]).map do |wg|
           Committee.new RelatonBib::WorkGroup.new(**wg)
         end
         ret[:editorialgroup] = RelatonBib::EditorialGroup.new technical_committee

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/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.1".freeze
+  VERSION = "1.12.4".freeze
 end

metadata

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