Changeset - 819eb7f8a555
Parent rev.
Child rev.
[Not reviewed]
beta
0 5 0
Marcin Kuzminski - 13 years ago 2012-09-13 20:07:43
marcin@python-works.com
Implemented patch from andrewsh ref #565 Add support for {netloc} and {scheme}
to alternative_gravatar_url
5 files changed with 47 insertions and 15 deletions:
development.ini
2
production.ini
2
rhodecode/config/deployment.ini_tmpl
2
rhodecode/lib/helpers.py
6
1
rhodecode/tests/test_libs.py
35
14
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -66,12 +66,14 @@ use_gravatar = true
 

			




	
	
	
		
 
## alternative_gravatar_url allows you to use your own avatar server application

			




	
	
	
		
 
## the following parts of the URL will be replaced

			




	
	
	
		
 
## {email}        user email

			




	
	
	
		
 
## {md5email}     md5 hash of the user email (like at gravatar.com)

			




	
	
	
		
 
## {size}         size of the image that is expected from the server application

			




	
	
	
		
 
## {scheme}       http/https from RhodeCode server

			




	
	
	
		
 
## {netloc}       network location from RhodeCode server

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}

			




	
	
	
		
 

			




	
	
	
		
 
container_auth_enabled = false

			




	
	
	
		
 
proxypass_auth_enabled = false

			




	
	
	
		
 
default_encoding = utf8

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -66,12 +66,14 @@ use_gravatar = true

			




	
	
	
		
 

			




	
	
	
		
 
## alternative_gravatar_url allows you to use your own avatar server application

			




	
	
	
		
 
## the following parts of the URL will be replaced

			




	
	
	
		
 
## {email}        user email

			




	
	
	
		
 
## {md5email}     md5 hash of the user email (like at gravatar.com)

			




	
	
	
		
 
## {size}         size of the image that is expected from the server application

			




	
	
	
		
 
## {scheme}       http/https from RhodeCode server

			




	
	
	
		
 
## {netloc}       network location from RhodeCode server

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}

			




	
	
	
		
 

			




	
	
	
		
 
container_auth_enabled = false

			




	
	
	
		
 
proxypass_auth_enabled = false

			




	
	
	
		
 
default_encoding = utf8

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -66,12 +66,14 @@ use_gravatar = true

			




	
	
	
		
 

			




	
	
	
		
 
## alternative_gravatar_url allows you to use your own avatar server application

			




	
	
	
		
 
## the following parts of the URL will be replaced

			




	
	
	
		
 
## {email}        user email

			




	
	
	
		
 
## {md5email}     md5 hash of the user email (like at gravatar.com)

			




	
	
	
		
 
## {size}         size of the image that is expected from the server application

			




	
	
	
		
 
## {scheme}       http/https from RhodeCode server

			




	
	
	
		
 
## {netloc}       network location from RhodeCode server

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbyemail/{email}/{size}

			




	
	
	
		
 
#alternative_gravatar_url = http://myavatarserver.com/getbymd5/{md5email}?s={size}

			




	
	
	
		
 

			




	
	
	
		
 
container_auth_enabled = false

			




	
	
	
		
 
proxypass_auth_enabled = false

			




	
	
	
		
 
default_encoding = utf8

			




        

    


    
    

    

        

                

                    rhodecode/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,12 +7,13 @@ import random

			




	
	
	
		
 
import hashlib

			




	
	
	
		
 
import StringIO

			




	
	
	
		
 
import urllib

			




	
	
	
		
 
import math

			




	
	
	
		
 
import logging

			




	
	
	
		
 
import re

			




	
	
	
		
 
import urlparse

			




	
	
	
		
 

			




	
	
	
		
 
from datetime import datetime

			




	
	
	
		
 
from pygments.formatters.html import HtmlFormatter

			




	
	
	
		
 
from pygments import highlight as code_highlight

			




	
	
	
		
 
from pylons import url, request, config

			




	
	
	
		
 
from pylons.i18n.translation import _, ungettext

			




	
	
		
 
@@ -708,17 +709,21 @@ HasRepoPermissionAny, HasRepoPermissionA

			




	
	
	
		
 

			




	
	
	
		
 
#==============================================================================

			




	
	
	
		
 
# GRAVATAR URL

			




	
	
	
		
 
#==============================================================================

			




	
	
	
		
 

			




	
	
	
		
 
def gravatar_url(email_address, size=30):

			




	
	
	
		
 
    from pylons import url  ## doh, we need to re-import url to mock it later

			




	
	
	
		
 
    if(str2bool(config['app_conf'].get('use_gravatar')) and

			




	
	
	
		
 
       config['app_conf'].get('alternative_gravatar_url')):

			




	
	
	
		
 
        tmpl = config['app_conf'].get('alternative_gravatar_url', '')

			




	
	
	
		
 
        parsed_url = urlparse.urlparse(url.current(qualified=True))

			




	
	
	
		
 
        tmpl = tmpl.replace('{email}', email_address)\

			




	
	
	
		
 
                   .replace('{md5email}', hashlib.md5(email_address.lower()).hexdigest())\

			




	
	
	
		
 
                   .replace('{md5email}', hashlib.md5(email_address.lower()).hexdigest()) \

			




	
	
	
		
 
                   .replace('{netloc}', parsed_url.netloc)\

			




	
	
	
		
 
                   .replace('{scheme}', parsed_url.scheme)\

			




	
	
	
		
 
                   .replace('{size}', str(size))

			




	
	
	
		
 
        return tmpl

			




	
	
	
		
 

			




	
	
	
		
 
    if (not str2bool(config['app_conf'].get('use_gravatar')) or

			




	
	
	
		
 
        not email_address or email_address == 'anonymous@rhodecode.org'):

			




	
	
	
		
 
        f = lambda a, l: min(l, key=lambda x: abs(x - a))

			




        

    


    
    

    

        

                

                    rhodecode/tests/test_libs.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -156,22 +156,43 @@ class TestLibs(unittest.TestCase):

			




	
	
	
		
 
        def fake_conf(**kwargs):

			




	
	
	
		
 
            from pylons import config

			




	
	
	
		
 
            config['app_conf'] = {}

			




	
	
	
		
 
            config['app_conf']['use_gravatar'] = True

			




	
	
	
		
 
            config['app_conf'].update(kwargs)

			




	
	
	
		
 
            return config

			




	
	
	
		
 
        fake = fake_conf(alternative_gravatar_url='http://test.com/{email}')

			




	
	
	
		
 
        with mock.patch('pylons.config', fake):

			




	
	
	
		
 
            grav = gravatar_url(email_address='test@foo.com', size=24)

			




	
	
	
		
 
            assert grav == 'http://test.com/test@foo.com'

			




	
	
	
		
 

			




	
	
	
		
 
        class fake_url():

			




	
	
	
		
 
            @classmethod

			




	
	
	
		
 
            def current(cls, *args, **kwargs):

			




	
	
	
		
 
                return 'https://server.com'

			




	
	
	
		
 

			




	
	
	
		
 
        with mock.patch('pylons.url', fake_url):

			




	
	
	
		
 
            fake = fake_conf(alternative_gravatar_url='http://test.com/{email}')

			




	
	
	
		
 
            with mock.patch('pylons.config', fake):

			




	
	
	
		
 
                    from pylons import url

			




	
	
	
		
 
                    assert url.current() == 'http://server.com'

			




	
	
	
		
 
                    grav = gravatar_url(email_address='test@foo.com', size=24)

			




	
	
	
		
 
                    assert grav == 'http://test.com/test@foo.com'

			




	
	
	
		
 

			




	
	
	
		
 
            fake = fake_conf(alternative_gravatar_url='http://test.com/{email}')

			




	
	
	
		
 
            with mock.patch('pylons.config', fake):

			




	
	
	
		
 
                grav = gravatar_url(email_address='test@foo.com', size=24)

			




	
	
	
		
 
                assert grav == 'http://test.com/test@foo.com'

			




	
	
	
		
 

			




	
	
	
		
 
        fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}')

			




	
	
	
		
 
        with mock.patch('pylons.config', fake):

			




	
	
	
		
 
            em = 'test@foo.com'

			




	
	
	
		
 
            grav = gravatar_url(email_address=em, size=24)

			




	
	
	
		
 
            assert grav == 'http://test.com/%s' % (_md5(em))

			




	
	
	
		
 
            fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}')

			




	
	
	
		
 
            with mock.patch('pylons.config', fake):

			




	
	
	
		
 
                em = 'test@foo.com'

			




	
	
	
		
 
                grav = gravatar_url(email_address=em, size=24)

			




	
	
	
		
 
                assert grav == 'http://test.com/%s' % (_md5(em))

			




	
	
	
		
 

			




	
	
	
		
 
        fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}/{size}')

			




	
	
	
		
 
        with mock.patch('pylons.config', fake):

			




	
	
	
		
 
            em = 'test@foo.com'

			




	
	
	
		
 
            grav = gravatar_url(email_address=em, size=24)

			




	
	
	
		
 
            assert grav == 'http://test.com/%s/%s' % (_md5(em), 24)

			




	
	
	
		
 
            fake = fake_conf(alternative_gravatar_url='http://test.com/{md5email}/{size}')

			




	
	
	
		
 
            with mock.patch('pylons.config', fake):

			




	
	
	
		
 
                em = 'test@foo.com'

			




	
	
	
		
 
                grav = gravatar_url(email_address=em, size=24)

			




	
	
	
		
 
                assert grav == 'http://test.com/%s/%s' % (_md5(em), 24)

			




	
	
	
		
 

			




	
	
	
		
 
            fake = fake_conf(alternative_gravatar_url='{scheme}://{netloc}/{md5email}/{size}')

			




	
	
	
		
 
            with mock.patch('pylons.config', fake):

			




	
	
	
		
 
                em = 'test@foo.com'

			




	
	
	
		
 
                grav = gravatar_url(email_address=em, size=24)

			




	
	
	
		
 
                assert grav == 'https://server.com/%s/%s' % (_md5(em), 24)

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-22315
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support