--- a/TODO.txt
+++ b/TODO.txt
@@ -46,7 +46,6 @@
 * improve commenting and comments visibility
 * handle mising/wrong SHA1s gracefully in browser
 * parse SHA1s in commits+comments
-* Normalize url fields (eg add http:// if it aint there) on User+Project
 * Detect renames etc when showing a commit
 * Always add a "mainline-upstream" branch that track the mainline repos automagically to clones
 ---

--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1,21 +1,21 @@
 class Project < ActiveRecord::Base
   acts_as_taggable
-  
+
   belongs_to  :user
   has_many    :comments, :dependent => :destroy
   has_many    :repositories, :order => "repositories.mainline desc, repositories.created_at asc",
     :dependent => :destroy
-  has_one     :mainline_repository, :conditions => ["mainline = ?", true], 
+  has_one     :mainline_repository, :conditions => ["mainline = ?", true],
     :class_name => "Repository"
   has_many    :repository_clones, :conditions => ["mainline = ?", false],
     :class_name => "Repository"
-    
-  is_indexed :fields => ["title", "description", "slug"], 
+
+  is_indexed :fields => ["title", "description", "slug"],
     :concatenate => [
-      { :class_name => 'Tag', 
-        :field => 'name', 
+      { :class_name => 'Tag',
+        :field => 'name',
         :as => 'category',
-        :association_sql => "LEFT OUTER JOIN taggings ON taggings.taggable_id = projects.id " + 
+        :association_sql => "LEFT OUTER JOIN taggings ON taggings.taggable_id = projects.id " +
                             "AND taggings.taggable_type = 'Project' LEFT OUTER JOIN tags ON taggings.tag_id = tags.id"
       }],
     :include => [{
@@ -23,26 +23,26 @@ class Project < ActiveRecord::Base
       :field => "login",
       :as => "user"
     }]
-      
-    
+
+
   URL_FORMAT_RE = /^(http|https|nntp):\/\//.freeze
   validates_presence_of :title, :user_id, :slug
   validates_uniqueness_of :slug, :case_sensitive => false
-  validates_format_of :slug, :with => /^[a-z0-9_\-]+$/i, 
+  validates_format_of :slug, :with => /^[a-z0-9_\-]+$/i,
     :message => "must match something in the range of [a-z0-9_\-]+"
-  validates_format_of :home_url, :with => URL_FORMAT_RE, 
+  validates_format_of :home_url, :with => URL_FORMAT_RE,
     :if => proc{|record| !record.home_url.blank? },
     :message => "Must begin with http(s)"
   validates_format_of :mailinglist_url, :with => URL_FORMAT_RE,
     :if => proc{|record| !record.mailinglist_url.blank? },
     :message => "Must begin with http(s)"
-  validates_format_of :bugtracker_url, :with => URL_FORMAT_RE, 
+  validates_format_of :bugtracker_url, :with => URL_FORMAT_RE,
     :if => proc{|record| !record.bugtracker_url.blank? },
     :message => "Must begin with http(s)"
-    
+
   before_validation :downcase_slug
   after_create :create_mainline_repository
-  
+
   LICENSES = [
     'Academic Free License v3.0',
     'MIT License',
@@ -68,47 +68,59 @@ class Project < ActiveRecord::Base
     'Other/Proprietary License',
     'None',
   ]
-  
+
   def self.find_by_slug!(slug, opts = {})
     find_by_slug(slug, opts) || raise(ActiveRecord::RecordNotFound)
   end
-  
+
   def self.per_page() 20 end
-    
+
   def self.top_tags(limit = 10)
     tag_counts(:limit => limit, :order => "count desc")
   end
-  
+
   def to_param
     slug
   end
-  
+
   def admin?(candidate)
     candidate == user
   end
-  
+
   def can_be_deleted_by?(candidate)
     (candidate == user) && (repositories.size == 1)
   end
-  
+
   def tag_list=(tag_list)
     tag_list.gsub!(",", "")
-    
+
     super
   end
-  
+
+  def home_url=(url)
+    self[:home_url] = clean_url(url)
+  end
+
+  def mailinglist_url=(url)
+    self[:mailinglist_url] = clean_url(url)
+  end
+
+  def bugtracker_url=(url)
+    self[:bugtracker_url] = clean_url(url)
+  end
+
   def stripped_description
     description.gsub(/<\/?[^>]*>/, "")
     # sanitizer = HTML::WhiteListSanitizer.new
     # sanitizer.sanitize(description, :tags => %w(str), :attributes => %w(class))
   end
-  
+
   def to_xml(opts = {})
     info = Proc.new { |options|
       builder = options[:builder]
       builder.owner user.login
-      
-      builder.repositories :type => "array" do 
+
+      builder.repositories :type => "array" do
         repositories.each { |repo|
           builder.repository do
             builder.id repo.id
@@ -120,14 +132,22 @@ class Project < ActiveRecord::Base
     }
     super({:procs => [info]}.merge(opts))
   end
-  
+
   protected
     def create_mainline_repository
       self.repositories.create!(:user => self.user, :name => "mainline")
     end
-    
+
     def downcase_slug
       slug.downcase! if slug
     end
-  
+
+    # Try our best to guess the url
+    def clean_url(url)
+      begin
+        url = "http://#{url}" if URI.parse(url).class == URI::Generic
+      rescue
+      end
+      url
+    end
 end

--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -1,31 +1,31 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Project do
-  
+
   def create_project(options={})
     Project.new({
-      :title => "foo project", 
-      :slug => "foo", 
+      :title => "foo project",
+      :slug => "foo",
       :user => users(:johan)
     }.merge(options))
   end
-  
+
   it "should have valid associations" do
     create_project.should have_valid_associations
   end
-  
+
   it "should have a title to be valid" do
     project = create_project(:title => nil)
     project.should_not be_valid
     project.title = "foo"
     project.should be_valid
   end
-  
+
   it "should have a slug to be valid" do
     project = create_project(:slug => nil)
     project.should_not be_valid
   end
-  
+
   it "should have a unique slug to be valid" do
     p1 = create_project
     p1.save!
@@ -33,19 +33,19 @@ describe Project do
     p2.should_not be_valid
     p2.should have(1).error_on(:slug)
   end
-  
+
   it "should have an alphanumeric slug" do
     project = create_project(:slug => "asd asd")
     project.valid?
     project.should_not be_valid
   end
-  
+
   it "should downcase the slug before validation" do
     project = create_project(:slug => "FOO")
     project.valid?
     project.slug.should == "foo"
   end
-  
+
   it "creates an initial repository for itself" do
     project = create_project
     project.save
@@ -54,24 +54,24 @@ describe Project do
     project.repositories.first.user.should == project.user
     project.user.can_write_to?(project.repositories.first).should == true
   end
-  
+
   it "finds a project by slug or raises" do
     Project.find_by_slug!(projects(:johans).slug).should == projects(:johans)
     proc{
       Project.find_by_slug!("asdasdasd")
     }.should raise_error(ActiveRecord::RecordNotFound)
-  end 
-  
+  end
+
   it "has the slug as its params" do
     projects(:johans).to_param.should == projects(:johans).slug
   end
-  
+
   it "knows if a user is a admin on a project" do
     projects(:johans).admin?(users(:johan)).should == true
     projects(:johans).admin?(users(:moe)).should == false
     projects(:johans).admin?(:false).should == false
   end
-  
+
   it "knows if a user can delete the project" do
     project = projects(:johans)
     project.can_be_deleted_by?(users(:moe)).should == false
@@ -79,15 +79,29 @@ describe Project do
     project.repositories.last.destroy
     project.reload.can_be_deleted_by?(users(:johan)).should == true
   end
-  
+
   it "should strip html tags" do
     project = create_project(:description => "<h1>Project A</h1>\n<b>Project A</b> is a....")
     project.stripped_description.should == "Project A\nProject A is a...."
   end
-  
+
   # it "should strip html tags, except highlights" do
   #   project = create_project(:description => %Q{<h1>Project A</h1>\n<strong class="highlight">Project A</strong> is a....})
   #   project.stripped_description.should == %Q(Project A\n<strong class="highlight">Project A</strong> is a....)
   # end
-  
+
+  it "should have valid urls ( prepending http:// if needed )" do
+    project = projects(:johans)
+    [ :home_url, :mailinglist_url, :bugtracker_url ].each do |attr|
+      project.should be_valid
+      project.send("#{attr}=", 'http://blah.com')
+      project.should be_valid
+      project.send("#{attr}=", 'ftp://blah.com')
+      project.should_not be_valid
+      project.send("#{attr}=", 'blah.com')
+      project.should be_valid
+      project.send(attr).should == 'http://blah.com'
+    end
+  end
+
 end