Merge pull request #82 from toogy/master

Adding the AVATAR_GRAVATAR_FIELD setting

avatar/conf.py

@@ -9,6 +9,7 @@ class AvatarConf(AppConf):
     RESIZE_METHOD = Image.ANTIALIAS
     STORAGE_DIR = 'avatars'
     GRAVATAR_BASE_URL = 'https://www.gravatar.com/avatar/'
+    GRAVATAR_FIELD = 'email'
     GRAVATAR_BACKUP = True
     GRAVATAR_DEFAULT = None
     DEFAULT_URL = 'avatar/img/default.jpg'

avatar/templatetags/avatar_tags.py

@@ -31,8 +31,8 @@ def avatar_url(user, size=settings.AVATAR_DEFAULT_SIZE):
         params = {'s': str(size)}
         if settings.AVATAR_GRAVATAR_DEFAULT:
             params['d'] = settings.AVATAR_GRAVATAR_DEFAULT
-        path = "%s/?%s" % (hashlib.md5(force_bytes(user.email)).hexdigest(),
-                           urlencode(params))
+        path = "%s/?%s" % (hashlib.md5(force_bytes(getattr(user,
+            settings.AVATAR_GRAVATAR_FIELD))).hexdigest(), urlencode(params))
         return urljoin(settings.AVATAR_GRAVATAR_BASE_URL, path)
 
     return get_default_avatar_url()

docs/index.txt

@@ -32,40 +32,40 @@ that are required. A minimal integration can work like this:
 
 1.  List this application in the ``INSTALLED_APPS`` portion of your settings
     file. Your settings file will look something like::
-   
+
         INSTALLED_APPS = (
             # ...
             'avatar',
         )
 
 2.  Update your database::
-   
+
         python manage.py syncdb
 
 3.  Add the avatar urls to the end of your root urlconf. Your urlconf
     will look something like::
-    
+
         urlpatterns = patterns('',
             # ...
             (r'^avatar/', include('avatar.urls')),
         )
 
 4.  Somewhere in your template navigation scheme, link to the change avatar
     page::
-    
+
         <a href="{% url 'avatar_change' %}">Change your avatar</a>
 
 5.  Wherever you want to display an avatar for a user, first load the avatar
     template tags::
-    
+
         {% load avatar_tags %}
-    
+
     Then, use the ``avatar`` tag to display an avatar of a default size::
-    
+
         {% avatar user %}
-    
+
     Or specify a size (in pixels) explicitly::
-    
+
         {% avatar user 65 %}
 
 Template tags and filter
@@ -118,15 +118,20 @@ AVATAR_GRAVATAR_BACKUP
     True.
 
 AVATAR_GRAVATAR_DEFAULT
-    A string determining the style of the default Gravatar. Available options 
-    listed in the 
-    (Gravatar documentation)[https://en.gravatar.com/site/implement/images/#default-image]. 
+    A string determining the style of the default Gravatar. Available options
+    listed in the
+    (Gravatar documentation)[https://en.gravatar.com/site/implement/images/#default-image].
     Ex. 'retro'. Defaults to None.
 
 AVATAR_DEFAULT_URL
     The default URL to default to if ``AVATAR_GRAVATAR_BACKUP`` is set to False
     and there is no ``Avatar`` instance found in the system for the given user.
 
+AVATAR_GRAVATAR_FIELD
+    The name of the user's field containing the gravatar email. Defaults to
+    ``email``. If you put, for example, ``gravatar``, django-avatar will get the
+    user's gravatar in ``user.gravatar``.
+
 AVATAR_MAX_SIZE
     File size limit for avatar upload. Default is ``1024 * 1024`` (1mb).