Merge pull request #61 from brentru/small-feed-names

Switch to small feed/group format

adafruit_io/adafruit_io.py

@@ -202,7 +202,7 @@ def add_feed_callback(self, feed_key, callback_method):
 
         """
         self._client.add_topic_callback(
-            "{0}/feeds/{1}".format(self._user, feed_key), callback_method
+            "{0}/f/{1}".format(self._user, feed_key), callback_method
         )
 
     def remove_feed_callback(self, feed_key):
@@ -214,7 +214,7 @@ def remove_feed_callback(self, feed_key):
         :param str feed_key: Adafruit IO feed key.
 
         """
-        self._client.remove_topic_callback("{0}/feeds/{1}".format(self._user, feed_key))
+        self._client.remove_topic_callback("{0}/f/{1}".format(self._user, feed_key))
 
     def loop(self):
         """Manually process messages from Adafruit IO.
@@ -251,11 +251,11 @@ def subscribe(self, feed_key=None, group_key=None, shared_user=None):
             client.subscribe([('temperature'), ('humidity')])
         """
         if shared_user is not None and feed_key is not None:
-            self._client.subscribe("{0}/feeds/{1}".format(shared_user, feed_key))
+            self._client.subscribe("{0}/f/{1}".format(shared_user, feed_key))
         elif group_key is not None:
-            self._client.subscribe("{0}/groups/{1}".format(self._user, group_key))
+            self._client.subscribe("{0}/g/{1}".format(self._user, group_key))
         elif feed_key is not None:
-            self._client.subscribe("{0}/feeds/{1}".format(self._user, feed_key))
+            self._client.subscribe("{0}/f/{1}".format(self._user, feed_key))
         else:
             raise AdafruitIO_MQTTError("Must provide a feed_key or group_key.")
 
@@ -332,11 +332,11 @@ def unsubscribe(self, feed_key=None, group_key=None, shared_user=None):
 
         """
         if shared_user is not None and feed_key is not None:
-            self._client.unsubscribe("{0}/feeds/{1}".format(shared_user, feed_key))
+            self._client.unsubscribe("{0}/f/{1}".format(shared_user, feed_key))
         elif group_key is not None:
-            self._client.unsubscribe("{0}/groups/{1}".format(self._user, feed_key))
+            self._client.unsubscribe("{0}/g/{1}".format(self._user, feed_key))
         elif feed_key is not None:
-            self._client.unsubscribe("{0}/feeds/{1}".format(self._user, feed_key))
+            self._client.unsubscribe("{0}/f/{1}".format(self._user, feed_key))
         else:
             raise AdafruitIO_MQTTError("Must provide a feed_key or group_key.")
 
@@ -416,18 +416,18 @@ def publish(self, feed_key, data, metadata=None, shared_user=None, is_group=Fals
 
         """
         if is_group:
-            self._client.publish("{0}/groups/{1}".format(self._user, feed_key), data)
+            self._client.publish("{0}/g/{1}".format(self._user, feed_key), data)
         if shared_user is not None:
-            self._client.publish("{0}/feeds/{1}".format(shared_user, feed_key), data)
+            self._client.publish("{0}/f/{1}".format(shared_user, feed_key), data)
         if metadata is not None:
             if isinstance(data, int or float):
                 data = str(data)
             csv_string = data + "," + metadata
             self._client.publish(
-                "{0}/feeds/{1}/csv".format(self._user, feed_key), csv_string
+                "{0}/f/{1}/csv".format(self._user, feed_key), csv_string
             )
         else:
-            self._client.publish("{0}/feeds/{1}".format(self._user, feed_key), data)
+            self._client.publish("{0}/f/{1}".format(self._user, feed_key), data)
 
     def get(self, feed_key):
         """Calling this method will make Adafruit IO publish the most recent
@@ -440,7 +440,7 @@ def get(self, feed_key):
 
             io.get('temperature')
         """
-        self._client.publish("{0}/feeds/{1}/get".format(self._user, feed_key), "\0")
+        self._client.publish("{0}/f/{1}/get".format(self._user, feed_key), "\0")
 
 
 class IO_HTTP: