From a934267b8625a007cd2247448f4c4ea48f9bc9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20=C5=A0im=C3=A1nek?= Date: Fri, 9 May 2014 01:54:33 +0200 Subject: [PATCH] Use gravatar for author and committer avatars. --- assets/scripts/app/helpers/urls.coffee | 3 +++ assets/scripts/app/templates/builds/show.hbs | 4 ++-- assets/scripts/app/views/build.coffee | 14 ++++++++++++-- assets/scripts/spec/integration/build_spec.coffee | 5 +++++ assets/scripts/spec/support/expectations.coffee | 7 +++++++ assets/scripts/travis.coffee | 1 + assets/scripts/vendor/md5.min.js | 1 + 7 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 assets/scripts/vendor/md5.min.js diff --git a/assets/scripts/app/helpers/urls.coffee b/assets/scripts/app/helpers/urls.coffee index 06dde98a..2bb58c24 100644 --- a/assets/scripts/app/helpers/urls.coffee +++ b/assets/scripts/app/helpers/urls.coffee @@ -25,3 +25,6 @@ email: (email) -> "mailto:#{email}" + + gravatarImage: (email, size) -> + "https://www.gravatar.com/avatar/#{md5(email)}?s=#{size}&d=#{encodeURIComponent(Travis.config.avatar_default_url)}" diff --git a/assets/scripts/app/templates/builds/show.hbs b/assets/scripts/app/templates/builds/show.hbs index aee204f7..2062cfa7 100644 --- a/assets/scripts/app/templates/builds/show.hbs +++ b/assets/scripts/app/templates/builds/show.hbs @@ -31,10 +31,10 @@
{{#if commit.authorName}} -
{{commit.authorName}} authored
+
{{commit.authorName}} authored
{{/if}} {{#if commit.committerName}} -
{{commit.committerName}} committed
+
{{commit.committerName}} committed
{{/if}}
diff --git a/assets/scripts/app/views/build.coffee b/assets/scripts/app/views/build.coffee index 287526b4..6868b48c 100644 --- a/assets/scripts/app/views/build.coffee +++ b/assets/scripts/app/views/build.coffee @@ -48,9 +48,19 @@ Travis.reopen BuildView: Travis.View.extend templateName: 'builds/show' classNameBindings: ['color', 'loading'] + buildBinding: 'controller.build' + commitBinding: 'build.commit' + + urlCommitterGravatarImage: (-> + Travis.Urls.gravatarImage(@get('commit.committerEmail'), 40) + ).property('commit.committerEmail') + + urlAuthorGravatarImage: (-> + Travis.Urls.gravatarImage(@get('commit.authorEmail'), 40) + ).property('commit.authorEmail') loadingBinding: 'controller.loading' color: (-> - Travis.Helpers.colorForState(@get('controller.build.state')) - ).property('controller.build.state') + Travis.Helpers.colorForState(@get('build.state')) + ).property('build.state') diff --git a/assets/scripts/spec/integration/build_spec.coffee b/assets/scripts/spec/integration/build_spec.coffee index 69f5ce14..d5640cff 100644 --- a/assets/scripts/spec/integration/build_spec.coffee +++ b/assets/scripts/spec/integration/build_spec.coffee @@ -26,6 +26,11 @@ test "displaying information on build page", -> duration: '30 sec' message: 'commit message 1' + displaysSummaryGravatars + authorEmail: 'author@email.com' + committerEmail: 'committer@email.com' + + displaysTabs current: { href: '/travis-ci/travis-core' } builds: { href: '/travis-ci/travis-core/builds' } diff --git a/assets/scripts/spec/support/expectations.coffee b/assets/scripts/spec/support/expectations.coffee index 60c3be99..c2033636 100644 --- a/assets/scripts/spec/support/expectations.coffee +++ b/assets/scripts/spec/support/expectations.coffee @@ -41,6 +41,13 @@ element = $('#new-summary .subject') equal(element.text().trim(), data.message) +@displaysSummaryGravatars = (data) -> + element = $('#new-summary .author .committed img') + equal(element.attr('src'), Travis.Urls.gravatarImage(data.committerEmail, 40)) + + element = $('#new-summary .author .authored img') + equal(element.attr('src'), Travis.Urls.gravatarImage(data.authorEmail, 40)) + @displaysLog = (lines) -> log = lines.join('') equal($('#log p').text().trim(), log) diff --git a/assets/scripts/travis.coffee b/assets/scripts/travis.coffee index 6c4453aa..f209166a 100644 --- a/assets/scripts/travis.coffee +++ b/assets/scripts/travis.coffee @@ -83,6 +83,7 @@ $.extend Travis, code_climate: $('meta[name="travis.code_climate"]').attr('value') code_climate_url: $('meta[name="travis.code_climate_url"]').attr('value') show_repos_hint: 'private' + avatar_default_url: 'https://travis-ci.org/images/mailer/mascot-avatar-40px.png' CONFIG_KEYS_MAP: { go: 'Go' diff --git a/assets/scripts/vendor/md5.min.js b/assets/scripts/vendor/md5.min.js new file mode 100644 index 00000000..11b15456 --- /dev/null +++ b/assets/scripts/vendor/md5.min.js @@ -0,0 +1 @@ +!function(a){"use strict";function b(a,b){var c=(65535&a)+(65535&b),d=(a>>16)+(b>>16)+(c>>16);return d<<16|65535&c}function c(a,b){return a<>>32-b}function d(a,d,e,f,g,h){return b(c(b(b(d,a),b(f,h)),g),e)}function e(a,b,c,e,f,g,h){return d(b&c|~b&e,a,b,f,g,h)}function f(a,b,c,e,f,g,h){return d(b&e|c&~e,a,b,f,g,h)}function g(a,b,c,e,f,g,h){return d(b^c^e,a,b,f,g,h)}function h(a,b,c,e,f,g,h){return d(c^(b|~e),a,b,f,g,h)}function i(a,c){a[c>>5]|=128<>>9<<4)+14]=c;var d,i,j,k,l,m=1732584193,n=-271733879,o=-1732584194,p=271733878;for(d=0;d>5]>>>b%32&255);return c}function k(a){var b,c=[];for(c[(a.length>>2)-1]=void 0,b=0;b>5]|=(255&a.charCodeAt(b/8))<16&&(e=i(e,8*a.length)),c=0;16>c;c+=1)f[c]=909522486^e[c],g[c]=1549556828^e[c];return d=i(f.concat(k(b)),512+8*b.length),j(i(g.concat(d),640))}function n(a){var b,c,d="0123456789abcdef",e="";for(c=0;c>>4&15)+d.charAt(15&b);return e}function o(a){return unescape(encodeURIComponent(a))}function p(a){return l(o(a))}function q(a){return n(p(a))}function r(a,b){return m(o(a),o(b))}function s(a,b){return n(r(a,b))}function t(a,b,c){return b?c?r(b,a):s(b,a):c?p(a):q(a)}"function"==typeof define&&define.amd?define(function(){return t}):a.md5=t}(this); \ No newline at end of file