Merge branch 'master' of git://github.com/tonnysk823/railsmg

.gitignore

@@ -12,3 +12,4 @@ public/system/**
 .settings
 tmp/
 .DS_Store
+*.swp

app/models/user.rb

@@ -30,7 +30,7 @@ class User < ActiveRecord::Base
   with_options :allow_blank => true do |u|
     u.validates_length_of :name, :city, :github, :in => 1..255
     u.validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i
-    u.validates_format_of :github, :with => /^[a-z_]+$/
+    u.validates_format_of :github, :with => /^[a-z_0-9]+$/
     u.validates_uniqueness_of :email, :github, :case_sensitive => false
   end
 

spec/models/user_spec.rb

@@ -34,7 +34,7 @@
   should_allow_values_for :email, '[email protected]', '[email protected]'
   should_not_allow_values_for :email, 'john@doe', 'john.doe'
 
-  should_allow_values_for :github, 'john', 'jonh_doe'
+  should_allow_values_for :github, 'john', 'jonh_doe', 'jonh0909'
   should_not_allow_values_for :github, 'jonhn doe', 'john.doe'
 
   it 'active should be on protected attributes' do