Merge lp:~james-w/summit/fix-plus-in-meeting-name into lp:summit

[James Westby]

Allow + in track, room and attendee names without causing url lookup errors.

Hi,

A followup branch to have urls.py support + in room, track, and attendee
names as well.

Thanks,

James

[Michael Hall (mhall119)]

Looks good

review: Approve

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-19 16:26:12 +0000
+++ summit/schedule/tests.py	2011-09-19 17:09:35 +0000
@@ -362,6 +362,16 @@
         reverse_url = reverse('summit.schedule.views.room_ical', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/room/test%room.ical')
 
+    def test_room_name_with_plus_sign(self):
+        room = factory.make_one(Room, summit=self.summit, name='test.room')
+
+        rev_args = ['uds-test', 'test+room']
+        reverse_url = reverse('summit.schedule.views.by_room', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/test+room/')
+
+        reverse_url = reverse('summit.schedule.views.room_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/room/test+room.ical')
+
     def test_track_name_with_percent(self):
         ''' Test the following Track urlconfs
         (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\.\w-]+)/$', 'by_track'),
@@ -375,7 +385,17 @@
 
         reverse_url = reverse('summit.schedule.views.track_ical', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/track/test%track.ical')
-        
+
+    def test_track_name_with_plus_sign(self):
+        track = factory.make_one(Track, summit=self.summit, slug='test.track')
+
+        rev_args = ['uds-test', 'test+track']
+        reverse_url = reverse('summit.schedule.views.by_track', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/track/test+track/')
+
+        reverse_url = reverse('summit.schedule.views.track_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/track/test+track.ical')
+
     def test_participant_name_with_percent(self):
         ''' Test the following User urlconf
         (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[\.\w-]+)\.ical$', 'user_ical'),
@@ -385,7 +405,14 @@
         rev_args = ['uds-test', 'test%user']
         reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/participant/test%user.ical')
-        
+
+    def test_participant_name_with_plus_sign(self):
+        user = factory.make_one(User, username='test.user')
+
+        rev_args = ['uds-test', 'test+user']
+        reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/participant/test+user.ical')
+
 
 class EtherpadEditUrl(djangotest.TestCase):
 

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-09-19 16:26:12 +0000
+++ summit/urls.py	2011-09-19 17:09:35 +0000
@@ -64,15 +64,15 @@
 
     (r'^(?P<summit_name>[\w-]+)/next$', 'next_session'),
     (r'^(?P<summit_name>[\w-]+)/(?P<date>[\d-]+)/$', 'by_date'),
-    (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%\.\w-]+)/$', 'by_room'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%\.\w-]+)/$', 'by_track'),
+    (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[%+\.\w-]+)/$', 'by_room'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+)/$', 'by_track'),
     (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$', 'meeting'),
     (r'^(?P<summit_name>[\w-]+)\.csv$', 'csv'),
     (r'^(?P<summit_name>[\w-]+)\.ical$', 'ical'),
     (r'^(?P<summit_name>[\w-]+)/participant/my_schedule_(?P<secret_key>[0-9a-f]{32})\.ical$', 'user_private_ical'),
-    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%\.\w-]+)\.ical$', 'user_ical'),
-    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[%\.\w-]+).ical$', 'room_ical'),
-    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%\.\w-]+).ical$', 'track_ical'),
+    (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[%+\.\w-]+)\.ical$', 'user_ical'),
+    (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[%+\.\w-]+).ical$', 'room_ical'),
+    (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[%+\.\w-]+).ical$', 'track_ical'),
 )
 
 if settings.DEBUG or settings.SERVE_STATIC: