adding unit tests

2 files changed, 240 insertions, 7 deletions

diff --git a/Pubnub.py b/Pubnub.py
index d75b452..acc680b 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -116,9 +116,12 @@ except ImportError:
 
 
 def get_data_for_user(data):
-    if 'message' in data and 'payload' in data:
-        return {'message': data['message'], 'payload': data['payload']}
-    else:
+    try:
+        if 'message' in data and 'payload' in data:
+            return {'message': data['message'], 'payload': data['payload']}
+        else:
+            return data
+    except TypeError:
         return data
 
 
@@ -138,7 +141,6 @@ class PubnubCrypto2():
         return hashlib.sha256(key).hexdigest()
 
     def encrypt(self, key, msg):
-
         secret = self.getSecret(key)
         Initial16bytes = '0123456789012345'
         cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
@@ -150,8 +152,11 @@ class PubnubCrypto2():
         secret = self.getSecret(key)
         Initial16bytes = '0123456789012345'
         cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
-        return self.depad((cipher.decrypt(decodestring(msg))))
-
+        plain = self.depad(cipher.decrypt(decodestring(msg)))
+        try:
+            return eval(plain)
+        except SyntaxError:
+            return plain
 
 class PubnubCrypto3():
 
@@ -795,7 +800,7 @@ class PubnubBase(object):
         if ("urlparams" in request):
             url = url + '?' + "&".join([x + "=" + str(y) for x, y in request[
                 "urlparams"].items() if y is not None])
-        print url
+        #print url
         return url
 
 
diff --git a/python/tests/test_publish_async.py b/python/tests/test_publish_async.py
new file mode 100644
index 0000000..7270727
--- /dev/null
+++ b/python/tests/test_publish_async.py
@@ -0,0 +1,228 @@
+
+
+from Pubnub import Pubnub
+import time
+
+pubnub = Pubnub("demo","demo")
+pubnub_enc = Pubnub("demo", "demo", cipher_key="enigma")
+pubnub_pam = Pubnub("pub-c-c077418d-f83c-4860-b213-2f6c77bde29a", 
+	"sub-c-e8839098-f568-11e2-a11a-02ee2ddab7fe", "sec-c-OGU3Y2Q4ZWUtNDQwMC00NTI1LThjNWYtNWJmY2M4OGIwNjEy")
+
+
+
+# Publish and receive string
+def test_1():
+
+	channel = "test_1-" + str(time.time())
+	message = "I am a string"
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive array
+def test_2():
+
+	channel = "test_2-" + str(time.time())
+	message = [1,2]
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive json object
+def test_3():
+
+	channel = "test_2-" + str(time.time())
+	message = { "a" : "b" }
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive number
+def test_4():
+
+	channel = "test_2-" + str(time.time())
+	message = 100
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive number string
+def test_5():
+
+	channel = "test_5-" + str(time.time())
+	message = "100"
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+
+# Publish and receive string (Encryption enabled)
+def test_6():
+
+	channel = "test_6-" + str(time.time())
+	message = "I am a string"
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive array (Encryption enabled)
+def test_7():
+
+	channel = "test_7-" + str(time.time())
+	message = [1,2]
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive json object (Encryption enabled)
+def test_8():
+
+	channel = "test_8-" + str(time.time())
+	message = { "a" : "b" }
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive number (Encryption enabled)
+def test_9():
+
+	channel = "test_9-" + str(time.time())
+	message = 100
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive number string (Encryption enabled)
+def test_10():
+
+	channel = "test_10-" + str(time.time())
+	message = "100"
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive object string (Encryption enabled)
+def test_11():
+
+	channel = "test_11-" + str(time.time())
+	message = '{"a" : "b"}'
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)
+
+# Publish and receive array string (Encryption enabled)
+def test_12():
+
+	channel = "test_12-" + str(time.time())
+	message = '[1,2]'
+
+	def _cb(resp, ch=None):
+		assert resp == message
+		pubnub_enc.unsubscribe(channel)
+
+	def _connect(resp):
+		pubnub_enc.publish(channel,message)
+
+	def _error(resp):
+		assert False
+
+	pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error)