dwc_agent 3.0.0.7 → 3.0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70910df19904a83d0a36645c3bd3335e63648d64e4e9c3d029adf6dc744fca4b
-  data.tar.gz: 151d8f4dc49024179cb189e24a9842ba8a634b3ec5f8c72b01b344ca1e798846
+  metadata.gz: 7088c447cef189841c901d87721653610ef2002b58431d17fbcf13eb9cdf4ea2
+  data.tar.gz: 254ae919ed52373e7782cb2c127d05dbf582d40841afba1c1f528580172ffc76
 SHA512:
-  metadata.gz: 80699e4a231dc12410e5b59fc15c433fe73a5785c4d4884c48e1bee83bf9674b0c62812f706da921e197a09ab270a889fc5e4150b2dbc5122083f1ac6c8082e7
-  data.tar.gz: 4e5e9ecd81d556c25eb9bb0620a00a6bb35f52d11036534ab48857dc333125fc7abf8ce408099fe5648e8bbac256c4e1c4674d8f55ce67cfa3fdf9286250f6e8
+  metadata.gz: 3d0c9c49eb804f11815a143409b2915a6fa579134e3a39c42ef4c36ba9b021d620289b1bccc49d83df51efa632300d4d0a5aaaee14c16aa585ecd500d1dce256
+  data.tar.gz: 6aefdd8f7c80ab18632792ae7e8914d8ba9a6a9c7b113b528e640af172bcdf78a9e85a1c72d569277cacb5d95787c3c8ffec026a4a36c715d836c81df1ec25ff

data/lib/dwc_agent/cleaner.rb

@@ -18,11 +18,14 @@ module DwcAgent
     # @return Namae::Name [Object] a new Namae object
     def clean(parsed_namae)
 
-      if parsed_namae.given && GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
+      if parsed_namae.given &&
+         GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
         return Namae::Name.new
       end
 
-      if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
+      if parsed_namae.family &&
+         parsed_namae.family.length == 3 &&
+         parsed_namae.family.count('.') == 1
         return Namae::Name.new
       end
 
@@ -30,7 +33,9 @@ module DwcAgent
         return Namae::Name.new
       end
 
-      if parsed_namae.given && parsed_namae.given.count('.') >= 3 && /\.\s*[a-zA-Z]{4,}\s+[a-zA-Z]{1,}\./.match(parsed_namae.given)
+      if parsed_namae.given &&
+         parsed_namae.given.count('.') >= 3 &&
+         /\.\s*[a-zA-Z]{4,}\s+[a-zA-Z]{1,}\./.match(parsed_namae.given)
         return Namae::Name.new
       end
 
@@ -38,6 +43,13 @@ module DwcAgent
         return Namae::Name.new
       end
 
+      if parsed_namae.family &&
+         parsed_namae.family.count(".") == 1 &&
+         parsed_namae.family[-1] == "." &&
+         parsed_namae.family.length > 3
+        parsed_namae.family = parsed_namae.family.delete_suffix(".")
+      end
+
       if parsed_namae.given &&
          parsed_namae.family &&
          parsed_namae.family.count(".") > 0 &&
@@ -59,6 +71,15 @@ module DwcAgent
           parsed_namae.given = family
       end
 
+      if !parsed_namae.given &&
+         parsed_namae.particle &&
+         parsed_namae.family &&
+         /^[A-Za-z]{3,}\s+(?:[A-Z]\.\s?){1,}$/.match(parsed_namae.family)
+         matched = /^(?<family>[A-Za-z]{3,})\s+(?<given>([A-Z]\.\s?){1,})$/.match(parsed_namae.family)
+         parsed_namae.family = matched[:family]
+         parsed_namae.given = matched[:given]
+       end
+
       if parsed_namae.given &&
         (parsed_namae.given == parsed_namae.given.upcase ||
         parsed_namae.given == parsed_namae.given.downcase) &&
@@ -75,13 +96,21 @@ module DwcAgent
         parsed_namae.given = NameCase(parsed_namae.given)
       end
 
-      if parsed_namae.family && FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
+      if parsed_namae.family &&
+         FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
         return Namae::Name.new
       end
 
+      if parsed_namae.family.nil? &&
+         !parsed_namae.given.nil? &&
+         !parsed_namae.given.include?(".")
+        parsed_namae.family = parsed_namae.given
+        parsed_namae.given = nil
+      end
+
       parsed_namae.normalize_initials
 
-      family = parsed_namae.family.gsub(/\.\z/, '').strip rescue nil
+      family = parsed_namae.family
       given = parsed_namae.given.strip rescue nil
       particle = parsed_namae.particle.strip rescue nil
       appellation = parsed_namae.appellation.strip rescue nil
@@ -92,12 +121,10 @@ module DwcAgent
         given = given.gsub(".", ". ").strip
       end
 
-      if family.nil? && !given.nil? && !given.include?(".")
-        family = given
-        given = nil
-      end
-
-      if !family.nil? && given.nil? && !particle.nil?
+      if !family.nil? &&
+         given.nil? &&
+         !particle.nil? &&
+         !PARTICLES.include?(particle.downcase)
         given = particle.sub(/[a-z]\./, &:upcase).sub(/^(.)/) { $1.capitalize }
         particle = nil
       end
@@ -110,8 +137,8 @@ module DwcAgent
         family = NameCase(family)
       end
 
-      if !family.nil? && family.match(/[A-Z]$/)
-        return Namae::Name.new
+      if !family.nil? && family.match(/[A-Z]{1,3}$/)
+        family = NameCase(family.upcase)
       end
 
       if given.nil? && !family.nil? && family.match(/^[A-Z]{2}/)

data/lib/dwc_agent/constants.rb

@@ -200,6 +200,7 @@ module DwcAgent
     "^(\\S{4,},\\s+(?:\\S\\.\\s*){1,})\\s+(\\S{4,},\\s+(?:\\S\.\\s*){1,})$" => "\\1 | \\2",
     "(\\S{1}\\.)([[:alpha:]]{2,})" => "\\1 \\2",
     "([[:alpha:]]*),?\\s+(.*)\\s+(van|von)$" => "\\3 \\1, \\2",
+    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]]{2,})\\s+([[:alpha:]]{2,})$" => "\\1 \\4 | \\2 \\3 \\4",
     "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]]{2,})(.*)" => "\\1 \\3 | \\2 \\3 | \\4",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?[,&]\\s*?([A-Z][[:alpha:]]{2,})$" => "\\1 | \\2 | \\3",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?[,&]\\s*?([A-Z][[:alpha:]]{3,})$" => "\\1 | \\2 | \\3 | \\4",
@@ -261,8 +262,7 @@ module DwcAgent
     (?i:submersible)|
     (?i:synonymy?)|
     (?i:systematic|perspective)|
-    \s+(?i:off)\s+|
-    \s*(?i:too)\s+|\s*(?i:the)\s+|
+    ^\s*(?i:off|too|the)\s*|
     (?i:taxiderm(ies|y))|
     (?i:though)|
     (?i:texas\s+instruments?)\s*?(for)?|
@@ -342,4 +342,26 @@ module DwcAgent
 
   SUFFIX = /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/
 
+  PARTICLES = [
+    "ap",
+    "da",
+    "de",
+    "de'",
+    "del",
+    "der",
+    "des",
+    "di",
+    "do",
+    "dos",
+    "du",
+    "el",
+    "le",
+    "la",
+    "van",
+    "von",
+    "the",
+    "of",
+    "van der"
+  ]
+
 end

data/lib/dwc_agent/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
     MAJOR = 3
     MINOR = 0
     PATCH = 0
-    BUILD = 7
+    BUILD = 10
 
     def self.version
       [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 3.0.0.7
+  version: 3.0.0.10
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae