lib/sup/contact.rb in sup-0.1 vs lib/sup/contact.rb in sup-0.2

@@ -8,11 +8,11 @@
     @p2a = {} # person to alias map
     @a2p = {} # alias to person map
 
     if File.exists? fn
       IO.foreach(fn) do |l|
-        l =~ /^(\S+): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
+        l =~ /^([^:]+): (.*)$/ or raise "can't parse #{fn} line #{l.inspect}"
         aalias, addr = $1, $2
         p = PersonManager.person_for addr, :definitive => true
         @p2a[p] = aalias
         @a2p[aalias] = p
       end
@@ -33,12 +33,13 @@
     if(aalias = @p2a[person])
       @p2a.delete person
       @a2p.delete aalias
     end
   end    
-  def person_with aalias; @a2p[aalias]; end
+  def contact_for aalias; @a2p[aalias]; end
   def alias_for person; @p2a[person]; end
   def is_contact? person; @p2a.member? person; end
+
   def save
     File.open(@fn, "w") do |f|
       @p2a.each do |p, a|
         f.puts "#{a}: #{p.full_address}"
       end