pubnub-ruby 0.0.5 → 0.0.6

data/lib/pubnub-ruby.rb

@@ -1 +1 @@
-require "pubnub"
+require "./pubnub.rb"

data/lib/pubnub.rb

@@ -1,5 +1,5 @@
-## www.pubnub.com - PubNub realtime push service in the cloud. 
-## http://www.pubnub.com/blog/ruby-push-api - Ruby Push API Blog 
+## www.pubnub.com - PubNub realtime push service in the cloud.
+## http://www.pubnub.com/blog/ruby-push-api - Ruby Push API Blog
 
 ## PubNub Real Time Push APIs and Notifications Framework
 ## Copyright (c) 2010 Stephen Blum
@@ -12,10 +12,13 @@
 require 'digest/md5'
 require 'open-uri'
 require 'uri'
+require 'net/http'
 require 'json'
 require 'pp'
 
 class Pubnub
+    MAX_RETRIES = 3
+
     #**
     #* Pubnub
     #*
@@ -39,6 +42,9 @@ class Pubnub
         else
             @origin = 'http://'  + @origin
         end
+
+        uri         = URI.parse(@origin)
+        @connection = Net::HTTP.start(uri.host, uri.port)
     end
 
     #**
@@ -100,7 +106,6 @@ class Pubnub
         ## Capture User Input
         channel   = args['channel']
         callback  = args['callback']
-        timetoken = args['timetoken'] ? args['timetoken'] : 0
 
         ## Fail if missing channel
         if !channel
@@ -114,39 +119,36 @@ class Pubnub
             return false
         end
 
-        ## Begin Recusive Subscribe
-        begin
-            ## Wait for Message
-            response = self._request([
-                'subscribe',
-                @subscribe_key,
-                channel,
-                '0',
-                timetoken.to_s
-            ])
-
-            messages          = response[0]
-            args['timetoken'] = response[1]
-
-            ## If it was a timeout
-            if !messages.length
-                return self.subscribe(args)
-            end
-
-            ## Run user Callback and Reconnect if user permits.
-            messages.each do |message|
-                if !callback.call(message)
-                    return
+        ## Begin Subscribe
+        loop do
+            begin
+                timetoken = args['timetoken'] ? args['timetoken'] : 0
+
+                ## Wait for Message
+                response = self._request([
+                    'subscribe',
+                    @subscribe_key,
+                    channel,
+                    '0',
+                    timetoken.to_s
+                ])
+
+                messages          = response[0]
+                args['timetoken'] = response[1]
+
+                ## If it was a timeout
+                next if !messages.length
+
+                ## Run user Callback and Reconnect if user permits.
+                messages.each do |message|
+                    if !callback.call(message)
+                        return
+                    end
                 end
+            rescue Timeout::Error
+            rescue
+                sleep(1)
             end
-
-            ## Keep Listening.
-            return self.subscribe(args)
-        rescue Timeout::Error
-            return self.subscribe(args)
-        rescue
-            sleep(1)
-            return self.subscribe(args)
         end
     end
 
@@ -201,17 +203,25 @@ class Pubnub
     #*
     def _request(request)
         ## Construct Request URL
-        url = @origin + '/' + request.map{ |bit| bit.split('').map{ |ch|
+        url = '/' + request.map{ |bit| bit.split('').map{ |ch|
             ' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.index(ch) ?
             '%' + ch.unpack('H2')[0].to_s.upcase : URI.encode(ch)
         }.join('') }.join('/')
 
-        response = ''
-        open(url) do |f|
-            response = f.read
-        end
+        response = send_with_retries(url, MAX_RETRIES)
+        JSON.parse(response)
+    end
+
+    private
 
-        return JSON.parse(response)
+    def send_with_retries(url, retries)
+      tries = 0
+      begin
+        @connection.get(url).body
+      rescue
+        tries += 1
+        tries < retries ? retry : raise
+      end
     end
 end
 

metadata

@@ -1,74 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pubnub-ruby
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Luke Carpenter
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &19743640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Simply Pubnub.rb in gem format, :require => "pubnub" - ask @rubynerd for upgrades
-email: orlyowlizere@gmail.com
+  prerelease: false
+  version_requirements: *19743640
+description: Simply Pubnub.rb in gem format, :require => "pubnub" - ask @rubynerd
+  for upgrades
+email: x@rubynerd.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE.PUBNUB
-- README
-- README.ROOT
-files: 
+extra_rdoc_files: []
+files:
 - examples/history-example.rb
 - examples/publish-example.rb
 - examples/subscribe-example.rb
 - lib/pubnub-ruby.rb
 - lib/pubnub.rb
 - tests/unit-test.rb
-- LICENSE.PUBNUB
-- README
-- README.ROOT
-homepage: http://github.com/rubynerd/pubnub
-licenses: 
+homepage: http://github.com/pubnub/pubnub-api/tree/master/ruby
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: PubNub unofficial gem
 test_files: []
-

data/LICENSE.PUBNUB

@@ -1,27 +0,0 @@
-PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks
-Copyright (c) 2011 TopMambo Inc.
-http://www.pubnub.com/
-http://www.pubnub.com/terms
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks
-Copyright (c) 2011 TopMambo Inc.
-http://www.pubnub.com/
-http://www.pubnub.com/terms

data/README

@@ -1,2 +0,0 @@
-Pubnub - http://github/pubnub/pubnub-api
-@rubynerd on Twitter

data/README.ROOT

@@ -1,39 +0,0 @@
-## ---------------------------------------------------
-##
-## YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
-## http://www.pubnub.com/account
-##
-## ----------------------------------------------------
-
-## -----------------------------------
-## PubNub 3.0 Real-time Cloud Push API
-## -----------------------------------
-##
-## www.pubnub.com - PubNub Real-time Push Service in the Cloud. 
-## http://www.pubnub.com/tutorial/javascript-push-api
-##
-## PubNub is a Massively Scalable Real-time Service for Web and Mobile Games.
-## This is a cloud-based service for broadcasting Real-time messages
-## to thousands of web and mobile clients simultaneously.
-
-JavaScript Tutorial: http://www.pubnub.com/tutorial/javascript-push-api
-
-Website: http://www.pubnub.com
-Videos: http://www.pubnub.com/#videos
-Docs: http://www.pubnub.com/tutorial
-Blog: http://www.pubnub.com/blog
-Podcast Interview: http://techzinglive.com/?p=227
-
-
-===============================================================================
-PubNub Client APIs! 
-===============================================================================
-Visit the PubNub website for more details at http://www.pubnub.com/
-PubNub is a client-to-client push service in the cloud.
-
-This public repository hosts client APIs for PubNub.
-PHP, Ruby, JavaScript and more.
-
-The API is SO FAST that iPhone, Android and Blackberry phones zip!
-The JavaScript Payload is less than 3KB.
-It's a breeze for mobile phones.