prohibit aliases from containing spaces

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@622 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/contact.rb b/lib/sup/contact.rb
index 94d076d0a8411a61273615bf24b107e740c8bb61..2af0c5a6f1e364f5a2c9d4af97615492a6675680 100644 (file)
--- a/lib/sup/contact.rb
+++ b/lib/sup/contact.rb
@@ -1,5 +1,7 @@
 module Redwood
 
+class InvalidAliasError < StandardError; end
+
 class ContactManager
   include Singleton
 
@@ -23,6 +25,8 @@ class ContactManager
 
   def contacts; @p2a.keys; end
   def set_contact person, aalias
+    raise InvalidAliasError unless valid_alias? aalias
+
     if(pold = @a2p[aalias]) && (pold != person)
       drop_contact pold
     end
@@ -38,6 +42,11 @@ class ContactManager
   def contact_for aalias; @a2p[aalias]; end
   def alias_for person; @p2a[person]; end
   def is_contact? person; @p2a.member? person; end
+
+  def valid_alias? a
+    a =~ /^\S+$/
+  end
+
   def save
     File.open(@fn, "w") do |f|
       @p2a.each do |p, a|

diff --git a/lib/sup/modes/contact-list-mode.rb b/lib/sup/modes/contact-list-mode.rb
index 86ae63ccffb54f3feaec5fb458a38affdd26a1ff..9b52a597942cce2284b198c83748e3097dd745b0 100644 (file)
--- a/lib/sup/modes/contact-list-mode.rb
+++ b/lib/sup/modes/contact-list-mode.rb
@@ -6,7 +6,11 @@ module CanAliasContacts
     if a.empty?
       ContactManager.drop_contact p
     else
-      ContactManager.set_contact p, a
+      begin
+        ContactManager.set_contact p, a
+      rescue InvalidAliasError
+        BufferManager.flash "Error: nickname cannot contain spaces."
+      end
     end
   end
 end