README fixes

Author: phpdude

.travis.yml

@@ -9,6 +9,7 @@ env:
   - DJANGO=1.6
   - DJANGO=1.7
   - DJANGO=1.8
+  - DJANGO=1.9
 install:
   - pip install -q Django==$DJANGO
 script:
@@ -21,3 +22,6 @@ matrix:
 
     - python: "2.6"
       env: DJANGO=1.8
+
+    - python: "2.6"
+      env: DJANGO=1.9

README.markdown

@@ -17,6 +17,7 @@ month - (0?([1-9])|10|11|12)
 day - ((0|1|2)?([1-9])|[1-3]0|31)
 id - \d+
 pk - \d+
+page - \d+
 uuid - [a-fA-F0-9]{8}-?[a-fA-F0-9]{4}-?[1345][a-fA-F0-9]{3}-?[a-fA-F0-9]{4}-?[a-fA-F0-9]{12}
 ```
 
@@ -98,8 +99,7 @@ urlpatterns = patterns(
 Standard Django urls example
 
 ```python
-from django.conf.urls import patterns
-from macrosurl import url
+from django.conf.urls import patterns, url
 from project.portal.views import IndexView
 
 

macrosurl/__init__.py

@@ -5,6 +5,7 @@
 _macros_library = {
     'id': r'\d+',
     'pk': r'\d+',
+    'page': r'\d+',
     'slug': r'[\w-]+',
     'year': r'\d{4}',
     'month': r'(0?([1-9])|10|11|12)',

tests/urls.py

@@ -1,7 +1,12 @@
+import sys
 import uuid
 
 from django.conf.urls import include
-from django.utils import unittest
+
+if sys.version_info >= (2, 7):
+    import unittest
+else:
+    from django.utils import unittest
 
 from macrosurl import MacroUrlPattern, url
 
@@ -42,6 +47,14 @@ def test_pk(self):
                          '^product/(?P<pk>\d+)/(?P<product_pk>\d+)$')
         self.assertEqual(MacroUrlPattern('product/:pk/:product_pk/:news_pk').compiled,
                          '^product/(?P<pk>\d+)/(?P<product_pk>\d+)/(?P<news_pk>\d+)$')
+        
+    def test_page(self):
+        self.assertEqual(MacroUrlPattern('page/:page').compiled, '^page/(?P<page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:product_page').compiled, '^product/(?P<product_page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:page/:product_page').compiled,
+                         '^product/(?P<page>\d+)/(?P<product_page>\d+)$')
+        self.assertEqual(MacroUrlPattern('product/:page/:product_page/:news_page').compiled,
+                         '^product/(?P<page>\d+)/(?P<product_page>\d+)/(?P<news_page>\d+)$')
 
     def test_slug(self):
         self.assertEqual(MacroUrlPattern('page/:slug').compiled, '^page/(?P<slug>[\w-]+)$')