Previewsdk

src/ClientBase.php

@@ -9,12 +9,14 @@ abstract class ClientBase {
     protected $accessToken;
     protected $endpointBase;
     protected $cacher;
+    protected $assoc = true;
 
-    function __construct($accessToken, $spaceId = null, CacherInterface $cacher = null) {
+    function __construct($accessToken, $spaceId = null, CacherInterface $cacher = null, $assoc = true) {
         $this->accessToken = $accessToken;
         $this->spaceId = $spaceId;
         $this->setClient(new GuzzleHttp\Client());
         $this->cacher = $cacher;
+        $this->assoc = $assoc;
     }
 
     /**
@@ -60,15 +62,18 @@ function getEndpoint() {
      * @param array $headers
      * @return mixed
      */
+
     function get($resource, $query = array(), $headers = array()) {
+
         $url = $this->build_url($resource, $query);
         $key = $this->buildCacheKey('get', $resource, $url, $headers, $query);
         if (($this->cacher) && ($this->cacher->has($key))) return $this->cacher->get($key);
+        //echo $url;exit;
         $result = $this->client->get($url, [
             'headers' => array_merge([
                 'Authorization' => $this->getBearer()
             ], $headers)
-        ])->json();
+        ])->json(['object' => !$this->assoc]);
         if ($this->cacher) $this->cacher->put($key, $result);
         return $result;
     }

src/DeliverySDK.php

@@ -22,7 +22,7 @@ class DeliverySDK extends SDKBase {
      */
     function assets()
     {
-        return new Assets($this->accessToken, $this->spaceId, $this->cacher);
+        return new Assets($this->client);
     }
 
     /**
@@ -31,7 +31,7 @@ function assets()
      */
     function contentTypes()
     {
-        return new ContentTypes($this->accessToken, $this->spaceId, $this->cacher);
+        return new ContentTypes($this->client);
     }
 
     /**
@@ -40,7 +40,7 @@ function contentTypes()
      */
     function entries()
     {
-        return new Entries($this->accessToken, $this->spaceId, $this->cacher);
+        return new Entries($this->client);
     }
 
     /**
@@ -49,7 +49,7 @@ function entries()
      */
     function spaces()
     {
-        return new Spaces($this->accessToken, $this->spaceId, $this->cacher);
+        return new Spaces($this->client);
     }
 
 }

src/ManagementClient.php

@@ -28,7 +28,7 @@ function get($resource, $query = array(), $headers = array()) {
             'headers' => array_merge([
                 'Authorization' => $this->getBearer()
             ], $headers)
-        ])->json();
+        ])->json(['object' => !$this->assoc]);
         return $result;
     }
 

src/ManagementResources/Entries.php

@@ -20,6 +20,17 @@ function limitByType($contentType)
         return $this;
     }
 
+    /**
+     * Target locale
+     * @param $locale
+     * @return $this
+     */
+    function limitByLocale($locale)
+    {
+        $this->requestDecorator->addParameter('locale', '=', $locale);
+        return $this;
+    }
+
     /**
      * Target content type.
      * @param $contentType

src/ManagementResources/ResourceBase.php

@@ -4,7 +4,6 @@
 
 
 abstract class ResourceBase extends \Incraigulous\ContentfulSDK\Resources\ResourceBase {
-    protected $clientClassName = 'Incraigulous\ContentfulSDK\ManagementClient';
 
     /**
      * Make a post request.

src/ManagementResources/Spaces.php

@@ -11,7 +11,6 @@ class Spaces extends ResourceBase {
      * Init and store a new client and decorator.
      */
     function refresh() {
-        $this->client = new $this->clientClassName($this->accessToken, null, $this->cacher);
         $this->requestDecorator = new RequestDecorator();
         $this->requestDecorator->setResource($this->resourceName);
     }

src/ManagementSDK.php

@@ -22,14 +22,15 @@
  */
 
 class ManagementSDK extends SDKBase {
+    protected $clientClassName = 'Incraigulous\ContentfulSDK\ManagementClient';
 
     /**
      * Use the assets resource.
      * @return \Incraigulous\ContentfulSDK\ManagementResources\Assets
      */
     function assets()
     {
-        return new Assets($this->accessToken, $this->spaceId, $this->cacher);
+        return new Assets($this->client);
     }
 
     /**
@@ -38,7 +39,7 @@ function assets()
      */
     function contentTypes()
     {
-        return new ContentTypes($this->accessToken, $this->spaceId, $this->cacher);
+        return new ContentTypes($this->client);
     }
 
     /**
@@ -47,7 +48,7 @@ function contentTypes()
      */
     function entries()
     {
-        return new Entries($this->accessToken, $this->spaceId, $this->cacher);
+        return new Entries($this->client);
     }
 
     /**
@@ -56,7 +57,7 @@ function entries()
      */
     function spaces()
     {
-        return new Spaces($this->accessToken, $this->spaceId, $this->cacher);
+        return new Spaces($this->client);
     }
 
     /**
@@ -65,6 +66,6 @@ function spaces()
      */
     function webhooks()
     {
-        return new Webhooks($this->accessToken, $this->spaceId, $this->cacher);
+        return new Webhooks($this->client);
     }
 }

src/PreviewClient.php

@@ -0,0 +1,9 @@
+<?php
+namespace Incraigulous\ContentfulSDK;
+
+use GuzzleHttp;
+
+class PreviewClient extends DeliveryClient {
+    protected $endpointBase = 'https://preview.contentful.com/spaces';
+
+}

src/PreviewSDK.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Incraigulous\ContentfulSDK;
+
+/**
+ * Factory for returning resources.
+ *
+ * Class PreviewSDK
+ * @package Incraigulous\ContentfulSDK
+ */
+
+class PreviewSDK extends DeliverySDK {
+    protected $clientClassName = 'Incraigulous\ContentfulSDK\PreviewClient';
+
+}

src/Resources/Entries.php

@@ -23,6 +23,17 @@ function limitByType($contentType)
         return $this;
     }
 
+    /**
+     * Target locale
+     * @param $locale
+     * @return $this
+     */
+    function limitByLocale($locale)
+    {
+        $this->requestDecorator->addParameter('locale', '=', $locale);
+        return $this;
+    }
+
     /**
      * Target content type.
      * @param $contentType

src/Resources/ResourceBase.php

@@ -2,31 +2,24 @@
 
 namespace Incraigulous\ContentfulSDK\Resources;
 
+use Incraigulous\ContentfulSDK\ClientBase;
 use Incraigulous\ContentfulSDK\RequestDecorator;
-use Incraigulous\ContentfulSDK\CacherInterface;
 
 abstract class ResourceBase {
-    protected $clientClassName = 'Incraigulous\ContentfulSDK\DeliveryClient';
     protected $resourceName;
-    protected $spaceId;
-    protected $accessToken;
     protected $client;
     protected $requestDecorator;
-    protected $cacher;
 
-    function __construct($accessToken, $spaceId = null, CacherInterface $cacher = null)
+    function __construct(ClientBase $client)
     {
-        $this->spaceId = $spaceId;
-        $this->accessToken = $accessToken;
-        $this->cacher = $cacher;
+        $this->client = $client;
         $this->refresh();
     }
 
     /**
      * Init and store a new client and decorator.
      */
     function refresh() {
-        $this->client = new $this->clientClassName($this->accessToken, $this->spaceId, $this->cacher);
         $this->requestDecorator = new RequestDecorator();
         $this->requestDecorator->setResource($this->resourceName);
     }

src/SDKBase.php

@@ -9,14 +9,18 @@
 namespace Incraigulous\ContentfulSDK;
 
 abstract class SDKBase {
+    protected $clientClassName = 'Incraigulous\ContentfulSDK\DeliveryClient';
+
     protected $accessToken;
     protected $spaceId;
     protected $cacher;
+    protected $client;
 
-    function __construct($accessToken, $spaceId = null, CacherInterface $cacher = null)
+    function __construct($accessToken, $spaceId = null, CacherInterface $cacher = null, $assoc = true)
     {
         $this->accessToken = $accessToken;
         $this->spaceId = $spaceId;
         $this->cacher = $cacher;
+        $this->client = new $this->clientClassName($this->accessToken, $this->spaceId, $this->cacher, $assoc);
     }
 }

tests/ClientTests.php

@@ -12,6 +12,7 @@
 use Incraigulous\ContentfulSDK\DeliveryClient;
 use Incraigulous\ContentfulSDK\ManagementClient;
 use Incraigulous\ContentfulSDK\ManagementResources\Assets as ManagementAssets;
+use Incraigulous\ContentfulSDK\PreviewClient;
 use Incraigulous\ContentfulSDK\Resources\Assets;
 use Incraigulous\ContentfulSDK\ManagementResources\Entries as ManagementEntries;
 use Incraigulous\ContentfulSDK\Resources\Entries;
@@ -22,15 +23,17 @@
 class ClientTests extends PHPUnit_Framework_TestCase {
     protected function getAssets() {
         return [
-            new Assets('asdfasdfklj', 'asdfasdf'),
-            new ManagementAssets('asdfasdfklj', 'asdfasdf')
+            new Assets(new DeliveryClient('asdfasdfklj', 'asdfasdf')),
+            new Assets(new PreviewClient('asdfasdfklj', 'asdfasdf')),
+            new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf'))
         ];
     }
 
     protected function getEntries() {
         return [
-            new Entries('asdfasdfklj', 'asdfasdf'),
-            new ManagementEntries('asdfasdfklj', 'asdfasdf')
+            new Entries(new DeliveryClient('asdfasdfklj', 'asdfasdf')),
+            new Entries(new PreviewClient('asdfasdfklj', 'asdfasdf')),
+            new ManagementEntries(new ManagementClient('asdfasdfklj', 'asdfasdf'))
         ];
     }
 
@@ -56,49 +59,49 @@ public function testGet() {
     }
 
     public function testPost() {
-        $resource = $this->attachSuccessful(new ManagementEntries('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementEntries(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->post(array('fields' => array('cat' => 'dog')));
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testPut() {
-        $resource = $this->attachSuccessful(new ManagementEntries('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementEntries(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->put('asdfasdf', array('fields' => array('cat' => 'dog')));
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testDelete() {
-        $resource = $this->attachSuccessful(new ManagementEntries('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementEntries(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->delete('asdfasdf');
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testProcess() {
-        $resource = $this->attachSuccessful(new ManagementAssets('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->process('asdfasdf');
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testArchive() {
-        $resource = $this->attachSuccessful(new ManagementAssets('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->archive('asdfasdf');
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testUnarchive() {
-        $resource = $this->attachSuccessful(new ManagementAssets('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->unarchive('asdfasdf');
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testPublish() {
-        $resource = $this->attachSuccessful(new ManagementAssets('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->publish('asdfasdf', 234);
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     public function testUnpublish() {
-        $resource = $this->attachSuccessful(new ManagementAssets('asdfasdfklj', 'asdfasdf'));
+        $resource = $this->attachSuccessful(new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf')));
         $response = $resource->unpublish('asdfasdf', 123);
         $this->assertEquals('200', $response->getStatusCode());
     }

tests/ResourceTests.php

@@ -1,7 +1,10 @@
 <?php
 namespace Incraigulous\ContentfulSDK\Tests;
 
+use Incraigulous\ContentfulSDK\DeliveryClient;
+use Incraigulous\ContentfulSDK\ManagementClient;
 use Incraigulous\ContentfulSDK\ManagementResources\Assets as ManagementAssets;
+use Incraigulous\ContentfulSDK\PreviewClient;
 use Incraigulous\ContentfulSDK\Resources\Assets;
 use Incraigulous\ContentfulSDK\ManagementResources\Entries as ManagementEntries;
 use Incraigulous\ContentfulSDK\Resources\Entries;
@@ -11,15 +14,17 @@ class ResourceTests extends PHPUnit_Framework_TestCase
 {
     protected function getAssets() {
         return [
-            new Assets('asdfasdfklj', 'asdfasdf'),
-            new ManagementAssets('asdfasdfklj', 'asdfasdf')
+            new Assets(new DeliveryClient('asdfasdfklj', 'asdfasdf')),
+            new Assets(new PreviewClient('asdfasdfklj', 'asdfasdf')),
+            new ManagementAssets(new ManagementClient('asdfasdfklj', 'asdfasdf'))
         ];
     }
 
     protected function getEntries() {
         return [
-            new Entries('asdfasdfklj', 'asdfasdf'),
-            new ManagementEntries('asdfasdfklj', 'asdfasdf')
+            new Entries(new DeliveryClient('asdfasdfklj', 'asdfasdf')),
+            new Entries(new PreviewClient('asdfasdfklj', 'asdfasdf')),
+            new ManagementEntries(new ManagementClient('asdfasdfklj', 'asdfasdf'))
         ];
     }