Merge pull request #52 from timmillwood/master

Adding path support for url
doctrine · Nov 11, 2015 · 9441f05 · 9441f05
2 parents b9e14fd + 936d591
commit 9441f05
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/Doctrine/CouchDB/CouchDBClient.php b/lib/Doctrine/CouchDB/CouchDBClient.php
@@ -88,7 +88,9 @@ static public function create(array $options)
                         break;
 
                     case 'path':
-                        $options['dbname'] = ltrim($value, '/');
+                        $path = explode('/', $value);
+                        $options['dbname'] = array_pop($path);
+                        $options['path'] = trim(implode('/', $path), '/');
                         break;
 
                     case 'pass':

diff --git a/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php b/tests/Doctrine/Tests/CouchDB/CouchDBClientTest.php
@@ -44,6 +44,27 @@ public function testCreateClientFromUrl()
         );
     }
 
+    public function testCreateClientFromUrlWithPath()
+    {
+        $client = CouchDBClient::create(array('url' => 'https://foo:bar@localhost:5555/baz/qux/norf'));
+
+        $this->assertEquals('norf', $client->getDatabase());
+        $this->assertEquals(
+            array(
+                'host' => 'localhost',
+                'port' => 5555,
+                'ip' => '127.0.0.1',
+                'username' => 'foo',
+                'password' => 'bar',
+                'ssl' => true,
+                'timeout' => 0.01,
+                'keep-alive' => true,
+                'path' => 'baz/qux',
+            ),
+            $client->getHttpClient()->getOptions()
+        );
+    }
+
     public function testCreateClientWithLogging()
     {
         $client = CouchDBClient::create(array('dbname' => 'test', 'logging' => true));