dwc_agent 1.5.0 → 1.5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87cfd6b6ab9ee83156f9503e48669691d486f143f64a623f93a40f064d2dc7f7
-  data.tar.gz: 7f40287aa6bf7e7b90408d72594fd9ab5498401c5ee402da6f2a78163f011a9a
+  metadata.gz: 0445f35092b28cfbcc273d01f90eee34c9642d7fc8b9c0b7e32e7720dc2f316b
+  data.tar.gz: f10b0b6424007a829196851ece90d6138693dcd1825b6b5712a96b9b9a2ce224
 SHA512:
-  metadata.gz: 4cb91ffc7530bd1a93fbbc70c716ad96d49cab139bf95507e3a688566ce997cb71510b13013bb07cb52dffe2ce7419d294392028eedd28f1caba8b032eb98c9a
-  data.tar.gz: ae226c63106a2b41899b6d4c85c92aa372d8d1cbce8a90023cf9b8d1a4c153a28bd33a9eb8064c492fa79d5d4229ec8979d5ca4f751d97fc1ec09132b0e46ca3
+  metadata.gz: 69d6e2be09b6edc55b5ebd0fef931dd5fcaf9df09b150bcd4580a9aace8c24576db65ea194352c134418f974b4cbfc0bf3254a1d4e22132f56203afcc06dbc08
+  data.tar.gz: 467f50b23cb2d3cf8ad406b9cd14c3bdbd6635806c46304be7a0708a03755c23db56f0295dd2d89f8325dbc7ac1a3c34b237103974bb27a62ab38446838b21bd

data/lib/dwc_agent/cleaner.rb

@@ -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
 
@@ -85,8 +85,8 @@ module DwcAgent
       given = parsed_namae.given.strip rescue nil
       particle = parsed_namae.particle.strip rescue nil
       appellation = parsed_namae.appellation.strip rescue nil
-      suffix = parsed_names.suffix.strip rescue nil
-      title = parsed_names.title.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
@@ -126,7 +126,7 @@ module DwcAgent
         return blank_name
       end
 
-      { title: nil, appellation: nil, given: given, particle: particle, family: family, suffix: nil }
+      { title: title, appellation: appellation, given: given, particle: particle, family: family, suffix: suffix }
     end
 
   end

data/lib/dwc_agent/constants.rb

@@ -6,15 +6,16 @@ module DwcAgent
     \s*?\d+\.\d+|
     \b\d+\(?(?i:[[:alpha:]])\)?\b|
     \b[,;]?\s*(?i:et\.?\s+al|&\s+al)\.?|
+    \b[,;]?\s*(?i:etal)\.?|
     \b\s+(bis|ter)(\b|\z)|
     \bu\.\s*a\.|
-    \b[,;]?\s*(?i:and|&)?\s*(?i:others)\s*\b|
+    \b[,;]?\s*(?i:and|&)?\s*(?i:others|party)\s*\b|
     \b[,;]?\s*(?i:etc)\.?|
     \b[,;]?\s*(?i:on)\b|
     \b[,;]?\s*(?i:unkn?own)\b|
     \b[,;]?\s*(?i:n/a)\b|
     \b[,;]?\s*(?i:ann?onymous)\b|
-    \b[,;]?\s*\(?(?i:undetermined|indeterminable|dummy|interim|accession|ill(eg|is)ible|scripsit|presumed?)\)?\b|
+    \b[,;]?\s*\(?(?i:undetermined|indeterminable|dummy|interim|accession|ill(eg|is)ible|scripsit|presumed?|presumably)\)?\b|
     \b[,;]?\s*(?i:importer|gift)\:?\b|
     \b[,;]?\s*(?i:string)\b|
     \b[,;]?\s*(?i:person\s*string)\b|
@@ -49,7 +50,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 +62,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)|
@@ -83,11 +84,14 @@ module DwcAgent
     \b(?i:to\s+(sub)?spp?)\.?|
     (?i:nom\.?\s+rev\.?)|
     FNA|DAO|HUH|FDNMB|MNHN|PNI|USNM|ZMUC|CSIRO|ACAD|USGS|NAWQA|
+    \b,?\s*(?i:para|topo|syn)?(?i:type)|
     AFSC\/POLISH\s+SORTING\s+CTR\.?|
     (?i:university|museum|exhibits?)|
     (?i:uqam)|
     (?i:sem\s+(colec?tor|data))|
     (?i:no\s+coll\.?(ector)?)|
+    (?i:not?)\s+(?i:name|date|details?|specific)?\s*?(?i:given|name|date|noted)|
+    (?i:non?)\s+(?i:specificato)|
     \b[,;]\s+\d+\z|
     ["!@?]|
     [,]?\d+|
@@ -113,19 +117,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|
@@ -155,16 +162,24 @@ module DwcAgent
     '}' => '',
     '@' => '',
     '%' => '',
-    '\\' => ''
+    '\\' => '',
+    '´' => '\'',
+    '+' => ' | '
   }
 
   PHRASE_SUBS = {
-    'prof\.' => 'Prof. ',
-    '\, ph\.d\.' => ' Ph.D.',
-    '\, bro\.' => ' Bro.',
-    ' jr\.\,' => ' Jr.;',
-    ' jr\,' => ' Jr.;',
-    '\-jr' => ' Jr.'
+    ', ph.d.' => ' Ph.D.',
+    ', Ph.D.' => ' Ph.D.',
+    ', bro.' => ' Bro.',
+    ', Jr.,' => ' Jr.;',
+    ', Jr.' => ' Jr.',
+    ',Jr.' => ' Jr.',
+    ', Sr.' => ' Sr.',
+    ',Sr.' => ' Sr.',
+    ' jr.,' => ' Jr.;',
+    ' jr,' => ' Jr.;',
+    '-jr' => ' Jr.',
+    '-Jr' => ' Jr.'
   }
 
   COMPLEX_SEPARATORS = %r{
@@ -257,6 +272,7 @@ module DwcAgent
     "determination",
     "dissection",
     "entered",
+    "indecipherable",
     "nomenclatural",
     "orig",
     "registration",
@@ -268,7 +284,7 @@ module DwcAgent
     "has not"
   ]
 
-  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
+  TITLE = /\s*\b(sir|count(ess)?|colonel|(gen|adm|col|maj|major|capt|cmdr|lt|sgt|cpl|pvt|proff?|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
 

data/lib/dwc_agent/parser.rb

@@ -20,7 +20,7 @@ module DwcAgent
       @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

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