Merge pull request roundware#161 from eosrei/api1-refactor

APIv1 refactor + APIv2 start

ARCHITECTURE.md

@@ -0,0 +1,25 @@
+# Roundware File Structure Architecture
+
+This document describes the Roundware system file structure.
+
+`roundware` - A Django project hosting the web admin, APIv1(currently) and API2.
+
+`roundware/settings` - The Roundware configuration settings for dev, test, and
+live environments.
+
+`roundware/rw` - The Django web admin and Roundware database models.
+
+`roundware/lib` - Common functionality used by rw/api1/api2 to process audio and
+communicate with rwstreamd.py instances via dbus.
+
+`roundware/api1` - The original Roundware API, it is partially REST based.
+
+`roundware/api2` - The Roundware fully RESTful API V2.
+
+`roundware/notifications` - The email notifications system. Can be used to notify
+Roundware administrators when new database objects have been created or
+updated.
+
+`roundwared` - rwstreamd.py is the audio stream control daemon. It communicates
+with the rest of the Roundware system via dbus, generates MP3/OGG audio streams
+using gstreamer and creates audio streams using icecast2.

deploy.sh

@@ -48,16 +48,18 @@ pip install -U pip
 # Install RoundWare requirements
 pip install -r $CODE_PATH/requirements.txt
 
-# Collect static files for production
-$CODE_PATH/roundware/manage.py collectstatic --noinput
-
 # Set $USERNAME to own all files
 chown $USERNAME:$USERNAME -R $WWW_PATH
 
 # Update database with syncdb and default_auth_data.json
 $CODE_PATH/roundware/manage.py syncdb --noinput
+# Must force authtoken to be first. See: https://github.com/tomchristie/django-rest-framework/issues/987
+$CODE_PATH/roundware/manage.py migrate rest_framework.authtoken
 $CODE_PATH/roundware/manage.py migrate
 
+# Collect static files for production
+$CODE_PATH/roundware/manage.py collectstatic --noinput
+
 service apache2 restart
 
 echo "Deploy Complete"

requirements/common.txt

@@ -1,5 +1,5 @@
 Django==1.6
-South==0.7.6
+South==1.0
 configobj==4.7.2
 django-chartit==0.1
 django-guardian==1.1.1
@@ -17,7 +17,7 @@ django-formset-js==0.4.0
 django-sortedm2m==0.6.1
 # Required for RDF Date parsing
 python-dateutil
-djangorestframework==2.3.14
+djangorestframework==2.4.3
 django-filter==0.7
 --allow-external django-ajax-filtered-fields
 --allow-unverified django-ajax-filtered-fields