dwc_agent 3.3.1.0 → 3.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39a9ead6ab8410e39f29e6bf5b841214042fbf47a336c0e4c5dfaa4b0d11b87d
-  data.tar.gz: 763e722a2f28c765660573b6a0f2895e5c4c25550e8c927f5a85fa6e533f3800
+  metadata.gz: a8c59f7eec17563af7a1e0ab3a931055d8181c7331f4ad4e569a61a4a05a07b8
+  data.tar.gz: 204d62a3fd1d5e003e455f271813d38691e00710a7e47b50e87bb60b7a4b7a90
 SHA512:
-  metadata.gz: e5e35467255e9e5dfc029a02757387099d3edc4ef385e4d73785c02ca74b0ffc8be7d87a60ec34f9fd22e80d10747bf357e4951b35d415bdc099b2ec24973178
-  data.tar.gz: 5726c9073b61195aa4e5a9f8d5861c044c4392e42b0c2ec114013cb3881362ff7b30927847b352152fb5659dcc8ca2aaf48c728a3bd6ab0059b1126f56659fd0
+  metadata.gz: b1872d38cdc1983d090850a4d0eb313c84f9b5a5c753d4a1af39fc016a3306245224f23f3fb021e1543f59646f685ba21167e80aef30bebb414349a0f675929a
+  data.tar.gz: 5fb3deb9a940f9407abeda5d558a2275bcc4df8180f5966e26af6692d74c044b3af88f4732a26185e2362a35d42883d45d47f1555ce9fecc10d9f0a5c37c91c9

data/lib/dwc_agent/constants.rb

@@ -202,10 +202,7 @@ module DwcAgent
     '%' => '',
     '\\' => '',
     '´' => '\'',
-    '+' => ' | '
-  }
-
-  PHRASE_SUBS = {
+    '+' => ' | ',
     ', ph.d.' => ' Ph.D.',
     ', Ph.D.' => ' Ph.D.',
     ', bro.' => ' Bro.',
@@ -224,7 +221,7 @@ module DwcAgent
     ', &' => ' &'
   }
 
-  SEPARATORS = {
+  COMPLEX_SEPARATORS = {
     "^(\\S{4,}),\\s+(Mrs?\\.|MRS?\\.)\\s+([A-Za-z\\.\\s]+)$" => "\\2 \\3 \\1",
     "^(Mrs?\\.?)\\s+&\\s+(Mrs?\\.?)\\s+(.*)$" => "\\1 \\3 | \\2 \\3",
     "^([A-Z]{1}\\.\\s*[[:alpha:]]+),\\s*?([A-Z.]+)$" => "\\1 \\2",

data/lib/dwc_agent/parser.rb

@@ -10,10 +10,9 @@ module DwcAgent
       suffix: SUFFIX,
       strip_out_regex: Regexp.new(STRIP_OUT.to_s),
       tidy_remains_regex: Regexp.new(POST_STRIP_TIDY.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),
-      residual_terminators_regex: Regexp.new(SPLIT_BY.to_s + %r{\s*\z}.to_s),
-      separators: SEPARATORS.map{|k,v| [ Regexp.new(k), v] }
+      subs_regex: Regexp.new(CHAR_SUBS.keys.map{|a| Regexp.escape a }.join('|').to_s),
+      complex_separators_regex: COMPLEX_SEPARATORS.map{|k,v| [Regexp.new(k), v] },
+      residual_terminators_regex: Regexp.new(SPLIT_BY.to_s + %r{\s*\z}.to_s)
     }
 
     class << self
@@ -39,8 +38,8 @@ module DwcAgent
       return [] if name.nil? || name == ""
       name.gsub!(options[:strip_out_regex], ' ')
       name.gsub!(options[:tidy_remains_regex], '')
-      name.gsub!(Regexp.union(options[:char_subs_regex], options[:phrase_subs_regex]), CHAR_SUBS.merge(PHRASE_SUBS))
-      options[:separators].each{|k| name.gsub!(k[0], k[1])}
+      name.gsub!(options[:subs_regex], CHAR_SUBS)
+      options[:complex_separators_regex].each{|k| name.gsub!(k[0], k[1])}
       name.gsub!(options[:residual_terminators_regex], '')
       name.squeeze!(' ')
       name.strip!

data/lib/dwc_agent/version.rb

@@ -3,8 +3,8 @@ module DwcAgent
   class Version
 
     MAJOR = 3
-    MINOR = 3
-    PATCH = 1
+    MINOR = 4
+    PATCH = 0
     BUILD = 0
 
     def self.version
@@ -12,7 +12,7 @@ module DwcAgent
     end
 
     def self.date
-      '2025-06-18'
+      '2025-08-20'
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 3.3.1.0
+  version: 3.4.0.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-18 00:00:00.000000000 Z
+date: 2025-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae