Merge remote-tracking branch 'upstream/master'

Author: Konviser

.gitignore

@@ -11,3 +11,4 @@ codeweekeu/static/css/scss/.sass-cache/
 *.sass-cache/
 staticfiles/
 .DS_Store
+Gemfile*

api/serializers.py

@@ -0,0 +1,8 @@
+from rest_framework import serializers
+
+from api.models.events import Event
+
+class EventListSerializers(serializers.ModelSerializer):
+	class Meta:
+		model = Event
+		fields = ('geoposition', 'title', 'id' , 'slug', 'description', 'picture')

api/tests/__init__.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+import json
+import datetime
+
+from geoposition import Geoposition
+
+from web.processors.event import create_or_update_event
+
+
+class TestRestApi:
+	def test_event_list_all(self, client, admin_user):
+		event_data = {
+			"start_date": datetime.datetime.now() - datetime.timedelta(days=1, hours=3),
+			"end_date": datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
+			"organizer": "some organizer",
+			"creator": admin_user,
+			"title": "Unique REST API Event",
+			"pub_date": datetime.datetime.now(),
+			"country": "SI",
+			"geoposition": Geoposition(46.05528,14.51444),
+			"location": "Ljubljana",
+			"audience": [1],
+			"theme": [1],
+			"tags": ["tag1", "tag2"],
+		}
+
+		event = create_or_update_event(**event_data)
+		event.status = 'APPROVED'
+		event.save()
+
+		response_json = client.get('/api/event/list/?format=json')
+		response_data = json.loads(response_json.content)
+
+		assert isinstance(response_data, list)
+		assert event_data['title'] in response_json.content

api/test_processors.py api/tests/test_processors.pyapi/test_processors.py renamed to api/tests/test_processors.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from django.conf.urls import patterns, url
+
+from api.views import EventListApi
+
+urlpatterns = patterns('',
+	url(r'^event/list/$', EventListApi.as_view(), name='event.list'),
+)

api/tests/test_restapi.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from rest_framework import generics
+
+from api.serializers import EventListSerializers
+from api.processors import get_approved_events
+
+class EventListApi(generics.ListAPIView):
+	""" Lists epproved Events, takes the following optional GET parameters:
+
+* limit
+* order
+* country_code
+* past
+	"""
+	serializer_class = EventListSerializers
+
+	def get_queryset(self):
+		params = {
+			'limit': self.request.GET.get('limit', None),
+			'order': self.request.GET.get('order', None),
+			'country_code': self.request.GET.get('country_code', None),
+			'past': self.request.GET.get('past', False)
+		}
+		
+		return get_approved_events(**params)
+

api/urls.py

@@ -199,6 +199,7 @@
     # South migration tool.
     'south',
 
+    'rest_framework',
     # Celery task queue.
     #'djcelery',
 

api/views.py

@@ -11,6 +11,7 @@
 	'',
 	url('', include('social.apps.django_app.urls', namespace='social')),
 	url(r'^avatar/', include('avatar.urls')),
+	url(r'^api/', include('api.urls', namespace='api')),
 	url(r'^admin/', include(admin.site.urls)),
 	#Note: keep this urls last
 	url(r'', include('web.urls')),

codeweekeu/settings.py

@@ -30,4 +30,6 @@ six==1.5.2
 sqlparse==0.1.11
 wsgiref==0.1.2
 dj-static==0.0.5
+djangorestframework==2.4.2
+Markdown==2.4.1
 django-cleanup==0.1.10