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
 
@@ -60,24 +60,26 @@ cache_dir = %(here)s/data
 
index_dir = %(here)s/data/index
 
app_instance_uuid = rc-develop
 
cut_off_limit = 256000
 
force_https = false
 
commit_parse_limit = 25
 
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

			




	
	
	
		
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




        

    


    
    

    

        

                

                    production.ini
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,24 +60,26 @@ cache_dir = %(here)s/data

			




	
	
	
		
 
index_dir = %(here)s/data/index

			




	
	
	
		
 
app_instance_uuid = rc-production

			




	
	
	
		
 
cut_off_limit = 256000

			




	
	
	
		
 
force_https = false

			




	
	
	
		
 
commit_parse_limit = 50

			




	
	
	
		
 
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

			




	
	
	
		
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




        

    


    
    

    

        

                

                    rhodecode/config/deployment.ini_tmpl
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -60,24 +60,26 @@ cache_dir = %(here)s/data

			




	
	
	
		
 
index_dir = %(here)s/data/index

			




	
	
	
		
 
app_instance_uuid = ${app_instance_uuid}

			




	
	
	
		
 
cut_off_limit = 256000

			




	
	
	
		
 
force_https = false

			




	
	
	
		
 
commit_parse_limit = 50

			




	
	
	
		
 
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

			




	
	
	
		
 

			




	
	
	
		
 
## overwrite schema of clone url

			




	
	
	
		
 
## available vars:

			




	
	
	
		
 
## scheme - http/https

			




	
	
	
		
 
## user - current user

			




	
	
	
		
 
## pass - password 

			




        

    


    
    

    

        

                

                    rhodecode/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
"""Helper functions

			




	
	
	
		
 

			




	
	
	
		
 
Consists of functions to typically be used within templates, but also

			




	
	
	
		
 
available to Controllers. This module is available to both as 'h'.

			




	
	
	
		
 
"""

			




	
	
	
		
 
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

			




	
	
	
		
 
from hashlib import md5

			




	
	
	
		
 

			




	
	
	
		
 
from webhelpers.html import literal, HTML, escape

			




	
	
	
		
 
from webhelpers.html.tools import *

			




	
	
	
		
 
from webhelpers.html.builder import make_tag

			




	
	
	
		
 
from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \

			




	
	
		
 
@@ -702,29 +703,33 @@ def action_parser(user_log, feed=False):

			




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

			




	
	
	
		
 
# PERMS

			




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

			




	
	
	
		
 
from rhodecode.lib.auth import HasPermissionAny, HasPermissionAll, \

			




	
	
	
		
 
HasRepoPermissionAny, HasRepoPermissionAll

			




	
	
	
		
 

			




	
	
	
		
 

			




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

			




	
	
	
		
 
# 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))

			




	
	
	
		
 
        return url("/images/user%s.png" % f(size, [14, 16, 20, 24, 30]))

			




	
	
	
		
 

			




	
	
	
		
 
    ssl_enabled = 'https' == request.environ.get('wsgi.url_scheme')

			




	
	
	
		
 
    default = 'identicon'

			




	
	
	
		
 
    baseurl_nossl = "http://www.gravatar.com/avatar/"

			




	
	
	
		
 
    baseurl_ssl = "https://secure.gravatar.com/avatar/"

			




        

    


    
    

    

        

                

                    rhodecode/tests/test_libs.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -150,28 +150,49 @@ class TestLibs(unittest.TestCase):

			




	
	
	
		
 
        self.assertTrue('<div class="metatag" tag="tag">tag</div>' in res)

			




	
	
	
		
 

			




	
	
	
		
 
    def test_alternative_gravatar(self):

			




	
	
	
		
 
        from rhodecode.lib.helpers import gravatar_url

			




	
	
	
		
 
        _md5 = lambda s: hashlib.md5(s).hexdigest()

			




	
	
	
		
 

			




	
	
	
		
 
        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)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.