Basic buttons fixed.

[redakcja.git] / apps / api / urls.py

diff --git a/apps/api/urls.py b/apps/api/urls.py
index de09605..6a95cf0 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -5,47 +5,65 @@ from django.conf.urls.defaults import *
 
 from api.resources import *
 
-FORMAT_EXT = r"\.(?P<emitter_format>xml|json|yaml)$"
+FORMAT = r"\.(?P<emitter_format>xml|json|yaml)"
+DOC = r'(?P<docid>[^/]+)'
+REVISION = r'(?P<revision>latest|[0-9a-f]{40})'
+
+def urlpath(*args, **kwargs):
+    format = kwargs.get('format', True)
+    return r'^' + (r'/'.join(args)) + (FORMAT if format else '') + '$'
 
 urlpatterns = patterns('',
 #    url(r'^hello$', hello_resource, {'emitter_format': 'json'}),
 #    url(r'^hello\.(?P<emitter_format>.+)$', hello_resource),
 
     # Toolbar
-    url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}),
-
-    # Toolbar
+    url(r'^toolbar/buttons$', toolbar_buttons, {'emitter_format': 'json'}),    
     url(r'^toolbar/scriptlets$', scriptlets, {'emitter_format': 'json'}),
+
+    # Pull requests
+    url(r"^pull-requests$", pullrequest_collection,
+        {'emitter_format': 'json'} ),
+        
+    url(r"^pull-requests/(?P<prq_id>\d+)$", pullrequest_rsrc,
+        {'emitter_format': 'json'}, name="pullrequest_view" ),    
     
     # Documents
     url(r'^documents$', library_resource,
         {'emitter_format': 'json'}, name="document_list_view"),
 
-    url(r'^documents'+FORMAT_EXT, library_resource,
+    url(urlpath(r'documents'), library_resource,
         name="document_list_view_withformat"),
         
-    url(r'^documents/(?P<docid>[^/]+)'+FORMAT_EXT,
+    url(urlpath(r'documents', DOC),
         document_resource, name="document_view_withformat"),
 
-    url(r'^documents/(?P<docid>[^/]+)$',
+    url(urlpath(r'documents', DOC, format=False),
         document_resource, {'emitter_format': 'json'},
         name="document_view"),
     
-    url(r'^documents/(?P<docid>[^/]+)/text$',
+    url(urlpath(r'documents', DOC, 'text', REVISION, format=False),
         document_text_resource, {'emitter_format': 'rawxml'},
         name="doctext_view"),
 
-    url(r'^documents/(?P<docid>[^/]+)/dc' + FORMAT_EXT,
+    url(urlpath(r'documents', DOC, 'html', REVISION, format=False),
+        document_html_resource, {'emitter_format': 'rawhtml'},
+        name="dochtml_view"),
+
+    url(urlpath(r'documents', DOC, 'dc', REVISION),
         document_dc_resource,
         name="docdc_view_withformat"),
 
-    url(r'^documents/(?P<docid>[^/]+)/dc$',
+    url(urlpath(r'documents', DOC, 'dc', REVISION, format=False),
         document_dc_resource, {'emitter_format': 'json'},
         name="docdc_view"),
 
-    url(r'^documents/(?P<docid>[^/]+)/parts$',
-        document_resource, {'emitter_format': 'json'},
-        name="docparts_view"),
+    url(urlpath(r'documents', DOC, 'revision', format=False),
+        document_merge, {'emitter_format': 'json'}, name="docmerge_view")
+
+#    url(r'^documents/(?P<docid>[^/]+)/parts$',
+#        document_resource, {'emitter_format': 'json'},
+#        name="docparts_view"),
         
   #  url(r'^posts/(?P<post_slug>[^/]+)/$', blogpost_resource),
   #  url(r'^other/(?P<username>[^/]+)/(?P<data>.+)/$', arbitrary_resource),