Merge pull request clue#22 from clue/factory-loop

Factory now accepts a LoopInterface as first argument

Author: clue

Diff for: README.md

@@ -10,8 +10,9 @@ Once [installed](#install), you can use the following code to connect to your
 local redis server and send some requests:
 
 ```php
+$loop = React\EventLoop\Factory::create();
+$factory = new Factory($loop);
 
-$factory = new Factory($connector);
 $factory->createClient()->then(function (Client $client) use ($loop) {
     $client->SET('greeting', 'Hello world');
     $client->APPEND('greeting', '!');

Diff for: examples/cli.php

@@ -8,10 +8,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$factory = new React\Dns\Resolver\Factory();
-$resolver = $factory->create('6.6.6.6', $loop);
-$connector = new React\SocketClient\Connector($loop, $resolver);
-$factory = new Factory($connector);
+$factory = new Factory($loop);
 
 echo '# connecting to redis...' . PHP_EOL;
 

Diff for: examples/incr.php

@@ -6,10 +6,7 @@
 require __DIR__ . '/../vendor/autoload.php';
 
 $loop = React\EventLoop\Factory::create();
-$factory = new React\Dns\Resolver\Factory();
-$resolver = $factory->create('6.6.6.6', $loop);
-$connector = new React\SocketClient\Connector($loop, $resolver);
-$factory = new Factory($connector);
+$factory = new Factory($loop);
 
 $factory->createClient()->then(function (Client $client) {
     $client->incr('test');

Diff for: src/Factory.php

@@ -6,22 +6,30 @@
 use React\Stream\Stream;
 use Clue\React\Redis\StreamingClient;
 use Clue\Redis\Protocol\Factory as ProtocolFactory;
+use React\SocketClient\Connector;
+use React\Dns\Resolver\Factory as ResolverFactory;
 use InvalidArgumentException;
 use BadMethodCallException;
 use Exception;
+use React\EventLoop\LoopInterface;
 
 class Factory
 {
     private $connector;
     private $protocol;
 
-    public function __construct(ConnectorInterface $connector, ProtocolFactory $protocol = null)
+    public function __construct(LoopInterface $loop, ConnectorInterface $connector = null, ProtocolFactory $protocol = null)
     {
-        $this->connector = $connector;
+        if ($connector === null) {
+            $resolverFactory = new ResolverFactory();
+            $connector = new Connector($loop, $resolverFactory->create('8.8.8.8', $loop));
+        }
 
         if ($protocol === null) {
             $protocol = new ProtocolFactory();
         }
+
+        $this->connector = $connector;
         $this->protocol = $protocol;
     }
 

Diff for: tests/FactoryTest.php

@@ -13,11 +13,7 @@ class FactoryTest extends TestCase
     public function setUp()
     {
         $this->loop = new React\EventLoop\StreamSelectLoop();
-        $factory = new React\Dns\Resolver\Factory();
-        $resolver = $factory->create('6.6.6.6', $this->loop);
-        $connector = new React\SocketClient\Connector($this->loop, $resolver);
-
-        $this->factory = new Factory($connector);
+        $this->factory = new Factory($this->loop);
     }
 
     public function testPrequisiteServerAcceptsAnyPassword()

Diff for: tests/FunctionalTest.php

@@ -16,11 +16,7 @@ class FunctionalTest extends TestCase
     public static function setUpBeforeClass()
     {
         self::$loop = new React\EventLoop\StreamSelectLoop();
-        $factory = new React\Dns\Resolver\Factory();
-        $resolver = $factory->create('6.6.6.6', self::$loop);
-        $connector = new React\SocketClient\Connector(self::$loop, $resolver);
-
-        self::$factory = new Factory($connector);
+        self::$factory = new Factory(self::$loop);
     }
 
     public function testPing()