dwc_agent 1.4.12 → 1.5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0eca9af87fc999b9d1e2313ea88df6bee1aec54a080e46fc8245abd3c41d615
-  data.tar.gz: 38f98d4fc7b30a2f80521d7d064666f5da9f64889af7f08b15a852619d1ab3be
+  metadata.gz: cef90f0884c7b59a1c3aae50198ef043a282127ef4b883b326a0a4b1bfdcd337
+  data.tar.gz: a19a07304fdd82ddd1259080a503fea4d13d5d44b60b6edb651e799a5c473525
 SHA512:
-  metadata.gz: 43dafd9ab3d3cf8513a579614d56429551803f15b39a814f25076d09d023f335c74fb8d22aaed49bbc2318587963972d74f035951221d5b12057fc7a0691ae57
-  data.tar.gz: 35d99c98fd8d7334e5cdac7bf781f0ad85adb6fd0684ffa6c9c058264ade10d2a6b0b544ceec4c52ca64192833c3edcb896ed29e8f45c4df970680b6db719eaa
+  metadata.gz: bcbebc3c10b85a5a86d9d67b8dbcee31164b64c46e8626f26378b36df7a2493d0f96a527423910a8748bc45fee7a9fd6ac8633392d78882bf43ff55902e2781d
+  data.tar.gz: 2f7e75e44b207fc72f6c90e413ac047337362494122cfe9ce976f993fe48bd9a0407c47ff56c5991c591c1e3562e999a88cfedcb869bb2712bed787b4cd17799

data/lib/dwc_agent/cleaner.rb

@@ -16,7 +16,7 @@ module DwcAgent
     # @param parsed_namae [Object] the namae object
     # @return [Hash] the given, family hash
     def clean(parsed_namae)
-      blank_name = { given: nil, family: nil, particle: nil }
+      blank_name = { title: nil, appellation: nil, given: nil, particle: nil, family: nil, suffix: nil }
 
       if parsed_namae.family && FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
         return blank_name
@@ -30,7 +30,7 @@ module DwcAgent
         return blank_name
       end
 
-      if parsed_namae.given && parsed_namae.given.length > 25
+      if parsed_namae.given && parsed_namae.given.length > 35
         return blank_name
       end
 
@@ -84,6 +84,9 @@ module DwcAgent
       family = parsed_namae.family.gsub(/\.\z/, '').strip rescue nil
       given = parsed_namae.given.strip rescue nil
       particle = parsed_namae.particle.strip rescue nil
+      appellation = parsed_namae.appellation.strip rescue nil
+      suffix = parsed_namae.suffix.strip rescue nil
+      title = parsed_namae.title.strip rescue nil
 
       if !given.nil? && given.match(/[A-Z]\.[A-Za-z]{2,}/)
         given = given.gsub(".", ". ").strip
@@ -123,7 +126,7 @@ module DwcAgent
         return blank_name
       end
 
-      { given: given, family: family, particle: particle }
+      { title: title, appellation: appellation, given: given, particle: particle, family: family, suffix: suffix }
     end
 
   end

data/lib/dwc_agent/constants.rb

@@ -49,7 +49,7 @@ module DwcAgent
     \d+\s+(?i:Nov|Novemb(er|re))\.?\b|
     \d+\s+(?i:Dec|D(e|é)cemb(er|re))\.?\b|
     \b[.-–,;:/]?\s*(?i:Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|Evergreen|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New\s+Hampshire|New\s+Jersey|New\s+Mexico|New\s+York|North\s+Carolina|North\s+Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Portland|Rhode\s+Island|South\s+Carolina|South\s+Dakota|St\s+Petersburg|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West\s+Virginia|Wisconsin|Wyoming)\s+(?i:State)\s*\b|
-    \b[.,;:/]?\s*?(?i:Afghanistan|Åland Islands|Albania|Algeria|American Samoa|Andorra|Angola|Anguilla|Antarctica|Antigua and Barbuda|Argentina|Armenia|Aruba|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia \(Plurinational State of\)|Bonaire, Sint Eustatius and Saba|Bosnia and Herzegovina|Botswana|Bouvet Island|Brazil|British Indian Ocean Territory|Brunei Darussalam|Bulgaria|Burkina Faso|Burundi|Cabo Verde|Cambodia|Cameroon|Canada|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Cocos \(Keeling\) Islands|Colombia|Comoros|Congo|Congo \(Democratic Republic of the\)|Cook Islands|Costa Rica|Côte d'Ivoire|Croatia|Cuba|Curaçao|Cyprus|Czechia|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Falkland Islands \(Malvinas\)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern Territories|Gabon|Gambia|Georgia|Germany|Ghana|Gibraltar|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See|Honduras|Hong Kong|Hungary|Iceland|India|Indonesia|Iran \(Islamic Republic of\)|Iraq|Ireland|Isle of Man|Israel|Italy|Jamaica|Japan|Jersey|Jordan|Kazakhstan|Kenya|Kiribati|Korea \(Democratic People\'s Republic of\)|Korea \(Republic of\)|Kuwait|Kyrgyzstan|Lao People\'s Democratic Republic|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macao|Macedonia (the former Yugoslav Republic of)|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia \(Federated States of\)|Moldova \(Republic of\)|Monaco|Mongolia|Montenegro|Montserrat|Morocco|Mozambique|Myanmar|Namibia|Nauru|Nepal|Netherlands|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Palestine, State of|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcairn|Poland|Portugal|Puerto Rico|Qatar|Réunion|Romania|Russian Federation|Rwanda|Saint Barthélemy|Saint Helena, Ascension and Tristan da Cunha|Saint Kitts and Nevis|Saint Lucia|Saint Martin \(French part\)|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Senegal|Serbia|Seychelles|Sierra Leone|Singapore|Sint Maarten \(Dutch part\)|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and the South Sandwich Islands|South Sudan|Spain|Sri Lanka|Sudan|Suriname|Svalbard and Jan Mayen|Swaziland|Sweden|Switzerland|Syrian Arab Republic|Taiwan|Tajikistan|Tanzania, United Republic of|Thailand|Timor-Leste|Togo|Tokelau|Tonga|Trinidad and Tobago|Tunisia|Turkey|Turkmenistan|Turks and Caicos Islands|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom of Great Britain and Northern Ireland|United States of America|United States Minor Outlying Islands|Uruguay|Uzbekistan|Vanuatu|Venezuela \(Bolivarian Republic of\)|Viet Nam|Virgin Islands \(British\)|Virgin Islands \(U\.S\.\)|Wallis and Futuna|Western Sahara|Yemen|Zambia|Zimbabwe)|
+    \b[.,;:/]?\s*?(?i:Afghanistan|Åland Islands|Albania|Algeria|American Samoa|Andorra|Angola|Anguilla|Antarctica|Antigua and Barbuda|Argentina|Armenia|Aruba|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia \(Plurinational State of\)|Bonaire, Sint Eustatius and Saba|Bosnia and Herzegovina|Botswana|Bouvet Island|Brazil|British Indian Ocean Territory|Brunei Darussalam|Bulgaria|Burkina Faso|Burundi|Cabo Verde|Cambodia|Cameroon|Canada|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Cocos \(Keeling\) Islands|Colombia|Comoros|Congo|Congo \(Democratic Republic of the\)|Cook Islands|Costa Rica|Côte d'Ivoire|Croatia|Cuba|Curaçao|Cyprus|Czechia|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Falkland Islands \(Malvinas\)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern Territories|Gabon|Gambia|Georgia|Germany|Ghana|Gibraltar|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See|Honduras|Hong Kong|Hungary|Iceland|India|Indonesia|Iran \(Islamic Republic of\)|Iraq|Ireland|Isle of Man|Israel|Italy|Jamaica|Japan|Jersey|Jordan|Kazakhstan|Kenya|Kiribati|Korea \(Democratic People\'s Republic of\)|Korea \(Republic of\)|Kuwait|Kyrgyzstan|Lao People\'s Democratic Republic|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macao|Macedonia (the former Yugoslav Republic of)|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia \(Federated States of\)|Moldova \(Republic of\)|Monaco|Mongolia|Montenegro|Montserrat|Morocco|Mozambique|Myanmar|Namibia|Nauru|Nepal|Netherlands|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Palestine, State of|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcairn|Poland|Portugal|Puerto Rico|Qatar|Réunion|Romania|Russian Federation|Rwanda|Saint Barthélemy|Saint Helena, Ascension and Tristan da Cunha|Saint Kitts and Nevis|Saint Lucia|Saint Martin \(French part\)|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Senegal|Serbia|Seychelles|Sierra Leone|Singapore|Sint Maarten \(Dutch part\)|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and the South Sandwich Islands|South Sudan|Spain|Sri Lanka|Sudan|Suriname|Svalbard and Jan Mayen|Swaziland|Sweden|Switzerland|Syrian Arab Republic|Taiwan|Tajikistan|Tanzania, United Republic of|Thailand|Timor-Leste|Togo|Tokelau|Tonga|Trinidad and Tobago|Tunisia|Turkey|Turkmenistan|Turks and Caicos Islands|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom of Great Britain and Northern Ireland|United States of America|United States Minor Outlying Islands|Uruguay|Uzbekistan|Vanuatu|Venezuela \(Bolivarian Republic of\)|Viet Nam|Virgin Islands \(British\)|Virgin Islands \(U\.S\.\)|Wallis and Futuna|Western Sahara|Yemen|Zambia|Zimbabwe)\b|
     (?i:autres?\s+de|probab|likely|possibl(e|y)|doubtful)|
     \b\s*(?i:maybe)\s*\b|
     \b\s*(?i:prob)\.\s*\b|
@@ -61,7 +61,7 @@ module DwcAgent
     (?i:see\s+notes?\s*(inside)?)|
     (?i:see\s+letter\s+enclosed)|
     (?i:(by)?\s+correspondance)|
-    (?i:pers\.?\s+comm\.?)|
+    (?i:pers\.?\s*comm\.?)|
     (?i:crossed\s+out)|
     \(?(?i:source)\(?|
     (?i:according\s+to)|
@@ -113,19 +113,22 @@ module DwcAgent
     [–|ǀ∣｜│&+\/;:]|
     \s+-\s+|
     \s+a\.\s+|
-    \b(e|y|i|en|et|or|per|for)\s*\b|
+    \b(con|e|y|i|en|et|or|per|for)\s*\b|
     \b(?i:and|with)\s*\b|
     \b(?i:annotated(\s+by)?)\s*\b|
     \b(?i:coll\.)\s*\b|
     \b(?i:communicate?d(\s+to)?)\s*\b|
     \b(?i:conf\.?(\s+by)?|confirmed(\s+by)?)\s*\b|
+    \b(?i:confirmada)(\s+por)?\s*\b|
     \b(?i:checked?(\s+by)?)\s*\b|
     \b(?i:det\.?(\s+by)?)\s*\b|
     \b(?i:dupl?\.?(\s+by)?|duplicate(\s+by)?)\s*\b|
     \b(?i:ex\.?(\s+by)?|examined(\s+by)?)\s*\b|
     \b(?i:in?dentified(\s+by)?)\s*\b|
     \b(?i:in\s+part(\s+by)?)\s*\b|
+    \b(?i:och)\s*\b|
     \b(?i:prep\.?\s+(?i:by)?)\s*\b|
+    \b(?i:purchased?)(\s+by)?\s*\b|
     \b(?i:redet\.?(\s+by?)?)\s*\b|
     \b(?i:reidentified(\s+by)?)\s*\b|
     \b(?i:stet)\s*\b|
@@ -159,16 +162,18 @@ module DwcAgent
   }
 
   PHRASE_SUBS = {
-    'dr\.' => 'Dr. ',
-    'mr\.' => 'Mr. ',
-    'mrs\.' => 'Mrs. ',
-    'ms\.' => 'Ms. ',
-    'prof\.' => 'Prof. ',
-    '\, ph\.d\.' => ' Ph.D.',
-    '\, bro\.' => ' Bro.',
-    ' jr\.,' => ' Jr.;',
+    ', ph.d.' => ' Ph.D.',
+    ', Ph.D.' => ' Ph.D.',
+    ', bro.' => ' Bro.',
+    ' jr.,' => ' Jr.;',
     ' jr,' => ' Jr.;',
-    '-Jr' => ' Jr.'
+    '-jr' => ' Jr.',
+    '-Jr' => ' Jr.',
+    ', Jr.' => ' Jr.',
+    ',Jr.' => ' Jr.',
+    ', Sr.' => ' Sr.',
+    ',Sr.' => ' Sr.'
+
   }
 
   COMPLEX_SEPARATORS = %r{
@@ -274,4 +279,8 @@ module DwcAgent
 
   TITLE = /\s*\b(sir|count(ess)?|colonel|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|prof|dr|md|ph\.?d|rev|mme|abbé|ptre|bro|esq)\.?|docteur|father|cantor|vicar|père|pastor|rabbi|reverend|pere|soeur|sister|professor)(\s+|$)/i
 
+  APPELLATION = /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
+
+  SUFFIX = /\s*\b(JR|Jr|jr|SR|Sr|sr|[IVX]{2,})(\.|\b)/
+
 end

data/lib/dwc_agent/parser.rb

@@ -11,14 +11,16 @@ module DwcAgent
       options = {
         prefer_comma_as_separator: true,
         separator: SPLIT_BY,
-        title: TITLE
+        title: TITLE,
+        appellation: APPELLATION,
+        suffix: SUFFIX
       }
       @namae = Namae::Parser.new(options)
 
       @strip_out_regex = Regexp.new STRIP_OUT.to_s
       @residual_terminators_regex = Regexp.new SPLIT_BY.to_s + %r{\s*\z}.to_s
       @char_subs_regex = Regexp.new [CHAR_SUBS.keys.join].to_s
-      @phrase_subs_regex = Regexp.new((PHRASE_SUBS.keys.join('|')).to_s, Regexp::IGNORECASE)
+      @phrase_subs_regex = Regexp.new PHRASE_SUBS.keys.map{|a| Regexp.escape a }.join('|').to_s
       @complex_separators_regex = Regexp.new COMPLEX_SEPARATORS.to_s
       @add_separators_regex = Regexp.new %r{(\S{1}\.)([[:alpha:]]{2,})}.to_s
     end

data/lib/dwc_agent/version.rb

@@ -2,9 +2,9 @@ module DwcAgent
   class Version
 
     MAJOR = 1
-    MINOR = 4
-    PATCH = 12
-    BUILD = nil
+    MINOR = 5
+    PATCH = 0
+    BUILD = 4
 
     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: 1.4.12
+  version: 1.5.0.4
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-05 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae