Skip to content

Refactor / prepare to support dedicated pattern APIs #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 25, 2014
Merged

Refactor / prepare to support dedicated pattern APIs #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bbc690
Simplify by replacing Request with Deferred.
clue Jul 25, 2014
34510c1
Rename handleReply() to handleMessage()
clue Jul 25, 2014
b2f1658
Simplify rejecting request when connection is ending
clue Jul 25, 2014
15e1a04
Rename old ClientTest to FunctionalTest
clue Jul 25, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
use Clue\Redis\Protocol\Model\ErrorReplyException;
use Clue\Redis\Protocol\Serializer\SerializerInterface;
use Clue\Redis\Protocol\Factory as ProtocolFactory;
use Clue\React\Redis\Request;
use UnderflowException;
use RuntimeException;
use React\Promise\Deferred;
use Clue\Redis\Protocol\Model\ErrorReply;
use Clue\Redis\Protocol\Model\ModelInterface;

class Client extends EventEmitter
{
Expand Down Expand Up @@ -46,7 +48,7 @@ public function __construct(Stream $stream, ParserInterface $parser = null, Seri

foreach ($models as $data) {
try {
$that->handleReply($data);
$that->handleMessage($data);
}
catch (UnderflowException $error) {
$that->emit('error', array($error));
Expand All @@ -67,36 +69,34 @@ public function __construct(Stream $stream, ParserInterface $parser = null, Seri

public function __call($name, $args)
{
if ($this->ending) {
$e = new RuntimeException('Connection closed');
$request = new Deferred();

if (class_exists('React\Promise\When')) {
return \React\Promise\When::reject($e);
} else {
return \React\Promise\reject($e);
}
if ($this->ending) {
$request->reject(new RuntimeException('Connection closed'));
} else {
$this->stream->write($this->serializer->getRequestMessage($name, $args));
$this->requests []= $request;
}

$this->stream->write($this->serializer->getRequestMessage($name, $args));

$request = new Request($name);
$this->requests []= $request;

return $request->promise();
}

public function handleReply($data)
public function handleMessage(ModelInterface $message)
{
$this->emit('message', array($data, $this));
$this->emit('message', array($message, $this));

if (!$this->requests) {
throw new UnderflowException('Unexpected reply received, no matching request found');
}

$request = array_shift($this->requests);
/* @var $request Request */
/* @var $request Deferred */

$request->handleReply($data);
if ($message instanceof ErrorReply) {
$request->reject($message);
} else {
$request->resolve($message->getValueNative());
}

if ($this->ending && !$this->isBusy()) {
$this->close();
Expand Down
19 changes: 0 additions & 19 deletions src/Request.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/ClientTest.php → tests/FunctionalTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use Clue\React\Redis\Client;

class ClientTest extends TestCase
class FunctionalTest extends TestCase
{
protected static $loop;
protected static $factory;
Expand Down