relaton-ietf 1.11.0 → 1.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 487865677406ccb87b65d3f4064c60bef7d26b7955817dd7030c4272eabf3e3f
-  data.tar.gz: 818d190f6bcb3d91a9b5a0bf7ebe8e5acd20e3f1e46de30c1b7e6e9b4435116b
+  metadata.gz: 53c7e68edafd4a51e8b08f0b169318d1864a0fba32327f9ceaf2eb7968048c97
+  data.tar.gz: 8b75d635bbc3e97c9cb7a680ed0c657d50614a5313babe1ac5759dd0e1c584c4
 SHA512:
-  metadata.gz: 1f2553900686f5c7a1a3653b0e9546510448e79dde9965d8c1aa604377bde3489d805bdd13ae68128bfa7f49fd4037d588584c3dcc3ca594579f5410c6cb0b6e
-  data.tar.gz: 1a0599db3efa91cfd7360f53cc77bffdb1fcf7b445f2fc56e9d2957634826adf71be8c54a75e71e2b5e4619e91c00d7b351b01eb01c16535be2c3602281ba45d
+  metadata.gz: bcdaea6abeb068ad1a23bd9e2ba3f5792c1eeccd06b90586f8307aa005f3204f6cd135ac96b38b5ac60a1a38e70980ec3ff3163255eb5b79254f60bba8be9732
+  data.tar.gz: 2f2ce84d3898691e786fc598963842f68e36ea0ee2a9ee179d131d00ab1ce724860938e40caedbb4cf06adf1cafceffdbd9109e481ae8142453f804c80349088

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/lib/relaton_ietf/data_fetcher.rb

@@ -63,13 +63,19 @@ module RelatonIetf
     #
     # Fetches ietf-internet-drafts documents
     #
-    def fetch_ieft_internet_drafts # rubocop:disable Metrics/MethodLength
+    def fetch_ieft_internet_drafts # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       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\./, "")
+          /(?<ver>\d+)$/ =~ file
         end
-        save_doc BibXMLParser.parse(File.read(path, encoding: "UTF-8"))
+        bib = BibXMLParser.parse(File.read(path, encoding: "UTF-8"))
+        if ver
+          version = RelatonBib::BibliographicItem::Version.new nil, [ver]
+          bib.instance_variable_set :@version, version
+        end
+        save_doc bib
       end
       update_versions(versions) if versions.any? && @format != "bibxml"
     end

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -3,12 +3,13 @@ module RelatonIetf
     #
     # Document parser initalization
     #
-    # @param [String] name document type name
+    # @param [Nokogiri::XML::Element] doc document
     # @param [String] doc_id document id
     # @param [Array<String>] is_also included document ids
     #
-    def initialize(name, doc_id, is_also)
-      @name = name
+    def initialize(doc, doc_id, is_also)
+      @doc = doc
+      @name = doc.name.split("-").first
       @shortnum = doc_id[-4..-1].sub(/^0+/, "")
       @doc_id = doc_id
       @is_also = is_also
@@ -26,8 +27,7 @@ module RelatonIetf
       is_also = doc.xpath("./xmlns:is-also/xmlns:doc-id").map &:text
       return unless doc_id && is_also.any?
 
-      name = doc.name.split("-").first
-      new(name, doc_id.text, is_also).parse
+      new(doc, doc_id.text, is_also).parse
     end
 
     def parse
@@ -79,7 +79,9 @@ module RelatonIetf
 
     def parse_relation
       @is_also.each_with_object([]) do |ref, a|
-        bib = IetfBibliography.get ref.sub(/^(RFC)(\d+)/, '\1 \2')
+        # bib = IetfBibliography.get ref.sub(/^(RFC)(\d+)/, '\1 \2')
+        ref_doc = @doc.at "/xmlns:rfc-index/xmlns:rfc-entry[xmlns:doc-id[text()='#{ref}']]"
+        bib = RfcEntry.parse ref_doc
         a << { type: "includes", bibitem: bib } if bib
       end
     end

data/lib/relaton_ietf/scrapper.rb

@@ -38,7 +38,7 @@ module RelatonIetf
       # doc = Nokogiri::XML get_page(uri)
       # r = doc.at("/referencegroup", "/reference")
       # fetch_rfc r, is_relation: is_relation, url: uri, ver: ver
-      BibXMLParser.parse get_page(uri), url: uri, is_relation: is_relation, ver: ver
+      BibXMLParser.parse get_page(uri), is_relation: is_relation, ver: ver
     end
 
     # @param uri [String]

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.11.0".freeze
+  VERSION = "1.11.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml