human_name_parser 1.0.0 → 1.0.1

data/lib/human_name_parser/name.rb

@@ -3,6 +3,7 @@ module HumanNameParser
     PREFIXES = ['mr', 'ms', 'miss', 'mrs', 'sir', 'prof', 'professor', 'md', 'dr']
     SUFFIXES = ['esq','esquire','jr','sr','2', 'i', 'ii','iii','iv', 'v', 'phd', 'md', 'do', 'dc', 'dds']
     LAST_PREFIXES = ['al', 'bar','ben','bin','da','dal','de la', 'de', 'del', 'der', 'di', 'el', 'ibn', 'la', 'le', 'mc', 'san', 'st', 'ste', 'van', 'van der', 'van den', 'vel','von']
+    NAME_JOINERS = ['&', 'and']
 
     attr_accessor :first, :middle, :last, :prefix, :suffix
 
@@ -43,7 +44,7 @@ module HumanNameParser
         self.prefix = @split_name.shift
       end
 
-      return self
+      self
     end
 
     def parse_suffix
@@ -53,40 +54,43 @@ module HumanNameParser
       end
       self.suffix = self.suffix.join(' ')
 
-      return self
+      self
     end
 
     def parse_last_name
-      self.last = []
-      self.last.unshift @split_name.pop
-
-      while is_last_name_prefix?(@split_name.last)
+      if !is_name_joiner? @split_name[-2]
+        self.last = []
         self.last.unshift @split_name.pop
-      end
 
-      self.last = self.last.join(' ')
+        while is_last_name_prefix?(@split_name.last)
+          self.last.unshift @split_name.pop
+        end
+
+        self.last = self.last.join(' ')
+      end
 
-      return self
+      self
     end
 
     def parse_first_name
-      self.first = @split_name.shift || ''
+      shift_distance = is_name_joiner?(@split_name[1]) ? 3 : 1
+      self.first = @split_name.shift(shift_distance).join(' ')
 
-      return self
+      self
     end
 
     def parse_middle_name
       # whatever's left
       self.middle = @split_name.join ' '
 
-      return self
+      self
     end
 
     def initials
       _i = ''
-      _i += self.first.slice(0,1)  if self.first && self.first.length > 0
-      _i += self.middle.slice(0,1) if self.middle && self.middle.length > 0
-      _i += self.last.slice(0,1)   if self.last && self.last.length > 0
+      _i += self.first.slice(0,1)  if !blank?(self.first)
+      _i += self.middle.slice(0,1) if !blank?(self.middle)
+      _i += self.last.slice(0,1)   if !blank?(self.last)
       _i.upcase
     end
 
@@ -97,7 +101,7 @@ module HumanNameParser
         self.middle,
         self.last,
         self.suffix
-      ].reject {|n| n.length == 0}.join(' ')
+      ].reject( &method(:blank?) ).join(' ')
     end
 
   private
@@ -116,7 +120,7 @@ module HumanNameParser
         @split_name = split_first_middle_last
       end
 
-      return self
+      self
     end
 
     # check whether each part is a suffix
@@ -154,14 +158,20 @@ module HumanNameParser
       is_ix?(SUFFIXES, string)
     end
 
+    def is_name_joiner?(string)
+      is_ix?(NAME_JOINERS, string)
+    end
+
     def is_last_name_prefix?(string)
-      return false if string.nil? || string == ""
-      LAST_PREFIXES.any? { |p| string.downcase.match(/^#{p}$/) }
+      !blank?(string) && LAST_PREFIXES.include?(string.downcase)
     end
 
     def is_ix?(kind, string)
-      return false if string.nil? || string == ""
-      kind.any? {|k| string.downcase.match(/^#{k}\.?$/)}
+      !blank?(string) && kind.any? { |k| string =~ /\A#{k}\.?\z/i }
+    end
+
+    def blank?(string)
+      string.nil? || string == ''
     end
 
   end

data/lib/human_name_parser/version.rb

@@ -1,3 +1,3 @@
 module HumanNameParser
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/name_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'human_name_parser/name'
 
 NAMES = [
@@ -9,6 +10,8 @@ NAMES = [
   ['Marley Mante', ['Marley', '', 'Mante', '', '', 'MM']],
   ['Marley Mante PhD', ['Marley', '', 'Mante', '', 'PhD', 'MM']],
   ['Marley Mante, esq.', ['Marley', '', 'Mante', '', 'esq.', 'MM']],
+  ['Amy and Brian Smith', ['Amy and Brian', '', 'Smith', '', '', 'AS']],
+  ['Amy & Brian', ['Amy & Brian', '', '', '', '', 'A']],
   ["Björn Charles van der O'Malley", ['Björn', 'Charles', "van der O'Malley", '', '', 'BCV']],
   ['Alex Rothlenson-ben-Elsburghmohampton', ['Alex', '', 'Rothlenson-ben-Elsburghmohampton', '', '', 'AR']],
   ['1234 Anywhere St., North Pole, SD 22323', ['', '', '', '', '', '']]

metadata

@@ -1,61 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: human_name_parser
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Adam Bachman
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-07 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: human_name_parser is intended to split names into their component parts.
-email: 
+email:
 - adam.bachman@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -71,41 +65,31 @@ files:
 - spec/human_name_parser_spec.rb
 - spec/name_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/abachman/human_name_parser
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Split most American names into their component parts.
-test_files: 
+test_files:
 - spec/human_name_parser_spec.rb
 - spec/name_spec.rb
 - spec/spec_helper.rb