No @s in usernames

models/user.rb

@@ -6,7 +6,7 @@ class User
 
   # Make the username required
   # However, this will break it when email authorization is used
-  key :username, String #, :unique => true
+  key :username, String #:unique => true
   key :perishable_token, String
 
   key :email, String #, :unique => true, :allow_nil => true
@@ -15,6 +15,9 @@ class User
   validates_uniqueness_of :email, :allow_nil => :true 
   validates_uniqueness_of :username, :allow_nil => :true 
 
+  # validate users don't have @ in their usernames
+  validate :no_at
+
   belongs_to :author
   belongs_to :feed
 
@@ -213,4 +216,11 @@ def follow_yo_self
     followers << feed
     save
   end
+
+  # validation that checks @s in usernames
+  def no_at
+    unless (username =~ /@/).nil?
+      errors.add(:username, "can't have @.") 
+    end
+  end
 end

test/user_test.rb

@@ -70,4 +70,9 @@ def test_reset_password
     assert u.hashed_password != prev_pass
   end
 
+  def test_no_at_in_usernames
+    u = User.new :username => "[email protected]"
+    refute u.save, "@ in username"
+  end
+
 end