relaton-ietf 1.9.12 → 1.10.2

data/grammars/reqt.rng

@@ -64,9 +64,9 @@
     <optional>
       <ref name="label"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="subject"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="reqinherit"/>
     </zeroOrMore>
@@ -80,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -105,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -138,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>

data/lib/relaton_ietf/bibxml_parser.rb

@@ -3,18 +3,31 @@ module RelatonIetf
     include RelatonBib::BibXMLParser
     extend BibXMLParser
 
-    FLAVOR = "IETF".freeze
-
     # @param attrs [Hash]
     # @return [RelatonIetf::IetfBibliographicItem]
     def bib_item(**attrs)
       unless attrs.delete(:is_relation)
         attrs[:fetched] = Date.today.to_s
-        attrs[:place] = ["Fremont, CA"]
+        # attrs[:place] = ["Fremont, CA"]
       end
       RelatonIetf::IetfBibliographicItem.new(**attrs)
     end
 
+    #
+    # Extract document identifier type form identifier
+    #
+    # @param [String] id identifier
+    #
+    # @return [String] type
+    #
+    def pubid_type(id)
+      type = super
+      case type
+      when "BCP", "FYI", "STD", "RFC" then "RFC"
+      else "IETF"
+      end
+    end
+
     # @param [RelatonBib::WorkGroup]
     # @return [RelatonIetf::Committee]
     def committee(wgr)
@@ -24,7 +37,10 @@ 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
+      [{
+        entity: new_org("Internet Engineering Task Force", "IETF"),
+        role: [type: "publisher"],
+      }] + super
       # persons(reference) + organizations(reference)
     end
   end

data/lib/relaton_ietf/data_fetcher.rb

@@ -64,17 +64,6 @@ 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?
-
-      #     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
@@ -83,6 +72,9 @@ module RelatonIetf
     def fetch_ieft_rfcs
       rfc_index.xpath("xmlns:rfc-entry").each do |doc|
         save_doc RfcEntry.parse(doc)
+      rescue StandardError => e
+        warn "Error parsing #{doc.at('./xmlns:doc-id').text}: #{e.message}"
+        warn e.backtrace[0..5].join("\n")
       end
     end
 

data/lib/relaton_ietf/rfc_entry.rb

@@ -67,7 +67,7 @@ module RelatonIetf
     #
     def parse_docid
       ids = [
-        RelatonBib::DocumentIdentifier.new(id: pub_id, type: "IETF"),
+        RelatonBib::DocumentIdentifier.new(id: pub_id, type: "IETF", primary: true),
         RelatonBib::DocumentIdentifier.new(id: code, type: "IETF", scope: "anchor"),
       ]
       doi = @doc.at("./xmlns:doi").text
@@ -142,19 +142,66 @@ module RelatonIetf
     #
     # @return [Array<RelatonBib::ContributionInfo>] document contributors
     #
-    def parse_contributor
-      @doc.xpath("./xmlns:author").map do |contributor|
+    def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity
+      @doc.xpath("./xmlns:author").map do |contributor| # rubocop:disable Metrics/BlockLength
         n = contributor.at("./xmlns:name").text
-        int, snm = n.split
-        initial = [RelatonBib::LocalizedString.new(int, "en", "Latn")]
-        surname = RelatonBib::LocalizedString.new(snm, "en", "Latn")
-        name = RelatonBib::LocalizedString.new(n, "en", "Latn")
-        fname = RelatonBib::FullName.new(completename: name, initial: initial, surname: surname)
-        person = RelatonBib::Person.new(name: fname)
-        RelatonBib::ContributionInfo.new(entity: person, role: [{ type: "author" }])
+        case n
+        when "ISO"
+          entity = RelatonBib::Organization.new(abbrev: n, name: "International Organization for Standardization")
+        when "International Organization for Standardization"
+          entity = RelatonBib::Organization.new(abbrev: "ISO", name: n)
+        when "IAB"
+          entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Architecture Board")
+        when "IESG"
+          entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Engineering Steering Group")
+        when "Internet Engineering Steering Group", "Federal Networking Council", "Internet Architecture Board",
+          "Internet Activities Board", "Defense Advanced Research Projects Agency", "National Science Foundation",
+          "National Research Council", "National Bureau of Standards"
+          abbr = n.split.map { |w| w[0] if w[0] == w[0].upcase }.join
+          entity = RelatonBib::Organization.new(abbrev: abbr, name: n)
+        when "IETF Secretariat"
+          entity = RelatonBib::Organization.new(abbrev: "IETF", name: n)
+        when "Audio-Video Transport Working Group", /North American Directory Forum/, "EARN Staff",
+          "Vietnamese Standardization Working Group", "ACM SIGUCCS", "ESCC X.500/X.400 Task Force",
+          "Sun Microsystems", "NetBIOS Working Group in the Defense Advanced Research Projects Agency",
+          "End-to-End Services Task Force", "Network Technical Advisory Group", "Bolt Beranek",
+          "Newman Laboratories", "Gateway Algorithms and Data Structures Task Force",
+          "Network Information Center. Stanford Research Institute", "RFC Editor",
+          "Information Sciences Institute University of Southern California"
+          entity = RelatonBib::Organization.new(name: n)
+        when "Internet Assigned Numbers Authority (IANA)"
+          entity = RelatonBib::Organization.new(abbrev: "IANA", name: "Internet Assigned Numbers Authority")
+        when "ESnet Site Coordinating Comittee (ESCC)"
+          entity = RelatonBib::Organization.new(abbrev: "ESCC", name: "ESnet Site Coordinating Comittee")
+        when "Energy Sciences Network (ESnet)"
+          entity = RelatonBib::Organization.new(abbrev: "ESnet", name: "Energy Sciences Network")
+        when "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union"
+          entity = RelatonBib::Organization.new(abbrev: "CCITT", name: n)
+        else
+          # int, snm = n.split
+          /^(?:(?<int>(?:\p{Lu}+(?:-\w|\(\w\))?\.{0,2}[-\s]?)+)\s)?(?<snm>[[:alnum:]\s'-.]+)$/ =~ n
+          surname = RelatonBib::LocalizedString.new(snm, "en", "Latn")
+          name = RelatonBib::LocalizedString.new(n, "en", "Latn")
+          fname = RelatonBib::FullName.new(completename: name, initial: initials(int), surname: surname)
+          entity = RelatonBib::Person.new(name: fname)
+        end
+        RelatonBib::ContributionInfo.new(entity: entity, role: [{ type: "author" }])
       end
     end
 
+    #
+    # Ctreat initials
+    #
+    # @param [String] int
+    #
+    # @return [Array<RelatonBib::LocalizedString>]
+    #
+    def initials(int)
+      return [] unless int
+
+      int.split(/\.-?\s?|\s/).map { |i| RelatonBib::LocalizedString.new i, "en", "Latn" }
+    end
+
     #
     # Parse document keywords
     #

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -54,7 +54,7 @@ module RelatonIetf
 
     def parse_docid
       [
-        RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id),
+        RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true),
         RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: @doc_id),
       ]
     end

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.9.12".freeze
+  VERSION = "1.10.2".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.19"
+  spec.add_dependency "relaton-bib", "~> 1.10.1"
   # 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.12
+  version: 1.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -126,16 +126,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.19
+        version: 1.10.1
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: