dwc_agent 3.0.0.9 → 3.0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed891ad93906581d9340f3baa16006336cd9424d8c44bf7fecd0611db5546182
-  data.tar.gz: a6785a960284e60f948fa07dfb042b83adb656ee5b2473101478aba43bbabf8b
+  metadata.gz: 51d092e5e8f6a540e67959189827553f1b37214b855465ef69444098e9146972
+  data.tar.gz: 5ca4086f1bed287ec90c1afc1ce1e46f1ad6fd149f7449ca519e59f2474a918c
 SHA512:
-  metadata.gz: 2765dfcc031e7cfc5e6c9d6b39f1aae9285fda95b029bd5a5d192292cafa911e885ce490a1e811055715b10bde1e986055fa36b13775c008ce04a6bda14baffb
-  data.tar.gz: 69807bf8ff357feec4ab9cd0a0e4c765cd49df19fa1b96eba6b8dfc7ade0c5c568d192dba83d325eec79e4a5f20b9752db8e5b5d5e560fcc3aa461062d5debe8
+  metadata.gz: a255f52c83b5bfda870d3edd20187186fd3d0a6345a51dadf67a2d9dd072ec4e476a56d0fbb593e72a417a425a5a9dae2716a61dc7bd88fbf9c8350a45ff68ea
+  data.tar.gz: 8cb41bc6e132bcc66aa3a196bd54e48b374c7a95227c9fa13f77b856d88684978d98c72100790db244a83e65b389d162a819a8926c2d1ca8c1dad7d8c6166de4

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",

data/lib/dwc_agent/parser.rb

@@ -1,4 +1,5 @@
 module DwcAgent
+
   class Parser
 
     class << self
@@ -20,6 +21,7 @@ module DwcAgent
       @char_subs_regex = Regexp.new [CHAR_SUBS.keys.join].to_s
       @phrase_subs_regex = Regexp.new PHRASE_SUBS.keys.map{|a| Regexp.escape a }.join('|').to_s
       @residual_terminators_regex = Regexp.new SPLIT_BY.to_s + %r{\s*\z}.to_s
+      @separators = SEPARATORS.map{|k,v| [ Regexp.new(k), v] }
     end
 
     # Parses the passed-in string and returns a list of names.
@@ -29,10 +31,8 @@ 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)
-      SEPARATORS.each{|key, value| name.gsub!(Regexp.new(key), value)}
+      name.gsub!(Regexp.union(@char_subs_regex, @phrase_subs_regex), CHAR_SUBS.merge(PHRASE_SUBS))
+      @separators.each{|k| name.gsub!(k[0], k[1])}
       name.gsub!(@residual_terminators_regex, '')
       name.squeeze!(' ')
       name.strip!

data/lib/dwc_agent/version.rb

@@ -3,8 +3,8 @@ module DwcAgent
 
     MAJOR = 3
     MINOR = 0
-    PATCH = 0
-    BUILD = 9
+    PATCH = 1
+    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: 3.0.0.9
+  version: 3.0.1.1
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-08-09 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