relaton-ietf 1.9.7 → 1.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38c6632f8b954cf88746dac6e0560294cf8c546063e774f1b717dec2a4f0a9d8
-  data.tar.gz: dcf250a7d8c88a06ba9be27ba3d69bcbe3f5e50b3d41ee1616834011d6b2995c
+  metadata.gz: 158773d0da39dc2b3e8829cc5e8873820c3f58ff9589887af1d52e0d946a384d
+  data.tar.gz: eeac44410467846a7f79eee9291c088b261792b2c44c8ac759f4f00a85beac8f
 SHA512:
-  metadata.gz: 55bb6cdf657772970caa7447097da8e38686aa7c0cc16a40e8f931963ecd26202ed1aed62a8c77269d8d0f49cf4e890002b8d4a2831235f566023dc3b13a06eb
-  data.tar.gz: cfb86b6c8f4a52a19ff52ecb93d0ca9211159f8499a782f2aa3904ae089d0f1f6ae7c9f96e00f532c7502cc4a718d0ebb9b6784e2d9f3d9ebc2b180489fc0b0a
+  metadata.gz: f3ee4c3add2574937638ed5975a46f2fdc4d0dbd7013cd7fdf83741016715dafec8921210dff398310c402926b6ad6605458fd7c9a02d3c6ccbce4ed3dc56c84
+  data.tar.gz: 1ed33f92838279279361975a75b8d3f6bdd54a91959b1142c901686a5bcf6f5cdf7747a74effffe41f689fd05e2a0970463dbe71e108eeaeef0d8b1e38391e0a

data/README.adoc

@@ -138,7 +138,7 @@ RelatonIetf::IetfBibliographicItem.from_hash hash
 There is a 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` - https://www.ietf.org/lib/dt/sprint/bibxml-ids.tgz
+- `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.
 - `ietf-rfc-entries` - https://www.rfc-editor.org/rfc-index.xml (`<rfc-entry>`)
 
 The method `RelatonIetf::DataFetcher.fetch(source, output: "data", format: "yaml")` converts all the documents from the dataset and save them to the `./data` folder in YAML format.

data/lib/relaton_ietf/data_fetcher.rb

@@ -1,6 +1,6 @@
-require "rubygems"
-require "rubygems/package"
-require "zlib"
+# require "rubygems"
+# require "rubygems/package"
+# require "zlib"
 require "relaton_ietf/rfc_index_entry"
 require "relaton_ietf/rfc_entry"
 
@@ -64,16 +64,19 @@ module RelatonIetf
     # Fetches ietf-internet-drafts documents
     #
     def fetch_ieft_internet_drafts # rubocop:disable Metrics/MethodLength
-      gz = OpenURI.open_uri("https://www.ietf.org/lib/dt/sprint/bibxml-ids.tgz")
-      z = Zlib::GzipReader.new(gz)
-      io = StringIO.new(z.read)
-      z.close
-      Gem::Package::TarReader.new io do |tar|
-        tar.each do |tarfile|
-          next if tarfile.directory?
+      # gz = OpenURI.open_uri("https://www.ietf.org/lib/dt/sprint/bibxml-ids.tgz")
+      # z = Zlib::GzipReader.new(gz)
+      # io = StringIO.new(z.read)
+      # z.close
+      # Gem::Package::TarReader.new io do |tar|
+      #   tar.each do |tarfile|
+      #     next if tarfile.directory?
 
-          save_doc RelatonBib::BibXMLParser.parse(tarfile.read)
-        end
+      #     save_doc BibXMLParser.parse(tarfile.read)
+      #   end
+      # end
+      Dir["bibxml-ids/*.xml"].each do |file|
+        save_doc BibXMLParser.parse(File.read(file, encoding: "UTF-8"))
       end
     end
 

data/lib/relaton_ietf/rfc_entry.rb

@@ -51,7 +51,10 @@ module RelatonIetf
     # @return [Array<RelatonBib::DocumentIdettifier>] document identifiers
     #
     def parse_docid
-      ids = [RelatonBib::DocumentIdentifier.new(id: pub_id, type: "IETF")]
+      ids = [
+        RelatonBib::DocumentIdentifier.new(id: pub_id, type: "IETF"),
+        RelatonBib::DocumentIdentifier.new(id: code, type: "IETF", scope: "anchor"),
+      ]
       doi = @doc.at("./xmlns:doi").text
       ids << RelatonBib::DocumentIdentifier.new(id: doi, type: "DOI")
       ids
@@ -73,7 +76,8 @@ module RelatonIetf
     # @return [String] PubID
     #
     def pub_id
-      "IETF #{code.sub(/^(RFC)(\d+)/, '\1 \2')}"
+      /^RFC(?<num>\d+)$/ =~ code
+      "RFC #{num.sub(/^0+/, '')}"
     end
 
     #

data/lib/relaton_ietf/rfc_index_entry.rb

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

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.9.7".freeze
+  VERSION = "1.9.11".freeze
 end

data/relaton_ietf.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", ">= 1.9.12"
-  spec.add_dependency "zlib", "~> 1.1.0"
+  spec.add_dependency "relaton-bib", ">= 1.9.19"
+  # spec.add_dependency "zlib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.9.7
+  version: 1.9.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-28 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,28 +128,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.12
+        version: 1.9.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.12
-- !ruby/object:Gem::Dependency
-  name: zlib
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.9.19
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: