lib/namor/namor.rb in namor-0.6.0 vs lib/namor/namor.rb in namor-0.6.1
- old
+ new
@@ -34,10 +34,10 @@
# * remove punctuation
# * squeeze whitespace & trim spaces from ends
def scrub(name, opts = {})
@re_cache[opts[:suppress]] ||= suppression_re(opts[:suppress])
- name && name.upcase.gsub(/^[ZX]{2,}/, '').gsub(@re_cache[opts[:suppress]], '').gsub(/\b(JR|SR|II|III|IV)\b/i, '').gsub(/\([^\)]*\)/, '').gsub(/\[[^\]]*\]/, '').gsub(/\./, ' ').gsub(/[_'\&]/, '').gsub(/,\s*$/, '').gsub(/ +/, ' ').strip
+ name && name.upcase.gsub(/^[ZX]{2,}/, '').gsub(@re_cache[opts[:suppress]], '').gsub(/\b(JR|SR|II|III|IV)\b/i, '').gsub(/\([^\)]*\)/, '').gsub(/\[[^\]]*\]/, '').gsub(/\./, ' ').gsub(/[_'"\&]/, '').gsub(/,\s*$/, '').gsub(/ +/, ' ').strip
end
def fullscrub(name, opts = {})
final_cleaning(scrub(name, opts))
end