dwc_agent 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d56e8cb49d4857e324dbdda7d6cfa31e9a7a3079c40a12659ff6077d13308613
-  data.tar.gz: 7652bc849261aa4179a99e64a725a0f82d0b65b4d2e2885042ad35521887e705
+  metadata.gz: dcdfb4922038d07715bd064b74a516203bcce44ef824683ac9766586764bb98f
+  data.tar.gz: d9113f199abc420d7c608bfbead6e70f1f6192437a82e43541f77eb187752c2a
 SHA512:
-  metadata.gz: 99d384a56c180c8c5db64c5cc8cf072da272b427830875783a22d67279cd070af3bd0bd2b881e4a20018bdeba774d27e8adb8ae048668c28452171017b72c70b
-  data.tar.gz: edc59989136745e0b603039d08420b368ef92e95a0ab17b48bcabf439472c1252ec763f4f9c7a398b735995b340f897dc0f3d85a45c2ea1c9ccec643f050e904
+  metadata.gz: 403049856dbfbc83c984b5175615718c738b46312ecced4d3b5853fb4584a080d1e868492ee476187c8cf7238481845c0f77bd181e6ceaeebc22bae8b7aef127
+  data.tar.gz: 01e8bc4beb84140a80763c6c0dc8ff6ee6f967e8382cbacf04a230aa3405f2394ec1a90570471e113d90264c1e202c5452428858eb5aff6bc499f4e795dc3158

data/lib/dwc_agent/cleaner.rb

@@ -22,10 +22,6 @@ module DwcAgent
         return blank_name
       end
 
-      if parsed_namae.family && parsed_namae.family.length < 2 && parsed_namae.family.count('.') == 0
-        return blank_name
-      end
-
       if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
         return blank_name
       end

data/lib/dwc_agent/constants.rb

@@ -162,9 +162,15 @@ module DwcAgent
     ^(\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
+# Was used in 1.1.0 but it sunk performance so threw it back to a WIP
+#
+# @contracted_list_regex = Regexp.new CONTRACTED_LIST.to_s
+#
+# name.gsub!(@contracted_list_regex, '\1 \3 | \2 \3')
+#
+#  CONTRACTED_LIST = %r{
+#    ^(\S{1,}\.?)+\s+(?i:and|&)\s+(\S{1,}\.?)+\s*(.*)$
+#  }x
 
   BLACKLIST = %r{
     (?i:abundant)|

data/lib/dwc_agent/parser.rb

@@ -21,7 +21,6 @@ module DwcAgent
       @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{(\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.
@@ -35,7 +34,6 @@ 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 = 1
+    MINOR = 2
     PATCH = 0
     BUILD = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - David P. Shorthouse