dwc_agent 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '07829a173fc5801e1f9adb9a3c348e67ab761b23544ef16c9f6e205f440ec085'
-  data.tar.gz: 7e974daf9385d4ccdc724cb03b0f69fcf96244b5bb2948518bbf3b4c1aafac5d
+  metadata.gz: 7bf17473ddabfee14ba9e7a8d451486ef8ebb058c9d1d0214b0ed9cbae996e48
+  data.tar.gz: cb404e507a9f9de35a5ddeebf94a6bdd4e0ad7b245e08909b1d71f50bd7595da
 SHA512:
-  metadata.gz: cd9e27fcee8afa357d03d3a18926aa8d6d83c7c6500c1a1639976d304e22838a6b24db837f64619d2fbbb6d91ce282241d10fb5d53b27361d4286a3f3f9a810f
-  data.tar.gz: 28ac3e485ccbb3ad13392168ebcd47b265926543c5a967a5ed770466c95b0868adf408d9519e6eebf88b846d70243c953dbd11ca1ffae02611af43bb90dedd1a
+  metadata.gz: a25e5863c6fa384604e399815ec1c4c9befadaf1ebdefb4ef52abdb1e9a296ace16718bab6020a32c3f1ed9c0728c46e76fdfa8c5b3133e98e48b0478c155858
+  data.tar.gz: 1243c70e9d479ca15dfc931e823939216873f536c3441f77e90bc9461e639e2d408e335d31418e0e31616686d24914ceffd43ae97fe9388f2ccfab443b102f1f

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.include?(parsed_namae.family)
+        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
@@ -44,6 +52,17 @@ module DwcAgent
           parsed_namae.given = family
       end
 
+      if parsed_namae.given && 
+         parsed_namae.family && 
+         parsed_namae.family.length <=3 && 
+         parsed_namae.family == parsed_namae.family.upcase &&
+         parsed_namae.given[-1] != "."
+          given = parsed_namae.given
+          family = parsed_namae.family
+          parsed_namae.family = given
+          parsed_namae.given = family
+      end
+
       if parsed_namae.given && 
         (parsed_namae.given == parsed_namae.given.upcase || 
         parsed_namae.given == parsed_namae.given.downcase) && 

data/lib/dwc_agent/constants.rb

@@ -1,5 +1,7 @@
 module DwcAgent
   STRIP_OUT = %r{
+    ^[\[{(]|
+    [\]})]$|
     \s*?\d+\.\d+|
     \b\d+\(?(?i:[[:alpha:]])\)?\b|
     \b[,;]?\s*(?i:et\.?\s+al)\.?|
@@ -11,7 +13,7 @@ module DwcAgent
     \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)\b|
+    \b[,;]?\s*\(?(?i:undetermined|indeterminable|dummy|interim|accession|illegible|scripsit)\)?\b|
     \b[,;]?\s*(?i:importer|gift)\:?\b|
     \b[,;]?\s*(?i:frère|frere|père|pere|soeur|sister|bro)\.?(\b|\z)|
     \b[,;]?\s*(?i:string)\b|
@@ -81,7 +83,7 @@ module DwcAgent
     (?i:university|museum|exhibits?)|
     (?i:uqam)|
     \b[,;]\s+\d+\z|
-    ["!]|
+    ["!@?]|
     [,]?\d+|
     \s+\d+?(\/|\.)?(?i:i|ii|iii|iv|v|vi|vii|viii|ix|x)(\/|\.)\d+|
     [,;]\z|
@@ -97,7 +99,8 @@ module DwcAgent
     ^[-,.\s;*\d]+\s?|
     -\d?\z|
     \s*?-{2,}\s*?|
-    ^(?i:exc?p?)[:.]\s*
+    ^(?i:exc?p?)[:.]\s*|
+    \s+de\s*$
   }x
 
   SPLIT_BY = %r{
@@ -164,7 +167,7 @@ module DwcAgent
     (?i:anon)|
     (?i:australian?)|
     (?i:average)|
-    (?i:believe|unclear|illegible|none|suggested|(dis)?agrees?)|approach|
+    (?i:believe|unclear|ill?egible|none|suggested|(dis)?agrees?)|approach|
     (?i:barcod)|
     (?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)|
@@ -189,6 +192,7 @@ 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:not?\s+stated)|
     (?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)|
@@ -209,9 +213,16 @@ module DwcAgent
     (?i:unidentified|unspecified|unk?nown|unnamed|unread|unmistak|no agent)|
     (?i:urn\:)|
     (?i:usda|ucla)|
-    (?i:workshop|garden|farm|jardin|public)
+    (?i:workshop|garden|farm|jardin|public)|
+    ^\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"
+  ]
+
+  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 = 0
+    MINOR = 4
+    PATCH = 1
     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.0
+  version: 0.4.1
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae