set TAGGED_ARGS and POSITIONAL_ARGS from rules as class property

Author: manfred-kaiser

sifter/commands/fileinto.py

@@ -24,6 +24,7 @@
 class CommandFileInto(Command):
 
     RULE_IDENTIFIER = 'FILEINTO'
+    POSITIONAL_ARGS = [StringList(length=1)]
 
     def __init__(
         self,
@@ -32,10 +33,7 @@ def __init__(
         block: Optional[CommandList] = None
     ) -> None:
         super().__init__(arguments, tests, block)
-        _, positional_args = self.validate_arguments(
-            {},
-            [StringList(length=1), ],
-        )
+        _, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
         self.validate_block_size(0)
         self.file_dest = positional_args[0]

sifter/commands/redirect.py

@@ -26,6 +26,7 @@
 class CommandRedirect(Command):
 
     RULE_IDENTIFIER = 'REDIRECT'
+    POSITIONAL_ARGS = [StringList(length=1)]
 
     def __init__(
         self,
@@ -34,10 +35,7 @@ def __init__(
         block: Optional[CommandList] = None
     ) -> None:
         super().__init__(arguments, tests, block)
-        _, positional_args = self.validate_arguments(
-            {},
-            [StringList(length=1), ],
-        )
+        _, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
         self.validate_block_size(0)
         if not isinstance(positional_args, list):

sifter/commands/require.py

@@ -26,6 +26,7 @@
 class CommandRequire(Command):
 
     RULE_IDENTIFIER: Text = 'REQUIRE'
+    POSITIONAL_ARGS = [StringList()]
 
     def __init__(
         self,
@@ -34,10 +35,7 @@ def __init__(
         block: Optional[CommandList] = None
     ) -> None:
         super().__init__(arguments, tests, block)
-        _, positional_args = self.validate_arguments(
-            {},
-            [StringList(), ],
-        )
+        _, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
         self.validate_block_size(0)
         self.ext_names = positional_args[0]

sifter/grammar/rule.py

@@ -29,6 +29,9 @@ class Rule(object):
     RULE_TYPE: Optional[Text] = None
     RULE_IDENTIFIER: Optional[Text] = None
 
+    TAGGED_ARGS: Optional[Union[List[Validator], Dict[Text, Validator]]] = None
+    POSITIONAL_ARGS: Optional[List[Validator]] = None
+
     @classmethod
     def register(cls) -> None:
         try:
@@ -70,9 +73,9 @@ def validate_arguments(
         List[Union[Tag, SupportsInt, List[Union[Text, 'String']]]]
     ]:
         if tagged_args is None:
-            tagged_args = {}
+            tagged_args = self.TAGGED_ARGS or {}
         if positional_args is None:
-            positional_args = []
+            positional_args = self.POSITIONAL_ARGS or []
 
         seen_args: Dict[Text, List[Union['Tag', SupportsInt, List[Union[Text, 'String']]]]] = {}
         i, n = 0, len(self.arguments)

sifter/tests/address.py

@@ -26,24 +26,23 @@
 class TestAddress(Test):
 
     RULE_IDENTIFIER: Text = 'ADDRESS'
+    TAGGED_ARGS = {
+        'comparator': Comparator(),
+        'match_type': MatchType(),
+        'address_part': Tag(('LOCALPART', 'DOMAIN', 'ALL')),
+    }
+    POSITIONAL_ARGS = [
+        StringList(),
+        StringList(),
+    ]
 
     def __init__(
         self,
         arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
         tests: Optional[List['Test']] = None
     ) -> None:
         super().__init__(arguments, tests)
-        tagged_args, positional_args = self.validate_arguments(
-            {
-                'comparator': Comparator(),
-                'match_type': MatchType(),
-                'address_part': Tag(('LOCALPART', 'DOMAIN', 'ALL')),
-            },
-            [
-                StringList(),
-                StringList(),
-            ]
-        )
+        tagged_args, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
 
         self.headers, self.keylist = positional_args

sifter/tests/exists.py

@@ -22,17 +22,15 @@
 class TestExists(Test):
 
     RULE_IDENTIFIER = 'EXISTS'
+    POSITIONAL_ARGS = [StringList()]
 
     def __init__(
         self,
         arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
         tests: Optional[List['Test']] = None
     ) -> None:
         super().__init__(arguments, tests)
-        tagged_args, positional_args = self.validate_arguments(
-            {},
-            [StringList(), ]
-        )
+        tagged_args, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
         self.headers = positional_args[0]
 

sifter/tests/header.py

@@ -24,23 +24,22 @@
 class TestHeader(Test):
 
     RULE_IDENTIFIER = 'HEADER'
+    TAGGED_ARGS = {
+        'comparator': Comparator(),
+        'match_type': MatchType(),
+    }
+    POSITIONAL_ARGS = [
+        StringList(),
+        StringList(),
+    ]
 
     def __init__(
         self,
         arguments: Optional[List[Union['TagGrammar', SupportsInt, List[Union[Text, 'String']]]]] = None,
         tests: Optional[List['Test']] = None
     ) -> None:
         super().__init__(arguments, tests)
-        tagged_args, positional_args = self.validate_arguments(
-            {
-                'comparator': Comparator(),
-                'match_type': MatchType(),
-            },
-            [
-                StringList(),
-                StringList(),
-            ]
-        )
+        tagged_args, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
 
         self.headers = positional_args[0]

sifter/tests/size.py

@@ -26,6 +26,12 @@
 class TestSize(Test):
 
     RULE_IDENTIFIER = 'SIZE'
+    TAGGED_ARGS = {
+        'size': Tag(
+            ('OVER', 'UNDER'),
+            (Number(),)
+        ),
+    }
 
     COMPARISON_FNS: Dict[Text, Callable[[Any, Any], bool]] = {
         'OVER': operator.gt,
@@ -38,14 +44,7 @@ def __init__(
         tests: Optional[List['Test']] = None
     ) -> None:
         super().__init__(arguments, tests)
-        tagged_args, positional_args = self.validate_arguments(
-            {
-                'size': Tag(
-                    ('OVER', 'UNDER'),
-                    (Number(),)
-                ),
-            }
-        )
+        tagged_args, positional_args = self.validate_arguments()
         self.validate_tests_size(0)
         self.comparison_fn = self.COMPARISON_FNS[tagged_args['size'][0]]  # type: ignore
         self.comparison_size = tagged_args['size'][1]