dwc_agent 2.0.1.5 → 3.0.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a72ae3bc74fcc411c648733f04ec43ee8b12512fb98bf58cb640493156412a
-  data.tar.gz: f310122cc8d7e6f65bb44904625d66a07883af553bd2425d2b2822b3d2ae7cf8
+  metadata.gz: 969bc7536c6e62205c92cd816cccf491d4f307f81cafaa7c9fd4ba90d41a1bb1
+  data.tar.gz: 21a049be78e691ab7905eae6af9723b9b2aeaca4e7d7594107f968494d71a932
 SHA512:
-  metadata.gz: 40354c8f1bc535c7011bf07a489cd5ac82c44df1031535933c0979acd49b69961e80467eaa036c4ebe7e9dd126a87f1103df74614e75c6c6f6ca299deff73374
-  data.tar.gz: aebee91062c0a02c00f6a4e8106334c231016ae8d02b4742bde9f594d6f71f50620e28341bd1076e29e751a3ab0a43c7a34fd31a145397d019301a23f4987bf6
+  metadata.gz: cdb088fa5df59b1c058226b8266b0e8d3c686f6e3632ddf09867b0ac75c8e9cd292ab44025e2e97720161963e0a5f7f9d7daf718f55ed9d0a66f9d0a44c03d78
+  data.tar.gz: 222e2443238ba507d97a7f069d08fbec5f070ec647f83d353ca482a0bbec926587e5ef65af21d7505f6abb714c709d2f3409efcc00d204d47f7ea723f05e3eb5

data/bin/dwcagent

@@ -7,8 +7,8 @@ require 'json'
 names = []
 DwcAgent.parse(ARGV[0].dup).each do |r|
   name = DwcAgent.clean(r)
-  if !name[:family].nil? && name[:family].length >= 2
+  if !name.family.nil? && name.family.length >= 2
     names << name
   end
 end
-puts names.uniq.to_json
+puts names.uniq.to_h.to_json

data/lib/dwc_agent/cleaner.rb

@@ -1,4 +1,5 @@
 module DwcAgent
+
   class Cleaner
 
     class << self
@@ -16,26 +17,25 @@ module DwcAgent
     # @param parsed_namae [Object] the namae object
     # @return [Hash] the given, family hash
     def clean(parsed_namae)
-      blank_name = { title: nil, appellation: nil, given: nil, particle: nil, family: nil, suffix: nil }
 
       if parsed_namae.given && GIVEN_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.given) == 0 }
-        return blank_name
+        return Namae::Name.new
       end
 
       if parsed_namae.family && parsed_namae.family.length == 3 && parsed_namae.family.count('.') == 1
-        return blank_name
+        return Namae::Name.new
       end
 
       if parsed_namae.given && parsed_namae.given.length > 35
-        return blank_name
+        return Namae::Name.new
       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 blank_name
+        return Namae::Name.new
       end
 
       if parsed_namae.display_order =~ BLACKLIST
-        return blank_name
+        return Namae::Name.new
       end
 
       if parsed_namae.given &&
@@ -76,7 +76,7 @@ module DwcAgent
       end
 
       if parsed_namae.family && FAMILY_BLACKLIST.any?{ |s| s.casecmp(parsed_namae.family) == 0 }
-        return blank_name
+        return Namae::Name.new
       end
 
       parsed_namae.normalize_initials
@@ -111,22 +111,30 @@ module DwcAgent
       end
 
       if !family.nil? && family.match(/[A-Z]$/)
-        return blank_name
+        return Namae::Name.new
       end
 
       if given.nil? && !family.nil? && family.match(/^[A-Z]{2}/)
-        return blank_name
+        return Namae::Name.new
       end
 
       if !family.nil? && FAMILY_BLACKLIST.any?{ |s| s.casecmp(family) == 0 }
-        return blank_name
+        return Namae::Name.new
       end
 
       if !given.nil? && GIVEN_BLACKLIST.any?{ |s| s.casecmp(given) == 0 }
-        return blank_name
-      end
-
-      { title: title, appellation: appellation, given: given, particle: particle, family: family, suffix: suffix }
+        return Namae::Name.new
+      end
+
+      name = {
+        title: title,
+        appellation: appellation,
+        given: given,
+        particle: particle,
+        family: family,
+        suffix: suffix
+      }
+      Namae::Name.new(name)
     end
 
   end

data/lib/dwc_agent/constants.rb

@@ -329,7 +329,7 @@ module DwcAgent
     "has not"
   ]
 
-  TITLE = /\s*\b(sir|count(ess)?|colonel|(gen|adm|col|maj|major|capt|cmdr|lt|sgt|cpl|pvt|proff?|dr|md|ph\.?d|rev|mme|abbé|ptre|bro|esq)\.?|docteur|father|cantor|vicar|père|pastor|rabbi|reverend|pere|soeur|sister|professor)(\s+|$)/i
+  TITLE = /\s*\b(sir|count(ess)?|colonel|(gen|adm|col|maj|capt|cmdr|lt|sgt|cpl|pvt|proff?|dr|md|ph\.?d|rev|mme|abbé|ptre|bro|esq)\.?|docteur|father|cantor|vicar|père|pastor|rabbi|reverend|pere|soeur|sister|professor)(\s+|$)/i
 
   APPELLATION = /\s*\b((mrs?|ms|fr|hr)\.?|miss|herr|frau)(\s+|$)/i
 

data/lib/dwc_agent/version.rb

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

metadata

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