project path & code regexp validation

1 files changed, 5 insertions, 6 deletions

diff --git a/app/models/project.rb b/app/models/project.rb
index 17b556c3471..0d90af866bf 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -16,6 +16,8 @@ class Project < ActiveRecord::Base
   validates :path,
             :uniqueness => true,
             :presence => true,
+            :format => { :with => /^[a-zA-Z0-9_\-]*$/,
+                         :message => "only letters, digits & '_' '-' allowed" },
             :length   => { :within => 0..255 }
   
   validates :description,
@@ -24,14 +26,15 @@ class Project < ActiveRecord::Base
   validates :code,
             :presence => true,
             :uniqueness => true,
-            :length   => { :within => 3..12 }
+            :format => { :with => /^[a-zA-Z0-9_\-]*$/,
+                         :message => "only letters, digits & '_' '-' allowed"  },
+            :length   => { :within => 3..16 }
 
   validates :owner,
             :presence => true
 
   validate :check_limit
   
-  before_save :format_code
   after_destroy :destroy_gitosis_project
   after_save :update_gitosis_project
 
@@ -47,10 +50,6 @@ class Project < ActiveRecord::Base
     notes.where(:noteable_type => ["", nil])
   end
 
-  def format_code
-    read_attribute(:code).downcase.strip.gsub(' ', '')
-  end
-
   def update_gitosis_project
     Gitosis.new.configure do |c|
       c.update_project(path, gitosis_writers)