dwc_agent 1.5.0.4 → 1.5.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef90f0884c7b59a1c3aae50198ef043a282127ef4b883b326a0a4b1bfdcd337
-  data.tar.gz: a19a07304fdd82ddd1259080a503fea4d13d5d44b60b6edb651e799a5c473525
+  metadata.gz: 0b79ba4257776b532e0e071ab4f2defb32fd2131147624b80e3a4b145ceb666e
+  data.tar.gz: cc5080d4b67557b5d68ca7c8de761c0fd7c063ef2f398e68aa7aff3b8bfbed5e
 SHA512:
-  metadata.gz: bcbebc3c10b85a5a86d9d67b8dbcee31164b64c46e8626f26378b36df7a2493d0f96a527423910a8748bc45fee7a9fd6ac8633392d78882bf43ff55902e2781d
-  data.tar.gz: 2f7e75e44b207fc72f6c90e413ac047337362494122cfe9ce976f993fe48bd9a0407c47ff56c5991c591c1e3562e999a88cfedcb869bb2712bed787b4cd17799
+  metadata.gz: 600569c1098627db767a701bc8f85079afa2e47930a8b707a089ef06f2597a4f97ffe8d8fd2d0fa3347bee8edb9a6d1035ac2645dc4baac1e1a02228c892675f
+  data.tar.gz: 94b68c1c443909b1d28396597ee7474981c51eddbba67a2dc29190b21700937bed091a645073533942360d2e2455b4140dba938f3e2f2af2f5f29fe32db337ca

data/lib/dwc_agent/cleaner.rb

@@ -18,10 +18,6 @@ module DwcAgent
     def clean(parsed_namae)
       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
-      end
-
       if parsed_namae.given && GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
         return blank_name
       end
@@ -79,6 +75,10 @@ module DwcAgent
         parsed_namae.given = NameCase(parsed_namae.given)
       end
 
+      if parsed_namae.family && FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
+        return blank_name
+      end
+
       parsed_namae.normalize_initials
 
       family = parsed_namae.family.gsub(/\.\z/, '').strip rescue nil
@@ -114,7 +114,7 @@ module DwcAgent
         return blank_name
       end
 
-      if !family.nil? && family.match(/^[A-Z]{2}/)
+      if given.nil? && !family.nil? && family.match(/^[A-Z]{2}/)
         return blank_name
       end
 

data/lib/dwc_agent/constants.rb

@@ -3,18 +3,20 @@ module DwcAgent
     ^[\[{(]|
     [\]})]\??$|
     (?i:acc\s?\#)|
+    [,;]?\s*(?i:1st|2nd|3rd|[4-9]th)|
     \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|
@@ -48,34 +50,38 @@ module DwcAgent
     \d+\s+(?i:Oct|Octob(er|re))\.?\b|
     \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|
+    \b[.-–,;:/]?\s*(?i:Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|Evergreen|Florida|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|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|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|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|
-    \(?[,]?\s*?(?i:(local)?\s?collector|data\s*recorder|netter|(oper|prepar)ator)\(?s?\)?\.?\:?|
+    \(?[,]?\s*?(?i:(local)?\s?collectors?|data\s*recorder|netter|(oper|prepar)ator)\(?s?\)?\.?\:?|
     \b[.-–,;:]?\s*(?i:department|faculty)\s*?(?i:of)?\s*?(?i:entomology|biology|zoology)|
     (?i:Engº|Agrº|Fcº|Drº|Mº|Profº|Dº|Fº)|
     (?i:fide)\:?\s*\b|
+    (?i:first\s+name\s+unknown)|
     (?i:game\s+dept)\.?\s*\b|
     (?i:see\s+notes?\s*(inside)?)|
     (?i:see\s+letter\s+enclosed)|
     (?i:(by)?\s+correspondance)|
     (?i:pers\.?\s*comm\.?)|
     (?i:crossed\s+out)|
+    (?i:(ohne|keine)\s+angaben)|
     \(?(?i:source)\(?|
     (?i:according\s+to)|
     (?i:lanuv)\d+|
+    \b\s*name\b|
+    \b\s*lost\b|
     (?i:nswobs)|
     ORCID|
     MRI(\s|-)PAS|
     urn\:qm\.qld\.gov\.au\:collector|
     (?i:University\s+of\s+(Southern\s+)?California(,\s+Berkeley)?)|
-    (?i:Field\s+Museum\s+of\s+Natural\s+History)|
-    (?i:American\s+Museum\s+of\s+Natural\s+History)|
+    (?i:field\s+museum\s+of\s+natural\s+history)|
+    (?i:american\s+museum\s+of\s+natural\s+history)|
     (?i:The\s+Paleontological\s+Research\s+Institution)|
     (?i:museums?\s+victoria)|
-    \b\s*(?i:United\s+States|Russia)\s*\b|
+    \b\s*(?i:united\s+states|russia)\s*\b|
     (?i:revised|photograph|fruits\s+only)|
     -?\s*(?i:sight\s+(id|identifi?cation))\.?\s*\b|
     -?\s*(?i:synonym(y|ie))|
@@ -83,11 +89,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+|
@@ -158,22 +167,24 @@ module DwcAgent
     '}' => '',
     '@' => '',
     '%' => '',
-    '\\' => ''
+    '\\' => '',
+    '´' => '\'',
+    '+' => ' | '
   }
 
   PHRASE_SUBS = {
     ', 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.'
-
+    ',Sr.' => ' Sr.',
+    ' jr.,' => ' Jr.;',
+    ' jr,' => ' Jr.;',
+    '-jr' => ' Jr.',
+    '-Jr' => ' Jr.'
   }
 
   COMPLEX_SEPARATORS = %r{
@@ -238,7 +249,7 @@ module DwcAgent
     (?i:though)|
     (?i:texas\s+instruments?)\s*?(for)?|
     (?:tropical)|
-    (?i:toward|seen at)|
+    (?i:toward|seen\s+at)|
     (?i:unidentified|unspecified|unk?nown?|unnamed|unread|unmistak|no agent)|
     (?i:urn\:)|
     (?i:usda|ucla)|
@@ -247,29 +258,47 @@ module DwcAgent
   }x
 
   FAMILY_BLACKLIST = [
+    "ap",
     "da",
+    "de",
     "de'",
     "del",
     "der",
+    "di",
+    "do",
+    "dos",
     "du",
     "el",
+    "le",
+    "la",
     "van",
     "von",
     "the",
     "of",
     "adjustment",
+    "annotator",
     "available",
     "arachnology",
     "catalogue",
     "curators",
     "data",
+    "details",
+    "determiner",
     "determination",
     "dissection",
     "entered",
+    "erased",
+    "indecipherable",
     "nomenclatural",
     "orig",
     "registration",
-    "science"
+    "science",
+    "wg",
+    "wm",
+    "wn",
+    "zw",
+    "zz",
+    "z-"
   ]
 
   GIVEN_BLACKLIST = [
@@ -277,7 +306,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/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
     MAJOR = 1
     MINOR = 5
     PATCH = 0
-    BUILD = 4
+    BUILD = 9
 
     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.4
+  version: 1.5.0.9
 platform: ruby
 authors:
 - David P. Shorthouse
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -102,7 +102,7 @@ homepage: https://github.com/bionomia/dwc_agent
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--encoding"
 - UTF-8
@@ -112,15 +112,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Parse Darwin Core agent terms such as recordedBy and identifiedBy
 test_files: []