dwc_agent 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c26dc44596aa62cfbf94db6aca41806ad6567367da35d23c746f19a036515121
-  data.tar.gz: 1029da746bd324bec825363f69cb2d77d66fd211fa949337b7602e43193b2ae4
+  metadata.gz: f54434352d90dff97e7c733fbc2fb53117380d5f04d6841d9796f48a5603dc18
+  data.tar.gz: 1ca4ae5b5bf104b51fa030cfe3984e428ab4325df266a6c90de50dff134038c6
 SHA512:
-  metadata.gz: a9ed1698d69ab48831a91d43c337e42efcfe6d1c97e00c8a7602465777302f93038c4d5b2a4eca244704cc59b7d49339f6d8489424e7b0ec0be0ba7e31eecab3
-  data.tar.gz: 6ad5912ea9977238490ce73c8a05e99488b71688074d614424ac086998167f2a52118316e167646ab0a8f317a13d189d9969acd62dc903f9594138732e70c49a
+  metadata.gz: bd1a44b5926abba1a7124493980fcf8e91aebc3bf854bca8c92da973299a345f8eb79cd3a02696e93d1c4426a6fa3bd5ff3414239c884566ed5de0679b0e3760
+  data.tar.gz: 2dcea697b1c7d589227469e5a69a3da40f71886c01e29a714557276bcdc0d3a2755cc0ff89bf36dcd70388fd640917384b776ace8de4bd3352cdea217d08ae3e

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) && 
@@ -92,6 +111,10 @@ module DwcAgent
         return blank_name
       end
 
+      if !family.nil? && FAMILY_BLACKLIST.include?(family)
+        return blank_name
+      end
+
       { given: given, family: family }
     end
 

data/lib/dwc_agent/constants.rb

@@ -83,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|
@@ -99,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{
@@ -146,7 +147,8 @@ module DwcAgent
     '{' => '',
     '}' => '',
     '@' => '',
-    '%' => ''
+    '%' => '',
+    '\\' => ''
   }
 
   PHRASE_SUBS = {
@@ -166,7 +168,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)|
@@ -191,6 +193,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)|
@@ -211,9 +214,19 @@ 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",
+    "the",
+    "The",
+    "Catalog"
+  ]
+
+  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 = 1
+    MINOR = 4
+    PATCH = 2
     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.1
+  version: 0.4.2
 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