dwc_agent 1.5.0.3 → 1.5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afa4821ae8db9f02c41c67b49ee95ef7d3d4961b3c609892058e023871b6ccf1
-  data.tar.gz: 235651dde097b5fdc167577c0193243f11d891e4f9e47b7e386b435dbf2e1feb
+  metadata.gz: cef90f0884c7b59a1c3aae50198ef043a282127ef4b883b326a0a4b1bfdcd337
+  data.tar.gz: a19a07304fdd82ddd1259080a503fea4d13d5d44b60b6edb651e799a5c473525
 SHA512:
-  metadata.gz: 00fa3c0eac444fa4da032223c792b716fd91915788d94ae38b58dc97eb1c528f76e62091500b77953d505359a62ad40c930ab75bb128a6df21d96587b69eadcc
-  data.tar.gz: 4bedfcaafeb0782fc3a3e374f8ae783290ba12566a05a1724ba3690b2c683ca354a5b0286070fe801540a06a89c66dc6d3e10166b27e328f384f4922b0481dc6
+  metadata.gz: bcbebc3c10b85a5a86d9d67b8dbcee31164b64c46e8626f26378b36df7a2493d0f96a527423910a8748bc45fee7a9fd6ac8633392d78882bf43ff55902e2781d
+  data.tar.gz: 2f7e75e44b207fc72f6c90e413ac047337362494122cfe9ce976f993fe48bd9a0407c47ff56c5991c591c1e3562e999a88cfedcb869bb2712bed787b4cd17799

data/lib/dwc_agent/constants.rb

@@ -61,7 +61,7 @@ module DwcAgent
     (?i:see\s+notes?\s*(inside)?)|
     (?i:see\s+letter\s+enclosed)|
     (?i:(by)?\s+correspondance)|
-    (?i:pers\.?\s+comm\.?)|
+    (?i:pers\.?\s*comm\.?)|
     (?i:crossed\s+out)|
     \(?(?i:source)\(?|
     (?i:according\s+to)|
@@ -113,19 +113,22 @@ module DwcAgent
     [–|ǀ∣｜│&+\/;:]|
     \s+-\s+|
     \s+a\.\s+|
-    \b(e|y|i|en|et|or|per|for)\s*\b|
+    \b(con|e|y|i|en|et|or|per|for)\s*\b|
     \b(?i:and|with)\s*\b|
     \b(?i:annotated(\s+by)?)\s*\b|
     \b(?i:coll\.)\s*\b|
     \b(?i:communicate?d(\s+to)?)\s*\b|
     \b(?i:conf\.?(\s+by)?|confirmed(\s+by)?)\s*\b|
+    \b(?i:confirmada)(\s+por)?\s*\b|
     \b(?i:checked?(\s+by)?)\s*\b|
     \b(?i:det\.?(\s+by)?)\s*\b|
     \b(?i:dupl?\.?(\s+by)?|duplicate(\s+by)?)\s*\b|
     \b(?i:ex\.?(\s+by)?|examined(\s+by)?)\s*\b|
     \b(?i:in?dentified(\s+by)?)\s*\b|
     \b(?i:in\s+part(\s+by)?)\s*\b|
+    \b(?i:och)\s*\b|
     \b(?i:prep\.?\s+(?i:by)?)\s*\b|
+    \b(?i:purchased?)(\s+by)?\s*\b|
     \b(?i:redet\.?(\s+by?)?)\s*\b|
     \b(?i:reidentified(\s+by)?)\s*\b|
     \b(?i:stet)\s*\b|
@@ -159,12 +162,18 @@ module DwcAgent
   }
 
   PHRASE_SUBS = {
-    'prof\.' => 'Prof. ',
-    '\, ph\.d\.' => ' Ph.D.',
-    '\, bro\.' => ' Bro.',
-    ' jr\.\,' => ' Jr.;',
-    ' jr\,' => ' Jr.;',
-    '\-jr' => ' Jr.'
+    ', ph.d.' => ' Ph.D.',
+    ', Ph.D.' => ' Ph.D.',
+    ', bro.' => ' Bro.',
+    ' jr.,' => ' Jr.;',
+    ' jr,' => ' Jr.;',
+    '-jr' => ' Jr.',
+    '-Jr' => ' Jr.',
+    ', Jr.' => ' Jr.',
+    ',Jr.' => ' Jr.',
+    ', Sr.' => ' Sr.',
+    ',Sr.' => ' Sr.'
+
   }
 
   COMPLEX_SEPARATORS = %r{

data/lib/dwc_agent/parser.rb

@@ -20,7 +20,7 @@ module DwcAgent
       @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.join('|').to_s, Regexp::IGNORECASE
+      @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
     end

data/lib/dwc_agent/version.rb

@@ -4,7 +4,7 @@ module DwcAgent
     MAJOR = 1
     MINOR = 5
     PATCH = 0
-    BUILD = 3
+    BUILD = 4
 
     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.0.3
+  version: 1.5.0.4
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-09 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae