dwc_agent 0.3.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94bd1d5cf3ecff4b3b30f82e68bbe2477db29e0ba8ce7d6c5e3d5220bcf46ca9
-  data.tar.gz: 2e0668f5aa4f76f9e05b83ba0d1514b0a9d89949904e8caff30cd4c450c8aa5b
+  metadata.gz: 69d6e0f6c0f9d59801d0e53a89dd73896f0ac5a8230156879227ea6efe14bb7d
+  data.tar.gz: 1330921589cbcad22273c4b5cae821eba7266cc4357756498ae3b6d4f029e3f8
 SHA512:
-  metadata.gz: d5c1f56b49826c72715258299d915b586d0aea88165de1c26a68b68a006df2ae3232c9fbb4bbdc9382240b90674e84b27b414089fe0bd7331e089063734f0773
-  data.tar.gz: c6c5c8aaba8d3b8b7305d430a154d14b4033f8a7f0d931161165d85baec0d93f0f81554299cdbac2f47734775a5189a9c3c5fc6ef50d801292da97c57fbea9cd
+  metadata.gz: 735057f853b259f4d7fcb9f4c73d2f193f9a0e363d439a8bf894bbd9f878e8667cd14979c10cf138c7cc007f83cd09b7d5f9f21e0482b6303f73a40c788a957a
+  data.tar.gz: 8760dc0d9976543fe6ce448e2129b94e2d86d5a17f8e0b4b297f4dd23e8c4e4d73b4c7af4863e5edfa6abbbdb83181e6364e8064b0c73f185b0370c3ea1f597c

data/lib/dwc_agent/cleaner.rb

@@ -16,20 +16,28 @@ module DwcAgent
     # @param parsed_namae [Object] the namae object
     # @return [Hash] the given, family hash
     def clean(parsed_namae)
-      blank_name = { given: nil, family: nil }
+      blank_name = { given: nil, family: nil, particle: 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
@@ -91,6 +99,10 @@ module DwcAgent
         particle = nil
       end
 
+      if !particle.nil? && particle.include?(".")
+        particle = nil
+      end
+
       if !family.nil? && (family == family.upcase || family == family.downcase)
         family = NameCase(family)
       end
@@ -103,7 +115,11 @@ module DwcAgent
         return blank_name
       end
 
-      { given: given, family: family }
+      if !family.nil? && FAMILY_BLACKLIST.any?{ |s| s.casecmp(family) == 0 }
+        return blank_name
+      end
+
+      { given: given, family: family, particle: particle }
     end
 
   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,10 +77,11 @@ 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)|
+    (?i:sem\s+(colec?tor|data))|
     \b[,;]\s+\d+\z|
     ["!@?]|
     [,]?\d+|
@@ -147,7 +147,8 @@ module DwcAgent
     '{' => '',
     '}' => '',
     '@' => '',
-    '%' => ''
+    '%' => '',
+    '\\' => ''
   }
 
   PHRASE_SUBS = {
@@ -164,6 +165,7 @@ module DwcAgent
   BLACKLIST = %r{
     (?i:abundant)|
     (?i:adult|juvenile)|
+    (?i:administra(d|t)or)|
     (?i:anon)|
     (?i:australian?)|
     (?i:average)|
@@ -172,9 +174,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 +195,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 +222,17 @@ module DwcAgent
     ^\s*?de\s*?$
   }x
 
+  FAMILY_BLACKLIST = [
+    "der",
+    "van",
+    "von",
+    "the",
+    "of",
+    "curators",
+    "nomenclatural",
+    "adjustment"
+  ]
+
   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

@@ -1,9 +1,9 @@
 module DwcAgent
   class Version
 
-    MAJOR = 0
-    MINOR = 3
-    PATCH = 3
+    MAJOR = 1
+    MINOR = 0
+    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.3.3
+  version: 1.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-24 00:00:00.000000000 Z
+date: 2019-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae