namor 0.5.0 → 0.5.1

data/lib/namor/namor.rb

@@ -41,9 +41,9 @@ class Namor::Namor
   def demaiden(lastname)
     return [nil,nil] unless lastname && !lastname.empty?
     if lastname =~ /\-/
-      [lastname.gsub(/ /, ''), lastname.split(/\-/).last.gsub(/ /, '')]
+      [lastname.upcase.gsub(/ /, ''), lastname.split(/\-/).last.gsub(/ /, '')]
     else
-      [lastname.gsub(/ /, ''), lastname.split(/ /).last]
+      [lastname.upcase.gsub(/ /, ''), lastname.split(/ /).last]
     end
   end
 
@@ -62,6 +62,7 @@ class Namor::Namor
     de_maidened_last = final_cleaning(de_maidened_last)
 
     fm = [firstname, middlename].compact.join(' ')
+    fm = nil if fm.empty?
     fullname = [lastname, fm].compact.join(',')
     nee_fullname = [de_maidened_last, fm].compact.join(',')
 
@@ -119,8 +120,8 @@ class Namor::Namor
     ary = assemble(
       scrub(hash[:first]),
       scrub(hash[:middle]),
-      scrub(hash[:last].upcase),
-      scrub(demaiden(hash[:last].upcase).last)
+      scrub(hash[:last]),
+      scrub(demaiden(hash[:last]).last)
     )
     ary << ary[3].gsub(/\W/, '_')
     ary << ary[4].gsub(/\W/, '_')

data/lib/namor/version.rb

@@ -1,3 +1,3 @@
 module Namor
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/lib/namor_spec.rb

@@ -87,6 +87,8 @@ describe "name extract" do
 
     @namor.extract_from_pieces_with_cluster(:first => 'John', :middle => 'M', :last => 'Smith').should == ['JOHN', 'M', 'SMITH', 'SMITH,JOHN M', 'SMITH,JOHN M', 'SMITH_JOHN_M', 'SMITH_JOHN_M']
     @namor.extract_from_pieces_with_cluster(:first => 'Susan', :last => 'Smith-Jones').should == ['SUSAN', nil, 'SMITHJONES', 'SMITHJONES,SUSAN', 'JONES,SUSAN', 'SMITHJONES_SUSAN', 'JONES_SUSAN']
+
+    @namor.extract_from_pieces(:last => 'Smith').should == [nil,nil, 'SMITH', 'SMITH', 'SMITH']
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1676995470774616053
+      hash: 4269875274243672429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1676995470774616053
+      hash: 4269875274243672429
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24