Merge branch 'add-user-agent'

Author: lornajane

MAINTAINERS.md

@@ -0,0 +1,7 @@
+# Maintainers
+
+This file details information that will be useful for the project maintainers.
+
+## Release Process
+
+Put the desired version number into the `VERSION` constant in `src/PHPCouchDB/Server.php`.  Then tag the master branch of the repo with the matching tag e.g. "v0.1.2" and push to GitHub.

src/PHPCouchDB/Server.php

@@ -6,6 +6,8 @@
 
 namespace PHPCouchDB;
 
+const VERSION = "0.1.0";
+
 /**
  * Server class deals with operations on the server level, rather than specific
  * to a particular database
@@ -38,7 +40,10 @@ public function __construct(array $options)
         if (isset($options['client']) && $options['client'] instanceof \GuzzleHttp\ClientInterface) {
             $client = $options['client'];
         } elseif (isset($options['url'])) {
-            $client = new \GuzzleHttp\Client(["base_uri" => $options['url']]);
+            // set a descriptive user agent
+            $user_agent = \GuzzleHttp\default_user_agent();
+            $client = new \GuzzleHttp\Client(["base_uri" => $options['url'],
+            "headers" => ["User-Agent" => "PHPCouchDB/" . VERSION . " " . $user_agent]]);
         } else {
             throw new Exception\ServerException(
                 'Failed to parse $options, array should contain either a url or a client'

tests/PHPCouchDB/ServerTest.php

@@ -31,6 +31,22 @@ public function testCreateWithClient() {
         $this->assertAttributeInstanceOf('\GuzzleHttp\ClientInterface', 'client', $server);
     }
 
+    public function testCreateWithUrl() {
+		$mock = new MockHandler([ ]);
+
+		$handler = HandlerStack::create($mock);
+
+		// userland code starts
+		$server = new \PHPCouchDB\Server(["url" => "http://localhost:5984"]);
+
+        $this->assertObjectHasAttribute('client', $server);
+        $this->assertAttributeInstanceOf('\GuzzleHttp\ClientInterface', 'client', $server);
+
+        $config = $server->getClient()->getConfig();
+        $this->assertArrayHasKey('User-Agent', $config['headers']);
+        $this->assertStringStartsWith('PHPCouchDB', $config['headers']['User-Agent']);
+    }
+
     public function testGetVersion() {
 		$mock = new MockHandler([ $this->db_response ]);