Merge lp:~michael.nelson/rnr-server/718898-review-unique-prefix into lp:rnr-server

[Michael Nelson]

[r=lukasz][bug=718898] Adds a unique prefix to the url for the api review-getter.

Overview
========
Adds a unique prefix to the url for the api review-getter (bug 718898).

I included 'reviews' in the new prefix: '/1.0/reviews/filter/' because the api might support other objects in the future like moderations etc.

Although the old api will continue to work, we should also land https://pastebin.canonical.com/43699/ on rnrclient when landing this branch.

To test: `make;make test`

=== modified file 'src/reviewsapp/api/urls.py'
--- src/reviewsapp/api/urls.py	2011-02-07 17:17:58 +0000
+++ src/reviewsapp/api/urls.py	2011-02-22 09:51:16 +0000
@@ -77,34 +77,32 @@
     url(r'^1.0/review-stats/updates-last-(?P<days>[1,3,7])-days/$',
         reviews_stats_resource, name='rnr-api-reviews-stats'),
 
-    # vote on the usefulness of a review
-    #  POST /1.0/reviews/405/usefulness/False/
-    url(r'^1.0/reviews/(?P<review_id>\d+)/recommendations/$',
-        submit_usefulness_resource, name='rnr-api-recommendations'),
-
     # gets the reviews (and ratings) for a given pkg/app
     #  GET /1.0/en/ubuntu/+binary/lucid/1:2.32.0-0ubuntu1/gnome-games;sane/page/1/
     #  GET /1.0/en/ubuntu/+binary/lucid/1:2.32.0-0ubuntu1/2vcard/
+    url(r'^1.0/reviews/filter/(?P<language>\w+)/(?P<origin>\w+)/'
+        r'(?P<distroseries>\w+)/(?P<version>[-\w+.:~]+)/'
+        r'(?P<package_name>[\w%+.;-]+)/$',
+        show_reviews_resource, name='rnr-api-reviews-for-package'),
+    url(r'^1.0/reviews/filter/(?P<language>\w+)/(?P<origin>\w+)/'
+        r'(?P<distroseries>\w+)/(?P<version>[-\w+.:~]+)/'
+        r'(?P<package_name>[\w%+.;-]+)/page/(?P<page>\d+)/$',
+        show_reviews_resource, name='rnr-api-reviews-for-package'),
+    # XXX: michaeln 2011-02-22 bug=718898: These urls should be removed
+    # a little while after the client has updated to the rnrclient
+    # matching the above urls.
     url(r'^1.0/(?P<language>\w+)/(?P<origin>\w+)/(?P<distroseries>\w+)/'
         r'(?P<version>[-\w+.:~]+)/(?P<package_name>[\w%+.;-]+)/$',
-        show_reviews_resource, name='rnr-api-reviews-for-package'),
+        show_reviews_resource, name='rnr-older-api-reviews-for-package'),
     url(r'^1.0/(?P<language>\w+)/(?P<origin>\w+)/(?P<distroseries>\w+)/'
         r'(?P<version>[-\w+.:~]+)/(?P<package_name>[\w%+.;-]+)/'
         r'page/(?P<page>\d+)/$',
-        show_reviews_resource, name='rnr-api-reviews-for-package'),
+        show_reviews_resource, name='rnr-older-api-reviews-for-package'),
 
-    # achuni 2011-01-27: Support the older api for a short while, until
-    # the client moves over to the newer client
-    url(r'^1.0/(?P<language>\w+)/(?P<origin>\w+)/(?P<distroseries>\w+)/'
-        r'(?P<package_name>[\w%+.;-]+)/$',
-        show_reviews_resource, name='rnr-older-api-reviews-for-package',
-        kwargs={'version': 'any'}),
-    url(r'^1.0/(?P<language>\w+)/(?P<origin>\w+)/(?P<distroseries>\w+)/'
-        r'(?P<package_name>[\w%+.;-]+)/'
-        r'page/(?P<page>\d+)/$',
-        show_reviews_resource, name='rnr-older-api-reviews-for-package',
-        kwargs={'version': 'any'}),
-    
+    # vote on the usefulness of a review
+    #  POST /1.0/reviews/405/usefulness/False/
+    url(r'^1.0/reviews/(?P<review_id>\d+)/recommendations/$',
+        submit_usefulness_resource, name='rnr-api-recommendations'),
 
     # submits a new review for a given pkg/app
     #  POST /1.0/reviews/

=== modified file 'src/reviewsapp/utilities.py'
--- src/reviewsapp/utilities.py	2011-02-10 21:40:55 +0000
+++ src/reviewsapp/utilities.py	2011-02-22 09:51:16 +0000
@@ -212,7 +212,6 @@
 
         # achuni 2011-01-27: This removes older api pages from cache, and
         # can be removed once the client is using the latest api.
-        del url_kwargs['version']
         package_url = reverse('rnr-older-api-reviews-for-package',
             kwargs=url_kwargs)
         key = cache_key_for_url(package_url)