Merge pull request pubnub#51 from nickveys/ruby-stack-overflow

Ruby gem stack overflow

ruby/.gitignore

@@ -0,0 +1 @@
+pkg

ruby/lib/pubnub.rb

@@ -100,7 +100,6 @@ def subscribe(args)
         ## Capture User Input
         channel   = args['channel']
         callback  = args['callback']
-        timetoken = args['timetoken'] ? args['timetoken'] : 0
 
         ## Fail if missing channel
         if !channel
@@ -114,39 +113,36 @@ def subscribe(args)
             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