Enhancement: allow setting the URL and also parameters

 * added a little documentation about what to expect
 * added a small test case to confirm the check initializes

Author: till

src/ZendDiagnostics/Check/CouchDBCheck.php

@@ -19,28 +19,12 @@ class CouchDBCheck extends GuzzleHttpService
      */
     public function __construct(array $couchDbSettings)
     {
-        $couchDbUrl = '';
-        if ($couchDbSettings['port'] === '5984' || $couchDbSettings['port'] === '80') {
-            $couchDbUrl .= 'http://';
+        if (false === array_key_exists('url', $couchDbSettings)) {
+            $couchDbUrl = $this->createUrlFromParameters($couchDbSettings);
         } else {
-            $couchDbUrl .= 'https://';
-        }
-
-        if ($couchDbSettings['username'] && $couchDbSettings['password']) {
-            $couchDbUrl .= sprintf(
-                '%s:%s@',
-                $couchDbSettings['username'],
-                $couchDbSettings['password']
-            );
+            $couchDbUrl = $couchDbSettings['url'];
         }
 
-        $couchDbUrl .= sprintf(
-            '%s:%s/%s',
-            $couchDbSettings['host'],
-            $couchDbSettings['port'],
-            $couchDbSettings['dbname']
-        );
-
         parent::__construct($couchDbUrl);
     }
 
@@ -61,4 +45,53 @@ public function check()
 
         return $failure;
     }
+
+    /**
+     * Assumes CouchDB defaults. Port 80 or 5984 is non-SSL, SSL otherwise.
+     * Override with 'protocol' if you run something else.
+     *
+     * Requires/Supports the following keys in the array:
+     *
+     *  - dbname
+     *  - host
+     *  - port
+     *  - protocol (optional)
+     *  - username (optional)
+     *  - password (optional)
+     *
+     * @param array $couchDbSettings
+     *
+     * @return string
+     */
+    private function createUrlFromParameters(array $couchDbSettings)
+    {
+        $couchDbUrl = '';
+
+        if (array_key_exists('protocol', $couchDbSettings)) {
+            $couchDbUrl .= $couchDbSettings['protocol'] . '://';
+        } else {
+            if ($couchDbSettings['port'] === '5984' || $couchDbSettings['port'] === '80') {
+                $couchDbUrl .= 'http://';
+            } else {
+                $couchDbUrl .= 'https://';
+            }
+        }
+
+        if ($couchDbSettings['username'] && $couchDbSettings['password']) {
+            $couchDbUrl .= sprintf(
+                '%s:%s@',
+                $couchDbSettings['username'],
+                $couchDbSettings['password']
+            );
+        }
+
+        $couchDbUrl .= sprintf(
+            '%s:%s/%s',
+            $couchDbSettings['host'],
+            $couchDbSettings['port'],
+            $couchDbSettings['dbname']
+        );
+
+        return $couchDbUrl;
+    }
 }

tests/ZendDiagnosticsTest/GuzzleHttpServiceTest.php

@@ -9,10 +9,22 @@
 use Guzzle\Plugin\Mock\MockPlugin;
 use GuzzleHttp\Stream\Stream;
 use GuzzleHttp\Subscriber\Mock;
+use ZendDiagnostics\Check\CouchDBCheck;
 use ZendDiagnostics\Check\GuzzleHttpService;
 
 class GuzzleHttpServiceTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @param array $params
+     *
+     * @dataProvider couchDbProvider
+     */
+    public function testCouchDbCheck(array $params)
+    {
+        $check = new CouchDBCheck($params);
+        $this->assertInstanceOf('ZendDiagnostics\Check\CouchDbCheck', $check);
+    }
+
     /**
      * @dataProvider checkProvider
      */
@@ -84,6 +96,14 @@ public function checkProvider()
         );
     }
 
+    public function couchDbProvider()
+    {
+        return array(
+            array(array('url' => 'http://root:party@localhost/hello')),
+            array(array('host' => '127.0.0.1', 'port' => '443', 'username' => 'test', 'password' => 'test', 'dbname' => 'database')),
+        );
+    }
+
     private function getMockGuzzle3Client($statusCode = 200, $content = null)
     {
         $plugin = new MockPlugin();