lib/sup/contact.rb in sup-0.20.0 vs lib/sup/contact.rb in sup-0.21.0
- old
+ new
@@ -14,11 +14,11 @@
@p2a = {} # person to alias
@a2p = {} # alias to person
@e2p = {} # email to person
- if File.exists? fn
+ if File.exist? fn
IO.foreach(fn) do |l|
l =~ /^([^:]*): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
aalias, addr = $1, $2
update_alias Person.from_address(addr), aalias
end
@@ -27,14 +27,16 @@
def contacts; @p2a.keys end
def contacts_with_aliases; @a2p.values.uniq end
def update_alias person, aalias=nil
+ ## Deleting old data if it exists
old_aalias = @p2a[person]
- if(old_aalias != nil and old_aalias != "") # remove old alias
+ if old_aalias
@a2p.delete old_aalias
@e2p.delete person.email
end
+ ## Update with new data
@p2a[person] = aalias
unless aalias.nil? || aalias.empty?
@a2p[aalias] = person
@e2p[person.email] = person
end