Merge c342d69 into a4c52d3

ScriptFUSION · Jul 5, 2017 · 68b0110 · 68b0110
2 parents a4c52d3 + c342d69
commit 68b0110
Show file tree

Hide file tree

Showing 8 changed files with 130 additions and 336 deletions.
diff --git a/src/Porter.php b/src/Porter.php
@@ -10,10 +10,13 @@
 use ScriptFUSION\Porter\Collection\PorterRecords;
 use ScriptFUSION\Porter\Collection\ProviderRecords;
 use ScriptFUSION\Porter\Collection\RecordCollection;
+use ScriptFUSION\Porter\Connector\Connector;
 use ScriptFUSION\Porter\Connector\RecoverableConnectorException;
+use ScriptFUSION\Porter\Provider\ForeignResourceException;
 use ScriptFUSION\Porter\Provider\ObjectNotCreatedException;
 use ScriptFUSION\Porter\Provider\Provider;
 use ScriptFUSION\Porter\Provider\ProviderFactory;
+use ScriptFUSION\Porter\Provider\ProviderOptions;
 use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
 use ScriptFUSION\Porter\Specification\ImportSpecification;
 use ScriptFUSION\Porter\Transform\Transformer;
@@ -108,12 +111,26 @@ private function fetch(
     ) {
         $provider = $this->getProvider($providerName ?: $resource->getProviderClassName());
 
-        $this->applyCacheAdvice($provider, $cacheAdvice);
+        if ($resource->getProviderClassName() !== get_class($provider)) {
+            throw new ForeignResourceException(sprintf(
+                'Cannot fetch data from foreign resource: "%s".',
+                get_class($resource)
+            ));
+        }
+
+        $this->applyCacheAdvice($provider->getConnector(), $cacheAdvice);
 
         if (($records = \ScriptFUSION\Retry\retry(
             $fetchAttempts,
             function () use ($provider, $resource) {
-                if (($records = $provider->fetch($resource)) instanceof \Iterator) {
+                $records = $resource->fetch(
+                    $provider->getConnector(),
+                    $provider instanceof ProviderOptions
+                        ? $provider->getOptions()
+                        : null
+                );
+
+                if ($records instanceof \Iterator) {
                     // Force generator to run until first yield to provoke an exception.
                     $records->valid();
                 }
@@ -173,22 +190,22 @@ private function createPorterRecords(RecordCollection $records, ImportSpecificat
         return new PorterRecords($records, $specification);
     }
 
-    private function applyCacheAdvice(Provider $provider, CacheAdvice $cacheAdvice)
+    private function applyCacheAdvice(Connector $connector, CacheAdvice $cacheAdvice)
     {
         try {
-            if (!$provider instanceof CacheToggle) {
+            if (!$connector instanceof CacheToggle) {
                 throw CacheUnavailableException::modify();
             }
 
             switch ("$cacheAdvice") {
                 case CacheAdvice::MUST_CACHE:
                 case CacheAdvice::SHOULD_CACHE:
-                    $provider->enableCache();
+                    $connector->enableCache();
                     break;
 
                 case CacheAdvice::MUST_NOT_CACHE:
                 case CacheAdvice::SHOULD_NOT_CACHE:
-                    $provider->disableCache();
+                    $connector->disableCache();
             }
         } catch (CacheUnavailableException $exception) {
             if ($cacheAdvice === CacheAdvice::MUST_NOT_CACHE() ||

diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php
diff --git a/src/Provider/Provider.php b/src/Provider/Provider.php
@@ -1,19 +1,17 @@
 <?php
 namespace ScriptFUSION\Porter\Provider;
 
-use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
+use ScriptFUSION\Porter\Connector\Connector;
 
 /**
- * Provides a method for fetching data from a resource.
+ * Provides a method for accessing a connector.
  */
 interface Provider
 {
     /**
-     * Fetches data from the specified resource.
+     * Gets a connector for accessing resource data.
      *
-     * @param ProviderResource $resource Resource.
-     *
-     * @return \Iterator Enumerable data series.
+     * @return Connector
      */
-    public function fetch(ProviderResource $resource);
+    public function getConnector();
 }
diff --git a/src/Provider/ProviderOptions.php b/src/Provider/ProviderOptions.php
@@ -0,0 +1,17 @@
+<?php
+namespace ScriptFUSION\Porter\Provider;
+
+use ScriptFUSION\Porter\Options\EncapsulatedOptions;
+
+/**
+ * Provides a method for accessing provider options.
+ */
+interface ProviderOptions
+{
+    /**
+     * Gets the provider options.
+     *
+     * @return EncapsulatedOptions
+     */
+    public function getOptions();
+}
diff --git a/src/Provider/StaticDataProvider.php b/src/Provider/StaticDataProvider.php
@@ -3,10 +3,17 @@
 
 use ScriptFUSION\Porter\Connector\NullConnector;
 
-class StaticDataProvider extends AbstractProvider
+class StaticDataProvider implements Provider
 {
+    private $connector;
+
     public function __construct()
     {
-        parent::__construct(new NullConnector);
+        $this->connector = new NullConnector;
+    }
+
+    public function getConnector()
+    {
+        return $this->connector;
     }
 }