dwc_agent 1.5.1.6 → 2.0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3dca2a7933504e381819bb5ea864515f6216a51c40af56df22b5aa9aa2b03b4
-  data.tar.gz: 9f96d1143f9a012ba5586e2e44f2ba3e89c5329ddb52600a82ace80ab729ddb1
+  metadata.gz: 6cebe60af14ccb9f16b88e59a7ae88e0c76dfedb22ec855dbb2a1c332fa2059b
+  data.tar.gz: e08bfeab07254818dc445f114919ec6dfeb526f10929f8c9cf59b76a8719ec39
 SHA512:
-  metadata.gz: 03b70b9826fc781b1684f12d6cba52a961934c719dbfeaa17a030e72c2330e697579e9880ee009306841dbb68e3dd5b4972f4f1c66300a935e2faf8bf21651f2
-  data.tar.gz: 1f61eea5f4d0ef946110a82472cedf22a7f9e6ba2ae4a11abbd9fc0f04c687935596ce84930685258b0e2700c6309475606bc0967f503975465bffec7d76095b
+  metadata.gz: b578ff67df343943bcbced24efafe62cb3e6e28e47c7e8e7a3095b9d19d19609bd7d6c054caf52b6bedc605949d5791204a398a65aeadbfa4d142a291ca127c6
+  data.tar.gz: 419f6f4293a05539e9ce23553d279e4f2b8f85c3bfb7bb8d2f3c46d2dbcbad13bb7c806c70494182a9d40e2be161b94924a92da8ad66f640fe03fa4113b9e61d

data/lib/dwc_agent/constants.rb

@@ -92,7 +92,7 @@ module DwcAgent
     FNA|DAO|HUH|FDNMB|MNHN|PNI|USNM|ZMUC|CSIRO|ACAD|USGS|NAWQA|
     (?i:para|topo|syn|holo|allo|choro|eco|iso|isoepi|isopara|karyo|morpho|neo|mero|pala|paralecto|paraneo|photo|schizo)?(?i:types?\:?)|
     AFSC\/POLISH\s+SORTING\s+CTR\.?|
-    (?i:university|museum|exhibits?)|
+    (?i:university|mus(e|é)um|exhibits?)|
     (?i:uqam)|
     (?i:sem\s+(colec?tor|data))|
     (?i:no\s+coll\.?(ector)?)|
@@ -118,6 +118,7 @@ module DwcAgent
     ^[-,.\s;*\d]+\s?|
     \s*?-{2,}\s*?|
     ^(?i:exc?p?)[:.]\s*|
+    \:?\s*(?i:exch)(\b|\z)|
     \s+de\s*$|
     \.{2,}$
   }x
@@ -195,9 +196,10 @@ module DwcAgent
     "^(\\S{4,},\\s+(?:\\S\\.\\s*){1,})\\s+(\\S{4,},\\s+(?:\\S\.\\s*){1,})$" => "\\1 | \\2",
     "(\\S{1}\\.)([[:alpha:]]{2,})" => "\\1 \\2",
     "(\\w*),?\\s+(.*)\\s+(van|von)$" => "\\3 \\1, \\2",
-    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+(.*)$" => "\\1 \\3 | \\2 \\3",
+    "^([A-Z.\\s]+)\\s+(?:and|&|et|e)\\s+([A-Z.\\s]+)\\s+(\\w{2,})(.*)" => "\\1 \\3 | \\2 \\3 | \\4",
     "^([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,})\\s*?[,&]\\s*?([A-Z]\\w{2,})$" => "\\1 | \\2 | \\3",
-    "^([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,})\\s*?[,&]\\s*?([A-Z]\\w{3,})$" => "\\1 | \\2 | \\3 | \\4"
+    "^([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,})\\s*?[,&]\\s*?([A-Z]\\w{3,})$" => "\\1 | \\2 | \\3 | \\4",
+    "^([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,}),\\s*?([A-Z]\\w{2,})\\s*?[,&]\\s*?([A-Z]\\w{3,})$" => "\\1 | \\2 | \\3 | \\4 | \\5"
   }
 
   BLACKLIST = %r{
@@ -230,6 +232,7 @@ module DwcAgent
     (?i:o?\.?m\.?n\.?r\.?)|
     (?i:measurement)|
     (?i:ent(o|y)mology)|
+    (?i:malacology)|
     (?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\.)|
@@ -298,11 +301,19 @@ module DwcAgent
     "dissection",
     "entered",
     "erased",
+    "expd",
+    "expdn",
+    "hist",
+    "historical",
+    "historie",
     "indecipherable",
+    "inst",
     "nomenclatural",
     "orig",
+    "qld",
     "registration",
     "science",
+    "study",
     "wg",
     "wm",
     "wn",

data/lib/dwc_agent/version.rb

@@ -1,10 +1,10 @@
 module DwcAgent
   class Version
 
-    MAJOR = 1
-    MINOR = 5
-    PATCH = 1
-    BUILD = 6
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
+    BUILD = 1
 
     def self.version
       [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 1.5.1.6
+  version: 2.0.0.1
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -110,7 +110,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: Parse Darwin Core agent terms such as recordedBy and identifiedBy