name_splitter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9842378513eb4b4d92498bcc0a91395fdfc01a7d
-  data.tar.gz: 70879753a52989acdc9bf82233c4031c8b8c0e69
+  metadata.gz: 1a9ecae57929fd6fc1656e7895a00e2de12872bd
+  data.tar.gz: 7abe667c28de3ba099ce479c16cfc8eb75a05a5d
 SHA512:
-  metadata.gz: cab9ca693f6598f2e6a84961bb73458737724da8e960ae7d35f6d53304a8126115004f7f7b02c3d375ef7bd4dda9a6ee14c074045b02e800579f590b5596792b
-  data.tar.gz: 5721c6327dc15be767661b7c77d7634f22d53df23e7beef244f83e140256c310a97f937d97288b33d171f65ceb9f9c1c3feca2c65dbf1813920d1b97a1457f43
+  metadata.gz: 30fe5a0f08474cb3b2d21d184b72e02c209c1820afadaab58e8b486ca8388db63d75c5a742b24dec1375a2180b5c1009d3439b30b0796f16175ed1e1cd88d328
+  data.tar.gz: 83efda15ec71e1a0e0f428bf5839681222ca067e883f6d9b8fc695e519886f2733412ab2eb4c40d2b229440e503f0d7e1d1e55e2acc8009d9d4945de4d5ff748

data/lib/name_splitter.rb

@@ -26,17 +26,15 @@ module NameSplitter
       name_arr = fullname.split(" ")
       if name_arr.length == 1
         self.first_name = name_arr.shift
-      elsif name_arr.length == 2 and contains_salutation(name_arr[0])
-        self.salutation = name_arr.shift
-        self.last_name = name_arr.shift
       else
         self.salutation = name_arr.shift(number_of_salutations(name_arr)).join(" ")
-        self.first_name = name_arr.shift
-        self.first_name = first_name + " " + name_arr.shift if is_second_first_name?(name_arr[0])
-        self.first_name = first_name + " " + name_arr.shift + " " + name_arr.shift if anded_first_names?(name_arr[0])
-
-        self.middle_name = name_arr.shift if contains_middle_name(name_arr)
-        self.last_name_check(name_arr)
+        if name_arr.length == 1
+          self.last_name = name_arr.shift
+        else
+          self.first_name = name_arr.shift(number_of_first_names(name_arr)).join(" ")
+          self.middle_name = name_arr.shift if contains_middle_name(name_arr)
+          self.last_name_check(name_arr)
+        end
       end
     end
 
@@ -60,17 +58,35 @@ module NameSplitter
     end
 
     def number_of_salutations(name_arr)
-      return 3 if contains_salutation(name_arr[0]) & anded_first_names?(name_arr[1]) & contains_salutation(name_arr[2])
+      return 3 if contains_salutation(name_arr[0]) & anded_names?(name_arr[1]) & contains_salutation(name_arr[2])
       return 1 if contains_salutation(name_arr[0])
       return 0
     end
 
+    def number_of_first_names(name_arr)
+      return 2 if is_second_first_name?(name_arr[1])
+      number_of_anded_names_before_last_names_if_any(name_arr)
+    end
+
+    def number_of_anded_names_before_last_names_if_any(name_arr)
+      return 1 unless contains_an_and(name_arr)
+      first_name_length = name_arr.length - 1
+      first_name_length -= 1 if contains_suffix(name_arr)
+      first_name_length -= 1 if contains_last_name_prefix(name_arr)
+      first_name_length
+    end
+
     def is_second_first_name?(_name)
-     second_first_names.collect { |x| x.upcase }.include?(_name.upcase)
+      return false unless _name
+      second_first_names.collect { |x| x.upcase }.include?(_name.upcase)
+    end
+
+    def anded_names?(_name)
+      contains_an_and(_name)
     end
 
-    def anded_first_names?(_name)
-      ["and", "&"].include?(_name.to_s.strip)
+    def contains_an_and(*name_arr)
+      name_arr.flatten.select { |_name| ["and", "&"].include?(_name.to_s.strip) }.any?
     end
 
     def contains_salutation(_name)

data/lib/name_splitter/version.rb

@@ -1,3 +1,3 @@
 module NameSplitter
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: name_splitter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tom Hoen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler