relaton-ietf 1.13.3 → 1.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe51d3e7f18e3e3b6c093ee78a24c917cdfd95d88bab7035078c8627a35f0fb
-  data.tar.gz: 29b83fa09d9a1b403fdeef78ef77297b8911d7ab222a2b4cf47a60ffd5b7a8d6
+  metadata.gz: 48b025f8949b55b5df8b2655037fed2d843721ae2e7c2d33c287f3dd5916ccc3
+  data.tar.gz: 263251fa0ee6063de9ed33e8af021041aaa71b95abf0547c809e643eae8a29ed
 SHA512:
-  metadata.gz: 98e68d59cc3b1c53c6c3ed3a845a05b9f2f2ceca3a60b6f63bb952fc51dcf81cfe8ebe7e62e9fbfaadd30a2268ded0dbf1c947e6c6c3f17e91bf76bd0feb4a70
-  data.tar.gz: ccf02324637a7da4cb8b960c5ed05363e399dd4da11578f50254dc783662aa82b4da87b4ca031bd8cc9de9c5500bc41741d98e9c63314e29771bd1ef7a62be2c
+  metadata.gz: 45d31fe5d94624e4a81762502daecf1be53759fb543e93fcb0b7a1a91a8f326ba4f01294344aca18fe7581df671a61dbb7cf8617f56204e25a71acd7c65b6d80
+  data.tar.gz: d301e5635a36a9c0f2897f33561398c7f4c31db4c5477cbc8050c7b5b9902b83282e234f03bb0823794edf200b40b9e825cc396f4a56c541ca500bfada2a9175

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)
@@ -43,7 +24,8 @@ module RelatonIetf
       type = super
       case type
       when "BCP", "FYI", "STD", "RFC" then "RFC"
-      when "Internet-Draft" then type
+      # when "Internet-Draft" then type
+      when "I-D" then "Internet-Draft"
       else "IETF"
       end
     end
@@ -67,38 +49,77 @@ 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 = 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, lang, script),
+        surname: localized_string(surname, lang, script)
       )
     end
 
-    def parse_surname_initials(author)
+    def parse_surname_initials(fname, sname, inits)
       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]
-    end
-
-    def parse_surname(fullname)
-      fullname.sub(/(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/, "").strip
-    end
-
-    def parse_initials(fullname)
-      fullname.match(/(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/).to_s.strip
+      surname = sname || fname.sub(regex, "").strip
+      initials = inits || regex.match(fname)&.to_s&.strip
+      [surname, initials]
     end
   end
 end

data/lib/relaton_ietf/rfc_entry.rb

@@ -149,55 +149,15 @@ 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 "IAB", "IESG", "Internet Architecture Board", "IAB and IESG",
-        #   "IAB Advisory Committee", "Internet Engineering Steering Group"
-        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)
-          desc = "BibXML author"
-        # when "IESG"
-        #   entity = RelatonBib::Organization.new(abbrev: n, name: "Internet Engineering Steering Group")
-        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"
-          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>(?:\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, desc))
+        RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib))
       end
     end
 
@@ -205,14 +165,12 @@ module RelatonIetf
     # Parse contributors role
     #
     # @param [Nokogiri::XML::Node] contrib contributor
-    # @param [String, nil] desc contributor description
     #
     # @return [Array<Hash>] contributor's role
     #
-    def parse_role(contrib, desc = nil)
+    def parse_role(contrib)
       type = contrib.at("./xmlns:title")&.text&.downcase || "author"
       role = { type: type }
-      role[:description] = [desc] if desc
       [role]
     end
 

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.13.3".freeze
+  VERSION = "1.13.5".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.3
+  version: 1.13.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2022-10-20 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: