From 0aa7f79ca4255eadd7d2aad7c3378915ee54e107 Mon Sep 17 00:00:00 2001
From: Sergey Linnik <linniksa@gmail.com>
Date: Fri, 7 Dec 2012 00:44:22 +0400
Subject: [PATCH] allow customize gravatar url

---
 app/helpers/application_helper.rb       |  5 +++--
 config/gitlab.yml.example               |  2 ++
 config/initializers/1_settings.rb       |  9 +++++++++
 spec/helpers/application_helper_spec.rb | 22 ++++++++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e130c095..81be6242 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'uri'
 
 module ApplicationHelper
 
@@ -36,9 +37,9 @@ module ApplicationHelper
     if Gitlab.config.disable_gravatar? || user_email.blank?
       'no_avatar.png'
     else
-      gravatar_prefix = request.ssl? ? "https://secure" : "http://www"
+      gravatar_url = request.ssl? ? Gitlab.config.gravatar_ssl_url : Gitlab.config.gravatar_url
       user_email.strip!
-      "#{gravatar_prefix}.gravatar.com/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=mm"
+      sprintf(gravatar_url, {:hash => Digest::MD5.hexdigest(user_email.downcase), :email => URI.escape(user_email), :size => size})
     end
   end
 
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 35683489..7fcfc5b7 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -24,6 +24,8 @@ app:
   # backup_path: "/vol/backups"   # default: Rails.root + backups/
   # backup_keep_time: 604800      # default: 0 (forever) (in seconds)
   # disable_gravatar: true        # default: false - Disable user avatars from Gravatar.com
+  # gravatar_url: "http://"       # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
+  # gravatar_ssl_url: "https://"  # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm
 
 
 #
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 32af3d07..e684f378 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -145,5 +145,14 @@ class Settings < Settingslogic
     def disable_gravatar?
       app['disable_gravatar'] || false
     end
+
+    def gravatar_url
+      app['gravatar_url'] || 'http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
+    end
+
+    def gravatar_ssl_url
+      app['gravatar_ssl_url'] || 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=mm'
+    end
+
   end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index a94d5505..df66e3b4 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -51,14 +51,36 @@ describe ApplicationHelper do
       gravatar_icon('').should == 'no_avatar.png'
     end
 
+    it "should return default gravatar url" do
+      stub!(:request).and_return(double(:ssl? => false))
+      gravatar_icon(user_email).should match('http://www.gravatar.com/avatar/b58c6f14d292556214bd64909bcdb118')
+    end
+
     it "should use SSL when appropriate" do
       stub!(:request).and_return(double(:ssl? => true))
       gravatar_icon(user_email).should match('https://secure.gravatar.com')
     end
 
+    it "should return custom gravatar path when gravatar_url is set" do
+      stub!(:request).and_return(double(:ssl? => false))
+      Gitlab.config.stub(:gravatar_url).and_return('http://example.local/?s=%{size}&hash=%{hash}')
+      gravatar_icon(user_email, 20).should == 'http://example.local/?s=20&hash=b58c6f14d292556214bd64909bcdb118'
+    end
+
     it "should accept a custom size" do
       stub!(:request).and_return(double(:ssl? => false))
       gravatar_icon(user_email, 64).should match(/\?s=64/)
     end
+
+    it "should use default size when size is wrong" do
+      stub!(:request).and_return(double(:ssl? => false))
+      gravatar_icon(user_email, nil).should match(/\?s=40/)
+    end
+
+    it "should be case insensitive" do
+      stub!(:request).and_return(double(:ssl? => false))
+      gravatar_icon(user_email).should == gravatar_icon(user_email.upcase + " ")
+    end
+
   end
 end