namor 0.4.2 → 0.5.0

data/lib/namor/namor.rb

@@ -55,6 +55,19 @@ class Namor::Namor
     end
   end
 
+  def assemble(firstname, middlename, lastname, de_maidened_last)
+    firstname = final_cleaning(firstname)
+    middlename = final_cleaning(middlename)
+    lastname = final_cleaning(lastname)
+    de_maidened_last = final_cleaning(de_maidened_last)
+
+    fm = [firstname, middlename].compact.join(' ')
+    fullname = [lastname, fm].compact.join(',')
+    nee_fullname = [de_maidened_last, fm].compact.join(',')
+
+    [firstname, middlename, lastname, fullname, nee_fullname]
+  end
+
   def extract(name, opts = {})
     return [] if name.nil?
 
@@ -84,16 +97,7 @@ class Namor::Namor
       lastname, de_maidened_last = demaiden(pieces.join(' '))
     end
 
-    firstname = final_cleaning(firstname)
-    middlename = final_cleaning(middlename)
-    lastname = final_cleaning(lastname)
-    de_maidened_last = final_cleaning(de_maidened_last)
-
-    fm = [firstname, middlename].compact.join(' ')
-    fullname = [lastname, fm].compact.join(',')
-    nee_fullname = [de_maidened_last, fm].compact.join(',')
-
-    [firstname, middlename, lastname, fullname, nee_fullname]
+    assemble(firstname, middlename, lastname, de_maidened_last)
   end
 
   def extract_with_cluster(name, opts = {})
@@ -102,6 +106,25 @@ class Namor::Namor
     ary << ary[3].gsub(/\W/, '_')
   end
 
+  def extract_from_pieces(hash)
+    assemble(
+      scrub(hash[:first]),
+      scrub(hash[:middle]),
+      scrub(hash[:last].upcase),
+      scrub(demaiden(hash[:last].upcase).last)
+    )
+  end
+
+  def extract_from_pieces_with_cluster(hash)
+    ary = assemble(
+      scrub(hash[:first]),
+      scrub(hash[:middle]),
+      scrub(hash[:last].upcase),
+      scrub(demaiden(hash[:last].upcase).last)
+    )
+    ary << ary[3].gsub(/\W/, '_')
+    ary << ary[4].gsub(/\W/, '_')
+  end
 
   def components(*args)
     suppression_list = @config[:suppress] ? @config[:suppress].map(&:upcase) : []

data/lib/namor/version.rb

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

data/spec/lib/namor_spec.rb

@@ -80,6 +80,15 @@ describe "name extract" do
     @namor.extract("Jones-De Quento, Maria").should == ['MARIA', nil, 'JONESDEQUENTO', 'JONESDEQUENTO,MARIA', 'DEQUENTO,MARIA']
     @namor.extract_with_cluster("Jones-De Quento, Maria").should == ['MARIA', nil, 'JONESDEQUENTO', 'JONESDEQUENTO,MARIA', 'DEQUENTO,MARIA', 'JONESDEQUENTO_MARIA']
   end
+
+  it "should build pieces from input components" do
+    @namor.extract_from_pieces(:first => 'John', :middle => 'M', :last => 'Smith').should == ['JOHN', 'M', 'SMITH', 'SMITH,JOHN M', 'SMITH,JOHN M']
+    @namor.extract_from_pieces(:first => 'Susan', :last => 'Smith-Jones').should == ['SUSAN', nil, 'SMITHJONES', 'SMITHJONES,SUSAN', 'JONES,SUSAN']
+
+    @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']
+  end
+
 end
 
 describe "with cluster coding" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namor
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3058052180651373494
+      hash: -1676995470774616053
 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: 3058052180651373494
+      hash: -1676995470774616053
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24