Merge lp:~mhall119/summit/fix-period-in-url into lp:summit

[Michael Hall]

Fix to allow periods in records names

Overview
========
Fix to allow periods in records names

Details
=======
Previous URLconf regex matching didn't support periods in the matched part of the url, which meant that any record who's name was used as part of the url couldn't contain a period. This patch fixes the urls, and adds a test for each of the affected schedule app urls.

[James Westby (james-w)]

review: Approve

=== modified file 'summit/schedule/models/meetingmodel.py'
--- summit/schedule/models/meetingmodel.py	2011-09-12 19:53:23 +0000
+++ summit/schedule/models/meetingmodel.py	2011-09-14 00:45:24 +0000
@@ -138,7 +138,7 @@
         if self.name is None or self.name == '':
             name = '-'
         else:
-            name = self.name.replace('.','-')
+            name = self.name
         args = [self.summit.name, self.id, name]
         return reverse('summit.schedule.views.meeting', args=args)
     meeting_page_url = property(get_meeting_page_url)

=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py	2011-09-02 23:33:15 +0000
+++ summit/schedule/models/summitmodel.py	2011-09-14 00:45:24 +0000
@@ -237,7 +237,6 @@
         name = elem.get("name", "")
         if not name:
             return
-        name = name.replace('.','-')
 
         print "meeting %s" % name
         meeting = ""

=== modified file 'summit/schedule/tests.py'
--- summit/schedule/tests.py	2011-09-12 20:37:07 +0000
+++ summit/schedule/tests.py	2011-09-14 00:45:24 +0000
@@ -153,6 +153,70 @@
         self.assertEquals(response.status_code, 200)
         self.assertContains(response, 'URL:http://summit.ubuntu.com/uds-test/meeting/%s/test-meeting/' % meeting.id, 1)
 
+
+class ReverseUrlLookupTestCase(djangotest.TestCase):
+
+    def setUp(self):
+        now = datetime.datetime.utcnow()
+        one_hour = datetime.timedelta(0, 3600)
+        self.summit = factory.make_one(Summit, name='uds-test')
+        self.summit.save()
+        self.slot = factory.make_one(
+            Slot,
+            start_utc=now,
+            end_utc=now+one_hour,
+            type='open',
+            summit=self.summit)
+        self.slot.save()
+        
+    def test_meeting_name_with_period(self):
+        ''' Test the following Meeting urlconf
+        (r'^(?P<summit_name>[\w-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[\.\w-]+)/$', 'meeting'),
+        '''
+        meeting = factory.make_one(Meeting, summit=self.summit, name='test.meeting')
+        
+        rev_args = ['uds-test', meeting.id, 'test.meeting']
+        reverse_url = reverse('summit.schedule.views.meeting', args=rev_args)
+        self.assertEquals(reverse_url, '/uds-test/meeting/%s/test.meeting/' % meeting.id)
+
+    def test_room_name_with_period(self):
+        ''' Test the following Room urlconfs
+        (r'^(?P<summit_name>[\w-]+)/(?P<room_name>[\w-]+)/$', 'by_room'),
+        (r'^(?P<summit_name>[\w-]+)/room/(?P<room_name>[\w-]+).ical$', 'room_ical'),
+        '''
+        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_period(self):
+        ''' Test the following Track urlconfs
+        (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\w-]+)/$', 'by_track'),
+        (r'^(?P<summit_name>[\w-]+)/track/(?P<track_slug>[\w-]+).ical$', 'track_ical'),
+        '''
+        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_period(self):
+        ''' Test the following User urlconf
+        (r'^(?P<summit_name>[\w-]+)/participant/(?P<username>[\w-]+)\.ical$', 'user_ical'),
+        '''
+        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):
 
     def setUp(self):

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-08-12 14:25:33 +0000
+++ summit/urls.py	2011-09-14 00:45:24 +0000
@@ -62,14 +62,14 @@
 
     (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-]+)/meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[\w-]+)/$', 'meeting'),
+    (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/(?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: