update current_user_serializer and remove default url from avatar

openhq · Oct 29, 2015 · 75d3c4a · 75d3c4a
1 parent d21f30c
commit 75d3c4a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -13,7 +13,7 @@ class User < ActiveRecord::Base
 
   has_and_belongs_to_many :projects, -> { order(name: :asc) }
 
-  has_attached_file :avatar, styles: { thumb: "300x300#" }, default_url: nil
+  has_attached_file :avatar, styles: { thumb: "300x300#" }
   validates_attachment_content_type :avatar, content_type: %r{^image\/}
 
   validates :first_name, :last_name, presence: true

diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
@@ -7,6 +7,19 @@ def filter(keys)
   end
 
   def avatar_url
-    object.avatar.url(:thumb)
+    if object.avatar_file_name.present?
+      user.avatar.url(:thumb)
+    else
+      gravatar_url
+    end
+  end
+
+  def gravatar_url(size = 200)
+    base_url = "https://www.gravatar.com/avatar/"
+    opts = "?d=blank&s="
+
+    hash = Digest::MD5.hexdigest(object.email)
+
+    base_url + hash + opts + size.to_s
   end
 end