Adding various new things to ParserProtocol.

The state now has a connectionMade method which is called immediately (but
makes testing states easier), and is passed the ParserProtocol.
ParserProtocol.setNextRule was added, which lets the state specify what the
next rule should be.

Author: habnabit

ometa/protocol.py

@@ -11,9 +11,13 @@ def __init__(self, grammar, senderFactory, stateFactory, bindings):
         self.senderFactory = senderFactory
         self.stateFactory = stateFactory
 
+    def setNextRule(self, rule):
+        self.currentRule = rule
+
     def connectionMade(self):
         self.sender = self.senderFactory(self.transport)
-        self.bindings['state'] = self.state = self.stateFactory(self.sender)
+        self.bindings['state'] = self.state = self.stateFactory(self.sender, self)
+        self.state.connectionMade()
         self._setupInterp()
 
     def _setupInterp(self):

ometa/test/test_protocol.py

@@ -21,12 +21,17 @@ def __init__(self, transport):
 
 
 class StateFactory(object):
-    def __init__(self, sender):
+    def __init__(self, sender, parser):
         self.sender = sender
+        self.parser = parser
         self.calls = []
         self.returnMap = {}
+        self.connected = False
         self.lossReason = None
 
+    def connectionMade(self):
+        self.connected = True
+
     def __call__(self, v):
         self.calls.append(v)
         return self.returnMap.get(v)
@@ -46,11 +51,22 @@ def test_transportPassed(self):
         self.protocol.makeConnection(transport)
         self.assertEqual(transport, self.protocol.sender.transport)
 
+    def test_parserPassed(self):
+        """The protocol is passed to the state."""
+        transport = object()
+        self.protocol.makeConnection(transport)
+        self.assertEqual(self.protocol, self.protocol.state.parser)
+
     def test_senderPassed(self):
         """The sender is passed to the state."""
         self.protocol.makeConnection(None)
         self.assertEqual(self.protocol.sender, self.protocol.state.sender)
 
+    def test_connectionEstablishes(self):
+        """connectionMade is called on the state after connection establishment."""
+        self.protocol.makeConnection(None)
+        self.assert_(self.protocol.state.connected)
+
     def test_basicParsing(self):
         """Rules can be parsed multiple times for the same effect."""
         self.protocol.makeConnection(None)
@@ -91,6 +107,20 @@ def test_ruleSwitchingWithChunks(self):
         self.protocol.dataReceived('baa')
         self.assertEqual(self.protocol.state.calls, ['a', 'b', 'a'])
 
+    def test_ruleSwitchingViaState(self):
+        """
+        The state is able to set the the next rule to be parsed with the parser
+        passed to it.
+        """
+        self.protocol.makeConnection(None)
+        self.protocol.dataReceived('aa')
+        self.assertEqual(self.protocol.state.calls, ['a'])
+        self.protocol.dataReceived('a')
+        self.assertEqual(self.protocol.state.calls, ['a'])
+        self.protocol.state.parser.setNextRule('someB')
+        self.protocol.dataReceived('abb')
+        self.assertEqual(self.protocol.state.calls, ['a', 'a', 'b'])
+
     def test_connectionLoss(self):
         """The reason for connection loss is forwarded to the state."""
         self.protocol.makeConnection(None)