lib/pubnub.rb in pubnub-0.1.9 vs lib/pubnub.rb in pubnub-0.1.10

@@ -27,11 +27,11 @@
 
 class Pubnub
   MAX_RETRIES = 3
   retries=0
   #**
-  #* Pubnub
+  #* Pubnub 3.1 with Cipher Key
   #*
   #* Init the Pubnub Client API
   #*
   #* @param string publish_key required key to send messages.
   #* @param string subscribe_key required key to receive messages.
@@ -53,10 +53,58 @@
       @origin = 'http://'  + @origin
     end
   end
 
   #**
+  #* Pubnub 3.0 Compatibility
+  #*
+  #* Init the Pubnub Client API
+  #*
+  #* @param string publish_key required key to send messages.
+  #* @param string subscribe_key required key to receive messages.
+  #* @param string secret_key required key to sign messages.
+  #* @param boolean ssl required for 2048 bit encrypted messages.
+  #*
+  def initialize( publish_key, subscribe_key, secret_key, ssl_on )
+    @publish_key   = publish_key
+    @subscribe_key = subscribe_key
+    @secret_key    = secret_key
+    @cipher_key    = ''
+    @ssl           = ssl_on
+    @origin        = 'pubsub.pubnub.com'
+ 
+    if @ssl     
+      @origin = 'https://' + @origin
+    else
+      @origin = 'http://'  + @origin
+    end
+  end
+  
+  #**
+  #* Pubnub 2.0 Compatibility
+  #*
+  #* Init the Pubnub Client API
+  #*
+  #* @param string publish_key required key to send messages.
+  #* @param string subscribe_key required key to receive messages.
+  #*
+  def initialize( publish_key, subscribe_key )
+    @publish_key   = publish_key
+    @subscribe_key = subscribe_key
+    @secret_key    = ''
+    @cipher_key    = ''
+    @ssl           = false
+    @origin        = 'pubsub.pubnub.com'
+ 
+    if @ssl
+      @origin = 'https://' + @origin
+    else
+      @origin = 'http://'  + @origin
+    end
+  end
+  
+  #**
   #* Publish
   #*
   #* Send a message to a channel.
   #*
   #* @param array args with channel and message.
@@ -267,10 +315,12 @@
         http = async_fetch(url)
         http_response = http.response
         EventMachine.stop
       }.resume
     end
-    JSON.parse(http_response)
+    if(http_response != '')
+      JSON.parse(http_response)
+    end
   end
 
   ## Non-blocking IO using EventMachine
   def async_fetch(url)
     f = Fiber.current