relaton-ietf 1.13.4 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db91bbb481894890a4cbeaa2be2360cdec706ed70032802445be832c563894cb
-  data.tar.gz: 46d9f9e438e4dbe4d42f8d12c6236c864677a56940358abf87a314987ac22579
+  metadata.gz: 8d5d9ec768b99a9f7dc61438afe510562005322438b5fff41fe04069111d73e0
+  data.tar.gz: 410398ba75786d32f94fb8e90303f507e6842b5eee84d57c3647bee8d539975c
 SHA512:
-  metadata.gz: cc5e578aa8f3669bd0a4edea2de81ec2b4413d4c35c569458bf8b30ac4f8d05e777aaf7180d4c2488041cfc8f0963e4730cb7364668e95c0f166bd81f189e84d
-  data.tar.gz: 64ff855b716bc70c09c3790bf7bb24fb2d208aee7ef92080d74d72e1a4425183d4ccf0d3ed33530c8a63fe41260cbac589618e82b3f0c12280dfcd4715e2f4fb
+  metadata.gz: 2bf9b65a7fd0e7b4702ddf9b35e8be78a308dccfaa85b83b9def4ea37192718abced81fb02e58d356ee600b421cde8deb190e8e3ffa10adc5882fad10b6db92b
+  data.tar.gz: 1edd378c32a456117f226dbef2b851f761e50e618b8962e022df096ac1557f7f081b1010c5e1cd22986b92b3bb593d58848703105631eb4f01b612f5e8fe3456

data/lib/relaton_ietf/bibxml_parser.rb

@@ -3,25 +3,6 @@ module RelatonIetf
     include RelatonBib::BibXMLParser
     extend BibXMLParser
 
-    FULLNAMEORG = [
-      "IAB", "Internet Architecture Board", "IAB and IESG", "IESG",
-      "IAB Advisory Committee", "Internet Engineering Steering Group",
-      "Network Information Center. Stanford Research Institute",
-      "Information Sciences Institute University of Southern California",
-      "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union",
-      "National Bureau of Standards", "International Organization for Standardization",
-      "National Research Council", "Gateway Algorithms and Data Structures Task Force",
-      "National Science Foundation", "Network Technical Advisory Group",
-      "NetBIOS Working Group in the Defense Advanced Research Projects Agency",
-      "Internet Activities Board", "End-to-End Services Task Force",
-      "Defense Advanced Research Projects Agency", "The North American Directory Forum",
-      "ESCC X.500/X.400 Task Force", "ESnet Site Coordinating Comittee (ESCC)",
-      "Energy Sciences Network (ESnet)", "RARE WG-MSG Task Force 88",
-      "Internet Assigned Numbers Authority (IANA)", "Federal Networking Council",
-      "Audio-Video Transport Working Group", "KOI8-U Working Group",
-      "The Internet Society", "Sun Microsystems"
-    ].freeze
-
     # @param attrs [Hash]
     # @return [RelatonIetf::IetfBibliographicItem]
     def bib_item(**attrs)
@@ -68,30 +49,107 @@ module RelatonIetf
       contribs + super
     end
 
+    def person(author, reference)
+      full_name_org(author[:fullname]) || super
+    end
+
+    def full_name_org(name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity
+      case name
+      when "ISO"
+        RelatonBib::Organization.new(abbreviation: name, name: "International Organization for Standardization")
+      when "IAB"
+        RelatonBib::Organization.new(abbreviation: name, name: "Internet Architecture Board")
+      when "IESG"
+        RelatonBib::Organization.new(abbreviation: name, name: "Internet Engineering Steering Group")
+      when "IANA"
+        RelatonBib::Organization.new(abbreviation: name, name: "Internet Assigned Numbers Authority")
+      when "International Organization for Standardization"
+        RelatonBib::Organization.new(abbreviation: "ISO", name: name)
+      when "Federal Networking Council", "Internet Architecture Board", "Internet Activities Board",
+        "Defense Advanced Research Projects Agency", "National Science Foundation",
+        "National Research Council", "National Bureau of Standards",
+        "Internet Engineering Steering Group"
+        abbr = name.split.map { |w| w[0] if w[0] == w[0].upcase }.join
+        RelatonBib::Organization.new(abbreviation: abbr, name: name)
+      when "IETF Secretariat"
+        RelatonBib::Organization.new(abbreviation: "IETF", name: name)
+      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", "IAB and IESG",
+        "RARE WG-MSG Task Force 88", "KOI8-U Working Group", "The Internet Society",
+        "IAB Advisory Committee", "ISOC Board of Trustees", "Mitra", "RFC Editor, et al."
+        RelatonBib::Organization.new(name: name)
+      when "Internet Assigned Numbers Authority (IANA)"
+        RelatonBib::Organization.new(abbreviation: "IANA", name: "Internet Assigned Numbers Authority (IANA)")
+      when "ESnet Site Coordinating Comittee (ESCC)"
+        RelatonBib::Organization.new(abbreviation: "ESCC", name: "ESnet Site Coordinating Comittee (ESCC)")
+      when "Energy Sciences Network (ESnet)"
+        RelatonBib::Organization.new(abbreviation: "ESnet", name: "Energy Sciences Network (ESnet)")
+      when "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union"
+        RelatonBib::Organization.new(abbreviation: "CCITT", name: name)
+      end
+    end
+
     #
     # Overrade RelatonBib::BibXMLParser#full_name method
     #
-    # @param author [Nokogiri::XML::Element]
-    # @param reference [Nokogiri::XML::Element]
+    # @param fname [String] full name
+    # @param sname [String, nil] surname
+    # @param fname [String, nil] first name
+    # @param lang [String, nil] language
+    # @param script [String, nil] script
     #
     # @return [RelatonBib::FullName]
     #
-    def full_name(author, reference)
-      lang = language reference
-      sname, inits = parse_surname_initials author
-      initials = localized_string(inits, lang)
+    def full_name(fname, sname, inits, lang, script = nil)
+      surname, ints, name = parse_surname_initials fname, sname, inits
+      initials = localized_string(ints, lang, script)
       RelatonBib::FullName.new(
-        completename: localized_string(author[:fullname], lang),
-        initials: initials, forename: forename(inits, lang),
-        surname: localized_string(sname, lang)
+        completename: localized_string(fname, lang, script),
+        initials: initials, forename: forename(ints, name, lang, script),
+        surname: localized_string(surname, lang, script)
       )
     end
 
-    def parse_surname_initials(author)
-      regex = /(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/
-      surname = author[:surname] || author[:fullname].sub(regex, "").strip
-      inits = author[:initials] || regex.match(author[:fullname])&.to_s&.strip
-      [surname, inits]
+    #
+    # Create forenames with initials
+    #
+    # @param [String] initials initials
+    # @param [String] lang language
+    #
+    # @return [Array<RelatonBib::Forename>] forenames
+    #
+    def forename(initials, name, lang = nil, script = nil)
+      fnames = []
+      if name
+        fnames << RelatonBib::Forename.new(content: name, language: lang, script: script)
+      end
+      return fnames unless initials
+
+      initials.split(/\.-?\s?|\s/).each_with_object(fnames) do |i, a|
+        a << RelatonBib::Forename.new(initial: i, language: lang, script: script)
+      end
+    end
+
+    #
+    # Parse name, surname, and initials from full name
+    #
+    # @param [String] fname full name
+    # @param [String, nil] sname surname
+    # @param [String, nil] inits
+    #
+    # @return [Array<String, nil>] surname, initials, forename
+    #
+    def parse_surname_initials(fname, sname, inits)
+      regex = /(?:(?<name>\w{3,})\s)?(?<inits>(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+)?/
+      match = fname.match(regex)
+      surname = sname || fname.sub(regex, "").strip
+      initials = inits || match[:inits]&.strip
+      [surname, initials, match[:name]]
     end
   end
 end

data/lib/relaton_ietf/rfc_entry.rb

@@ -149,48 +149,12 @@ module RelatonIetf
     #
     # @return [Array<RelatonBib::ContributionInfo>] document contributors
     #
-    def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      @doc.xpath("./xmlns:author").map do |contrib| # rubocop:disable Metrics/BlockLength
-        n = contrib.at("./xmlns:name").text
-        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 /#{RelatonBib::BibXMLParser::FULLNAMEORG.join("|")}/
-          abbr = n.upcase == n ? n : n.split.reduce([]) { |a, w| w == w.upcase ? break : a << w[0] }&.join
-          entity = RelatonBib::Organization.new(abbrev: abbr, name: n)
-        when "Federal Networking Council", "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",
-          "RARE WG-MSG Task Force 88", "KOI8-U Working Group", "The Internet Society"
-          entity = RelatonBib::Organization.new(name: n)
-        when "Internet Assigned Numbers Authority (IANA)"
-          entity = RelatonBib::Organization.new(abbrev: "IANA", name: "Internet Assigned Numbers Authority (IANA)")
-        when "ESnet Site Coordinating Comittee (ESCC)"
-          entity = RelatonBib::Organization.new(abbrev: "ESCC", name: "ESnet Site Coordinating Comittee (ESCC)")
-        when "Energy Sciences Network (ESnet)"
-          entity = RelatonBib::Organization.new(abbrev: "ESnet", name: "Energy Sciences Network (ESnet)")
-        when "International Telegraph and Telephone Consultative Committee of the International Telecommunication Union"
-          entity = RelatonBib::Organization.new(abbrev: "CCITT", name: n)
-        else
-          /^(?:(?<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, initials: int, forename: forename(int), surname: surname,
-          )
+    def parse_contributor
+      @doc.xpath("./xmlns:author").map do |contrib|
+        name = contrib.at("./xmlns:name").text
+        entity = BibXMLParser.full_name_org name
+        unless entity
+          fname = BibXMLParser.full_name name, nil, nil, "en", "Latn"
           entity = RelatonBib::Person.new(name: fname)
         end
         RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib))

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.13.4".freeze
+  VERSION = "1.13.6".freeze
 end

data/relaton_ietf.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.13.10"
+  spec.add_dependency "relaton-bib", "~> 1.13.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.13.4
+  version: 1.13.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.10
+        version: 1.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.10
+        version: 1.13.11
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: