Adding more sympathetic error handling when no objects found

Author: jamiehannaford

lib/OpenCloud/ObjectStore/AbstractService.php

@@ -45,5 +45,4 @@ public function getAccount()
     {
         return new Resource\Account($this);
     }
-    
 }

lib/OpenCloud/ObjectStore/Exception/ObjectNotFoundException.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace OpenCloud\ObjectStore\Exception;
+
+class ObjectNotFoundException extends \RuntimeException
+{
+    public static function factory($name, \Exception $exception)
+    {
+        $message = sprintf(
+            "%s could not be found. The API returned this HTTP response:\n\n%s",
+            $name,
+            (string) $exception->getResponse()
+        );
+
+        $e = new self($message);
+
+        $e->name = $name;
+        $e->response = $exception->getResponse();
+        $e->request  = $exception->getRequest();
+
+        return $e;
+    }
+} 

lib/OpenCloud/ObjectStore/Resource/Container.php

@@ -11,6 +11,7 @@
 namespace OpenCloud\ObjectStore\Resource;
 
 use Guzzle\Http\EntityBody;
+use Guzzle\Http\Exception\BadResponseException;
 use Guzzle\Http\Exception\ClientErrorResponseException;
 use Guzzle\Http\Message\Response;
 use Guzzle\Http\Url;
@@ -19,6 +20,7 @@
 use OpenCloud\Common\Service\ServiceInterface;
 use OpenCloud\ObjectStore\Constants\Header as HeaderConst;
 use OpenCloud\ObjectStore\Exception\ContainerException;
+use OpenCloud\ObjectStore\Exception\ObjectNotFoundException;
 use OpenCloud\ObjectStore\Upload\DirectorySync;
 use OpenCloud\ObjectStore\Upload\TransferBuilder;
 
@@ -322,9 +324,16 @@ public function dataObject($info = null)
      */
     public function getObject($name, array $headers = array())
     {
-        $response = $this->getClient()
-            ->get($this->getUrl($name), $headers)
-            ->send();
+        try {
+            $response = $this->getClient()
+                ->get($this->getUrl($name), $headers)
+                ->send();
+        } catch (BadResponseException $e) {
+            if ($e->getResponse()->getStatusCode() == 404) {
+                throw ObjectNotFoundException::factory($name, $e);
+            }
+            throw $e;
+        }
 
         return $this->dataObject()
             ->populateFromResponse($response)

tests/OpenCloud/Tests/ObjectStore/Resource/ContainerTest.php

@@ -10,6 +10,7 @@
 
 namespace OpenCloud\Tests\ObjectStore\Resource;
 
+use Guzzle\Http\Message\Response;
 use OpenCloud\Common\Constants\Size;
 use OpenCloud\Tests\ObjectStore\ObjectStoreTestCase;
 
@@ -148,7 +149,25 @@ public function test_Get_Object()
         );
         $this->assertEquals('foobar', $object->getName());
     }
-    
+
+    /**
+     * @expectedException \OpenCloud\ObjectStore\Exception\ObjectNotFoundException
+     */
+    public function test_Get_Object_404()
+    {
+        $this->addMockSubscriber(new Response(404));
+        $this->container->getObject('foobar');
+    }
+
+    /**
+     * @expectedException \Guzzle\Http\Exception\BadResponseException
+     */
+    public function test_Get_Object_500()
+    {
+        $this->addMockSubscriber(new Response(500));
+        $this->container->getObject('foobar');
+    }
+
     /**
      * @expectedException OpenCloud\Common\Exceptions\InvalidArgumentError
      */

tests/OpenCloud/Tests/ObjectStore/Resource/DataObjectTest.php

@@ -94,5 +94,4 @@ public function test_Public_Urls()
         $this->assertNotNull($object->getPublicUrl(UrlType::STREAMING));
         $this->assertNotNull($object->getPublicUrl(UrlType::IOS_STREAMING));
     }
-    
 }