refactoring

4 files changed, 51 insertions, 6 deletions

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
new file mode 100644
index 0000000..b3c9dc0
--- /dev/null
+++ b/python-twisted/examples/here-now-example.py
@@ -0,0 +1,43 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud. 
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+## -----------------------------------
+## PubNub 3.1 Real-time Push Cloud API
+## -----------------------------------
+
+import sys
+from twisted.internet import reactor
+from Pubnub import Pubnub
+
+publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
+secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+crazy  = 'hello_world'
+
+## -----------------------------------------------------------------------
+## History Example
+## -----------------------------------------------------------------------
+def here_now_complete(messages):
+    print(messages)
+    reactor.stop()
+
+pubnub.here_now( {
+    'channel'  : crazy,
+    'callback' : here_now_complete
+})
+
+## -----------------------------------------------------------------------
+## IO Event Loop
+## -----------------------------------------------------------------------
+reactor.run()
diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
index 31b8edb..5f352ef 100644
--- a/python-twisted/examples/history-example.py
+++ b/python-twisted/examples/history-example.py
@@ -31,6 +31,7 @@ crazy  = 'hello_world'
 ## -----------------------------------------------------------------------
 def history_complete(messages):
     print(messages)
+    reactor.stop()
 
 pubnub.history( {
     'channel'  : crazy,
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index 9c3be60..d09ad8d 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -48,11 +48,14 @@ pubnub.publish({
     'callback' : publish_complete
 })
 
+def done_cb(info):
+    publish_complete(info)
+    reactor.stop()
 ## Publish Dictionary Object
 pubnub.publish({
     'channel' : crazy,
     'message' : { 'some_key' : 'some_val' },
-    'callback' : publish_complete
+    'callback' : done_cb
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
index 994e7e3..cf4a919 100644
--- a/python-twisted/examples/subscribe-example.py
+++ b/python-twisted/examples/subscribe-example.py
@@ -23,7 +23,8 @@ ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+#pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
 crazy  = 'hello_world'
 
 ## -----------------------------------------------------------------------
@@ -33,10 +34,7 @@ def message_received(message):
     print(message)
 
 def connected() :
-    pubnub.publish({
-        'channel' : crazy,
-        'message' : { 'Info' : 'Connected!' }
-    })
+    print 'Connected'
 
 pubnub.subscribe({
     'channel'  : crazy,