dwc_agent 3.1.5.0 → 3.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62cb1702b9b52df587b9ac32df61a6d1c294398238f65def28ca28dff97188f3
-  data.tar.gz: 2ae483cff386f6d74f15d96bda2422117b93e0738e8312d1f79812205733d49f
+  metadata.gz: cec3414f1b65b944a67995a6a306282ceced45af8d58a63c42ecfd469d74b135
+  data.tar.gz: 26644458e9c264b4f07c270c86bdcc89ba5654495662f08974bc551688fb3cab
 SHA512:
-  metadata.gz: 557e939feeb928d83ee99db7c19d992e135c574e23a9d530f1cf4f4b517f9355bfa1da13c4191b68cddbec7dcc2cea290e75723da3f6b85e4c8ba7407f08e99e
-  data.tar.gz: b3af497750749cc6585e96c28825baba87c94bcdccdeb3a50a4dae7bf99f7999717aa06399fc7c8d02735c6222f349f60ad29bf7aa599a429e44dee2fb8e7dd3
+  metadata.gz: 4915c877d81d0f19c4b32fb05bbf6fd708e7ebd69f27f3ae119f7896668b946612228a155879b64713af3bdd8107fbf1760e3182e99000038dfa6b1530dadd2b
+  data.tar.gz: 6c85892b18270743222d2db185e34e531c025e12d6f15915352fe3e6e2229d4b814a127036b24cce5f89a739d07353754d74fa132c07173225060ed80e06bb41

data/lib/dwc_agent/cleaner.rb

@@ -16,7 +16,7 @@ module DwcAgent
     end
 
     def default
-      Namae::Name.new
+      DwcAgent.default
     end
 
     # Cleans the passed-in namae object from the parse method and
@@ -26,6 +26,8 @@ module DwcAgent
     # @return Namae::Name [Object] a new Namae object
     def clean(parsed_namae)
 
+      return default if !parsed_namae.instance_of?(Namae::Name)
+
       if parsed_namae.family &&
          parsed_namae.family == NameCase(parsed_namae.family) &&
          parsed_namae.display_order.split.join == parsed_namae.initials
@@ -92,7 +94,7 @@ module DwcAgent
          matched = /^(?<family>[A-Za-z]{3,})\s+(?<given>([A-Z]\.\s?){1,})$/.match(parsed_namae.family)
          parsed_namae.family = matched[:family]
          parsed_namae.given = matched[:given]
-       end
+      end
 
       if parsed_namae.given &&
         (parsed_namae.given == parsed_namae.given.upcase ||

data/lib/dwc_agent/constants.rb

@@ -10,7 +10,7 @@ module DwcAgent
     [,]?\s*\#*\s+\d+\-(?i:[A-Z]|\d)+\-?\d*[A-Za-z]*\z|
     \d*[A-Za-z]*\d*-\d*\z|
     \b\d+\(?(?i:[[:alpha:]])\)?\b|
-    \b[,;]?\s*(?:et\.?\s+al|&\s+al)\.?|
+    [,;\s]{1,}(?:et\.?\s+al|&\s+al)l?\.?|
     \b[,;]?\s*(?i:etal)\.?|
     \b[,;]?\s*(?i:et.al)\.?|
     \b\s+(bis|ter)(\b|\z)|
@@ -94,6 +94,7 @@ module DwcAgent
     (?i:field\s+museum\s+of\s+natural\s+history)|
     (?i:american\s+museum\s+of\s+natural\s+history)|
     (?i:The\s+Paleontological\s+Research\s+Institution)|
+    (?i:literature?)|
     (?i:museums?\s+victoria)|
     \b\s*(?i:united\s+states|russia)\s*\b|
     (?i:revised|photograph|fruits\s+only)|
@@ -112,7 +113,7 @@ module DwcAgent
     (?i:not?)\s+(?i:name|date|details?|specific)?\s*?(?i:given|name|date|noted)|
     (?i:non?)\s+(?i:specificato)|
     \b[,;]\s+\d+\.?\z|
-    [!@?]|
+    [!@?]\s*\-?\s*|
     \d{1,4}[\/.]?(?i:i|ii|iii|iv|v|vi|vii|viii|ix|x|xi|xii)[\/.]\d{1,4}|
     [,]?\d+|
     [,;]\z|

data/lib/dwc_agent/utility.rb

@@ -14,4 +14,8 @@ module DwcAgent
     Similarity.instance.similarity_score(given1, given2)
   end
 
+  def default
+    Namae::Name.new
+  end
+
 end

data/lib/dwc_agent/version.rb

@@ -3,8 +3,8 @@ module DwcAgent
   class Version
 
     MAJOR = 3
-    MINOR = 1
-    PATCH = 5
+    MINOR = 2
+    PATCH = 1
     BUILD = 0
 
     def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dwc_agent
 version: !ruby/object:Gem::Version
-  version: 3.1.5.0
+  version: 3.2.1.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-18 00:00:00.000000000 Z
+date: 2024-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: namae