dwc_agent 0.3.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfbc3ad3469ce14a1496befc2ffae9c25a17f2526dc02f1e8e7c14c7e7b431f0
-  data.tar.gz: ddeb0f4eeb81450c1f8ec0d2233e037340650570a14f77b2fa08b5d0e65ee9ac
+  metadata.gz: c4ea46a2cca2719aebba4a99251aaf02f6d2fb36f21f3e6ea28b76584fc7345a
+  data.tar.gz: 72cde7bbdf5c8f93923710f887f299a4618e32c5d129e8cac0bbcc1a285492fd
 SHA512:
-  metadata.gz: a8add8048e7c1ef15d9974d198cb9e74c8dd1ec210530fbe4088b4dedd993de4e94cf01ed5daf58e21bb353eaf6d8192f377fb0ba93bb01371112bdf491453de
-  data.tar.gz: efca1ecff92dee36596d0ae655678e892b2729c47333a6af25c0e68e0ad525b4e69ecd573524498eeb5ca4e87b96f5e6e4133a5ce2200f43e5b01def0c0ca19b
+  metadata.gz: 77c1027c302f5b853641266a833d197c1d81045ffad0ca0a2b3f4161d1fc4443fff944e6493d9c1089e710ac5aaff33bd0075698c7b70ff0ddf90d79602c8442
+  data.tar.gz: 9b92955bf9421e4b5f7a0c5cc5fa04265a393f04de6d7f23217cea739732b81bd8f9fb9042c02db20fe13118f2c9f3b75e1a374787b83d8e0ee1350e3e2a6c7b

data/lib/dwc_agent/cleaner.rb

@@ -18,18 +18,26 @@ module DwcAgent
     def clean(parsed_namae)
       blank_name = { given: nil, family: nil }
 
+      if parsed_namae.family && FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
+        return blank_name
+      end
+
       if parsed_namae.family && parsed_namae.family.length < 2 && parsed_namae.family.count('.') == 0
         return blank_name
       end
+
       if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
         return blank_name
       end
+
       if parsed_namae.given && parsed_namae.given.length > 25
         return blank_name
       end
+
       if parsed_namae.given && parsed_namae.given.count('.') >= 3 && /\.\s*[a-zA-Z]{4,}\s+[a-zA-Z]{1,}\./.match(parsed_namae.given)
         return blank_name
       end
+
       if parsed_namae.display_order =~ BLACKLIST
         return blank_name
       end
@@ -103,6 +111,10 @@ module DwcAgent
         return blank_name
       end
 
+      if !family.nil? && FAMILY_BLACKLIST.any?{ |s| s.casecmp(family) == 0 }
+        return blank_name
+      end
+
       { given: given, family: family }
     end
 

data/lib/dwc_agent/constants.rb

@@ -20,7 +20,6 @@ module DwcAgent
     \b[,;]?\s*(?i:person\s*string)\b|
     \b[,;]?\s*(?i:colls)\.(\b|\z)|
     \b[,;]?\s*(?i:colln?)[:.]?(\b|\z)|
-    (?i:no\s+(data|disponible))|
     \b[,;]?\s*(?i:stet)[,!]?\s*\d*\z|
     [,;]?\s*\d+[-/\s+](?i:\d+|Jan|Feb|Mar|Apr|
       May|Jun|Jul|Aug|Sept?|
@@ -78,7 +77,7 @@ module DwcAgent
     \b\s*\(?(?i:(fe)?male)\)?\s*\b|
     \b(?i:to\s+(sub)?spp?)\.?|
     (?i:nom\.?\s+rev\.?)|
-    FNA|DAO|HUH|FDNMB|
+    FNA|DAO|HUH|FDNMB|MNHN|PNI|USNM|
     AFSC\/POLISH\s+SORTING\s+CTR\.?|
     (?i:university|museum|exhibits?)|
     (?i:uqam)|
@@ -147,7 +146,8 @@ module DwcAgent
     '{' => '',
     '}' => '',
     '@' => '',
-    '%' => ''
+    '%' => '',
+    '\\' => ''
   }
 
   PHRASE_SUBS = {
@@ -164,6 +164,7 @@ module DwcAgent
   BLACKLIST = %r{
     (?i:abundant)|
     (?i:adult|juvenile)|
+    (?i:administra(d|t)or)|
     (?i:anon)|
     (?i:australian?)|
     (?i:average)|
@@ -172,9 +173,10 @@ module DwcAgent
     (?i:biolog|botan|zoo|ecolog|mycol|(in)?vertebrate|fisheries|genetic|animal|mushroom|wildlife|plumage|flower|agriculture)|
     (?i:bris?tish|canadi?an?|chinese|arctic|japan|russian|north\s+america)|
     (?i:carex|salix)|
-    (?:catalog)|
+    (?i:catalog(ue)?)|
     (?i:herbarium|herbier|collection|collected|publication|specimen|species|describe|an(a|o)morph|isolated|recorded|inspection|define|status|lighthouse)|
     \b\s*(?i:help)\s*\b|
+    (?i:data\s+not\s+captured)|
     (?i:description|drawing|identification|remark|original|illustration|checklist|intermedia|measurement|indisting|series|imperfect)|
     (?i:desconocido)|
     (?i:exc?s?icc?at(a|i))|
@@ -192,6 +194,9 @@ module DwcAgent
     (?i:univ\.)|
     (?i:graduate|student|estudi?antes?|labo\.|storekeep|supervisor|superint|rcmp|coordinator|minority|fishermen|police|taxonomist|consultant|participante?s?|team|(é|e)quipe|memb(er|re)|crew|group|staff|personnel|family|captain|friends|assistant|worker)|
     (?i:non\s+pr(é|e)cis(é|e))|
+    (?i:no\s+(agent)?\s?(data|disponible)(\s+available)?)|
+    (?i:not?\s+(entered|stated))|
+    (?i:nomenclatur(e|al)\s+adjustment)|
     (?i:ontario|qu(e|é)bec|saskatchewan|new brunswick|sault|newfoundland|assurance|vancouver|u\.?s\.?s\.?r\.?)|
     (?i:recreation|culture)|
     (?i:shaped|dark|pale|areas|phase|spotting|interior|between|closer)|
@@ -216,6 +221,15 @@ module DwcAgent
     ^\s*?de\s*?$
   }x
 
-  TITLE = /\s*\b(sir|lord|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|prof|dr|md|ph\.?d|rev|docteur|mme|abbé|ptre)\.?|frère|frere|père|pere|professor|esq\.?)(\s+|$)/i
+  FAMILY_BLACKLIST = [
+    "der",
+    "van",
+    "von",
+    "the",
+    "of",
+    "curators"
+  ]
+
+  TITLE = /\s*\b(sir|count(ess)?|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|prof|dr|md|ph\.?d|rev|docteur|mme|abbé|ptre)\.?|frère|frere|père|pere|professor|esq\.?)(\s+|$)/i
 
 end

data/lib/dwc_agent/version.rb

@@ -2,8 +2,8 @@ module DwcAgent
   class Version
 
     MAJOR = 0
-    MINOR = 3
-    PATCH = 2
+    MINOR = 4
+    PATCH = 3
     BUILD = nil
 
     def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.3
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae