relaton-ietf 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeb4af4144610491bf2bea9e39dc33eb0df67f8a64c67302b2a503a07d3e8fc8
-  data.tar.gz: 9e3ec1c20c3c987449cc438c88045b445c1a4196a53aee5a0e5b00b6a038aef4
+  metadata.gz: d095dbbd95a78f345ce51149c8fcea964014f3e7aeef7b96ee4021df52900e60
+  data.tar.gz: f240f8d05275819b620455f743bf4d31d096ca1f0bd4de9c594cd2d163b6fc0e
 SHA512:
-  metadata.gz: d24d58dae25d535ce8fde08676e244e8435ab9d20fbbd5d9eb6b6f6c620e377686cf3436f49df145d7016a16a3713a6bc65955f1e8d8062ac84953d6cc67796e
-  data.tar.gz: 056caff1d268d56dc15049714784edb13ff25339fded08b8b2833ec95d843ccfe82855ebeece50f1f126c30c6bc9461af9d937451f9856bd53547b486434ae21
+  metadata.gz: fc7e74b30da9eb8c26d1b45e11511b0e2f17ff08eb0354b15e2445515c98d28d985e5582f09cbb2ab966916e872fdafe56b00b0e9a2148c80a1aa9fdc6b8b37e
+  data.tar.gz: e89482fa9042118c3cdece897e1c976d889986d374a89105aebe41c414cf57d6ad41f7ffb5e4b92bcb9d0f87e3f9ee79cf64b64dcde0ebe50127aa9ad16ad091

data/lib/relaton_ietf/ietf_bibliographic_item.rb

@@ -45,33 +45,15 @@ module RelatonIetf
     end
 
     #
-    # Render date as BibXML. Override to skip IANA docidentifiers
+    # Render BibXML (RFC)
     #
-    # @param [Nokogiri::XML::Builder] builder xml builder
+    # @param [Nokogiri::XML::Builder, nil] builder
+    # @param [Boolean] include_keywords (false)
     #
-    def render_date(builder)
-      return if docidentifier.detect { |i| i.type == "IANA" }
-
-      super
-    end
-
+    # @return [String, Nokogiri::XML::Builder::NodeBuilder] XML
     #
-    # Render authors as BibXML. Override to skip "RFC Publisher" organization
-    #
-    # @param [Nokogiri::XML::Builder] builder xml builder
-    #
-    def render_authors(builder) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      contributor.each do |c|
-        next if c.entity.is_a?(Organization) && c.entity.name.map(&:content).include?("RFC Publisher")
-
-        builder.author do |xml|
-          xml.parent[:role] = "editor" if c.role.detect { |r| r.type == "editor" }
-          if c.entity.is_a?(Person) then render_person xml, c.entity
-          else render_organization xml, c.entity, c.role
-          end
-          render_address xml, c
-        end
-      end
+    def to_bibxml(builder = nil, include_keywords: false)
+      Renderer::BibXML.new(self).render builder: builder, include_keywords: include_keywords
     end
   end
 end

data/lib/relaton_ietf/renderer/bibxml.rb

@@ -0,0 +1,33 @@
+module RelatonIetf
+  module Renderer
+    class BibXML < RelatonBib::Renderer::BibXML
+      #
+      # Render dates as BibXML. Override to skip IANA date rendering.
+      #
+      # @param [Nokogiri::XML::Builder] builder xml builder
+      #
+      def render_date(builder)
+        super unless @bib.docidentifier.detect { |i| i.type == "IANA" }
+      end
+
+      #
+      # Render authors as BibXML. Override to skip "RFC Publisher" organization.
+      #
+      # @param [Nokogiri::XML::Builder] builder xml builder
+      #
+      def render_authors(builder) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        @bib.contributor.each do |c|
+          next if c.entity.is_a?(RelatonBib::Organization) && c.entity.name.map(&:content).include?("RFC Publisher")
+
+          builder.author do |xml|
+            xml.parent[:role] = "editor" if c.role.detect { |r| r.type == "editor" }
+            if c.entity.is_a?(RelatonBib::Person) then render_person xml, c.entity
+            else render_organization xml, c.entity, c.role
+            end
+            render_address xml, c
+          end
+        end
+      end
+    end
+  end
+end

data/lib/relaton_ietf/rfc_entry.rb

@@ -52,11 +52,22 @@ module RelatonIetf
     #
     def parse_series
       title = RelatonBib::TypedTitleString.new(content: "RFC")
+      series_is_also + seires_stream + [RelatonBib::Series.new(title: title, number: docnum)]
+    end
+
+    def series_is_also
       @doc.xpath("./xmlns:is-also/xmlns:doc-id").map do |s|
         /^(?<name>\D+)(?<num>\d+)/ =~ s.text
         t = RelatonBib::TypedTitleString.new(content: name)
         RelatonBib::Series.new title: t, number: num.gsub(/^0+/, "")
-      end + [RelatonBib::Series.new(title: title, number: docnum)]
+      end
+    end
+
+    def seires_stream
+      @doc.xpath("./xmlns:stream").map do |s|
+        t = RelatonBib::TypedTitleString.new content: s.text
+        RelatonBib::Series.new type: "stream", title: t
+      end
     end
 
     #

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -46,6 +46,7 @@ module RelatonIetf
         link: parse_link,
         formattedref: formattedref,
         relation: parse_relation,
+        series: parse_series,
       )
     end
 
@@ -73,10 +74,7 @@ module RelatonIetf
     # @return [Array<RelatonBib::DocumentIdentifier>] docidentifiers
     #
     def parse_docid
-      [
-        RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true),
-        # RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: anchor),
-      ]
+      [RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true)]
     end
 
     #
@@ -100,7 +98,7 @@ module RelatonIetf
     #
     # Create link
     #
-    # @return [Array<RelatonBib::TypedUri>] 
+    # @return [Array<RelatonBib::TypedUri>]
     #
     def parse_link
       [RelatonBib::TypedUri.new(type: "src", content: "https://www.rfc-editor.org/info/#{@name}#{@shortnum}")]
@@ -109,7 +107,7 @@ module RelatonIetf
     #
     # Create formatted reference
     #
-    # @return [RelatonBib::FormattedRef] 
+    # @return [RelatonBib::FormattedRef]
     #
     def formattedref
       RelatonBib::FormattedRef.new(
@@ -131,5 +129,12 @@ module RelatonIetf
         { type: "includes", bibitem: bib }
       end
     end
+
+    def parse_series
+      @doc.xpath("./xmlns:stream").map do |s|
+        title = RelatonBib::TypedTitleString.new content: s.text
+        RelatonBib::Series.new type: "stream", title: title
+      end
+    end
   end
 end

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.14.2".freeze
+  VERSION = "1.14.3".freeze
 end

data/lib/relaton_ietf.rb

@@ -8,6 +8,7 @@ require "relaton_ietf/ietf_bibliography"
 require "relaton_ietf/xml_parser"
 require "relaton_ietf/hash_converter"
 require "relaton_ietf/data_fetcher"
+require "relaton_ietf/renderer/bibxml"
 require "relaton/provider_ietf"
 
 module RelatonIetf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-24 00:00:00.000000000 Z
+date: 2023-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -171,6 +171,7 @@ files:
 - lib/relaton_ietf/ietf_bibliographic_item.rb
 - lib/relaton_ietf/ietf_bibliography.rb
 - lib/relaton_ietf/processor.rb
+- lib/relaton_ietf/renderer/bibxml.rb
 - lib/relaton_ietf/rfc_entry.rb
 - lib/relaton_ietf/rfc_index_entry.rb
 - lib/relaton_ietf/scrapper.rb