Merge pull request clue#4 from clue/parser

Use new request parser, support inline protocol. Fixes clue#3.

Author: clue

composer.json

@@ -14,7 +14,7 @@
         "react/promise": "~1",
         "react/socket-client": "0.3.*",
         "react/event-loop": "0.3.*",
-        "clue/redis-protocol": "0.2.*"
+        "clue/redis-protocol": "0.3.*"
     },
     "autoload": {
         "psr-0": { "Clue\\Redis\\Server": "src" }

composer.lock

@@ -29,9 +29,9 @@ public function end()
         $this->connection->end();
     }
 
-    public function write(ModelInterface $response)
+    public function write($data)
     {
-        $this->connection->write($response->getMessageSerialized());
+        $this->connection->write($data);
     }
 
     public function getRequestDebug(ModelInterface $request)

src/Clue/Redis/Server/Client.php

@@ -33,26 +33,28 @@ private function getNumberOfArguments(ReflectionMethod $method)
 
     public function invoke($command, array $args)
     {
+        $command = strtolower($command);
+
         if (!isset($this->commands[$command])) {
-            return new ErrorReply('ERR Unknown or disabled command \'' . $command . '\'');
+            return $this->serializer->getErrorMessage('ERR Unknown or disabled command \'' . $command . '\'');
         }
 
         $n = count($args);
         if ($n < $this->commands[$command]) {
-            return new ErrorReply('ERR wrong number of arguments for \'' . $command . '\' command');
+            return $this->serializer->getErrorMessage('ERR wrong number of arguments for \'' . $command . '\' command');
         }
 
         try {
             $ret = call_user_func_array(array($this->business, $command), $args);
         }
         catch (Exception $e) {
-            return $this->serializer->createReplyModel($e);
+            return $this->serializer->getErrorMessage($e);
         }
 
-        if (!($ret instanceof ModelInterface)) {
-            $ret = $this->serializer->createReplyModel($ret);
+        if ($ret instanceof ModelInterface) {
+            return $ret->getMessageSerialized($this->serializer);
         }
 
-        return $ret;
+        return $this->serializer->getReplyMessage($ret);
     }
 }

src/Clue/Redis/Server/Invoker.php

@@ -13,9 +13,10 @@
 use Clue\Redis\Protocol\Parser\ParserException;
 use SplObjectStorage;
 use Exception;
-use Clue\Redis\React\Client\Request;
+use Clue\Redis\Protocol\Model\Request;
 use ReflectionMethod;
 use ReflectionException;
+use Clue\Redis\Protocol\Parser\RequestParser;
 
 /**
  * Dummy redis server implementation
@@ -60,22 +61,23 @@ public function __construct(ServerSocket $socket, LoopInterface $loop, ProtocolF
 
     public function handleConnection(Connection $connection)
     {
-        $parser = $this->protocol->createParser();
+        $parser = $this->protocol->createResponseParser();
+        $parser = new RequestParser();
         $that = $this;
 
         $client = new Client($connection);
         $this->clients->attach($client);
 
         $connection->on('data', function ($data) use ($parser, $that, $client) {
             try {
-                $parser->pushIncoming($data);
+                $messages = $parser->pushIncoming($data);
             }
             catch (ParserException $e) {
                 $that->emit('error', array($e, $client));
                 return;
             }
-            while ($parser->hasIncomingModel()) {
-                $that->handleRequest($parser->popIncomingModel(), $client);
+            foreach ($messages as $message) {
+                $that->handleRequest($message, $client);
             }
         });
 
@@ -93,21 +95,11 @@ public function handleDisconnection(Client $client)
         $this->emit('disconnection', array($client, $this));
     }
 
-    public function handleRequest(ModelInterface $request, Client $client)
+    public function handleRequest(Request $request, Client $client)
     {
         $this->emit('request', array($request, $client));
 
-        if (!($request instanceof MultiBulkReply) || !$request->isRequest()) {
-            $model = new ErrorReply('ERR Malformed request. Bye!');
-            $client->write($model);
-            $client->end();
-            return;
-        }
-
-        $args = $request->getValueNative();
-        $method = strtolower(array_shift($args));
-
-        $ret = $this->business->invoke($method, $args);
+        $ret = $this->business->invoke($request->getCommand(), $request->getArgs());
         if ($ret !== null) {
             $client->write($ret);
         }

src/Clue/Redis/Server/Server.php

@@ -13,6 +13,10 @@ public function setUp()
 
     public function testPairAuthRejectDisconnects()
     {
+        if (defined('HPHP_VERSION')) {
+            $this->markTestSkipped();
+        }
+
         $server = null;
 
         // bind to a random port on the local interface