Moved fetch attempts and exception handler from Porter -> ImportSpeci…

…fication.
ScriptFUSION · Jan 29, 2017 · 6d16020 · 6d16020
1 parent 8e69257
commit 6d16020
Show file tree

Hide file tree

Showing 3 changed files with 80 additions and 65 deletions.
diff --git a/src/Porter.php b/src/Porter.php
@@ -16,15 +16,12 @@
 use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Specification\ImportSpecification;
 use ScriptFUSION\Porter\Transform\Transformer;
-use ScriptFUSION\Retry\ExceptionHandler\ExponentialBackoffExceptionHandler;
 
 /**
  * Imports data according to an ImportSpecification.
  */
 class Porter
 {
-    const DEFAULT_FETCH_ATTEMPTS = 5;
-
     /**
      * @var Provider[]
      */
@@ -35,16 +32,6 @@ class Porter
      */
     private $providerFactory;
 
-    /**
-     * @var int
-     */
-    private $maxFetchAttempts = self::DEFAULT_FETCH_ATTEMPTS;
-
-    /**
-     * @var callable
-     */
-    private $fetchExceptionHandler;
-
     /**
      * Imports data according to the design of the specified import specification.
      *
@@ -57,7 +44,13 @@ class Porter
     public function import(ImportSpecification $specification)
     {
         $specification = clone $specification;
-        $records = $this->fetch($specification->getResource(), $specification->getCacheAdvice());
+
+        $records = $this->fetch(
+            $specification->getResource(),
+            $specification->getCacheAdvice(),
+            $specification->getMaxFetchAttempts(),
+            $specification->getFetchExceptionHandler()
+        );
 
         if (!$records instanceof ProviderRecords) {
             $records = $this->createProviderRecords($records, $specification->getResource());
@@ -94,24 +87,24 @@ public function importOne(ImportSpecification $specification)
         return $one;
     }
 
-    private function fetch(ProviderResource $resource, CacheAdvice $cacheAdvice = null)
+    private function fetch(ProviderResource $resource, CacheAdvice $cacheAdvice, $fetchAttempts, $fetchExceptionHandler)
     {
         $provider = $this->getProvider($resource->getProviderClassName(), $resource->getProviderTag());
 
         $this->applyCacheAdvice($provider, $cacheAdvice);
 
         if (($records = \ScriptFUSION\Retry\retry(
-            $this->getMaxFetchAttempts(),
+            $fetchAttempts,
             function () use ($provider, $resource) {
                 return $provider->fetch($resource);
             },
-            function (\Exception $exception) {
+            function (\Exception $exception) use ($fetchExceptionHandler) {
                 // Throw exception if unrecoverable.
                 if (!$exception instanceof RecoverableConnectorException) {
                     throw $exception;
                 }
 
-                call_user_func($this->getFetchExceptionHandler(), $exception);
+                $fetchExceptionHandler($exception);
             }
         )) instanceof \Iterator) {
             return $records;
@@ -266,44 +259,4 @@ private function getOrCreateProviderFactory()
     {
         return $this->providerFactory ?: $this->providerFactory = new ProviderFactory;
     }
-
-    /**
-     * Gets the maximum number of fetch attempts per import.
-     *
-     * @return int
-     */
-    public function getMaxFetchAttempts()
-    {
-        return $this->maxFetchAttempts;
-    }
-
-    /**
-     * Sets the maximum number of fetch attempts per import.
-     *
-     * @param int $attempts Maximum fetch attempts.
-     *
-     * @return $this
-     */
-    public function setMaxFetchAttempts($attempts)
-    {
-        $this->maxFetchAttempts = max(1, $attempts|0);
-
-        return $this;
-    }
-
-    /**
-     * @return callable
-     */
-    private function getFetchExceptionHandler()
-    {
-        return $this->fetchExceptionHandler ?: $this->fetchExceptionHandler = new ExponentialBackoffExceptionHandler;
-    }
-
-    /**
-     * @param callable $fetchExceptionHandler
-     */
-    public function setFetchExceptionHandler(callable $fetchExceptionHandler)
-    {
-        $this->fetchExceptionHandler = $fetchExceptionHandler;
-    }
 }
diff --git a/src/Specification/ImportSpecification.php b/src/Specification/ImportSpecification.php
@@ -4,12 +4,15 @@
 use ScriptFUSION\Porter\Cache\CacheAdvice;
 use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Transform\Transformer;
+use ScriptFUSION\Retry\ExceptionHandler\ExponentialBackoffExceptionHandler;
 
 /**
  * Specifies which resource to import and how the data should be transformed.
  */
 class ImportSpecification
 {
+    const DEFAULT_FETCH_ATTEMPTS = 5;
+
     /**
      * @var ProviderResource
      */
@@ -35,6 +38,16 @@ class ImportSpecification
      */
     private $defaultCacheAdvice;
 
+    /**
+     * @var int
+     */
+    private $maxFetchAttempts = self::DEFAULT_FETCH_ATTEMPTS;
+
+    /**
+     * @var callable
+     */
+    private $fetchExceptionHandler;
+
     public function __construct(ProviderResource $resource)
     {
         $this->resource = $resource;
@@ -56,6 +69,7 @@ function (Transformer $transformer) {
         ));
 
         is_object($this->context) && $this->context = clone $this->context;
+        is_object($this->fetchExceptionHandler) && $this->fetchExceptionHandler = clone $this->fetchExceptionHandler;
     }
 
     /**
@@ -162,4 +176,52 @@ final public function setCacheAdvice(CacheAdvice $cacheAdvice)
 
         return $this;
     }
+
+    /**
+     * Gets the maximum number of fetch attempts per import.
+     *
+     * @return int Maximum fetch attempts.
+     */
+    final public function getMaxFetchAttempts()
+    {
+        return $this->maxFetchAttempts;
+    }
+
+    /**
+     * Sets the maximum number of fetch attempts per import.
+     *
+     * @param int $attempts Maximum fetch attempts.
+     *
+     * @return $this
+     */
+    final public function setMaxFetchAttempts($attempts)
+    {
+        $this->maxFetchAttempts = max(1, $attempts|0);
+
+        return $this;
+    }
+
+    /**
+     * Gets the exception handler invoked each time a fetch attempt fails.
+     *
+     * @return callable Exception handler.
+     */
+    final public function getFetchExceptionHandler()
+    {
+        return $this->fetchExceptionHandler ?: $this->fetchExceptionHandler = new ExponentialBackoffExceptionHandler;
+    }
+
+    /**
+     * Sets the exception handler invoked each time a fetch attempt fails.
+     *
+     * @param callable $fetchExceptionHandler Exception handler.
+     *
+     * @return $this
+     */
+    final public function setFetchExceptionHandler(callable $fetchExceptionHandler)
+    {
+        $this->fetchExceptionHandler = $fetchExceptionHandler;
+
+        return $this;
+    }
 }
diff --git a/test/Integration/Porter/PorterTest.php b/test/Integration/Porter/PorterTest.php
@@ -257,23 +257,23 @@ public function testOneTry()
         $this->provider->shouldReceive('fetch')->once()->andThrow(RecoverableConnectorException::class);
 
         $this->setExpectedException(FailingTooHardException::class, '1');
-        $this->porter->setMaxFetchAttempts(1)->import($this->specification);
+        $this->porter->import($this->specification->setMaxFetchAttempts(1));
     }
 
     public function testDerivedRecoverableException()
     {
         $this->provider->shouldReceive('fetch')->once()->andThrow(\Mockery::mock(RecoverableConnectorException::class));
 
         $this->setExpectedException(FailingTooHardException::class);
-        $this->porter->setMaxFetchAttempts(1)->import($this->specification);
+        $this->porter->import($this->specification->setMaxFetchAttempts(1));
     }
 
     public function testDefaultTries()
     {
-        $this->provider->shouldReceive('fetch')->times(Porter::DEFAULT_FETCH_ATTEMPTS)
+        $this->provider->shouldReceive('fetch')->times(ImportSpecification::DEFAULT_FETCH_ATTEMPTS)
             ->andThrow(RecoverableConnectorException::class);
 
-        $this->setExpectedException(FailingTooHardException::class, (string)Porter::DEFAULT_FETCH_ATTEMPTS);
+        $this->setExpectedException(FailingTooHardException::class, (string)ImportSpecification::DEFAULT_FETCH_ATTEMPTS);
         $this->porter->import($this->specification);
     }
 
@@ -287,13 +287,13 @@ public function testUnrecoverableException()
 
     public function testCustomFetchExceptionHandler()
     {
-        $this->porter->setFetchExceptionHandler(
+        $this->specification->setFetchExceptionHandler(
             \Mockery::mock(ExponentialBackoffExceptionHandler::class)
                 ->shouldReceive('__invoke')
-                ->times(Porter::DEFAULT_FETCH_ATTEMPTS - 1)
+                ->times(ImportSpecification::DEFAULT_FETCH_ATTEMPTS - 1)
                 ->getMock()
         );
-        $this->provider->shouldReceive('fetch')->times(Porter::DEFAULT_FETCH_ATTEMPTS)
+        $this->provider->shouldReceive('fetch')->times(ImportSpecification::DEFAULT_FETCH_ATTEMPTS)
             ->andThrow(RecoverableConnectorException::class);
 
         $this->setExpectedException(FailingTooHardException::class);