dwc_agent 3.0.10.0 → 3.0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf7946475612999b141445b40ee1b93c1252d3f987b65eab8523238716ab162e
-  data.tar.gz: '09d2c2353fc63d86bdb327cfc8cd29e33be945d2eb4a6d147c55e31e30c80c14'
+  metadata.gz: e293fff35d22252ef51e375df3aa3daa48405ae175f45529ac90006d5edc48d3
+  data.tar.gz: 54ebf850b428d4cf2bb6c0c17bc41c90aa0982db90f133dcdbc2077c6f1277d4
 SHA512:
-  metadata.gz: ce194f8823af1f1a594a43a0f37eb2e08ea51dbec107fb3c7d19dceb04e6579efe30d7a5bbaafbf964f1110debd8b4a8bb2abe53a55c9f99965da0a6cc32f8d3
-  data.tar.gz: 7f6b7b0fe8c23cd1e0bbef6eefa1488300867f7acbb8b039bef65f0c597011a85aad7f926652ce99993a0fa6bbebbc4eef99f73769031714e4f5e0002d5c6737
+  metadata.gz: 9438247b18b2813c9643b8a272ce38b5b4083fac30791a66bc1df33920b987f586978e578d8bbfb0795991e13ed712bf1e1eaafb637df7e92a414dc10852762f
+  data.tar.gz: 972b20669e401cc1c748f3e3135a49363c2964288ffce92cdc8131300f228ea7d75c11a82b4438d3167ab8901dbcd79e5156fe2c60a13d321dede70ff59d9315

data/lib/dwc_agent/constants.rb

@@ -218,8 +218,9 @@ module DwcAgent
     "(\\S{1}\\.)([[:alpha:]]{2,})" => "\\1 \\2",
     "^([[:alpha:]]{2,})(?:\\s+)((?:\\S{1}\\.\\s?){1,})$" => "\\1, \\2",
     "([[:alpha:]]*),?\\s*(.*)\\s+(van|von)$" => "\\3 \\1, \\2",
-    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]]{2,})\\s+([[:alpha:]]{2,})$" => "\\1 \\4 | \\2 \\3 \\4",
-    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]]{2,})(.*)$" => "\\1 \\3 | \\2 \\3 | \\4",
+    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]’`'-]{2,})\\s+([[:alpha:]’`'-]{2,})$" => "\\1 \\4 | \\2 \\3 \\4",
+    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]’`'-]{2,})(.*)$" => "\\1 \\3 | \\2 \\3 | \\4",
+    "^([A-Z.\\s]+),\\s+([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+([[:alpha:]’`'-]{2,})(.*)$" => "\\1 \\4 | \\2 \\4 | \\3 \\4 | \\5",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?(?i:and|&|et|e|,)\\s+([A-Z][[:alpha:]]{2,})$" => "\\1 | \\2 | \\3",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?(?i:and|&|et|e|,)\\s+([A-Z][[:alpha:]]{3,})$" => "\\1 | \\2 | \\3 | \\4",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?(?i:and|&|et|e|,)\\s+([A-Z][[:alpha:]]{3,})$" => "\\1 | \\2 | \\3 | \\4 | \\5"
@@ -232,7 +233,8 @@ module DwcAgent
     ^(?i:anon)$|
     (?i:australian?)|
     (?i:average)|
-    (?i:believe|unclear|ill?egible|none|suggested|(dis)?agrees?)|approach|
+    (?i:believe|unclear|ill?egible|suggested|(dis)?agrees?)|approach|
+    \b\s*(?i:none)\s*\b|
     (?i:barcod)|
     (?i:BgWd)|
     (?i:biolog|botan|zoo|ecolog|mycol|(in)?vertebrate|fisheries|genetic|animal|mushroom|wildlife|plumage|flower|agriculture)|
@@ -260,7 +262,7 @@ module DwcAgent
     (?i:geographic)|
     (?i:mus(eum|ée)|universit(y|é|e|at)|college|institute?|acad(e|é)m|school|écol(e|iers?)|laboratoi?r|projec?t|polytech|dep(t|art?ment)|research|clinic|hospital|cientifica|sanctuary|safari)|
     (?i:univ\.)|
-    (?i:graduate|student|élèves?|éleveur|étudiants|estudi?antes?|labo\.|storekeep|supervisor|superint|rcmp|coordinator|minority|fisherm(a|e)n|police|taxonomist|consultant|participante?s?|team|(é|e)quipe|memb(er|re)|crew|group|staff|personnel|family|captain|friends|assistant|worker|gamekeeper)|
+    \b\s*(?i:graduate|student|élèves?|éleveur|étudiants|estudi?antes?|labo\.|storekeep|supervisor|superint|rcmp|coordinator|minority|fisherm(a|e)n|police|taxonomist|consultant|participante?s?|team|(é|e)quipe|memb(er|re)|crew|group|personnel|staff|family|captain|friends|assistant|worker|gamekeeper)\s*\b|
     (?i:non\s+pr(é|e)cis(é|e))|
     (?i:no\s+consta)|
     (?i:no\s+(agent)?\s?(data|disponible)(\s+available)?)|
@@ -272,16 +274,18 @@ module DwcAgent
     (?i:recreation|culture)|
     (?i:renseigné)|
     (?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:soci(e|é)t(y|é)|cent(er|re)|community|history|conservation|conference|assoc|commission|consortium|council|club|exposit|alliance|protective|circle)|
+    ^(?i:class)\s*\b|
+    (?i:commercial|control|product)|
+    ^(?i:company)\s*\b|
     (?i:sequence\s+data)|
     (?i:size|large|colou?r)\s+|
     (?i:skeleton)|
-    (?i:survey|assessment|station|monitor|stn\.|index|project|bureau|engine|(e|é)x?chang(e|é)s?|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)|
+    (?i:survey|assessment|station|monitor|stn\.|index|project|engine|(e|é)x?chang(e|é)s?|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)|
     (?i:submersible)|
     (?i:synonymy?)|
     (?i:systematic|perspective)|
-    ^\s*(?i:off|too|the)\s*|
+    ^\s*(?i:off|too|the)\s*\b|
     (?i:taxiderm(ies|y))|
     (?i:though)|
     (?i:texas\s+instruments?)\s*?(for)?|
@@ -383,6 +387,7 @@ module DwcAgent
     "von",
     "the",
     "of",
+    "van de",
     "van der"
   ]
 

data/lib/dwc_agent/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
 
     MAJOR = 3
     MINOR = 0
-    PATCH = 10
+    PATCH = 12
     BUILD = 0
 
     def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 3.0.10.0
+  version: 3.0.12.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae