Introduced Grammar.create()

src/ruler/rules.py

@@ -14,28 +14,22 @@
 class Grammar(object):
     grammar = None
 
-    def __init__(self):
-        self.matched = None
-        self.error = None
-
+    @classmethod
+    def create(cls):
         # Collect and name member rules
-        for attr_name in dir(self):
+        for attr_name in dir(cls):
 
             # 'grammar' is a reserved name
             if attr_name == 'grammar':
                 continue
 
-            attr = self.__getattribute__(attr_name)
+            attr = getattr(cls, attr_name)
             if isinstance(attr, BaseRule):
                 attr.name = attr_name
 
-        self.grammar.register_named_subrules()
+        cls.grammar.register_named_subrules()
 
-    def match(self, text):
-        result = self.grammar.match(text)
-        self.matched = self.grammar.matched
-        self.error = self.grammar.error
-        return result
+        return cls.grammar
 
 
 class CompoundRule(BaseCompoundRule):

tests/test_ruler.py

@@ -54,7 +54,7 @@ class G(Grammar):
             e = Rule('e')
             grammar = Rule('a', bcd, e)
 
-        g = G()
+        g = G.create()
 
         assert g.match('abcde')
         assert g.matched == 'abcde'
@@ -212,19 +212,19 @@ def test_example(self):
             milk = 'with milk'
         """
 
-        class Morning(Grammar):
+        class MorningGrammar(Grammar):
             who = OneOf('John', 'Peter', 'Ann')
             juice = Rule('juice')
             milk = Optional(' with milk')
             tea = Rule('tea', milk)
             what = OneOf(juice, tea)
             grammar = Rule(who, ' likes to drink ', what, '\.')
 
-        r = Morning()
+        r = MorningGrammar.create()
 
-        assert r.juice.name == 'juice'
+        assert MorningGrammar.juice.name == 'juice'
         with raises(RuleNamingError):
-            r.juice.name = ''
+            MorningGrammar.juice.name = ''
 
         assert r.match('Ann likes to drink tea with milk.')
         assert r.who.matched == 'Ann'