Use HEAD instead of GET for gravatar image check. Add simple tests fo…

…r Author.

models/author.rb

@@ -25,6 +25,10 @@ def self.create_from_hash!(hsh)
     )
   end
 
+  def self.gravatar_host
+    "gravatar.com"
+  end
+
   def url
     if remote_url.nil?
       "/users/#{username}"
@@ -34,26 +38,39 @@ def url
   end
 
   def avatar_url
-    if image_url.nil?
-      if email.nil?
-        # Using a default avatar
-        "/images/avatar.png"
+    return image_url if image_url
+
+    if email
+      valid_gravatar? ? gravatar_url : "/images/avatar.png"
+    else
+      # Using a default avatar
+      "/images/avatar.png"
+    end
+  end
+
+  def valid_gravatar?
+    return false unless use_gravatar?
+    uri = URI.parse(gravatar_url)
+    result = Net::HTTP.start(Author.gravatar_host, 80) do |http|
+      res = http.head(uri.path + "?" +  uri.query ) # Use HEAD instead of GET for a faster response
+
+      if res.class == Net::HTTPNotFound
+        return false
       else
-        # Using gravatar
-        current_url = "http://gravatar.com/avatar/" + Digest::MD5.hexdigest(email) + "?s=48&r=r&d=404"
-        res = Net::HTTP.get_response(URI.parse(current_url))
-        if res.class == Net::HTTPNotFound
-          "/images/avatar.png"
-        else
-          current_url
-        end
+        return true
       end
-    else
-      # Use the twitter image
-      image_url
     end
   end
 
+  def gravatar_url
+    path = "/avatar/" + Digest::MD5.hexdigest(email) + "?s=48&r=r&d=404"
+    ["http://", Author.gravatar_host, path].join ""
+  end
+
+  private
+  def use_gravatar?
+    @use_gravatar || false # Useful for tests
+  end
 end
 
 

test/author_test.rb

@@ -0,0 +1,30 @@
+require_relative "test_helper"
+
+class AuthorTest < MiniTest::Unit::TestCase
+
+  include TestHelper
+  def setup
+    @author = Factory.build :author, :username => "james", :email => nil, :image_url => nil
+    @author.instance_variable_set "@use_gravatar", true
+  end
+
+  def test_create_from_hash
+    hash = {"user_info" => {"name" => "james", "nickname" => "jim", "urls" => {}} }
+    assert Author.create_from_hash!(hash).is_a?(Author)
+  end
+
+  def test_url
+    @author.remote_url = "some_url.com"
+    assert_equal @author.url, @author.remote_url
+  end
+
+  def test_valid_avatar_url
+    @author.email = "[email protected]"
+    assert_equal @author.avatar_url, @author.gravatar_url
+  end
+
+  def test_invalid_avatar_url
+    @author.email = "[email protected]"
+    assert_equal @author.avatar_url, "/images/avatar.png"
+  end
+end