Merge branch 'user-agent-application-info'

Author: timcraft

nexmo/__init__.py

@@ -28,12 +28,18 @@ def __init__(self, **kwargs):
 
     self.api_secret = kwargs.get('secret', None) or os.environ['NEXMO_API_SECRET']
 
-    self.headers = {'User-Agent': 'nexmo-python/{0}/{1}'.format(__version__, python_version())}
-
     self.host = 'rest.nexmo.com'
 
     self.api_host = 'api.nexmo.com'
 
+    user_agent = 'nexmo-python/{0}/{1}'.format(__version__, python_version())
+
+    if 'app_name' in kwargs and 'app_version' in kwargs:
+      user_agent += '/{0}/{1}'.format(kwargs['app_name'], kwargs['app_version'])
+
+    self.headers = {'User-Agent': user_agent}
+
+
   def send_message(self, params):
     return self.post(self.host, '/sms/json', params)
 

test_nexmo.py

@@ -376,6 +376,17 @@ def test_server_error(self):
 
     self.assertRaisesRegex(nexmo.ServerError, message, self.client.send_message, {})
 
+  @responses.activate
+  def test_application_info_options(self):
+    app_name, app_version = 'ExampleApp', 'X.Y.Z'
+
+    self.stub(responses.GET, 'https://rest.nexmo.com/account/get-balance')
+
+    self.client = nexmo.Client(key=self.api_key, secret=self.api_secret, app_name=app_name, app_version=app_version)
+    self.user_agent = '/'.join(['nexmo-python', nexmo.__version__, platform.python_version(), app_name, app_version])
+
+    self.assertOK(self.client.get_balance())
+
 
 if __name__ == '__main__':
   unittest.main()