relaton-ietf 1.13.5 → 1.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b025f8949b55b5df8b2655037fed2d843721ae2e7c2d33c287f3dd5916ccc3
-  data.tar.gz: 263251fa0ee6063de9ed33e8af021041aaa71b95abf0547c809e643eae8a29ed
+  metadata.gz: 8d5d9ec768b99a9f7dc61438afe510562005322438b5fff41fe04069111d73e0
+  data.tar.gz: 410398ba75786d32f94fb8e90303f507e6842b5eee84d57c3647bee8d539975c
 SHA512:
-  metadata.gz: 45d31fe5d94624e4a81762502daecf1be53759fb543e93fcb0b7a1a91a8f326ba4f01294344aca18fe7581df671a61dbb7cf8617f56204e25a71acd7c65b6d80
-  data.tar.gz: d301e5635a36a9c0f2897f33561398c7f4c31db4c5477cbc8050c7b5b9902b83282e234f03bb0823794edf200b40b9e825cc396f4a56c541ca500bfada2a9175
+  metadata.gz: 2bf9b65a7fd0e7b4702ddf9b35e8be78a308dccfaa85b83b9def4ea37192718abced81fb02e58d356ee600b421cde8deb190e8e3ffa10adc5882fad10b6db92b
+  data.tar.gz: 1edd378c32a456117f226dbef2b851f761e50e618b8962e022df096ac1557f7f081b1010c5e1cd22986b92b3bb593d58848703105631eb4f01b612f5e8fe3456

data/lib/relaton_ietf/bibxml_parser.rb

@@ -106,20 +106,50 @@ module RelatonIetf
     # @return [RelatonBib::FullName]
     #
     def full_name(fname, sname, inits, lang, script = nil)
-      surname, ints = parse_surname_initials fname, sname, inits
+      surname, ints, name = parse_surname_initials fname, sname, inits
       initials = localized_string(ints, lang, script)
       RelatonBib::FullName.new(
         completename: localized_string(fname, lang, script),
-        initials: initials, forename: forename(ints, lang, script),
+        initials: initials, forename: forename(ints, name, lang, script),
         surname: localized_string(surname, lang, script)
       )
     end
 
+    #
+    # 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 = /(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+/
+      regex = /(?:(?<name>\w{3,})\s)?(?<inits>(?:[A-Z]{1,2}(?:\.[\s-]?|\s))+)?/
+      match = fname.match(regex)
       surname = sname || fname.sub(regex, "").strip
-      initials = inits || regex.match(fname)&.to_s&.strip
-      [surname, initials]
+      initials = inits || match[:inits]&.strip
+      [surname, initials, match[:name]]
     end
   end
 end

data/lib/relaton_ietf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.13.5
+  version: 1.13.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml