Remove excess whitespace before validation.

Author: kubitron

Diff for: app/models/gitolite_public_key.rb

@@ -98,11 +98,12 @@ def self.user_to_user_token(user)
 
     # Strip leading and trailing whitespace
     def strip_whitespace
-	# Don't mess with existing keys (since cannot change key text anyway)
-	return if !new_record?
-
 	self.title = title.strip
-	self.key = key.strip
+
+	# Don't mess with existing keys (since cannot change key text anyway)
+	if new_record?
+	    self.key = key.strip
+	end
     end
 
     # Remove control characters from key

Diff for: app/models/repository_mirror.rb

@@ -16,6 +16,8 @@ class RepositoryMirror < ActiveRecord::Base
 
     validate :check_refspec
 
+    before_validation :strip_whitespace
+
     named_scope :active, {:conditions => {:active => RepositoryMirror::STATUS_ACTIVE}}
     named_scope :inactive, {:conditions => {:active => RepositoryMirror::STATUS_INACTIVE}}
 
@@ -77,6 +79,12 @@ def to_s
 
     protected
 
+    # Strip leading and trailing whitespace
+    def strip_whitespace
+	self.url = url.strip
+	self.explicit_refspec = explicit_refspec.strip
+    end
+
     # Put backquote in front of crucial characters
     def dequote(in_string)
 	in_string.gsub(/[$,"\\\n]/) {|x| "\\"+x}

Diff for: app/models/repository_post_receive_url.rb

@@ -7,10 +7,12 @@ class RepositoryPostReceiveUrl < ActiveRecord::Base
     attr_accessible :url, :mode, :active
 
     validates_uniqueness_of :url, :scope => [:project_id]
-    validates_presence_of :project_id, :url
+    validates_presence_of :project_id
     validates_format_of :url, :with => URI::regexp(%w(http https))
     validates_associated :project
 
+    before_validation :strip_whitespace
+
     named_scope :active, {:conditions => {:active => RepositoryPostReceiveUrl::STATUS_ACTIVE}}
     named_scope :inactive, {:conditions => {:active => RepositoryPostReceiveUrl::STATUS_INACTIVE}}
 
@@ -25,4 +27,11 @@ def mode= (value)
     def to_s
 	return File.join("#{project.identifier}-#{url}")
     end
+
+    protected
+
+    # Strip leading and trailing whitespace
+    def strip_whitespace
+	self.url = url.strip
+    end
 end