pubnub 3.5.14 → 3.6.7

data/fixtures/vcr_cassettes/where_now-ssl-parameter-valid-200-async.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/v2/presence/sub-key/demo/uuid/demo_uuid?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.3&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Apr 2014 11:22:29 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '84'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Accept-Ranges:
+      - bytes
+      Age:
+      - '0'
+      Server:
+      - Pubnub Presence
+    body:
+      encoding: UTF-8
+      string: '{"status": 200, "message": "OK", "payload": {"channels": []}, "service":
+        "Presence"}'
+    http_version: 
+  recorded_at: Mon, 28 Apr 2014 11:22:28 GMT
+recorded_with: VCR 2.9.0

data/fixtures/vcr_cassettes/where_now-ssl-parameter-valid-200-sync.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/v2/presence/sub-key/demo/uuid/demo_uuid?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.3&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Apr 2014 11:22:29 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '84'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Accept-Ranges:
+      - bytes
+      Age:
+      - '0'
+      Server:
+      - Pubnub Presence
+    body:
+      encoding: UTF-8
+      string: '{"status": 200, "message": "OK", "payload": {"channels": []}, "service":
+        "Presence"}'
+    http_version: 
+  recorded_at: Mon, 28 Apr 2014 11:22:28 GMT
+recorded_with: VCR 2.9.0

data/fixtures/vcr_cassettes/where_now-ssl-parameter-valid-non-200-async.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/v2/presence/sub-key/demo/uuid/demo_uuid?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.3&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 500
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Apr 2014 11:22:29 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '84'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Accept-Ranges:
+      - bytes
+      Age:
+      - '0'
+      Server:
+      - Pubnub Presence
+    body:
+      encoding: UTF-8
+      string: '{"status": 200, "message": "OK", "payload": {"channels": []}, "service":
+        "Presence"}'
+    http_version: 
+  recorded_at: Mon, 28 Apr 2014 11:22:28 GMT
+recorded_with: VCR 2.9.0

data/fixtures/vcr_cassettes/where_now-ssl-parameter-valid-non-200-sync.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/v2/presence/sub-key/demo/uuid/demo_uuid?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.3&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 500
+      message: OK
+    headers:
+      Date:
+      - Mon, 28 Apr 2014 11:22:29 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '84'
+      Connection:
+      - keep-alive
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+      Accept-Ranges:
+      - bytes
+      Age:
+      - '0'
+      Server:
+      - Pubnub Presence
+    body:
+      encoding: UTF-8
+      string: '{"status": 200, "message": "OK", "payload": {"channels": []}, "service":
+        "Presence"}'
+    http_version: 
+  recorded_at: Mon, 28 Apr 2014 11:22:28 GMT
+recorded_with: VCR 2.9.0

data/lib/pubnub.rb

@@ -6,7 +6,7 @@
 ## http://www.pubnub.com/
 
 ## -----------------------------------
-## PubNub 3.5.1 Real-time Push Cloud API
+## PubNub Real-time Push Cloud API
 ## -----------------------------------
 
 require 'json'
@@ -18,7 +18,6 @@ require 'net/http/persistent'
 require 'logger'
 
 require 'pubnub/version'
-
 require 'pubnub/client'
 
 

data/lib/pubnub/client.rb

@@ -16,7 +16,7 @@ module Pubnub
     attr_reader :env
     attr_accessor :single_event_connections_pool, :subscribe_event_connections_pool, :uuid, :async_events
 
-    EVENTS = %w(publish subscribe presence leave history here_now audit grant revoke time heartbeat)
+    EVENTS = %w(publish subscribe presence leave history here_now audit grant revoke time heartbeat where_now state set_state)
     VERSION = Pubnub::VERSION
 
     EVENTS.each do |event_name|
@@ -35,11 +35,56 @@ module Pubnub
 
     def initialize(options)
       validate!(options)
-      setup_app(options)
-      # From this moment we have to use @env in that method instead of options
+      setup_app(options) # After that we have to use @env in that method instead of options
       create_connections_pools(@env)
       create_subscriptions_pools(@env)
-      start_event_machine(@env)
+      # start_event_machine(@env)
+    end
+
+    def paged_history(options = {}, &block)
+      channel  = options[:channel]
+      page     = options[:page]      || 1
+      limit    = options[:limit]     || 100
+      callback = options[:callback]  || block
+      sync     = options[:http_sync] ? true : false
+      start_tt = options[:start]     || nil
+      end_tt   = options[:end]       || nil
+
+      current_start_tt = start_tt
+
+      if sync
+
+          puts "page = #{page}"
+          envelopes = nil
+          page.times do
+            envelopes = self.history(:channel => channel, :http_sync => true, :count => limit, :start => current_start_tt, :end => end_tt)
+            current_start_tt = envelopes.last.history_start.to_i - 1
+          end
+
+          envelopes.each do |envelope|
+            callback.call envelope
+          end if callback
+
+
+      else
+        EM.defer do
+          until msgs.size <= page * entries
+            msgs.merge!(self.history(:channel => channel, :http_sync => true, :start => start_tt, :end => end_tt, :limit => entries))
+          end
+
+          msgs.reverse[0..entries].each do |envelope|
+            callback.call envelope
+          end
+
+        end
+      end
+
+      envelopes
+
+    end
+
+    def state_for(origin = DEFAULT_ORIGIN)
+      @env[:state][origin]
     end
 
     def shutdown(stop_em = false)
@@ -63,6 +108,27 @@ module Pubnub
       $logger.info('Pubnub'){'Bye!'}
     end
 
+    def stop_async
+      $logger.debug('Pubnub'){'Pubnub::Client#stop_async | fired'}
+      @env[:subscribe_railgun].cancel unless @env[:subscribe_railgun].blank?
+      @env[:respirator].cancel        unless @env[:respirator].blank?
+      @env[:subscribe_railgun].cancel unless @env[:subscribe_railgun].blank?
+
+      @env[:subscribe_railgun] = nil
+      @env[:respirator] = nil
+      @env[:subscribe_railgun] = nil
+
+      EM.stop
+
+      $logger.debug('Pubnub'){'Pubnub::Client#stop_async | timers killed'}
+    end
+
+    def restore_async
+      start_event_machine
+      start_subscribe unless @env[:subscriptions].blank?
+      start_railgun
+    end
+
     def start_respirator
       $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | fired'}
       if @env[:heartbeat]
@@ -99,29 +165,38 @@ module Pubnub
         end
       end
 
-      @env[:wait_for_response] = Hash.new unless @wait_for_response
-      @env[:subscribe_railgun] = EM.add_periodic_timer(PERIODIC_TIMER_INTERVAL) do
-        begin
-          @env[:subscriptions].each do |origin, subscribe|
-            unless @env[:wait_for_response][origin]
-              @env[:wait_for_response][origin] = true
+      if @env[:subscribe_railgun] && @subscribe_deffered_thread
+        $logger.debug('Pubnub'){'Pubnub::Client#start_subscribe | Aborting previous request'}
+        @subscribe_deffered_thread.kill
+        Thread.pass until @subscribe_deffered_thread.status == false
+      end
 
-              $logger.debug('Pubnub'){'Async subscription running'}
-              $logger.debug('Pubnub'){"origin: #{origin}"}
-              $logger.debug('Pubnub'){"timetoken: #{@env[:timetoken]}"}
+      @env[:wait_for_response] = Hash.new unless @wait_for_response
+      unless @env[:subscribe_railgun]
+        @env[:subscribe_railgun] = EM.add_periodic_timer(PERIODIC_TIMER_INTERVAL) do
+          begin
+            @env[:subscriptions].each do |origin, subscribe|
+              unless @env[:wait_for_response][origin]
+                @env[:wait_for_response][origin] = true
+
+                $logger.debug('Pubnub'){'Async subscription running'}
+                $logger.debug('Pubnub'){"origin: #{origin}"}
+                $logger.debug('Pubnub'){"timetoken: #{@env[:timetoken]}"}
+
+                EM.defer do
+                  @subscribe_deffered_thread = Thread.current
+                  subscribe.start_event(self) if subscribe
+                  # @env[:wait_for_response][origin] = false # moved to Event
+                end
 
-              EM.defer do
-                subscribe.start_event(self) if subscribe
-                # @env[:wait_for_response][origin] = false # moved to Event
               end
-
             end
+          rescue => e
+            $logger.error('Pubnub'){e}
+            $logger.error('Pubnub'){e.backtrace}
           end
-        rescue => e
-          $logger.error('Pubnub'){e}
-          $logger.error('Pubnub'){e.backtrace}
         end
-      end unless @env[:subscribe_railgun]
+      end
     end
 
     def subscription_running?
@@ -172,6 +247,7 @@ module Pubnub
     alias_method :cipher_key=, :set_cipher_key
 
     def start_railgun
+      start_event_machine(@env)
       if @env[:railgun]
         $logger.debug('Pubnub'){'Pubnub::Client#start_railgun | Railgun already initialized'}
       else

data/lib/pubnub/configuration.rb

@@ -1,7 +1,7 @@
 module Pubnub
   module Configuration
     DEFAULT_ERROR_CALLBACK             = lambda { |err| puts err.inspect }
-    DEFAULT_CONNECT_CALLBACK           = lambda { |msg| puts msg.inspect }
+    DEFAULT_CONNECT_CALLBACK           = lambda { |msg| msg.inspect }
     DEFAULT_SSL                        = false
     DEFAULT_CONNECTION_PORT            = 80
     DEFAULT_NON_SUBSCRIBE_TIMEOUT      = 310

data/lib/pubnub/envelope.rb

@@ -13,11 +13,12 @@ module Pubnub
         :object,
         :payload,
         :response,
+        :parsed_response,
         :response_message,
         :service,
         :status,
         :timetoken,
-        :timetoken_update,
+        :timetoken_update
     ]
 
     INSTANCE_VARIABLES.each do |var_name|
@@ -42,4 +43,4 @@ module Pubnub
     end
 
   end
-end
+end

data/lib/pubnub/event.rb

@@ -103,6 +103,7 @@ module Pubnub
 
       $logger.debug('Pubnub'){'Event#handle_response'}
       envelopes = format_envelopes(response, app, error)
+      $logger.debug('Pubnub'){"Response: #{response.body}"} if (response && response.body)
       update_app_timetoken(envelopes, app)
       fire_callbacks(envelopes,app)
       @finished = true
@@ -118,7 +119,7 @@ module Pubnub
       unless envelopes.blank?
         $logger.debug('Pubnub'){'Firing callbacks'}
         envelopes.each do |envelope|
-          @callback.call(envelope)       if !envelope.error && @callback && !envelope.timetoken_update
+          @callback.call(envelope)       if envelope && !envelope.error && @callback && !envelope.timetoken_update
           #if envelope.timetoken_update || envelope.timetoken.to_i > app.env[:timetoken].to_i
           #  update_timetoken(app, envelope.timetoken)
           #end
@@ -261,9 +262,8 @@ module Pubnub
     def new_connection(app)
       unless app.disabled_persistent_connection?
         connection = Net::HTTP::Persistent.new "pubnub_ruby_client_v#{Pubnub::VERSION}"
-        connection.idle_timeout   = app.env[:subscribe_timeout]
-        connection.read_timeout   = app.env[:subscribe_timeout]
-        @connect_callback.call "New connection to #{@origin}"
+        connection.idle_timeout = app.env[:timeout]
+        connection.read_timeout = app.env[:timeout]
         connection.proxy_from_env
         connection
       end
@@ -369,9 +369,14 @@ module Pubnub
     def parameters(app)
       parameters = super(app)
       parameters.merge!({:heartbeat => app.env[:heartbeat]}) if app.env[:heartbeat]
+      parameters.merge!({:state => encode_state(app.env[:state][@origin])}) if app.env[:state] && app.env[:state][@origin]
       parameters
     end
 
+    def encode_state(state)
+      URI.encode_www_form_component(state.to_json).gsub('+', '%20')
+    end
+
     def update_app_timetoken(envelopes, app)
       $logger.debug('Pubnub'){'Event#update_app_timetoken'}
       envelopes.each do |envelope|
@@ -524,7 +529,6 @@ module Pubnub
         connection.proxy_from_env
         connection
       end
-
     end
   end
 end