Merge pull request #592 from Paranaix/fix_pattern

Strengthed uri Pattern tests and fixed parsing edge case
crossbario · Feb 4, 2016 · ca65b1f · ca65b1f
2 parents 29b10fd + 5a9e7f8
commit ca65b1f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/autobahn/wamp/test/test_uri_pattern.py b/autobahn/wamp/test/test_uri_pattern.py
@@ -48,6 +48,7 @@ def test_valid_uris(self):
         for u in [u"com.myapp.proc1",
                   u"123",
                   u"com.myapp.<product:int>.update",
+                  u"com.myapp.<category:string>.<subcategory>.list"
                   ]:
             p = Pattern(u, Pattern.URI_TARGET_ENDPOINT)
             self.assertIsInstance(p, Pattern)
@@ -67,6 +68,19 @@ def test_parse_uris(self):
                 (u"com.myapp.123456.update", {u'product': u'123456'}),
                 (u"com.myapp..update", None),
             ]
+            ),
+            (u"com.myapp.<product>.update", [
+                (u"com.myapp.0.update", {u'product': u'0'}),
+                (u"com.myapp.abc.update", {u'product': u'abc'}),
+                (u"com.myapp..update", None),
+            ]
+            ),
+            (u"com.myapp.<category:string>.<subcategory:string>.list", [
+                (u"com.myapp.cosmetic.shampoo.list", {u'category': u'cosmetic', u'subcategory': u'shampoo'}),
+                (u"com.myapp...list", None),
+                (u"com.myapp.cosmetic..list", None),
+                (u"com.myapp..shampoo.list", None),
+            ]
             )
         ]
         for test in tests:

diff --git a/autobahn/wamp/uri.py b/autobahn/wamp/uri.py
@@ -132,7 +132,7 @@ def __init__(self, uri, target):
                     raise Exception("invalid URI")
 
                 nc[name] = str
-                pl.append("(?P<{0}>[a-z][a-z0-9_]*)".format(name))
+                pl.append("(?P<{0}>[a-z0-9_]+)".format(name))
                 continue
 
             match = Pattern._URI_COMPONENT.match(component)