relaton-ietf 1.11.3 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53c7e68edafd4a51e8b08f0b169318d1864a0fba32327f9ceaf2eb7968048c97
-  data.tar.gz: 8b75d635bbc3e97c9cb7a680ed0c657d50614a5313babe1ac5759dd0e1c584c4
+  metadata.gz: bb60963a99c05a4f4ce71a2f896e6f6a4ba4d5aca27affbb5a5f224671e2fa35
+  data.tar.gz: 11fedecf896b30c5fedf546eb683ef5f5cfc1c58eab735155a2d5a394b585733
 SHA512:
-  metadata.gz: bcdaea6abeb068ad1a23bd9e2ba3f5792c1eeccd06b90586f8307aa005f3204f6cd135ac96b38b5ac60a1a38e70980ec3ff3163255eb5b79254f60bba8be9732
-  data.tar.gz: 2f2ce84d3898691e786fc598963842f68e36ea0ee2a9ee179d131d00ab1ce724860938e40caedbb4cf06adf1cafceffdbd9109e481ae8142453f804c80349088
+  metadata.gz: dfff8e3c6390dbeadc59c8a2e3779520e13042adc3b752556111ac61851bbd30612799bd9c9296d919d88ca79188454ecf292f9afe4979053d67a0a03b699d3a
+  data.tar.gz: 0f3224b2e6272bc570bdb9d705c9d3e3dfa3ec8f47019e46dee266ef11f8803a74be0fbbd8c604b9e84ae4fd7b473857dab03aac61a23a0df52a363a260620b7

data/.github/workflows/rake.yml

@@ -10,27 +10,4 @@ on:
 
 jobs:
   rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: ['3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      # https://github.com/ruby-debug/debase/issues/89#issuecomment-686827382
-      - if: matrix.os == 'macos-latest' && matrix.ruby == '2.5'
-        run: echo BUNDLE_BUILD__DEBASE="--with-cflags=\"-Wno-error=implicit-function-declaration\"" >> $GITHUB_ENV
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
+    uses: relaton/support/.github/workflows/rake.yml@master

data/README.adoc

@@ -47,10 +47,10 @@ item = RelatonIetf::IetfBibliography.get 'IETF RFC 8341'
 ...
 
 # Fetch Internet-Draft document
-RelatonIetf::IetfBibliography.get 'IETF I-D.abarth-cake-02'
-[relaton-ietf] ("IETF I-D.abarth-cake-02") fetching...
-[relaton-ietf] ("IETF I-D.abarth-cake-02") found I-D.abarth-cake
-=> #<RelatonIetf::IetfBibliographicItem:0x00007fa7c81688f8
+RelatonIetf::IetfBibliography.get 'IETF I-D.draft-abarth-cake-01'
+[relaton-ietf] ("IETF I-D.draft-abarth-cake-01") fetching...
+[relaton-ietf] ("IETF I-D.draft-abarth-cake-01") found draft-abarth-cake-01
+=> #<RelatonIetf::IetfBibliographicItem:0x00007fdd129bbeb8
 ...
 
 # Return nil if document doesn't exist.
@@ -65,12 +65,12 @@ RelatonIetf::IetfBibliography.get 'IETF 1111'
 [source,ruby]
 ----
 item.to_xml
-=>"<bibitem id="RFC8341">
-  <fetched>2019-06-05</fetched>
-  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+=>"<bibitem id="RFC8341" type="standard">
+  <fetched>2022-06-10</fetched>
+  <title type="main" format="text/plain">Network Configuration Access Control Model</title>
   <uri type="src">https://www.rfc-editor.org/info/rfc8341</uri>
-  <docidentifier type="IETF">RFC 8341</docidentifier>
-  <docidentifier type=\"rfc-anchor\">RFC8341</docidentifier>
+  <docidentifier type="IETF" primary="true">RFC 8341</docidentifier>
+  <docidentifier type="IETF" scope="anchor">RFC8341</docidentifier>
   <docidentifier type="DOI">10.17487/RFC8341</docidentifier>
   ....
 </bibitem>"
@@ -79,13 +79,15 @@ With `bibdata: true` option XML output wrapped with `bibdata` element and `ext`
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=>"<bibdata>
-  <fetched>2019-06-05</fetched>
-  <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
+=>"<bibdata type="standard">
+  <fetched>2022-06-10</fetched>
+  <title type="main" format="text/plain">Network Configuration Access Control Model</title>
   <uri type="src">https://www.rfc-editor.org/info/rfc8341</uri>
   ...
   <ext>
-    <doctype>rfc</doctype>
+    <editorialgroup>
+      <committee>netconf</committee>
+    </editorialgroup>
   </ext>
 </bibdata>"
 ----

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

@@ -9,6 +9,16 @@ module RelatonIetf
       def bib_item(item)
         IetfBibliographicItem.new(**item)
       end
+
+      # @param ret [Hash]
+      def editorialgroup_hash_to_bib(ret)
+        return unless ret[:editorialgroup]
+
+        technical_committee = array(ret[:editorialgroup]).map do |wg|
+          Committee.new RelatonBib::WorkGroup.new(**wg)
+        end
+        ret[:editorialgroup] = RelatonBib::EditorialGroup.new technical_committee
+      end
     end
   end
 end

data/lib/relaton_ietf/processor.rb

@@ -6,7 +6,7 @@ module RelatonIetf
     def initialize # rubocop:disable Lint/MissingSuper
       @short = :relaton_ietf
       @prefix = "IETF"
-      @defaultprefix = /^(IETF|RFC|BCP)\s/
+      @defaultprefix = /^(IETF|RFC|BCP|FYI|STD)\s/
       @idtype = "IETF"
       @datasets = %w[ietf-rfcsubseries ietf-internet-drafts ietf-rfc-entries]
     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

@@ -5,7 +5,9 @@ module RelatonIetf
   module Scrapper
     extend Scrapper
 
-    GH_URL = "https://raw.githubusercontent.com/relaton/relaton-data-ietf/master/data/reference."
+    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/"
 
     # @param text [String]
     # @param is_relation [TrueClass, FalseClass]
@@ -13,8 +15,7 @@ module RelatonIetf
     def scrape_page(text, is_relation: false)
       # Remove initial "IETF " string if specified
       ref = text.gsub(/^IETF /, "")
-      /^(?:RFC|BCP|FYI|STD)\s(?<num>\d+)/ =~ ref
-      ref.sub!(/(?<=^(?:RFC|BCP|FYI|STD)\s)(\d+)/, num.rjust(4, "0")) if num
+      ref.sub!(/(?<=^(?:RFC|BCP|FYI|STD))\s(\d+)/) { $1.rjust 4, "0" }
       rfc_item ref, is_relation
     rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
            Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
@@ -28,17 +29,19 @@ module RelatonIetf
     # @param is_relation [Boolen, nil]
     # @return [RelatonIetf::IetfBibliographicItem]
     def rfc_item(ref, is_relation)
-      /(?<=-)(?<ver>\d{2})$/ =~ ref
-      if /^I-D/.match? ref
-        ref.sub!(/-\d{2}/, "") if ver
-        ref.sub!(/(?<=I-D\.)draft-/, "")
-      end
-
-      uri = "#{GH_URL}#{ref.sub(/\s|\u00a0/, '.')}.xml"
-      # 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), is_relation: is_relation, ver: ver
+      ghurl = case ref
+              when /^RFC/ then RFC
+              when /^(?:BCP|FYI|STD)/ then RSS
+              when /^I-D/
+                ref.sub!(/^I-D\./, "")
+                IDS
+              else return
+              end
+
+      uri = "#{ghurl}#{ref.sub(/\s|\u00a0/, '.')}.yaml"
+      # BibXMLParser.parse get_page(uri), is_relation: is_relation, ver: ver
+      resp = get_page uri
+      IetfBibliographicItem.from_hash YAML.safe_load(resp) if resp
     end
 
     # @param uri [String]

data/lib/relaton_ietf/version.rb

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

data/lib/relaton_ietf/xml_parser.rb

@@ -11,6 +11,21 @@ module RelatonIetf
       def bib_item(item_hash)
         IetfBibliographicItem.new(**item_hash)
       end
+
+      # @param ext [Nokogiri::XML::Element]
+      # @return [RelatonBib::EditorialGroup, nil]
+      def fetch_editorialgroup(ext)
+        return unless ext && (eg = ext.at "editorialgroup")
+
+        eg = eg.xpath("committee").map do |tc|
+          wg = RelatonBib::WorkGroup.new(
+            name: tc.text, number: tc[:number]&.to_i, type: tc[:type],
+            identifier: tc[:identifier], prefix: tc[:prefix]
+          )
+          Committee.new wg
+        end
+        RelatonBib::EditorialGroup.new eg if eg.any?
+      end
     end
   end
 end

metadata

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