dwc_agent 1.5.0.5 → 1.5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0445f35092b28cfbcc273d01f90eee34c9642d7fc8b9c0b7e32e7720dc2f316b
-  data.tar.gz: f10b0b6424007a829196851ece90d6138693dcd1825b6b5712a96b9b9a2ce224
+  metadata.gz: 4b3360ae9a26c61f08d3a687e8c4e1af9e19334714746a976cb4c90e93d72a63
+  data.tar.gz: 4ada728f04c124ec1fbd6a9b45c1ecba80f45319f051a087c2074b2417110478
 SHA512:
-  metadata.gz: 69d6e2be09b6edc55b5ebd0fef931dd5fcaf9df09b150bcd4580a9aace8c24576db65ea194352c134418f974b4cbfc0bf3254a1d4e22132f56203afcc06dbc08
-  data.tar.gz: 467f50b23cb2d3cf8ad406b9cd14c3bdbd6635806c46304be7a0708a03755c23db56f0295dd2d89f8325dbc7ac1a3c34b237103974bb27a62ab38446838b21bd
+  metadata.gz: ced6e4cd9352b267ee8662993d4a39c9aa6e35965c550fef33993bd3c7c40feb07e7ad1ac8e6c60531f843b5e3d18a5bc0caafb38de41b55f0ad706be898d81a
+  data.tar.gz: 4c3c76a1f3cf17114d9e23a2ec19f40772fe38b5bd1b6dd49264cf82081dac797b182ae0a2cd5d90732a0f3cd947251ea28830f7769a82d4bfe8a10ca166213e

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

data/lib/dwc_agent/constants.rb

@@ -54,10 +54,11 @@ module DwcAgent
     (?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)|
@@ -67,16 +68,18 @@ module DwcAgent
     \(?(?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))|
@@ -244,7 +247,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)|
@@ -253,30 +256,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 = [

data/lib/dwc_agent/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
     MAJOR = 1
     MINOR = 5
     PATCH = 0
-    BUILD = 5
+    BUILD = 6
 
     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.5
+  version: 1.5.0.6
 platform: ruby
 authors:
 - David P. Shorthouse
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-09-06 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
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: []