dwc_agent 1.5.1.2 → 1.5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46975c588975ffd636e3c07506e27c0121e9af9acbc1e7b36275bedb5bc67f29
-  data.tar.gz: c39f8a7f561fa69abc0ba5cb0f8a67d545f63356dc28c7eb27c465ac20824c3c
+  metadata.gz: 8f1a07e6b4a0c4819107295a79d395321dbf73772c81cb32013a66a88baeedda
+  data.tar.gz: b686b2cbcefb91d8a35f24e6364528683b40f15a833b5c7a5297f862b7ff64a0
 SHA512:
-  metadata.gz: d974871f6ce3c31424d2802bff332190b702cacb1008e82c2827f63da30643506b71b484be05c436a4d6cf2f8ab841979bd626ee721a8a4230e07fe2b96b97c4
-  data.tar.gz: 8ade64986b8f7774cfdc8bb9170a1ad3134b0ec6dc84d81aab1909175f1ec48af1df260c10bb7c113b73ae1da16f6f0163fcf8fd57b3579c718666f31fe8aac7
+  metadata.gz: 120885a8b97055dcc5e91ad5a00c763b4de2db4a825557f6a8231f3ef314a160a59d24352f2f56bdaa78b61539b7c794801b64bf53af3c0893fbbdb5b36edb6a
+  data.tar.gz: 3d3529434a1e5be6ab372dff55af6cb0debedfc8dbbcd9f78a00d3b62093487359d054c62df33723bd56ee1dffa7bcf9c3102dda28a0cca77b40529fea5fc3fd

data/lib/dwc_agent/constants.rb

@@ -191,9 +191,11 @@ module DwcAgent
     '-Jr' => ' Jr.'
   }
 
-  COMPLEX_SEPARATORS = %r{
-    ^(\S{4,},\s+(?:\S\.\s*){1,})\s+(\S{4,},\s+(?:\S\.\s*){1,})$
-  }x
+  SEPARATORS = {
+    "^(\\S{4,},\\s+(?:\\S\\.\\s*){1,})\\s+(\\S{4,},\\s+(?:\\S\.\\s*){1,})$" => "\\1 | \\2",
+    "(\\S{1}\\.)([[:alpha:]]{2,})" => "\\1 \\2",
+    "(.*)\s+(.*)\s+(van|von)$" => "\\3 \\1, \\2"
+  }
 
   BLACKLIST = %r{
     (?i:abundant)|

data/lib/dwc_agent/parser.rb

@@ -16,13 +16,10 @@ module DwcAgent
         suffix: SUFFIX
       }
       @namae = Namae::Parser.new(options)
-
       @strip_out_regex = Regexp.new STRIP_OUT.to_s
-      @residual_terminators_regex = Regexp.new SPLIT_BY.to_s + %r{\s*\z}.to_s
       @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
-      @complex_separators_regex = Regexp.new COMPLEX_SEPARATORS.to_s
-      @add_separators_regex = Regexp.new %r{(\S{1}\.)([[:alpha:]]{2,})}.to_s
+      @residual_terminators_regex = Regexp.new SPLIT_BY.to_s + %r{\s*\z}.to_s
     end
 
     # Parses the passed-in string and returns a list of names.
@@ -35,8 +32,7 @@ module DwcAgent
       name.gsub!(/\[|\]/, '')
       name.gsub!(@char_subs_regex, CHAR_SUBS)
       name.gsub!(@phrase_subs_regex, PHRASE_SUBS)
-      name.gsub!(@add_separators_regex, '\1 \2')
-      name.gsub!(@complex_separators_regex, '\1 | \2')
+      SEPARATORS.each{|key, value| name.gsub!(Regexp.new(key), value)}
       name.gsub!(@residual_terminators_regex, '')
       name.squeeze!(' ')
       name.strip!

data/lib/dwc_agent/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
     MAJOR = 1
     MINOR = 5
     PATCH = 1
-    BUILD = 2
+    BUILD = 3
 
     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.2
+  version: 1.5.1.3
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2021-01-08 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.1.2
+rubygems_version: 3.2.4
 signing_key:
 specification_version: 4
 summary: Parse Darwin Core agent terms such as recordedBy and identifiedBy