relaton-ietf 1.11.2 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36682c0123ce382610e18c06a3c9ae748ed3d906080786e40c88b61143ed9c0d
-  data.tar.gz: 88e8bd5dac94beb166f4fa467f83625376630ea36da7c314d044677bce541709
+  metadata.gz: c8668aa18254f8c9c0dd9f0a6b47b8d8c3b83e9795ef2ece6d422962cb894e6a
+  data.tar.gz: 5c47519efd521568f671c7e56148133f3d3155d3a3057829b6c735df6be887f5
 SHA512:
-  metadata.gz: 5e1bc72dbf69771e46ff1250b21126f08cc794c16cc69b14d4a2a5f0fd8de544de07597e4a6e4bc0ef8ec5f1ec5699ab07f01d8a3f8bd0d9bd5bfefc38210d2a
-  data.tar.gz: 55eea68edf4a372065475fe74d86f407782d007b99a6fcffa1f121f44dd70d75f60fa0bf97cb0d38a76a595ff7c3b505d0f3e9b3a091417a0625fd71fa076461
+  metadata.gz: ffadb9d261290bc847c5ef4d56a85eaee3eee4d6ddab429e56b350dca0c30c78fb35c155e59c65dc00889cf7a33d7d821545215bd372a8457ec73cacabbdf8f3
+  data.tar.gz: 6b5262d9b858af95a5c0afccb2c09f109bdd6edf3ad85c5552988c8193bd1107e00ee2ee4f1751334d0d5eccb50eef9b0d8f8494887cbdc1bb835f148563e2ba

data/lib/relaton_ietf/data_fetcher.rb

@@ -94,6 +94,7 @@ module RelatonIetf
           if series != match[:series]
             bib_versions = versions.select { |ref| ref.include? match[:series] }
             create_series match[:series], bib_versions
+            series = match[:series]
           end
           lv = bib_versions.select { |ref| ref.match(/\d+$/).to_s.to_i < match[:ver].to_i }
           hv = bib_versions.select { |ref| ref.match(/\d+$/).to_s.to_i > match[:ver].to_i }
@@ -103,7 +104,6 @@ module RelatonIetf
             bib.relation << version_relation(hv.first, "updatedBy") if hv.any?
             save_doc bib, check_duplicate: false
           end
-          series = match[:series]
         end
       end
     end
@@ -114,14 +114,18 @@ module RelatonIetf
     # @param [String] ref reference
     # @param [Array<String>] versions list of versions
     #
-    def create_series(ref, versions)
+    def create_series(ref, versions) # rubocop:disable Metrics/AbcSize
       return if versions.size < 2
 
+      vs = versions.sort_by { |v| v.match(/\d+$/).to_s.to_i }
       fref = RelatonBib::FormattedRef.new content: ref
-      rel = versions.map do |v|
-        version_relation v, "includes"
-      end
-      save_doc IetfBibliographicItem.new(formattedref: fref, relation: rel)
+      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,
+      )
+      save_doc bib
     end
 
     #
@@ -134,7 +138,8 @@ module RelatonIetf
     #
     def version_relation(ref, type)
       fref = RelatonBib::FormattedRef.new content: ref
-      bibitem = IetfBibliographicItem.new formattedref: fref
+      docid = RelatonBib::DocumentIdentifier.new type: "Internet-Draft", id: ref, primary: true
+      bibitem = IetfBibliographicItem.new formattedref: fref, docid: [docid]
       RelatonBib::DocumentRelation.new(type: type, bibitem: bibitem)
     end
 

data/lib/relaton_ietf/rfc_entry.rb

@@ -243,7 +243,8 @@ module RelatonIetf
       types = { "updates" => "updates", "obsoleted-by" => "obsoletedBy"}
       @doc.xpath("./xmlns:updates/xmlns:doc-id|./xmlns:obsoleted-by/xmlns:doc-id").map do |r|
         fref = RelatonBib::FormattedRef.new(content: r.text)
-        bib = IetfBibliographicItem.new(formattedref: fref)
+        docid = RelatonBib::DocumentIdentifier.new type: "IETF", id: r.text, primary: true
+        bib = IetfBibliographicItem.new(formattedref: fref, docid: [docid])
         RelatonBib::DocumentRelation.new(type: types[r.parent.name], bibitem: bib)
       end
     end

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -30,6 +30,11 @@ module RelatonIetf
       new(doc, doc_id.text, is_also).parse
     end
 
+    #
+    # Parse document
+    #
+    # @return [RelatonIetf::IetfBibliographicItem] bib item
+    #
     def parse
       IetfBibliographicItem.new(
         docnumber: docnumber,
@@ -44,14 +49,19 @@ module RelatonIetf
     end
 
     #
-    # Document id
+    # Document number
     #
-    # @return [Strinng] document id
+    # @return [Strinng] document number
     #
     def docnumber
       @doc_id
     end
 
+    #
+    # Create docidentifiers
+    #
+    # @return [Array<RelatonBib::DocumentIdentifier>] docidentifiers
+    #
     def parse_docid
       [
         RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true),
@@ -59,30 +69,55 @@ module RelatonIetf
       ]
     end
 
+    #
+    # Create pub_id
+    #
+    # @return [String] pub_id
+    #
     def pub_id
       "#{@name.upcase} #{@shortnum}"
     end
 
+    #
+    # Create anchor
+    #
+    # @return [String] anchor
+    #
     def anchor
       "#{@name.upcase}#{@shortnum}"
     end
 
+    #
+    # Create link
+    #
+    # @return [Array<RelatonBib::TypedUri>] 
+    #
     def parse_link
       [RelatonBib::TypedUri.new(type: "src", content: "https://www.rfc-editor.org/info/#{@name}#{@shortnum}")]
     end
 
+    #
+    # Create formatted reference
+    #
+    # @return [RelatonBib::FormattedRef] 
+    #
     def formattedref
       RelatonBib::FormattedRef.new(
         content: anchor, language: "en", script: "Latn",
       )
     end
 
+    #
+    # Create relations
+    #
+    # @return [Array<Hash>] relations
+    #
     def parse_relation
-      @is_also.each_with_object([]) do |ref, a|
-        # 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
+      @is_also.map do |ref|
+        fref = RelatonBib::FormattedRef.new content: ref
+        docid = RelatonBib::DocumentIdentifier.new(type: "IETF", id: ref, primary: true)
+        bib = IetfBibliographicItem.new formattedref: fref, docid: [docid]
+        { type: "includes", bibitem: bib }
       end
     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.2".freeze
+  VERSION = "1.11.5".freeze
 end

metadata

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