namor 0.3.1 → 0.4.0

data/lib/namor/namor.rb

@@ -17,13 +17,13 @@ class Namor::Namor
   # * squeeze whitespace & trim spaces from ends
   def scrub(name, opts = {})
     suppression_list = @config[:suppress] || []
-    suppression_re = Regexp.new('\b?' + (suppression_list + (opts[:suppress]||[])).compact.map(&:upcase).join('|') + '\b?')
+    suppression_re = Regexp.new('(\s|^)' + (suppression_list + (opts[:suppress]||[])).compact.map(&:upcase).join('|') + '(\s|\.|$)')
 
     name && name.upcase.gsub(/^[ZX]{2,}/, '').gsub(suppression_re, '').gsub(/\b(JR|SR|II|III|IV)\b/i, '').gsub(/\([^\(]*\)/, '').gsub(/\./, ' ').gsub(/[_'\&]/, '').gsub(/,\s*$/, '').gsub(/ +/, ' ').strip
   end
 
-  def fullscrub(name)
-    final_cleaning(scrub(name))
+  def fullscrub(name, opts = {})
+    final_cleaning(scrub(name, opts))
   end
 
   def demaiden(lastname)

data/lib/namor/version.rb

@@ -1,3 +1,3 @@
 module Namor
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/spec/lib/namor_spec.rb

@@ -136,3 +136,22 @@ describe "name componentization" do
     @namor.scrub("Jones, Susan Select Transcriptionist", :suppress => ['transcriptionist', 'select transcriptionist']).should == 'JONES, SUSAN'
   end
 end
+
+describe "title suppression" do
+  before(:all) do
+    @namor = Namor::Namor.new
+  end
+
+  it "should only suppress isolated terms" do
+    @namor.scrub("Smith, Mary RN", :suppress => ['RN']).should == 'SMITH, MARY'
+    @namor.scrub("Smith, Marnie", :suppress => ['RN']).should == 'SMITH, MARNIE'
+  end
+
+  it "should scrub words with periods" do
+    @namor.scrub("Smith, Mary M.D.", :suppress => ['M.D.']).should == 'SMITH, MARY'
+  end
+
+  it "should scrub individual name components of punctuation and titles" do
+    @namor.fullscrub('Foxworthy-Smythe, ESQ.', :suppress => ['esq']).should == 'FOXWORTHYSMYTHE'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: namor
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3235644830650956760
+      hash: -2390200260815377507
 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: 3235644830650956760
+      hash: -2390200260815377507
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24