relaton-ietf 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8668aa18254f8c9c0dd9f0a6b47b8d8c3b83e9795ef2ece6d422962cb894e6a
-  data.tar.gz: 5c47519efd521568f671c7e56148133f3d3155d3a3057829b6c735df6be887f5
+  metadata.gz: bb60963a99c05a4f4ce71a2f896e6f6a4ba4d5aca27affbb5a5f224671e2fa35
+  data.tar.gz: 11fedecf896b30c5fedf546eb683ef5f5cfc1c58eab735155a2d5a394b585733
 SHA512:
-  metadata.gz: ffadb9d261290bc847c5ef4d56a85eaee3eee4d6ddab429e56b350dca0c30c78fb35c155e59c65dc00889cf7a33d7d821545215bd372a8457ec73cacabbdf8f3
-  data.tar.gz: 6b5262d9b858af95a5c0afccb2c09f109bdd6edf3ad85c5552988c8193bd1107e00ee2ee4f1751334d0d5eccb50eef9b0d8f8494887cbdc1bb835f148563e2ba
+  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/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/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.5".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.5
+  version: 1.11.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml