Updated to extracting and hydrating functionality from foundation

Author: WyriHaximus

composer.lock

@@ -23,12 +23,15 @@
 foreach ($repos as $repo) {
     $client->repository($repo)->then(function (RepositoryInterface $repo) use ($client) {
         resource_pretty_print($repo);
+
         return $client->extract($repo);
-    })->then(function (array $json) use ($client) {
-        var_export($json);
+    })->then(function (string $json) use ($client) {
+        echo $json, PHP_EOL;
+
         return $client->hydrate($json);
     })->then(function (RepositoryInterface $repo) {
         resource_pretty_print($repo);
+
         return $repo->refresh();
     })->done(function (RepositoryInterface $repo) {
         resource_pretty_print($repo);

…pository-extra-hydrate-refresh-async.php …sitory-extract-hydrate-refresh-async.phpexamples/repository-extra-hydrate-refresh-async.php renamed to examples/repository-extract-hydrate-refresh-async.php examples/repository-extra-hydrate-refresh-async.php renamed to examples/repository-extract-hydrate-refresh-async.php

@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+use ApiClients\Client\Travis\Client;
+use React\EventLoop\Factory;
+use function ApiClients\Foundation\resource_pretty_print;
+
+require dirname(__DIR__) . DIRECTORY_SEPARATOR . 'vendor/autoload.php';
+
+$client = Client::create();
+
+$repos = [
+    'WyriHaximus/php-travis-client',
+];
+
+if (count($argv) > 1) {
+    unset($argv[0]);
+    foreach ($argv as $repo) {
+        $repos[] = $repo;
+    }
+}
+
+foreach ($repos as $repo) {
+    $repo = $client->repository($repo);
+    resource_pretty_print($repo);
+
+    $json = $client->extract($repo);
+    echo $json, PHP_EOL;
+
+    $repo = $client->hydrate($json);
+    resource_pretty_print($repo);
+
+    $repo = $repo->refresh();
+    resource_pretty_print($repo);
+}

examples/repository-extract-hydrate-refresh.php

@@ -6,8 +6,6 @@
 use ApiClients\Client\Travis\Resource\HookInterface;
 use ApiClients\Foundation\ClientInterface;
 use ApiClients\Foundation\Factory;
-use ApiClients\Foundation\Hydrator\CommandBus\Command\ExtractFQCNCommand;
-use ApiClients\Foundation\Hydrator\CommandBus\Command\HydrateFQCNCommand;
 use ApiClients\Foundation\Resource\ResourceInterface;
 use React\EventLoop\LoopInterface;
 use React\Promise\CancellablePromiseInterface;
@@ -16,7 +14,6 @@
 use Rx\React\Promise;
 use Rx\Scheduler;
 use function ApiClients\Tools\Rx\unwrapObservableFromPromise;
-use function React\Promise\resolve;
 
 final class AsyncClient implements AsyncClientInterface
 {
@@ -59,24 +56,14 @@ public static function create(
         return new self($client);
     }
 
-    public function hydrate(array $resource)
+    public function hydrate(string $resource): CancellablePromiseInterface
     {
-        $class = $resource['class'];
-        $json = $resource['json'];
-        return $this->client->handle(new HydrateFQCNCommand($class, $json));
+        return $this->client->hydrate($resource);
     }
 
-    public function extract(ResourceInterface $resource)
+    public function extract(ResourceInterface $resource): CancellablePromiseInterface
     {
-        $class = get_class($resource);
-        return $this->client->handle(
-            new ExtractFQCNCommand($class, $resource)
-        )->then(function ($json) use ($class) {
-            return resolve([
-                'class' => $class,
-                'json' => $json,
-            ]);
-        });
+        return $this->client->extract($resource);
     }
 
     /**

src/AsyncClient.php

@@ -2,6 +2,7 @@
 
 namespace ApiClients\Client\Travis;
 
+use ApiClients\Foundation\Resource\ResourceInterface;
 use React\Promise\CancellablePromiseInterface;
 use React\Promise\PromiseInterface;
 use Rx\Observable;
@@ -10,6 +11,10 @@
 
 interface AsyncClientInterface
 {
+    public function hydrate(string $resource): CancellablePromiseInterface;
+
+    public function extract(ResourceInterface $resource): CancellablePromiseInterface;
+
     /**
      * Fetch the given repository.
      * This will resolve a Resource\Async\Repository object.

src/AsyncClientInterface.php

@@ -7,6 +7,7 @@
 use ApiClients\Client\Travis\Resource\SSHKeyInterface;
 use ApiClients\Client\Travis\Resource\UserInterface;
 use ApiClients\Foundation\Factory;
+use ApiClients\Foundation\Resource\ResourceInterface;
 use React\EventLoop\Factory as LoopFactory;
 use React\EventLoop\LoopInterface;
 use Rx\React\Promise;
@@ -67,6 +68,22 @@ public static function createFromClient(LoopInterface $loop, AsyncClientInterfac
         return new self($loop, $asyncClient);
     }
 
+    public function hydrate(string $resource): ResourceInterface
+    {
+        return await(
+            $this->asyncClient->hydrate($resource),
+            $this->loop
+        );
+    }
+
+    public function extract(ResourceInterface $resource): string
+    {
+        return await(
+            $this->asyncClient->extract($resource),
+            $this->loop
+        );
+    }
+
     /**
      * {@inheritdoc}
      */

src/Client.php

@@ -6,9 +6,14 @@
 use ApiClients\Client\Travis\Resource\RepositoryInterface;
 use ApiClients\Client\Travis\Resource\SSHKeyInterface;
 use ApiClients\Client\Travis\Resource\UserInterface;
+use ApiClients\Foundation\Resource\ResourceInterface;
 
 interface ClientInterface
 {
+    public function hydrate(string $resource): ResourceInterface;
+
+    public function extract(ResourceInterface $resource): string;
+
     /**
      * Fetch the given repository.
      * This will return a Resource\Async\Repository object.