namor 0.5.2 → 0.5.3

data/lib/namor/namor.rb

@@ -38,6 +38,12 @@ class Namor::Namor
     final_cleaning(scrub(name, opts))
   end
 
+  # scrub as above, but as a final stage, convert the result to a single term (no spaces or hyphens between bits)
+  def scrub_and_squash(name, opts = {})
+    s = scrub(name, opts)
+    s && s.gsub(/[- ]/, '')
+  end
+
   def demaiden(lastname)
     return [nil,nil] unless lastname && !lastname.empty?
     if lastname =~ /\-/
@@ -112,18 +118,13 @@ class Namor::Namor
     assemble(
       scrub(hash[:first]),
       scrub(hash[:middle]),
-      scrub(hash[:last].upcase),
-      scrub(demaiden(hash[:last].upcase).last)
+      scrub_and_squash(hash[:last].upcase),
+      scrub_and_squash(demaiden(hash[:last].upcase).last)
     )
   end
 
   def extract_from_pieces_with_cluster(hash)
-    ary = assemble(
-      scrub(hash[:first]),
-      scrub(hash[:middle]),
-      scrub(hash[:last]),
-      scrub(demaiden(hash[:last]).last)
-    )
+    ary = extract_from_pieces(hash)
     ary << ary[3].gsub(/\W/, '_')
     ary << ary[4].gsub(/\W/, '_')
   end

data/lib/namor/version.rb

@@ -1,3 +1,3 @@
 module Namor
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/lib/namor_spec.rb

@@ -89,6 +89,8 @@ describe "name extract" do
     @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']
+
+    @namor.extract_from_pieces(:first => 'Mary', :last => 'Smith Jones').should == ['MARY',nil, 'SMITHJONES', 'SMITHJONES,MARY', 'JONES,MARY']
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namor
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-11 00:00:00.000000000 Z
+date: 2012-09-12 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: -483833370846785327
+      hash: -278780401687876131
 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: -483833370846785327
+      hash: -278780401687876131
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24