don't do manual 404 in piston

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

diff --git a/apps/api/urls.py b/apps/api/urls.py
index 77fe8cf..89bb600 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -1,36 +1,55 @@
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 from piston.resource import Resource
 # -*- coding: utf-8 -*-
 from django.conf.urls.defaults import *
 from piston.resource import Resource

-#from piston.authentication import HttpBasicAuthentication

 
 

-#from api.handlers import BookHandler, TagHandler

 from api import handlers
 
 
 from api import handlers
 
 

-#auth = OAuthAuthentication(realm='API')

 book_changes_resource = Resource(handler=handlers.BookChangesHandler)
 book_changes_resource = Resource(handler=handlers.BookChangesHandler)

-tag_changes_resource = Resource(handler=handlers.TagChangesHandler)#, authentication=auth)
+tag_changes_resource = Resource(handler=handlers.TagChangesHandler)

 changes_resource = Resource(handler=handlers.ChangesHandler)
 
 changes_resource = Resource(handler=handlers.ChangesHandler)
 

+book_list_resource = Resource(handler=handlers.BooksHandler)
+book_resource = Resource(handler=handlers.BookDetailHandler)
+
+tag_list_resource = Resource(handler=handlers.TagsHandler)
+tag_resource = Resource(handler=handlers.TagDetailHandler)
+
+fragment_resource = Resource(handler=handlers.FragmentDetailHandler)
+fragment_list_resource = Resource(handler=handlers.FragmentsHandler)
+
+

 urlpatterns = patterns('',
 urlpatterns = patterns('',

-    url(r'^book_changes/(?P<since>\d*(\.\d*)?)\.(?P<emitter_format>xml|json|yaml)$', book_changes_resource),
-    url(r'^tag_changes/(?P<since>\d*(\.\d*)?)\.(?P<emitter_format>xml|json|yaml)$', tag_changes_resource),
-    url(r'^changes/(?P<since>\d*(\.\d*)?)\.(?P<emitter_format>xml|json|yaml)$', changes_resource),
+    url(r'^$', 'django.views.generic.simple.direct_to_template',
+            {'template': 'api/main.html'}),

 
 

-    #url(r'^books/(?P<id>[\d,]+)\.(?P<emitter_format>xml|json|yaml)$', book_resource),
-    #url(r'^books\.(?P<emitter_format>xml|json|yaml)$', book_resource),

 
 

-    #url(r'^tags/(?P<tags>[a-zA-Z0-9-/]*)\.(?P<emitter_format>xml|json|yaml)$', tag_resource),
-    #url(r'^lektura/(?P<slug>[a-zA-Z0-9-]+)\.(?P<emitter_format>xml|json|yaml)$', book_resource), #detail
-    #url(r'^lektura/(?P<book_slug>[a-zA-Z0-9-]+)/motyw/(?P<theme_slug>[a-zA-Z0-9-]+)\.(?P<emitter_format>xml|json|yaml)$', book_resource), #fragments
-    #url(r'^oauth/callback/$','oauth_callback'),
-)
+    # changes handlers
+    url(r'^book_changes/(?P<since>\d*?)\.(?P<emitter_format>xml|json|yaml)$', book_changes_resource),
+    url(r'^tag_changes/(?P<since>\d*?)\.(?P<emitter_format>xml|json|yaml)$', tag_changes_resource),
+    # used by mobile app
+    url(r'^changes/(?P<since>\d*?)\.(?P<emitter_format>xml|json|yaml)$', changes_resource),
+
+    # info boxes (used by mobile app)
+    url(r'book/(?P<id>\d*?)/info\.html$', 'catalogue.views.book_info'),
+    url(r'tag/(?P<id>\d*?)/info\.html$', 'catalogue.views.tag_info'),
+
+
+    # objects details
+    url(r'^books/(?P<slug>[a-z0-9-]+)/$', book_resource, name="api_book"),
+    url(r'^(?P<category>[a-z0-9-]+)/(?P<slug>[a-z0-9-]+)/$',
+        tag_resource, name="api_tag"),
+    url(r'^books/(?P<slug>[a-z0-9-]+)/fragments/(?P<anchor>[a-z0-9-]+)/$',
+        fragment_resource, name="api_fragment"),
+
+    # books by tags
+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})books/$', book_list_resource),
+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){0,6})parent_books/$', book_list_resource, {"top_level": True}),
+
+    # fragments by book, tags, themes
+    # this should be paged
+    url(r'^(?P<tags>(?:(?:[a-z0-9-]+/){2}){1,6})fragments/$', fragment_list_resource),

 
 

-"""
-urlpatterns += patterns(
-'piston.authentication',
-    url(r'^oauth/request_token/$','oauth_request_token'),
-    url(r'^oauth/authorize/$','oauth_user_auth'),
-    url(r'^oauth/access_token/$','oauth_access_token'),
+    # tags by category
+    url(r'^(?P<category>[a-z0-9-]+)/$', tag_list_resource),

 )
 )

-"""
\ No newline at end of file