name_splitter 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a9ecae57929fd6fc1656e7895a00e2de12872bd
-  data.tar.gz: 7abe667c28de3ba099ce479c16cfc8eb75a05a5d
+  metadata.gz: 8f8eff789aed6e740d2deb32d6611ee1f6f109f6
+  data.tar.gz: 1c7e23dc60098b1a4b0609f30e0a951c8041f6f6
 SHA512:
-  metadata.gz: 30fe5a0f08474cb3b2d21d184b72e02c209c1820afadaab58e8b486ca8388db63d75c5a742b24dec1375a2180b5c1009d3439b30b0796f16175ed1e1cd88d328
-  data.tar.gz: 83efda15ec71e1a0e0f428bf5839681222ca067e883f6d9b8fc695e519886f2733412ab2eb4c40d2b229440e503f0d7e1d1e55e2acc8009d9d4945de4d5ff748
+  metadata.gz: 22a57459a630bd777602760421fc261ee95d9f2afb2ee959715efad10d4d4fc8c285069212c32f0c5b5a191dffeb70509f5470af2feda04eac3d845afdc85b6d
+  data.tar.gz: a24f421fe44b20873ed02848a5edfaa209800fdaf523dd363e696d3f097a16dcee8e0ccba6080278d57860d48a9a7144953236864e0e018aa462b4521968302c

data/lib/name_splitter.rb

@@ -24,17 +24,24 @@ module NameSplitter
 
     def name=(fullname)
       name_arr = fullname.split(" ")
+
       if name_arr.length == 1
         self.first_name = name_arr.shift
+        return
+      end
+
+      if is_first_element_a_last_name(name_arr)
+        self.last_name = name_arr.shift.gsub(",","")
+      end
+
+      self.salutation = name_arr.shift(number_of_salutations(name_arr)).join(" ")
+
+      if name_arr.length == 1 && last_name.empty?
+        self.last_name = name_arr.shift
       else
-        self.salutation = name_arr.shift(number_of_salutations(name_arr)).join(" ")
-        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
+        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
 
@@ -48,6 +55,8 @@ module NameSplitter
       self.last_name = last_name_arr.join(" ").gsub(/[.,]+/, "")
     end
 
+    private
+
     def contains_middle_name(name_arr)
       #checks whether the array of names passed in contains a likely middle name
       (name_arr.length == 2 and
@@ -70,7 +79,7 @@ module NameSplitter
 
     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 = name_arr.length - (last_name.empty? ? 1 : 0)
       first_name_length -= 1 if contains_suffix(name_arr)
       first_name_length -= 1 if contains_last_name_prefix(name_arr)
       first_name_length
@@ -81,6 +90,10 @@ module NameSplitter
       second_first_names.collect { |x| x.upcase }.include?(_name.upcase)
     end
 
+    def is_first_element_a_last_name(name_arr)
+      name_arr[0].strip.match(/,/)
+    end
+
     def anded_names?(_name)
       contains_an_and(_name)
     end

data/lib/name_splitter/version.rb

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

metadata

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