dwc_agent 3.0.1.1 → 3.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d092e5e8f6a540e67959189827553f1b37214b855465ef69444098e9146972
-  data.tar.gz: 5ca4086f1bed287ec90c1afc1ce1e46f1ad6fd149f7449ca519e59f2474a918c
+  metadata.gz: 45cbccd35856eb8b283ae4edcca8275b4fb1f901a9dc9420880abfb5eaea64ff
+  data.tar.gz: 27d4ec41bc275ff9a9a2846c9d7bf2745a8522da6656aae2268de77465deaa92
 SHA512:
-  metadata.gz: a255f52c83b5bfda870d3edd20187186fd3d0a6345a51dadf67a2d9dd072ec4e476a56d0fbb593e72a417a425a5a9dae2716a61dc7bd88fbf9c8350a45ff68ea
-  data.tar.gz: 8cb41bc6e132bcc66aa3a196bd54e48b374c7a95227c9fa13f77b856d88684978d98c72100790db244a83e65b389d162a819a8926c2d1ca8c1dad7d8c6166de4
+  metadata.gz: 0bda64950477617d6ecf2f5aa1c3de225a2dce33856c808ca836ed7e8a36b05d120fb7380352e1b3ca79ddcfc85442fbd0432853cf34283f31965cdd1e02924b
+  data.tar.gz: abf6a8173c42b55e4c51b71b030838112ec10914101b60ed6cf5c67a767194a761ac351a802229850f37ab8415f19580c381f7297caa9d27891ac85201deb773

data/lib/dwc_agent/cleaner.rb

@@ -9,6 +9,14 @@ module DwcAgent
     end
 
     def initialize
+      @blacklist = BLACKLIST
+      @given_blacklist = GIVEN_BLACKLIST
+      @family_blacklist = FAMILY_BLACKLIST
+      @particles = PARTICLES
+    end
+
+    def default
+      Namae::Name.new
     end
 
     # Cleans the passed-in namae object from the parse method and
@@ -19,28 +27,28 @@ module DwcAgent
     def clean(parsed_namae)
 
       if parsed_namae.given &&
-         GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
-        return Namae::Name.new
+         @given_blacklist.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
+        return
       end
 
       if parsed_namae.family &&
          parsed_namae.family.length == 3 &&
          parsed_namae.family.count('.') == 1
-        return Namae::Name.new
+        return default
       end
 
       if parsed_namae.given && parsed_namae.given.length > 35
-        return Namae::Name.new
+        return default
       end
 
       if parsed_namae.given &&
          parsed_namae.given.count('.') >= 3 &&
          /\.\s*[a-zA-Z]{4,}\s+[a-zA-Z]{1,}\./.match(parsed_namae.given)
-        return Namae::Name.new
+        return default
       end
 
-      if parsed_namae.display_order =~ BLACKLIST
-        return Namae::Name.new
+      if parsed_namae.display_order =~ @blacklist
+        return default
       end
 
       if parsed_namae.family &&
@@ -97,8 +105,8 @@ module DwcAgent
       end
 
       if parsed_namae.family &&
-         FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
-        return Namae::Name.new
+         @family_blacklist.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
+        return default
       end
 
       if parsed_namae.family.nil? &&
@@ -124,7 +132,7 @@ module DwcAgent
       if !family.nil? &&
          given.nil? &&
          !particle.nil? &&
-         !PARTICLES.include?(particle.downcase)
+         !@particles.include?(particle.downcase)
         given = particle.sub(/[a-z]\./, &:upcase).sub(/^(.)/) { $1.capitalize }
         particle = nil
       end
@@ -142,15 +150,15 @@ module DwcAgent
       end
 
       if given.nil? && !family.nil? && family.match(/^[A-Z]{2}/)
-        return Namae::Name.new
+        return default
       end
 
-      if !family.nil? && FAMILY_BLACKLIST.any?{ |s| s.casecmp(family) == 0 }
-        return Namae::Name.new
+      if !family.nil? && @family_blacklist.any?{ |s| s.casecmp(family) == 0 }
+        return default
       end
 
-      if !given.nil? && GIVEN_BLACKLIST.any?{ |s| s.casecmp(given) == 0 }
-        return Namae::Name.new
+      if !given.nil? && @given_blacklist.any?{ |s| s.casecmp(given) == 0 }
+        return default
       end
 
       name = {
@@ -165,4 +173,5 @@ module DwcAgent
     end
 
   end
+
 end

data/lib/dwc_agent/constants.rb

@@ -222,6 +222,7 @@ module DwcAgent
     (?i:bris?tish|canadi?an?|chinese|arctic|japan|russian|north\s+america)|
     (?i:carex|salix)|
     (?i:catalog(ue)?)|
+    (?i:conservator)|
     (?i:herbarium|herbier|collection|collected|publication|specimen|species|describe|an(a|o)morph|isolated|recorded|inspection|define|status|lighthouse)|
     \b\s*(?i:help)\s*\b|
     (?i:data\s+not\s+captured)|
@@ -297,6 +298,7 @@ module DwcAgent
     "new",
     "no",
     "adjustment",
+    "agent",
     "annotator",
     "available",
     "arachnology",

data/lib/dwc_agent/parser.rb

@@ -40,4 +40,5 @@ module DwcAgent
     end
 
   end
+
 end

data/lib/dwc_agent/similarity.rb

@@ -1,4 +1,5 @@
 module DwcAgent
+
   class Similarity
 
     class << self
@@ -40,9 +41,10 @@ module DwcAgent
           score += 0.1
         end
       end
-    
+
       score
     end
 
   end
-end
+
+end

data/lib/dwc_agent/version.rb

@@ -1,14 +1,16 @@
 module DwcAgent
+
   class Version
 
     MAJOR = 3
     MINOR = 0
     PATCH = 1
-    BUILD = 1
+    BUILD = 2
 
     def self.version
       [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze
     end
 
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 3.0.1.1
+  version: 3.0.1.2
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae