Added CountableAsyncProviderRecords test.

Added AsyncTransformer + PorterAware test.
Fixed bug where async transformer was not cloned due to type mismatch.

Author: Bilge

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptfusion/porter",
-  "description": "Data import abstraction library.",
+  "description": "Scalable and efficient data import abstraction for APIs.",
   "authors": [
     {
       "name": "Bilge",

src/Specification/Specification.php

@@ -50,7 +50,7 @@ public function __clone()
     {
         $transformers = $this->transformers;
         $this->clearTransformers()->addTransformers(array_map(
-            static function (Transformer $transformer): Transformer {
+            static function (AnysyncTransformer $transformer): AnysyncTransformer {
                 return clone $transformer;
             },
             $transformers

test/Integration/Porter/PorterAsyncTest.php

@@ -6,14 +6,19 @@
 use Amp\Iterator;
 use Amp\Loop;
 use Amp\Producer;
+use ScriptFUSION\Porter\Collection\AsyncRecordCollection;
+use ScriptFUSION\Porter\Collection\CountableAsyncPorterRecords;
+use ScriptFUSION\Porter\Collection\CountableAsyncProviderRecords;
 use ScriptFUSION\Porter\Connector\AsyncConnector;
 use ScriptFUSION\Porter\Connector\ConnectorOptions;
 use ScriptFUSION\Porter\ForeignResourceException;
 use ScriptFUSION\Porter\ImportException;
 use ScriptFUSION\Porter\IncompatibleProviderException;
 use ScriptFUSION\Porter\Porter;
+use ScriptFUSION\Porter\PorterAware;
 use ScriptFUSION\Porter\Provider\Provider;
 use ScriptFUSION\Porter\Specification\AsyncImportSpecification;
+use ScriptFUSION\Porter\Transform\AsyncTransformer;
 use ScriptFUSION\Porter\Transform\FilterTransformer;
 use ScriptFUSIONTest\MockFactory;
 
@@ -48,6 +53,30 @@ public function testImportOneAsync(): \Generator
         self::assertSame(['foo'], yield $this->porter->importOneAsync($this->specification));
     }
 
+    /**
+     * Tests that when the resource is countable, the count is propagated to the outermost collection and the records
+     * are intact.
+     */
+    public function testImportCountableAsyncRecords(): \Generator
+    {
+        $this->resource->shouldReceive('fetchAsync')->andReturn(
+            new CountableAsyncProviderRecords(Iterator\fromIterable([$record = ['foo']]), $count = 123, $this->resource)
+        );
+
+        $records = $this->porter->importAsync($this->specification);
+
+        // Innermost collection.
+        self::assertInstanceOf(\Countable::class, $first = $records->findFirstCollection());
+        self::assertCount($count, $first);
+
+        // Outermost collection.
+        self::assertInstanceOf(CountableAsyncPorterRecords::class, $records);
+        self::assertCount($count, $records);
+
+        self::assertTrue(yield $records->advance());
+        self::assertSame($record, $records->getCurrent());
+    }
+
     /**
      * Tests that when importOne receives multiple records from a resource, an exception is thrown.
      */
@@ -62,7 +91,7 @@ public function testImportOneOfManyAsync(): \Generator
     /**
      * Tests that when importing from a provider that does not implement AsyncProvider, an exception is thrown.
      */
-    public function testImportIncompatibleProvider(): \Generator
+    public function testImportIncompatibleProviderAsync(): \Generator
     {
         $this->registerProvider(\Mockery::mock(Provider::class), $providerName = 'foo');
 
@@ -73,7 +102,7 @@ public function testImportIncompatibleProvider(): \Generator
     /**
      * Tests that when a resource's provider class name does not match the provider an exception is thrown.
      */
-    public function testImportForeignResource(): \Generator
+    public function testImportForeignResourceAsync(): \Generator
     {
         // Replace existing provider with a different one.
         $this->registerProvider(MockFactory::mockProvider(), \get_class($this->provider));
@@ -85,7 +114,7 @@ public function testImportForeignResource(): \Generator
     /**
      * Tests that when importing using a connector that exports options, but no clone method, an exception is thrown.
      */
-    public function testImportConnectorWithOptions(): void
+    public function testImportAsyncConnectorWithOptions(): void
     {
         $this->provider->shouldReceive('getAsyncConnector')
             ->andReturn(\Mockery::mock(AsyncConnector::class, ConnectorOptions::class));
@@ -138,4 +167,22 @@ public function testFilterAsync(): void
 
         $importAndExpect([7, 9]);
     }
+
+    /**
+     * Tests that when an AsyncTransformer is PorterAware it receives the Porter instance that invoked it.
+     */
+    public function testPorterAwareAsyncTransformer(): void
+    {
+        $this->porter->importAsync(
+            $this->specification->addTransformer(
+                \Mockery::mock(implode(',', [AsyncTransformer::class, PorterAware::class]))
+                    ->shouldReceive('setPorter')
+                        ->with($this->porter)
+                        ->once()
+                    ->shouldReceive('transformAsync')
+                        ->andReturn(\Mockery::mock(AsyncRecordCollection::class))
+                    ->getMock()
+            )
+        );
+    }
 }

test/Integration/Porter/PorterSyncTest.php

@@ -4,6 +4,7 @@
 namespace ScriptFUSIONTest\Integration\Porter;
 
 use ScriptFUSION\Porter\Cache\CacheUnavailableException;
+use ScriptFUSION\Porter\Collection\CountablePorterRecords;
 use ScriptFUSION\Porter\Collection\FilteredRecords;
 use ScriptFUSION\Porter\Collection\PorterRecords;
 use ScriptFUSION\Porter\Collection\ProviderRecords;
@@ -13,12 +14,11 @@
 use ScriptFUSION\Porter\Connector\ImportConnector;
 use ScriptFUSION\Porter\Connector\Recoverable\RecoverableExceptionHandler;
 use ScriptFUSION\Porter\Connector\Recoverable\StatelessRecoverableExceptionHandler;
+use ScriptFUSION\Porter\ForeignResourceException;
 use ScriptFUSION\Porter\ImportException;
 use ScriptFUSION\Porter\IncompatibleProviderException;
 use ScriptFUSION\Porter\PorterAware;
-use ScriptFUSION\Porter\ForeignResourceException;
 use ScriptFUSION\Porter\Provider\AsyncProvider;
-use ScriptFUSION\Porter\Provider\Provider;
 use ScriptFUSION\Porter\ProviderNotFoundException;
 use ScriptFUSION\Porter\Specification\ImportSpecification;
 use ScriptFUSION\Porter\Specification\StaticDataImportSpecification;
@@ -46,7 +46,7 @@ public function testImport(): void
     }
 
     /**
-     * Tests that when the resource is countable the count is propagated to the outermost collection.
+     * Tests that when the resource is countable, the count is propagated to the outermost collection.
      */
     public function testImportCountableRecords(): void
     {
@@ -59,7 +59,7 @@ public function testImportCountableRecords(): void
         self::assertCount($count, $first);
 
         // Outermost collection.
-        self::assertInstanceOf(\Countable::class, $records);
+        self::assertInstanceOf(CountablePorterRecords::class, $records);
         self::assertCount($count, $records);
     }
 
@@ -102,10 +102,10 @@ public function testPorterAwareTransformer(): void
             $this->specification->addTransformer(
                 \Mockery::mock(implode(',', [Transformer::class, PorterAware::class]))
                     ->shouldReceive('setPorter')
-                    ->with($this->porter)
-                    ->once()
+                        ->with($this->porter)
+                        ->once()
                     ->shouldReceive('transform')
-                    ->andReturn(\Mockery::mock(RecordCollection::class))
+                        ->andReturn(\Mockery::mock(RecordCollection::class))
                     ->getMock()
             )
         );