dwc_agent 1.2.0 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcdfb4922038d07715bd064b74a516203bcce44ef824683ac9766586764bb98f
-  data.tar.gz: d9113f199abc420d7c608bfbead6e70f1f6192437a82e43541f77eb187752c2a
+  metadata.gz: ee3ede60926c849a6db7094f63a9d03d07f3e9d13fd74428841812f8970aa681
+  data.tar.gz: 7075c82cd35834f8dad00d57922e46f7ab0eb4f086eb4c0ad40b02c5726ca001
 SHA512:
-  metadata.gz: 403049856dbfbc83c984b5175615718c738b46312ecced4d3b5853fb4584a080d1e868492ee476187c8cf7238481845c0f77bd181e6ceaeebc22bae8b7aef127
-  data.tar.gz: 01e8bc4beb84140a80763c6c0dc8ff6ee6f967e8382cbacf04a230aa3405f2394ec1a90570471e113d90264c1e202c5452428858eb5aff6bc499f4e795dc3158
+  metadata.gz: 9e7b655e50ec2d744d74ad44a30b35d75e76b7e0160a35ee7e6b295a03dbc343a012a702e3614c10516bf1282617ec00a0f472e2cc1aefc9d3decc9b4494a946
+  data.tar.gz: a28bd967f7df5afaf5e71a01f3902c0bab33dc735bc0861ceb137bad2d81981ec9ae6768497afff267b986bf653f9ba1fb8091221720964866b3352f8d8e2aae

data/bin/dwcagent

@@ -5,7 +5,7 @@ require 'dwc_agent'
 require 'json'
 
 names = []
-DwcAgent.parse(ARGV[0]).each do |r|
+DwcAgent.parse(ARGV[0].dup).each do |r|
   name = DwcAgent.clean(r)
   if !name[:family].nil? && name[:family].length >= 2
     names << name

data/bin/dwcagent-similarity

@@ -3,4 +3,4 @@
 
 require 'dwc_agent'
 
-puts DwcAgent.similarity_score(ARGV[0],ARGV[1])
+puts DwcAgent.similarity_score(ARGV[0].dup,ARGV[1].dup)

data/lib/dwc_agent/cleaner.rb

@@ -22,6 +22,10 @@ module DwcAgent
         return blank_name
       end
 
+      if parsed_namae.given && GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
+        return blank_name
+      end
+
       if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
         return blank_name
       end
@@ -38,9 +42,9 @@ module DwcAgent
         return blank_name
       end
 
-      if parsed_namae.given && 
-         parsed_namae.family && 
-         parsed_namae.family.count(".") > 0 && 
+      if parsed_namae.given &&
+         parsed_namae.family &&
+         parsed_namae.family.count(".") > 0 &&
          parsed_namae.family.length - parsed_namae.family.count(".") <= 3
           given = parsed_namae.given
           family = parsed_namae.family
@@ -48,9 +52,9 @@ module DwcAgent
           parsed_namae.given = family
       end
 
-      if parsed_namae.given && 
-         parsed_namae.family && 
-         parsed_namae.family.length <=3 && 
+      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
@@ -59,9 +63,9 @@ module DwcAgent
           parsed_namae.given = family
       end
 
-      if parsed_namae.given && 
-        (parsed_namae.given == parsed_namae.given.upcase || 
-        parsed_namae.given == parsed_namae.given.downcase) && 
+      if parsed_namae.given &&
+        (parsed_namae.given == parsed_namae.given.upcase ||
+        parsed_namae.given == parsed_namae.given.downcase) &&
         !parsed_namae.given.include?(".") &&
         parsed_namae.given.tr(".","").length >= 4
           parsed_namae.given = NameCase(parsed_namae.given)
@@ -115,8 +119,12 @@ module DwcAgent
         return blank_name
       end
 
+      if !given.nil? && GIVEN_BLACKLIST.any?{ |s| s.casecmp(given) == 0 }
+        return blank_name
+      end
+
       { given: given, family: family, particle: particle }
     end
 
   end
-end
+end

data/lib/dwc_agent/constants.rb

@@ -48,10 +48,12 @@ module DwcAgent
     \d+\s+(?i:Oct|Octob(er|re))\.?\b|
     \d+\s+(?i:Nov|Novemb(er|re))\.?\b|
     \d+\s+(?i:Dec|D(e|é)cemb(er|re))\.?\b|
+    \b[.-–,;:/]?\s*(?i:Alabama|Alaska|Arizona|Arkansas|California|Colorado|Connecticut|Delaware|Evergreen|Florida|Georgia|Hawaii|Idaho|Illinois|Indiana|Iowa|Kansas|Kentucky|Louisiana|Maine|Maryland|Massachusetts|Michigan|Minnesota|Mississippi|Missouri|Montana|Nebraska|Nevada|New\s+Hampshire|New\s+Jersey|New\s+Mexico|New\s+York|North\s+Carolina|North\s+Dakota|Ohio|Oklahoma|Oregon|Pennsylvania|Portland|Rhode\s+Island|South\s+Carolina|South\s+Dakota|St\s+Petersburg|Tennessee|Texas|Utah|Vermont|Virginia|Washington|West\s+Virginia|Wisconsin|Wyoming)\s+(?i:State)\s*\b|
     (?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?\)?\.?\:?|
+    \b[.-–,;:]?\s*(?i:department|faculty)\s*?(?i:of)?\s*?(?i:entomology|biology|zoology)|
     (?i:fide)\:?\s*\b|
     (?i:game\s+dept)\.?\s*\b|
     (?i:see\s+notes?\s*(inside)?)|
@@ -71,6 +73,7 @@ module DwcAgent
     (?i:American\s+Museum\s+of\s+Natural\s+History)|
     (?i:The\s+Paleontological\s+Research\s+Institution)|
     (?i:museum\s+victoria)|
+    \b\s*(?i:United\s+States|Russia)\s*\b|
     (?i:revised|photograph|fruits\s+only)|
     -?\s*(?i:sight\s+(id|identifi?cation))\.?\s*\b|
     -?\s*(?i:synonym(y|ie))|
@@ -162,16 +165,6 @@ module DwcAgent
     ^(\S{4,},\s+(?:\S\.\s*){1,})\s+(\S{4,},\s+(?:\S\.\s*){1,})$
   }x
 
-# Was used in 1.1.0 but it sunk performance so threw it back to a WIP
-#
-# @contracted_list_regex = Regexp.new CONTRACTED_LIST.to_s
-#
-# name.gsub!(@contracted_list_regex, '\1 \3 | \2 \3')
-#
-#  CONTRACTED_LIST = %r{
-#    ^(\S{1,}\.?)+\s+(?i:and|&)\s+(\S{1,}\.?)+\s*(.*)$
-#  }x
-
   BLACKLIST = %r{
     (?i:abundant)|
     (?i:adult|juvenile)|
@@ -208,11 +201,14 @@ module DwcAgent
     (?i:no\s+(agent)?\s?(data|disponible)(\s+available)?)|
     (?i:not?\s+(entered|stated))|
     (?i:nomenclatur(e|al)\s+adjustment)|
+    (?i:not\s+available)|
     (?i:ontario|qu(e|é)bec|saskatchewan|new brunswick|sault|newfoundland|assurance|vancouver|u\.?s\.?s\.?r\.?)|
+    (?i:popa\s+observers?)|
     (?i:recreation|culture)|
     (?i:shaped|dark|pale|areas|phase|spotting|interior|between|closer)|
     (?i:soci(e|é)t(y|é)|cent(er|re)|community|history|conservation|conference|assoc|class|commission|consortium|council|club|exposit|alliance|protective|circle)|
     (?i:commercial|company|control|product)|
+    (?i:sequence\s+data)|
     (?i:size|large|colou?r)\s+|
     (?i:skeleton)|
     (?i:survey|assessment|station|monitor|stn\.|index|project|bureau|engine|exchange|ex(c|k)ursi(e|o|ó)n?|exped\.?|exp(e|i)di(c|t)i(e|o|ó)n?|experiment|explora(d|t)|festival|generation|inventory|marine|service)|
@@ -223,6 +219,7 @@ module DwcAgent
     \s*(?i:too)\s+|\s*(?i:the)\s+|
     (?i:taxiderm(ies|y))|
     (?i:though)|
+    (?i:texas\s+instruments?)\s*?(for)?|
     (?:tropical)|
     (?i:toward|seen at)|
     (?i:unidentified|unspecified|unk?nown|unnamed|unread|unmistak|no agent)|
@@ -240,7 +237,19 @@ module DwcAgent
     "of",
     "curators",
     "nomenclatural",
-    "adjustment"
+    "adjustment",
+    "available",
+    "data",
+    "orig",
+    "science",
+    "catalogue",
+    "entered",
+    "registration"
+  ]
+
+  GIVEN_BLACKLIST = [
+    "not any",
+    "has not"
   ]
 
   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

data/lib/dwc_agent/version.rb

@@ -2,8 +2,8 @@ module DwcAgent
   class Version
 
     MAJOR = 1
-    MINOR = 2
-    PATCH = 0
+    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: 1.2.0
+  version: 1.4.3
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae