<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -13,11 +13,12 @@ class User &lt; ActiveRecord::Base
   has_and_belongs_to_many :flickr_photos
   has_and_belongs_to_many :viddler_videos
   
-  validates_presence_of :full_name, :nick_name, :email
+  validates_presence_of :full_name, :email
   validates_uniqueness_of :email, :case_sensitive =&gt; false
   validates_uniqueness_of :nick_name
   validates_format_of :website_url, :with =&gt; URI_FORMAT, :allow_nil =&gt; true
-  validates_format_of :nick_name, :with =&gt; NICK_NAME_FORMAT, :allow_blank =&gt; true, :message =&gt; &quot;can only contain the characters a-z, A-Z, 0-9, - and _&quot;
+  validates_format_of :nick_name, :with =&gt; NICK_NAME_FORMAT, :allow_nil =&gt; true, :message =&gt; &quot;can only contain the characters a-z, A-Z, 0-9, - and _&quot;
+  validates_length_of :nick_name, :in =&gt; (2..20)
   
   has_attached_file :mugshot,
                     :styles =&gt; { </diff>
      <filename>app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -80,17 +80,27 @@ describe User, &quot;validations&quot; do
     end
   end
   it &quot;validates true if nick_name has only [a-zA-Z0-9-_]&quot; do
-    User.new(:nick_name =&gt; 'a').should have(0).errors_on(:nick_name)
     User.new(:nick_name =&gt; 'a_b').should have(0).errors_on(:nick_name)
     User.new(:nick_name =&gt; 'a-b').should have(0).errors_on(:nick_name)
-    User.new(:nick_name =&gt; '1').should have(0).errors_on(:nick_name)
+    User.new(:nick_name =&gt; '11').should have(0).errors_on(:nick_name)
   end
   it &quot;validates false if nick_name has non [a-zA-Z0-9-_]&quot; do
-    User.new(:nick_name =&gt; '').should have(1).error_on(:nick_name)
-    User.new(:nick_name =&gt; ' ').should have(1).error_on(:nick_name)
+    User.new(:nick_name =&gt; '  ').should have(1).error_on(:nick_name)
     User.new(:nick_name =&gt; 'a b').should have(1).error_on(:nick_name)
     User.new(:nick_name =&gt; 'a.b').should have(1).error_on(:nick_name)
     User.new(:nick_name =&gt; 'a$').should have(1).error_on(:nick_name)
     User.new(:nick_name =&gt; 'a/').should have(1).error_on(:nick_name)
   end
+  it &quot;validates false if name is less than 2 characters&quot; do
+    User.new(:nick_name =&gt; nil).should have(1).error_on(:nick_name)
+    User.new(:nick_name =&gt; '').should have(2).error_on(:nick_name)
+    User.new(:nick_name =&gt; 'a').should have(1).error_on(:nick_name)
+  end
+  it &quot;validates false if name is greater than 20 characters&quot; do
+    User.new(:nick_name =&gt; 'a' * 21).should have(1).error_on(:nick_name)
+  end
+  it &quot;validates true if name is between 2 and 20 characters&quot; do
+    User.new(:nick_name =&gt; 'a' * 2).should have(0).errors_on(:nick_name)
+    User.new(:nick_name =&gt; 'a' * 20).should have(0).errors_on(:nick_name)
+  end
 end
\ No newline at end of file</diff>
      <filename>spec/models/user_spec.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>f81c01a241c3cd9ab31e7b5ed2369a14da220281</id>
    </parent>
  </parents>
  <author>
    <name>Tim Lucas</name>
    <email>t.lucas@toolmantim.com</email>
  </author>
  <url>http://github.com/webjam/webjam/commit/039ce3dde880de3cb210505ff49fb7d0412ec63a</url>
  <id>039ce3dde880de3cb210505ff49fb7d0412ec63a</id>
  <committed-date>2008-10-19T03:40:03-07:00</committed-date>
  <authored-date>2008-10-19T03:40:03-07:00</authored-date>
  <message>Validate nick_name's are between 2 and 20 chars long</message>
  <tree>d9870df652b2b0ca12757519232fe8355455e2ef</tree>
  <committer>
    <name>Tim Lucas</name>
    <email>t.lucas@toolmantim.com</email>
  </committer>
</commit>
