dwc_agent 3.0.0.8 → 3.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2ec2d89d805d35fb64401736263556d13d244407456b909996912d4eb749653
-  data.tar.gz: 1bb39f6a59ae242362266f8a949626cfd1289d194e150463dd2eb650b98a4171
+  metadata.gz: a9428270164619d86464c072066fc6ca0abb8f29fa5453bee14e9213a50d2436
+  data.tar.gz: ef6dea822f19594773883268e1100baaabadcba660065a9d862de6df792256b2
 SHA512:
-  metadata.gz: f005ba01365f8226966aae1e2e70ffcbbc3ffef391eeb319baad0e666c91c8edc0bef2acd1ce98dabf5d6503c063f43341c7da72e4f4b11e370537ec4592408e
-  data.tar.gz: bef79f42b26962c60357c3dba78d15d4b9f8189cc3c31f7034e65f78f6bc41c8b3153083354186869e9ac6b7285aa355a2b62b4c81060091a2ae99c08829ff2a
+  metadata.gz: 6c778778f63294ea9844a1ee3bfc042b51da618811e43118a2487d304d826089b10025c01df98d3c1cdb8fccd1828d320ca10207e140d43bd7ce0745efabbb79
+  data.tar.gz: da216fa168e39240066d7fb6f93c63d7e66a822679623104b7c8fadacf03ac822e78c772a9b69392584319691d277685ba953d7bbc43d71c3cbee460e8b95d53

data/lib/dwc_agent/constants.rb

@@ -124,7 +124,8 @@ module DwcAgent
     (?i:ex\.?\s+herb\.?\s*)|
     \:?\s*(?i:exch)(\b|\z)|
     \s+de\s*$|
-    \.{2,}$
+    \.{2,}$|
+    \[|\]
   }x
 
   SPLIT_BY = %r{
@@ -200,6 +201,7 @@ module DwcAgent
     "^(\\S{4,},\\s+(?:\\S\\.\\s*){1,})\\s+(\\S{4,},\\s+(?:\\S\.\\s*){1,})$" => "\\1 | \\2",
     "(\\S{1}\\.)([[:alpha:]]{2,})" => "\\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][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?[,&]\\s*?([A-Z][[:alpha:]]{2,})$" => "\\1 | \\2 | \\3",
     "^([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,}),\\s*?([A-Z][[:alpha:]]{2,})\\s*?[,&]\\s*?([A-Z][[:alpha:]]{3,})$" => "\\1 | \\2 | \\3 | \\4",
@@ -261,8 +263,7 @@ module DwcAgent
     (?i:submersible)|
     (?i:synonymy?)|
     (?i:systematic|perspective)|
-    \s+(?i:off)\s+|
-    \s*(?i:too)\s+|\s*(?i:the)\s+|
+    ^\s*(?i:off|too|the)\s*|
     (?i:taxiderm(ies|y))|
     (?i:though)|
     (?i:texas\s+instruments?)\s*?(for)?|

data/lib/dwc_agent/parser.rb

@@ -1,4 +1,5 @@
 module DwcAgent
+
   class Parser
 
     class << self
@@ -29,9 +30,7 @@ module DwcAgent
     def parse(name)
       return [] if name.nil? || name == ""
       name.gsub!(@strip_out_regex, ' ')
-      name.gsub!(/\[|\]/, '')
-      name.gsub!(@char_subs_regex, CHAR_SUBS)
-      name.gsub!(@phrase_subs_regex, PHRASE_SUBS)
+      name.gsub!(Regexp.union(@char_subs_regex, @phrase_subs_regex), CHAR_SUBS.merge(PHRASE_SUBS))
       SEPARATORS.each{|key, value| name.gsub!(Regexp.new(key), value)}
       name.gsub!(@residual_terminators_regex, '')
       name.squeeze!(' ')

data/lib/dwc_agent/version.rb

@@ -3,8 +3,8 @@ module DwcAgent
 
     MAJOR = 3
     MINOR = 0
-    PATCH = 0
-    BUILD = 8
+    PATCH = 1
+    BUILD = 0
 
     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: 3.0.0.8
+  version: 3.0.1.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.17
 signing_key:
 specification_version: 4
 summary: Parse Darwin Core agent terms such as recordedBy and identifiedBy