relaton-ietf 1.10.2 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b981efd1d7feca207943b7bfd7e59a70615bbc23a9f7d5a8627a148fa7122ee
-  data.tar.gz: 959f7382d73071e9fb53211ae081129ccb5016ba7427afc026334e6f9ebda6a2
+  metadata.gz: 2bdbf2b79c15e3a39c10694ba1ed129b825c6481f95939dfd322da43a3ea859e
+  data.tar.gz: da2f82d0c9ec214fbef2dd229f06d8dd9ffc0099c1eededcfbfca3e3d2cebd70
 SHA512:
-  metadata.gz: a5e2d560647cfeb636ebf7de38c921a82b094c9995bfcc2972a24c843d9877158c3a7667140c747627e2c21d073170f494ca80ff250db54e2d720c7765a37058
-  data.tar.gz: 49d8dc28f9c5b7831c4b5c3bee346440a7562eb6c6e6cb6d0bba8a821a0c52f72b062abbd2f46aeb59b2d5fcc782d839626299dd018b9bc0e656247a3f8ba4ea
+  metadata.gz: 2e435d1419778748b600048fd02881fa0cc32faa462fd50e95a1c837dcdd3c475ffd5f1cf0b143b1d20be38dae96dbdad3556d4b3d4954bc4a6de717da5cd0ec
+  data.tar.gz: dcf0ce8ce233f9f29073bea10b3abc4ffb9aa70f3749c88d3961fe01e6e157616237ded93e02ac664dba7c34a89da212880e2adb3d75949d176d41ff32491123

data/README.adoc

@@ -135,7 +135,7 @@ RelatonIetf::IetfBibliographicItem.from_hash hash
 
 === Fetch data
 
-There is a IETF datasets what can be converted into RelatonXML/BibXML/BibYAML formats:
+There are IETF datasets what can be converted into RelatonXML/BibXML/BibYAML formats:
 
 - `ietf-rfcsubseries` - https://www.rfc-editor.org/rfc-index.xml (`<bcp-entry>`, `<fyi-entry>`, `<std-entry>`)
 - `ietf-internet-drafts` - converts files from local directory `./bibxml-ids`. Use `rsync -avcizxL rsync.ietf.org::bibxml-ids ./bibxml-ids` command to fetch the files.

data/lib/relaton_ietf/bibxml_parser.rb

@@ -24,6 +24,7 @@ module RelatonIetf
       type = super
       case type
       when "BCP", "FYI", "STD", "RFC" then "RFC"
+      when "Internet-Draft" then type
       else "IETF"
       end
     end
@@ -37,10 +38,14 @@ module RelatonIetf
     # @param reference [Nokogiri::XML::Element]
     # @return [Array<Hash>]
     def contributors(reference)
-      [{
-        entity: new_org("Internet Engineering Task Force", "IETF"),
-        role: [type: "publisher"],
-      }] + super
+      contribs = []
+      unless reference[:anchor]&.match?(/^I-D/)
+        contribs << {
+          entity: new_org("Internet Engineering Task Force", "IETF"),
+          role: [type: "publisher"],
+        }
+      end
+      contribs + super
       # persons(reference) + organizations(reference)
     end
   end

data/lib/relaton_ietf/rfc_entry.rb

@@ -68,7 +68,7 @@ module RelatonIetf
     def parse_docid
       ids = [
         RelatonBib::DocumentIdentifier.new(id: pub_id, type: "IETF", primary: true),
-        RelatonBib::DocumentIdentifier.new(id: code, type: "IETF", scope: "anchor"),
+        RelatonBib::DocumentIdentifier.new(id: anchor, type: "IETF", scope: "anchor"),
       ]
       doi = @doc.at("./xmlns:doi").text
       ids << RelatonBib::DocumentIdentifier.new(id: doi, type: "DOI")
@@ -112,14 +112,22 @@ module RelatonIetf
       @doc.at("./xmlns:doc-id").text
     end
 
+    #
+    # Create acnhor
+    #
+    # @return [String] anchor
+    #
+    def anchor
+      "RFC#{docnum}"
+    end
+
     #
     # Create link
     #
     # @return [Array<RelatonBib::TypedUri>] 
     #
     def parse_link
-      num = code[-4..-1].sub(/^0+/, "")
-      url = "https://www.rfc-editor.org/info/rfc#{num}"
+      url = "https://www.rfc-editor.org/info/rfc#{docnum}"
       [RelatonBib::TypedUri.new(content: url, type: "src")]
     end
 
@@ -256,11 +264,13 @@ module RelatonIetf
     # @return [RelatonBib::EditorialGroup] document editorial group
     #
     def parse_editorialgroup
-      tc = @doc.xpath("./xmlns:wg_acronym").map do |wg|
+      tc = @doc.xpath("./xmlns:wg_acronym").each_with_object([]) do |wg, arr|
+        next if wg.text == "NON WORKING GROUP"
+
         wg = RelatonBib::WorkGroup.new(name: wg.text)
-        RelatonBib::TechnicalCommittee.new(wg)
+        arr << RelatonBib::TechnicalCommittee.new(wg)
       end
-      RelatonBib::EditorialGroup.new(tc)
+      RelatonBib::EditorialGroup.new(tc) if tc.any?
     end
   end
 end

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -19,7 +19,7 @@ module RelatonIetf
     #
     # @param [Nokogiri::XML::Element] doc document
     #
-    # @return [RelatonIetf:IetfBibliographicItem, nil]
+    # @return [RelatonIetf::IetfBibliographicItem, nil]
     #
     def self.parse(doc)
       doc_id = doc.at("./xmlns:doc-id")
@@ -55,7 +55,7 @@ module RelatonIetf
     def parse_docid
       [
         RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true),
-        RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: @doc_id),
+        RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: anchor),
       ]
     end
 

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.10.2".freeze
+  VERSION = "1.10.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.10.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml