dwc_agent 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b78266edf4bba3e709436eea17e10a3f368487ab6b2e2d500390f6f18eef8cd
-  data.tar.gz: 14464308a3ffb8139305eabdf04bfe032e0d6de526e303980ff4fe165165ec7b
+  metadata.gz: 988e79daa81edb97377cdaf65ad2e6aa79b6e524cd3c9ab940d7b4cc1c1c9885
+  data.tar.gz: 7b6969b8da5e772858e68313e24954bd352c78f62e552d0b5b16a328b3d20e0c
 SHA512:
-  metadata.gz: 805e512bbfb76d17b45ad33f0ac5d550f5c4e3add36f09d9fe5053169bc3a5e357783c7512b21f91a816288685ad97cf12b53540272b475d7bdd6172bb9ed83b
-  data.tar.gz: c220b4bedf8b8914035ce3a2e2e5e9742c566bcf28ce8b2488efbb9aa2c5dfd881819bf666c9583b9f1151c06b44425a7614e0d6ab5cda9d5ca2d68965d85130
+  metadata.gz: 5794e0e8b1d779a72e6d8ba599e85b196f870f16494e663830f3c265c3ee39101bf729e6670f0f8f7d5762dadd438b3843aab5d7bcd450bd1212d4c95f0c6183
+  data.tar.gz: 91fca40528d0f20a698ea66602de134ba6c442e6ab7e51118003ba0afdf49eca1247caa33fcf025f9cced537dc6f2ecaad8a440f07d7d34232d1326bb2eaa213

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|
@@ -50,7 +52,7 @@ 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?collector|data\s*recorder|netter|(oper|prepar)ator)\(?s?\)?\.?\:?|
     (?i:fide)\:?\s*\b|
     (?i:game\s+dept)\.?\s*\b|
     (?i:see\s+notes?\s*(inside)?)|
@@ -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)|
@@ -209,9 +212,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 = 2
-    PATCH = 3
+    MINOR = 4
+    PATCH = 0
     BUILD = nil
 
     def self.version

metadata

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