pubnub 3.3.0.1 → 3.3.0.2

data/lib/pubnub.rb

@@ -15,9 +15,10 @@ require 'uri'
 
 require 'pubnub_crypto'
 require 'pubnub_request'
-require 'pubnub_deferrable'
 
 require 'eventmachine'
+require 'em-http-request'
+require 'yajl'
 require 'uuid'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/inflections'
@@ -95,7 +96,7 @@ class Pubnub
 
     publish_request.format_url!
 
-    _request(publish_request)
+    check_for_em publish_request
   end
 
   def subscribe(options)
@@ -117,7 +118,7 @@ class Pubnub
     format_url_options = options[:override_timetoken].present? ? options[:override_timetoken] : nil
     subscribe_request.format_url!(format_url_options)
 
-    _request(subscribe_request)
+    check_for_em subscribe_request
 
   end
 
@@ -159,7 +160,7 @@ class Pubnub
     here_now_request.set_subscribe_key(options, self.subscribe_key)
 
     here_now_request.format_url!
-    _request(here_now_request)
+    check_for_em here_now_request
 
   end
 
@@ -195,7 +196,7 @@ class Pubnub
     detailed_history_request.history_reverse = options[:reverse]
 
     detailed_history_request.format_url!
-    _request(detailed_history_request)
+    check_for_em detailed_history_request
 
   end
 
@@ -227,7 +228,7 @@ class Pubnub
     history_request.history_limit = options[:limit]
 
     history_request.format_url!
-    _request(history_request)
+    check_for_em history_request
 
   end
 
@@ -239,7 +240,7 @@ class Pubnub
     time_request.set_callback(options)
 
     time_request.format_url!
-    _request(time_request)
+    check_for_em time_request
   end
 
   def my_callback(x, quiet = false)
@@ -255,101 +256,73 @@ class Pubnub
     UUID.new.generate
   end
 
-  def _request(request)
-
-    if (defined?(Rails) && Rails.present? && Rails.env.present?) && Rails.env.test?
-
-      open(request.url, 'r', :read_timeout => 300) do |response|
-        request.package_response!(response.read)
-        request.callback.call(request.response)
-        request.response
-      end
-
+  def check_for_em request
+    if EM.reactor_running?
+      _request(request, true)
     else
+      EM.run do
+        _request(request)
+      end
+    end
+  end
 
-      request.format_url!
-      #puts("- Fetching #{request.url}")
-
+  private
+  
+  def _request(request, is_reactor_running = false)
+    request.format_url!
+    #puts("- Fetching #{request.url}")
+    Thread.new{
       begin
 
-        EM.run do
-
-          conn = PubnubDeferrable.connect request.host, request.port
-          conn.pubnub_request = request
-          req = conn.get(request.query)
-
-          timeout_timer = EM.add_periodic_timer(290) do
-            #puts("#{Time.now}: Reconnecting from timeout.")
-            reconnect_and_query(conn, request)
-          end
+        conn = EM::HttpRequest.new(request.url, :inactivity_timeout => 310)#client times out in 310s unless the server returns or timeout first
+        req = conn.get()
 
-          error_timer = EM.add_periodic_timer(5) do
-            #puts("#{Time.now}: Checking for errors.")
-            if conn.error?
+        req.errback{
+          if req.response.blank?
+            puts("#{Time.now}: Reconnecting from timeout.")
 
-              error_message = "Intermittent Error: #{response.status}, extended info: #{response.internal_error}"
-              puts(error_message)
-              request.callback.call([0, error_message])
-
-              reconnect_and_query(conn, request)
+            EM::Timer.new(1) do
+              _request(request, is_reactor_running)
             end
-          end
-
-          req.errback do |response|
-            conn.close_connection
-            error_message = "Unknown Error: #{response.to_s}"
-
+          else
+            error_message = "Unknown Error: #{req.response.to_s}"
             puts(error_message)
             request.callback.call([0, error_message])
 
-            reconnect_and_query(conn, request)
+            EM.stop unless is_reactor_running
           end
+        }
 
-          req.callback do |response|
-
-            if response.status != 200
-              error_message = "Server Error, status: #{response.status}, extended info: #{response.internal_error}"
-
-              puts(error_message)
-              request.callback.call([0, error_message])
-
-              conn.reconnect request.host, request.port
-            end
-
-            request.package_response!(response.content)
-            request.callback.call(request.response)
-
-            EM.next_tick do
-              if %w(subscribe presence).include?(request.operation)
-                conn.close_connection
+        req.callback {
+          request.package_response!(req.response)
+          cycle = request.callback.call(request.response)
 
-                timeout_timer.cancel
-                error_timer.cancel
+          only_success_status_is_acceptable = 200
 
-                _request(request)
-              else
-                conn.close_connection
-                return request.response
+          if (req.response_header.http_status.to_i != only_success_status_is_acceptable)
 
-              end
+            error_message = "Server Error, status: #{req.response_header.http_status}, extended info: #{req.response}"
+            puts(error_message)
+            EM.stop unless is_reactor_running
+          else
 
+            if %w(subscribe presence).include?(request.operation) && (cycle != false || request.first_request?)
+              _request(request, is_reactor_running)
+            else
+              EM.stop unless is_reactor_running
             end
+
           end
-        end
+        }
 
-      rescue EventMachine::ConnectionError => e
+      rescue EventMachine::ConnectionError, RuntimeError => e # RuntimeError for catching "EventMachine not initialized"
         error_message = "Network Error: #{e.message}"
         puts(error_message)
         return [0, error_message]
       end
-
-    end
+    }
   end
 
-  def reconnect_and_query(conn, request)
-    conn.reconnect request.host, request.port
-    conn.pubnub_request = request
-    conn.get(request.query)
-  end
+
 
 end

data/lib/pubnub_request.rb

@@ -1,6 +1,6 @@
 class PubnubRequest
   attr_accessor :cipher_key, :host, :query, :response, :timetoken, :url, :operation, :callback, :publish_key, :subscribe_key, :secret_key, :channel, :jsonp, :message, :ssl, :port
-  attr_accessor :history_limit, :history_count, :history_start, :history_end, :history_reverse, :session_uuid
+  attr_accessor :history_limit, :history_count, :history_start, :history_end, :history_reverse, :session_uuid, :last_timetoken
 
   class RequestError < RuntimeError;
   end
@@ -142,6 +142,7 @@ class PubnubRequest
 
   def package_response!(response_data)
     self.response = response_data.respond_to?(:content) ? Yajl.load(response_data.content) : Yajl.load(response_data)
+    self.last_timetoken = self.timetoken
     self.timetoken = self.response[1] unless self.operation == "time"
 
     if self.cipher_key.present? && %w(subscribe history detailed_history).include?(self.operation)
@@ -284,4 +285,8 @@ class PubnubRequest
     return url
   end
 
+  def first_request?
+    @last_timetoken == "0"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 3.3.0.1
+  version: 3.3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-18 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -32,17 +32,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.9
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +99,6 @@ extra_rdoc_files: []
 files:
 - lib/pubnub.rb
 - lib/pubnub_crypto.rb
-- lib/pubnub_deferrable.rb
 - lib/pubnub_request.rb
 homepage: http://github.com/pubnub/pubnub-api
 licenses:

data/lib/pubnub_deferrable.rb

@@ -1,37 +0,0 @@
-require 'eventmachine'
-
-class PubnubDeferrable < EM::Protocols::HttpClient2
-
-  include EM::Deferrable
-
-  attr_accessor :start_time, :end_time, :elapsed_time, :pubnub_request
-
-  def initialize
-    super
-  end
-
-  def post_init
-    #puts("deferrable says my query is: #{pubnub_request.query}")
-    super
-  end
-
-  def connection_completed
-    @start_time = Time.now
-    #puts("\n--- #{@start_time}: Connected with string: #{self.pubnub_request.query}")
-    super
-  end
-
-  def unbind
-    @end_time = Time.now
-
-    if @start_time == nil
-      @start_time = Time.now
-    end
-
-    #puts("-- #{@end_time}: Disconnected.")
-    #puts("--- Elapsed connection time: #{@end_time - @start_time}s")
-    super
-  end
-
-
-end