Added unit tests for folded argument classes.

Author: MarcCote

smartdispatch/argument.py

@@ -1,7 +1,7 @@
 import re
 
 
-class Argument(object):
+class FoldedArgument(object):
     def __init__(self):
         self.name = ""
         self.regex = ""
@@ -10,7 +10,7 @@ def unfold(self, match):
         raise NotImplementedError("Subclass must implement this method!")
 
 
-class EnumerationArgument(object):
+class EnumerationFoldedArgument(FoldedArgument):
     def __init__(self):
         self.name = "enumeration"
         self.regex = "\[[^]]*\]"
@@ -19,14 +19,14 @@ def unfold(self, match):
         return match[1:-1].split(' ')
 
 
-class RangeArgument(object):
+class RangeFoldedArgument(FoldedArgument):
     def __init__(self):
         self.name = "range"
-        self.regex = "\[\d+:\d+(:\d+)?\]"
+        self.regex = "\[(\d+):(\d+)(?::(\d+))?\]"
 
     def unfold(self, match):
         groups = re.search(self.regex, match).groups()
         start = int(groups[0])
         end = int(groups[1])
         step = 1 if groups[2] is None else int(groups[2])
-        return range(start, end, step)
+        return map(str, range(start, end, step))

smartdispatch/smartdispatch.py

@@ -7,7 +7,7 @@
 
 import smartdispatch
 from smartdispatch import utils
-from smartdispatch.argument import EnumerationArgument, RangeArgument
+from smartdispatch.argument import EnumerationFoldedArgument, RangeFoldedArgument
 
 UID_TAG = "{UID}"
 
@@ -138,7 +138,7 @@ def unfold_arguments(arguments):
     text = utils.escape(" ".join(arguments))
 
     # Order matter, if some regex is more greedy than another, the it should go after
-    arguments = [RangeArgument(), EnumerationArgument()]
+    arguments = [RangeFoldedArgument(), EnumerationFoldedArgument()]
 
     # Build the master regex with all argument's regex
     regex = "(" + "|".join(["(?P<{0}>{1})".format(arg.name, arg.regex) for arg in arguments]) + ")"