diff --git a/src/colab-spb-plugin/src/colab_spb/fixtures/__init__.py b/src/colab-spb-plugin/src/colab_spb/fixtures/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/colab-spb-plugin/src/colab_spb/fixtures/__init__.py diff --git a/src/colab-spb-plugin/src/colab_spb/fixtures/colab_spb.json b/src/colab-spb-plugin/src/colab_spb/fixtures/colab_spb.json index 28019c6..0d730dd 100644 --- a/src/colab-spb-plugin/src/colab_spb/fixtures/colab_spb.json +++ b/src/colab-spb-plugin/src/colab_spb/fixtures/colab_spb.json @@ -379,5 +379,35 @@ }, "model": "super_archives.emailaddress", "pk": 1 +}, +{ + "fields": { + "description": null, + "created_at": "2015-09-29T14:36:58Z", + "user": null, + "identifier": "example_community", + "categories": [], + "name": "example_community" + }, + "model": "colab_noosfero.noosferocommunity", + "pk": 69 +}, +{ + "fields": { + "path": "example_community", + "name": "example_community", + "owner_id": null + }, + "model": "colab_gitlab.gitlabgroup", + "pk": 23 +}, +{ + "fields": { + "mail_list": 1, + "group": 23, + "community": 69 + }, + "model": "colab_spb.communityassociations", + "pk": 2 } ] diff --git a/src/colab-spb-plugin/src/colab_spb/migrations/0001_initial.py b/src/colab-spb-plugin/src/colab_spb/migrations/0001_initial.py index de306ee..0fedf9a 100644 --- a/src/colab-spb-plugin/src/colab_spb/migrations/0001_initial.py +++ b/src/colab-spb-plugin/src/colab_spb/migrations/0001_initial.py @@ -8,7 +8,7 @@ class Migration(migrations.Migration): dependencies = [ ('colab_gitlab', '0001_initial'), - ('colab_noosfero', '0001_initial'), + ('colab_noosfero', '__first__'), ('super_archives', '0002_mailinglist_is_private'), ] diff --git a/src/colab-spb-plugin/src/colab_spb/static/spb/js/jquery.timeago.js b/src/colab-spb-plugin/src/colab_spb/static/spb/js/jquery.timeago.js new file mode 100644 index 0000000..a8ad067 --- /dev/null +++ b/src/colab-spb-plugin/src/colab_spb/static/spb/js/jquery.timeago.js @@ -0,0 +1,223 @@ +/** + * Timeago is a jQuery plugin that makes it easy to support automatically + * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago"). + * + * @name timeago + * @version 1.4.2 + * @requires jQuery v1.2.3+ + * @author Ryan McGeary + * @license MIT License - http://www.opensource.org/licenses/mit-license.php + * + * For usage and examples, visit: + * http://timeago.yarp.com/ + * + * Copyright (c) 2008-2015, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org) + */ + +(function (factory) { + if (typeof define === 'function' && define.amd) { + // AMD. Register as an anonymous module. + define(['jquery'], factory); + } if (typeof module === 'object' && typeof module.exports === 'object') { + factory(require('jquery')); + } else { + // Browser globals + factory(jQuery); + } +}(function ($) { + $.timeago = function(timestamp) { + if (timestamp instanceof Date) { + return inWords(timestamp); + } else if (typeof timestamp === "string") { + return inWords($.timeago.parse(timestamp)); + } else if (typeof timestamp === "number") { + return inWords(new Date(timestamp)); + } else { + return inWords($.timeago.datetime(timestamp)); + } + }; + var $t = $.timeago; + + $.extend($.timeago, { + settings: { + refreshMillis: 60000, + allowPast: true, + allowFuture: false, + localeTitle: false, + cutoff: 0, + strings: { + prefixAgo: null, + prefixFromNow: null, + suffixAgo: "ago", + suffixFromNow: "from now", + inPast: 'any moment now', + seconds: "less than a minute", + minute: "about a minute", + minutes: "%d minutes", + hour: "about an hour", + hours: "about %d hours", + day: "a day", + days: "%d days", + month: "about a month", + months: "%d months", + year: "about a year", + years: "%d years", + wordSeparator: " ", + numbers: [] + } + }, + + inWords: function(distanceMillis) { + if(!this.settings.allowPast && ! this.settings.allowFuture) { + throw 'timeago allowPast and allowFuture settings can not both be set to false.'; + } + + var $l = this.settings.strings; + var prefix = $l.prefixAgo; + var suffix = $l.suffixAgo; + if (this.settings.allowFuture) { + if (distanceMillis < 0) { + prefix = $l.prefixFromNow; + suffix = $l.suffixFromNow; + } + } + + if(!this.settings.allowPast && distanceMillis >= 0) { + return this.settings.strings.inPast; + } + + var seconds = Math.abs(distanceMillis) / 1000; + var minutes = seconds / 60; + var hours = minutes / 60; + var days = hours / 24; + var years = days / 365; + + function substitute(stringOrFunction, number) { + var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction; + var value = ($l.numbers && $l.numbers[number]) || number; + return string.replace(/%d/i, value); + } + + var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) || + seconds < 90 && substitute($l.minute, 1) || + minutes < 45 && substitute($l.minutes, Math.round(minutes)) || + minutes < 90 && substitute($l.hour, 1) || + hours < 24 && substitute($l.hours, Math.round(hours)) || + hours < 42 && substitute($l.day, 1) || + days < 30 && substitute($l.days, Math.round(days)) || + days < 45 && substitute($l.month, 1) || + days < 365 && substitute($l.months, Math.round(days / 30)) || + years < 1.5 && substitute($l.year, 1) || + substitute($l.years, Math.round(years)); + + var separator = $l.wordSeparator || ""; + if ($l.wordSeparator === undefined) { separator = " "; } + return $.trim([prefix, words, suffix].join(separator)); + }, + + parse: function(iso8601) { + var s = $.trim(iso8601); + s = s.replace(/\.\d+/,""); // remove milliseconds + s = s.replace(/-/,"/").replace(/-/,"/"); + s = s.replace(/T/," ").replace(/Z/," UTC"); + s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400 + s = s.replace(/([\+\-]\d\d)$/," $100"); // +09 -> +0900 + return new Date(s); + }, + datetime: function(elem) { + var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title"); + return $t.parse(iso8601); + }, + isTime: function(elem) { + // jQuery's `is()` doesn't play well with HTML5 in IE + return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time"); + } + }); + + // functions that can be called via $(el).timeago('action') + // init is default when no action is given + // functions are called with context of a single element + var functions = { + init: function(){ + var refresh_el = $.proxy(refresh, this); + refresh_el(); + var $s = $t.settings; + if ($s.refreshMillis > 0) { + this._timeagoInterval = setInterval(refresh_el, $s.refreshMillis); + } + }, + update: function(time){ + var parsedTime = $t.parse(time); + $(this).data('timeago', { datetime: parsedTime }); + if($t.settings.localeTitle) $(this).attr("title", parsedTime.toLocaleString()); + refresh.apply(this); + }, + updateFromDOM: function(){ + $(this).data('timeago', { datetime: $t.parse( $t.isTime(this) ? $(this).attr("datetime") : $(this).attr("title") ) }); + refresh.apply(this); + }, + dispose: function () { + if (this._timeagoInterval) { + window.clearInterval(this._timeagoInterval); + this._timeagoInterval = null; + } + } + }; + + $.fn.timeago = function(action, options) { + var fn = action ? functions[action] : functions.init; + if(!fn){ + throw new Error("Unknown function name '"+ action +"' for timeago"); + } + // each over objects here and call the requested function + this.each(function(){ + fn.call(this, options); + }); + return this; + }; + + function refresh() { + //check if it's still visible + if(!$.contains(document.documentElement,this)){ + //stop if it has been removed + $(this).timeago("dispose"); + return this; + } + + var data = prepareData(this); + var $s = $t.settings; + + if (!isNaN(data.datetime)) { + if ( $s.cutoff == 0 || Math.abs(distance(data.datetime)) < $s.cutoff) { + $(this).text(inWords(data.datetime)); + } + } + return this; + } + + function prepareData(element) { + element = $(element); + if (!element.data("timeago")) { + element.data("timeago", { datetime: $t.datetime(element) }); + var text = $.trim(element.text()); + if ($t.settings.localeTitle) { + element.attr("title", element.data('timeago').datetime.toLocaleString()); + } else if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) { + element.attr("title", text); + } + } + return element.data("timeago"); + } + + function inWords(date) { + return $t.inWords(distance(date)); + } + + function distance(date) { + return (new Date().getTime() - date.getTime()); + } + + // fix for IE6 suckage + document.createElement("abbr"); + document.createElement("time"); +})); diff --git a/src/colab-spb-plugin/src/colab_spb/templates/gitlab_activity.html b/src/colab-spb-plugin/src/colab_spb/templates/gitlab_activity.html new file mode 100644 index 0000000..797e7a8 --- /dev/null +++ b/src/colab-spb-plugin/src/colab_spb/templates/gitlab_activity.html @@ -0,0 +1,25 @@ + +{% load i18n %} + + + + +
+ {{message}} +
+ + + diff --git a/src/colab-spb-plugin/src/colab_spb/urls.py b/src/colab-spb-plugin/src/colab_spb/urls.py index f14cdfc..43c72a5 100644 --- a/src/colab-spb-plugin/src/colab_spb/urls.py +++ b/src/colab-spb-plugin/src/colab_spb/urls.py @@ -2,4 +2,6 @@ from django.conf.urls import patterns, url from . import views urlpatterns = patterns('', - url(r'^get_list/$', views.get_list, name='get_list'),) + url(r'^mail_list/$', views.mail_list, name='mail_list'), + url(r'^gitlab_activity/$', views.gitlab_activity, + name='gitlab_activity'),) diff --git a/src/colab-spb-plugin/src/colab_spb/views.py b/src/colab-spb-plugin/src/colab_spb/views.py index a3b3a41..e398302 100644 --- a/src/colab-spb-plugin/src/colab_spb/views.py +++ b/src/colab-spb-plugin/src/colab_spb/views.py @@ -4,13 +4,15 @@ from django.http import HttpResponse from colab.super_archives.models import MailingList, Thread from colab.accounts.utils import mailman from colab.accounts.models import User +from colab_spb.models import CommunityAssociations -def get_list(request): - list_name = request.GET.get('list_name', None) - MAX = request.GET.get('MAX', 7) +def mail_list(request): + community = request.GET.get('community', "") + list_name = get_community_association(community).get("mailman_list", "") - if not MAX: + MAX = request.GET.get('MAX', 7) + if not MAX or MAX < 0: MAX = 7 context = {} @@ -44,6 +46,37 @@ def get_list(request): message = ("Não foi possível encontrada lista de discussão" " associada a está comunidade, para mais" " detalhes contate o administrador.") - return HttpResponse(message, status=404) + return HttpResponse(message, status=200) + + return render(request, 'discussion.html', context) + + +def gitlab_activity(request): + community = request.GET.get('community', "") + limit = request.GET.get('limit', 7) + offset = request.GET.get('offset', 0) + + context = {} + context['message'] = ("Esta comunidade não está associada a" + " nenhum repositório no momento, para mais" + " detalhes contate o administrador.") + + association = get_community_association(community, limit, offset) + context['community_association'] = association + + return render(request, 'gitlab_activity.html', context) + + +def get_community_association(community, limit=7, offset=0): + if not community: + return {} - return render(request, "discussion.html", context) + associations = CommunityAssociations.objects.all() + for community_association in associations: + if community_association.community.identifier in community: + return {'community': community_association.community.identifier, + 'repository': community_association.group.url, + 'mailman_list': community_association.mail_list.name, + 'limit': limit, + 'offset': offset} + return {} diff --git a/src/colab-spb-plugin/tests/plugins.d/gitlab.py b/src/colab-spb-plugin/tests/plugins.d/gitlab.py index 0b379e7..4c22641 100644 --- a/src/colab-spb-plugin/tests/plugins.d/gitlab.py +++ b/src/colab-spb-plugin/tests/plugins.d/gitlab.py @@ -10,7 +10,7 @@ name = 'colab_gitlab' verbose_name = 'Gitlab Plugin' upstream = 'localhost' -#middlewares = [] +# middlewares = [] urls = { 'include': 'colab_gitlab.urls', diff --git a/src/colab-spb-plugin/tests/plugins.d/noosfero.py b/src/colab-spb-plugin/tests/plugins.d/noosfero.py index 20ddaaa..97025b1 100644 --- a/src/colab-spb-plugin/tests/plugins.d/noosfero.py +++ b/src/colab-spb-plugin/tests/plugins.d/noosfero.py @@ -10,7 +10,7 @@ name = 'colab_noosfero' verbose_name = 'Noosfero Plugin' upstream = 'localhost' -#middlewares = [] +# middlewares = [] urls = { 'include': 'colab_noosfero.urls', diff --git a/src/colab-spb-plugin/tests/plugins.d/spb.py b/src/colab-spb-plugin/tests/plugins.d/spb.py index 085d651..29cf3bd 100644 --- a/src/colab-spb-plugin/tests/plugins.d/spb.py +++ b/src/colab-spb-plugin/tests/plugins.d/spb.py @@ -1,15 +1,12 @@ -from django.utils.translation import ugettext_lazy as _ -from colab.plugins.utils.menu import colab_url_factory - +from colab.plugins.utils.menu import colab_url_factory + name = "colab_spb" verbose_name = "SPB Plugin" middlewares = ['colab_spb.middleware.ForceLangMiddleware'] -urls = { - "include":"colab_spb.urls", - "prefix": '^spb/', - "namespace":"colab_spb" - } +urls = {"include": "colab_spb.urls", + "prefix": '^spb/', + "namespace": "colab_spb"} url = colab_url_factory('colab_spb') diff --git a/src/colab-spb-plugin/tests/test_colab_integration.py b/src/colab-spb-plugin/tests/test_colab_integration.py new file mode 100644 index 0000000..b86774f --- /dev/null +++ b/src/colab-spb-plugin/tests/test_colab_integration.py @@ -0,0 +1,80 @@ +# -*- coding: utf-8 -*- + +from django.test import TestCase, Client + + +class SPBTest(TestCase): + + fixtures = ['colab_spb.json'] + + def setUp(self): + super(SPBTest, self).setUp() + self.client = Client() + + def tearDown(self): + pass + + def test_mail_list_without_list(self): + response = self.client.get("/spb/mail_list/?community=") + message = ("Não foi possível encontrada lista de discussão" + " associada a está comunidade, para mais" + " detalhes contate o administrador.") + self.assertEqual(message, response.content) + self.assertEqual(200, response.status_code) + + def test_mail_list_with_list(self): + response = self.client.get("/spb/mail_list/" + "?community=example_community&MAX=5") + self.assertEqual(5, len(response.context[1]['latest'])) + + def test_mail_list_default_MAX(self): + response = self.client.get("/spb/mail_list/" + "?community=example_community") + self.assertEqual(7, len(response.context[1]['latest'])) + + def test_mail_list_invalid_MAX(self): + response = self.client.get("/spb/mail_list/" + "?community=example_community&MAX=") + self.assertEqual(7, len(response.context[1]['latest'])) + + def test_gitlab_community_association_with_invalid_community(self): + response = self.client.get("/spb/gitlab_activity/?community=") + message = ("Esta comunidade não está associada a" + " nenhum repositório no momento, para mais" + " detalhes contate o administrador.") + self.assertIn(message, response.content) + self.assertEqual(dict(), response.context['community_association']) + self.assertEqual(200, response.status_code) + + def test_gitlab_community_association_with_valid_community(self): + response = self.client.get("/spb/gitlab_activity/" + "?community=example_community") + + result = response.context['community_association'] + + self.assertEqual(type(result), dict) + self.assertEqual(result['community'], 'example_community') + self.assertEqual(result['limit'], 7) + self.assertEqual(result['offset'], 0) + self.assertEqual(result['repository'], + '/gitlab/groups/example_community') + self.assertEqual(result['mailman_list'], 'ListA') + + def test_gitlab_community_association_with_no_default_limit(self): + response = self.client.get("/spb/gitlab_activity/" + "?community=example_community" + "&limit=5") + + result = response.context['community_association'] + + self.assertEqual(type(result), dict) + self.assertEqual(result['limit'], "5") + + def test_gitlab_community_association_with_no_default_offset(self): + response = self.client.get("/spb/gitlab_activity/" + "?community=example_community" + "&offset=5") + + result = response.context['community_association'] + + self.assertEqual(result['offset'], "5") diff --git a/src/colab-spb-plugin/tests/test_get_list.py b/src/colab-spb-plugin/tests/test_get_list.py deleted file mode 100644 index 02b5ae1..0000000 --- a/src/colab-spb-plugin/tests/test_get_list.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -from django.test import TestCase, Client - - -class SPBTest(TestCase): - - fixtures = ['colab_spb.json'] - - def setUp(self): - super(SPBTest, self).setUp() - self.client = Client() - - def tearDown(self): - pass - - def test_getlist_without_list(self): - response = self.client.get("/spb/get_list/?list_name=") - message = ("Não foi possível encontrada lista de discussão" - " associada a está comunidade, para mais" - " detalhes contate o administrador.") - self.assertEqual(message, response.content) - self.assertEqual(404, response.status_code) - - def test_getlist_with_list(self): - response = self.client.get("/spb/get_list/?list_name=ListA&MAX=5") - self.assertEqual(5, len(response.context[1]['latest'])) - - def test_getlist_default_MAX(self): - response = self.client.get("/spb/get_list/?list_name=ListA") - self.assertEqual(7, len(response.context[1]['latest'])) - - def test_getlist_invalid_MAX(self): - response = self.client.get("/spb/get_list/?list_name=ListA&MAX=") - self.assertEqual(7, len(response.context[1]['latest'])) -- libgit2 0.21.2