dwc_agent 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69d6e0f6c0f9d59801d0e53a89dd73896f0ac5a8230156879227ea6efe14bb7d
-  data.tar.gz: 1330921589cbcad22273c4b5cae821eba7266cc4357756498ae3b6d4f029e3f8
+  metadata.gz: d56e8cb49d4857e324dbdda7d6cfa31e9a7a3079c40a12659ff6077d13308613
+  data.tar.gz: 7652bc849261aa4179a99e64a725a0f82d0b65b4d2e2885042ad35521887e705
 SHA512:
-  metadata.gz: 735057f853b259f4d7fcb9f4c73d2f193f9a0e363d439a8bf894bbd9f878e8667cd14979c10cf138c7cc007f83cd09b7d5f9f21e0482b6303f73a40c788a957a
-  data.tar.gz: 8760dc0d9976543fe6ce448e2129b94e2d86d5a17f8e0b4b297f4dd23e8c4e4d73b4c7af4863e5edfa6abbbdb83181e6364e8064b0c73f185b0370c3ea1f597c
+  metadata.gz: 99d384a56c180c8c5db64c5cc8cf072da272b427830875783a22d67279cd070af3bd0bd2b881e4a20018bdeba774d27e8adb8ae048668c28452171017b72c70b
+  data.tar.gz: edc59989136745e0b603039d08420b368ef92e95a0ab17b48bcabf439472c1252ec763f4f9c7a398b735995b340f897dc0f3d85a45c2ea1c9ccec643f050e904

data/lib/dwc_agent/constants.rb

@@ -159,7 +159,11 @@ module DwcAgent
   }
 
   COMPLEX_SEPARATORS = %r{
-    ^([A-Za-z]{4,},\s+(?:[A-Z]\.\s*){1,})\s+([A-Za-z]{4,},\s+(?:[A-Z]\.\s*){1,})$
+    ^(\S{4,},\s+(?:\S\.\s*){1,})\s+(\S{4,},\s+(?:\S\.\s*){1,})$
+  }x
+
+  CONTRACTED_LIST = %r{
+    ^(\S{1,}\.?)+\s+(?i:and|&)\s+(\S{1,}\.?)+\s*(.*)$
   }x
 
   BLACKLIST = %r{

data/lib/dwc_agent/parser.rb

@@ -20,7 +20,8 @@ module DwcAgent
       @char_subs_regex = Regexp.new [CHAR_SUBS.keys.join('\\')].to_s
       @phrase_subs_regex = Regexp.new (PHRASE_SUBS.keys.join('|')).to_s
       @complex_separators_regex = Regexp.new COMPLEX_SEPARATORS.to_s
-      @add_separators_regex = Regexp.new %r{([A-Z]{1}\.)([[:alpha:]]{2,})}.to_s
+      @add_separators_regex = Regexp.new %r{(\S{1}\.)([[:alpha:]]{2,})}.to_s
+      @contracted_list_regex = Regexp.new CONTRACTED_LIST.to_s
     end
       
     # Parses the passed-in string and returns a list of names.
@@ -34,6 +35,7 @@ module DwcAgent
       name.gsub!(@phrase_subs_regex, PHRASE_SUBS)
       name.gsub!(@add_separators_regex, '\1 \2')
       name.gsub!(@complex_separators_regex, '\1 | \2')
+      name.gsub!(@contracted_list_regex, '\1 \3 | \2 \3')
       name.gsub!(@residual_terminators_regex, '')
       name.squeeze!(' ')
       name.strip!

data/lib/dwc_agent/version.rb

@@ -2,7 +2,7 @@ module DwcAgent
   class Version
 
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     BUILD = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-29 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae