Update to use new MQTT path with username.

Author: tdicola

Adafruit_IO/mqtt_client.py

@@ -34,12 +34,15 @@ class MQTTClient(object):
     using the MQTT protocol.
     """
 
-    def __init__(self, key, service_host='io.adafruit.com', service_port=1883):
+    def __init__(self, username, key, service_host='io.adafruit.com', service_port=1883):
         """Create instance of MQTT client.
 
         Required parameters:
+        - username: The Adafruit.IO username for your account (found on the
+                    accounts site https://accounts.adafruit.com/).
         - key: The Adafruit.IO access key for your account.
         """
+        self._username = username
         self._service_host = service_host
         self._service_port = service_port
         # Initialize event callbacks to be None so they don't fire.
@@ -48,7 +51,7 @@ def __init__(self, key, service_host='io.adafruit.com', service_port=1883):
         self.on_message    = None
         # Initialize MQTT client.
         self._client = mqtt.Client()
-        self._client.username_pw_set(key)
+        self._client.username_pw_set(username, key)
         self._client.on_connect    = self._mqtt_connect
         self._client.on_disconnect = self._mqtt_disconnect
         self._client.on_message    = self._mqtt_message
@@ -146,7 +149,7 @@ def subscribe(self, feed_id):
         """Subscribe to changes on the specified feed.  When the feed is updated
         the on_message function will be called with the feed_id and new value.
         """
-        self._client.subscribe('api/feeds/{0}/data/receive.json'.format(feed_id))
+        self._client.subscribe('{0}/feeds/{1}'.format(self._username, feed_id))
 
     def publish(self, feed_id, value):
         """Publish a value to a specified feed.
@@ -155,5 +158,5 @@ def publish(self, feed_id, value):
         - feed_id: The id of the feed to update.
         - value: The new value to publish to the feed.
         """
-        self._client.publish('api/feeds/{0}/data/send.json'.format(feed_id),
+        self._client.publish('{0}/feeds/{1}'.format(self._username, feed_id),
             payload=value)

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='adafruit-io',
-    version='0.9.1',
+    version='1.0.0',
     author='Justin Cooper',
     author_email='[email protected]',
     packages=['Adafruit_IO'],

tests/README.txt

@@ -10,6 +10,10 @@ set this envirionment variable before running the tests, for example to run all
 the tests with a key execute in this directory:
   ADAFRUIT_IO_KEY=my_io_key_value python -m unittest discover
 
+In addition for the MQTT tests you must set the following environment variable
+to the username for your AIO account (found on https://accounts.adafruit.com):
+  ADAFRUIT_IO_USERNAME=your_username
+
 To add your own tests you are strongly encouraged to build off the test base 
 class provided in base.py.  This class provides a place for common functions
 that don't need to be duplicated across all the tests.  See the existing test

tests/base.py

@@ -33,3 +33,13 @@ def get_test_key(self):
             raise RuntimeError("ADAFRUIT_IO_KEY environment variable must be " \
               "set with valid Adafruit IO key to run this test!")
         return key
+
+    def get_test_username(self):
+        """Return the AIO username specified in the ADAFRUIT_IO_USERNAME
+        environment variable, or raise an exception if it doesn't exist.
+        """
+        username = os.environ.get('ADAFRUIT_IO_USERNAME', None)
+        if username is None:
+            raise RuntimeError("ADAFRUIT_IO_USERNAME environment variable must be " \
+              "set with valid Adafruit IO username to run this test!")
+        return username

tests/test_mqtt_client.py

@@ -45,13 +45,13 @@ def wait_until_connected(self, client, connect_value=True,
 
     def test_create_client(self):
         # Create MQTT test client.
-        client = MQTTClient(self.get_test_key())
+        client = MQTTClient(self.get_test_username(), self.get_test_key())
         # Verify not connected by default.
         self.assertFalse(client.is_connected())
 
     def test_connect(self):
         # Create MQTT test client.
-        client = MQTTClient(self.get_test_key())
+        client = MQTTClient(self.get_test_username(), self.get_test_key())
         # Verify on_connect handler is called and expected client is provided.
         def on_connect(mqtt_client):
             self.assertEqual(mqtt_client, client)
@@ -64,7 +64,7 @@ def on_connect(mqtt_client):
 
     def test_disconnect(self):
         # Create MQTT test client.
-        client = MQTTClient(self.get_test_key())
+        client = MQTTClient(self.get_test_username(), self.get_test_key())
         # Verify on_connect handler is called and expected client is provided.
         def on_disconnect(mqtt_client):
             self.assertEqual(mqtt_client, client)
@@ -80,7 +80,7 @@ def on_disconnect(mqtt_client):
 
     def test_subscribe_and_publish(self):
         # Create MQTT test client.
-        client = MQTTClient(self.get_test_key())
+        client = MQTTClient(self.get_test_username(), self.get_test_key())
         # Save all on_message handler responses.
         messages = []
         def on_message(mqtt_client, feed, payload):