pubnub 3.7.7 → 3.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e930123aa3744cc2502f5c149ff6d3ac84bb2b3
-  data.tar.gz: f40e73b54f5d772900442f8f781e59cb86e3b0b5
+  metadata.gz: 62193ab10214d59518c9062bc59e8c3c8d2f1734
+  data.tar.gz: 853adb652e08e97ae375053f4c946820ee6af4f4
 SHA512:
-  metadata.gz: b7f919110b50b429783472663fd4d66c6790dc61b2e0956f1b77d0190148cde22fa2d2d763817dbd9bdb106ace6bd5ec4fc3e3e0dc950e2f7982c2aafae04735
-  data.tar.gz: b1a6b6020cc24a3a3c960a13f54084b3b4ee228e426b378a6df6215c0f8871e8a5b40adb7b0a504193681a88f9329fd221497380dea8cd2cc52cf3e567c70583
+  metadata.gz: 1fb7d4e826de2989190dc60ba0e04eba377ab46300cc13f1ab506e4eca0bb825fb06a04caa412384df76716a950429adadbe8480b10b336c51c2b7c6acca8eaa
+  data.tar.gz: 9b137577a94359da14c6e044e0cba58fe06300fc1938826ef5c2dc811ca8e55d394eb959a2d356d5b120e3cdd4a71b87cf47c30580a01a3bb117731f501abe21

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+3.7.9 Release
+. Secured calling callbacks
+. Reestablishing subscription improved
+
+3.7.8 Release
+. Connect callback is fired after subscription starts working
+
 3.7.7 Release
 . Small wildcard fix
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (3.7.6)
+    pubnub (3.7.9)
       eventmachine (~> 1.0)
       json (~> 1.8)
       net-http-persistent (~> 2.9)
@@ -57,4 +57,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.10.3
+   1.10.6

data/README.md

@@ -6,7 +6,7 @@ Give it a try and share with us your thoughts!
 
 # Please direct all Support Questions and Concerns to Support@PubNub.com
 
-## PubNub Gem version 3.7.6
+## PubNub Gem version 3.7.9
 
 ##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
 ##### http://www.pubnub.com/account

data/VERSION

@@ -1 +1 @@
-3.7.6
+3.7.9

data/lib/pubnub/client.rb

@@ -211,6 +211,7 @@ module Pubnub
     end
 
     def update_timetoken(timetoken)
+      @env[:connect_callback].call "New connection to #{@origin}" if @env[:timetoken] == 0 && @env[:connect_callback]
       @env[:timetoken] = timetoken.to_i
       Pubnub.logger.debug(:pubnub){"Pubnub::Client#update_timetoken | Current timetoken is eq #{@env[:timetoken]}"}
     end
@@ -312,6 +313,7 @@ module Pubnub
       @env = symbolize_options_keys(options)
       @env = set_default_values(@env)
       @env.delete_if { |_,v| v.blank? } # nillify if blank
+      @env[:timetoken] = 0
       @async_events = Array.new
       Pubnub.logger.debug(:pubnub){"\n\nCreated new Pubnub::Client instance"}
     end
@@ -333,6 +335,7 @@ module Pubnub
           :subscribe_timeout          => DEFAULT_SUBSCRIBE_TIMEOUT,
           :timeout                    => DEFAULT_NON_SUBSCRIBE_TIMEOUT,
           :max_retries                => MAX_RETRIES,
+          :retries_interval           => RETRIES_INTERVAL,
           :non_subscribe_timeout      => DEFAULT_NON_SUBSCRIBE_TIMEOUT,
           :reconnect_max_attempts     => DEFAULT_RECONNECT_ATTEMPTS,
           :reconnect_retry_interval   => DEFAULT_RECONNECT_INTERVAL,

data/lib/pubnub/event.rb

@@ -34,6 +34,14 @@ module Pubnub
       Pubnub.logger.debug(:pubnub){"Event#initialize | Initialized #{self.class.to_s}"}
     end
 
+    def secure_call(lambda, parameter)
+      begin
+        lambda.call parameter
+      rescue => e
+        Pubnub.logger.error(:pubnub){"Can't fire callback because: #{e}"}
+      end
+    end
+
     def fire(app)
       Pubnub.logger.debug(:pubnub){'Pubnub::Event#fire'}
       @fired = true
@@ -69,10 +77,13 @@ module Pubnub
         end
       rescue => e
         Pubnub.logger.error(:pubnub){e.inspect}
+        sleep app.env[:retries_interval]
         if count <= app.env[:max_retries]
           start_event(app, count + 1)
         else
           Pubnub.logger.error(:pubnub){"Aborting #{self.class} event due to network errors and reaching max retries"}
+          app.env[:subscribe_railgun].cancel if app.env[:subscribe_railgun]
+          app.env[:subscribe_railgun] = nil
         end
         false
       end
@@ -136,12 +147,12 @@ module Pubnub
         Pubnub.logger.debug(:pubnub){'Firing callbacks'}
         # EM.defer do
           envelopes.each do |envelope|
-            @callback.call(envelope)       if envelope && !envelope.error && @callback && !envelope.timetoken_update
+            secure_call(@callback, 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
           end
-          @error_callback.call(envelopes.first) if envelopes.first.error
+        secure_call(@error_callback, envelopes.first) if envelopes.first.error
         # end
       else
         Pubnub.logger.debug(:pubnub){'No envelopes for callback'}
@@ -523,18 +534,37 @@ module Pubnub
           Pubnub.logger.debug(:pubnub){'Event#fire_callbacks async'}
           envelopes.each do |envelope|
             if group_envelope?(envelope, app) # WITH GROUP
-              app.env[:callbacks_pool][:channel_group][@origin][envelope.channel_group][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
+              secure_call(
+                  app.env[:callbacks_pool][:channel_group][@origin][envelope.channel_group][:callback],
+                  envelope
+              ) if !envelope.error && !envelope.timetoken_update
             elsif channel_envelope?(envelope, app) # CHANNEL SUBSCRIBE
-              app.env[:callbacks_pool][:channel][@origin][encode_channel(envelope.channel)][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
+              secure_call(
+                  app.env[:callbacks_pool][:channel][@origin][encode_channel(envelope.channel)][:callback],
+                  envelope
+              ) if !envelope.error && !envelope.timetoken_update
             elsif wc_pnpres_envelope(envelope, app) # wildcard pnpres
-              app.env[:callbacks_pool][:wildcard_channel][@origin][encode_channel(envelope.wildcard_channel)][:presence_callback].call(envelope) if !envelope.error && !envelope.timetoken_update
+              secure_call(
+                  app.env[:callbacks_pool][:wildcard_channel][@origin][encode_channel(envelope.wildcard_channel)][:presence_callback],
+                  envelope
+              ) if !envelope.error && !envelope.timetoken_update
             elsif wc_envelope?(envelope, app) # wildcard
-              app.env[:callbacks_pool][:wildcard_channel][@origin][encode_channel(envelope.wildcard_channel)][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
+              secure_call(
+                  app.env[:callbacks_pool][:wildcard_channel][@origin][encode_channel(envelope.wildcard_channel)][:callback],
+                  envelope
+              ) if !envelope.error && !envelope.timetoken_update
             end
           end
           Pubnub.logger.debug(:pubnub){'We can send next request now'}
-          app.env[:error_callbacks_pool][:channel][@origin].call(envelopes.first)       if envelopes.first.error && !envelopes.first.channel_group
-          app.env[:error_callbacks_pool][:channel_group][@origin].call(envelopes.first) if envelopes.first.error &&  envelopes.first.channel_group
+          secure_call(
+              app.env[:error_callbacks_pool][:channel][@origin],
+              envelopes.first
+          ) if envelopes.first.error && !envelopes.first.channel_group
+
+          secure_call(
+              app.env[:error_callbacks_pool][:channel_group][@origin],
+              envelopes.first
+          ) if envelopes.first.error &&  envelopes.first.channel_group
 
         rescue => error
           Pubnub.logger.error(:pubnub){error}
@@ -706,7 +736,6 @@ module Pubnub
         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.proxy_from_env
         connection
       end

data/lib/pubnub/formatter.rb

@@ -44,7 +44,7 @@ module Pubnub
           message = pc.encrypt(message)
           URI.escape(message.to_json)
         rescue => error
-          @error_callback.call 'bug'
+          @error_callback.call error
         end
       else
         URI.encode_www_form_component(message.to_json).gsub('+', '%20')

data/lib/pubnub/version.rb

@@ -1,3 +1,3 @@
 module Pubnub
-  VERSION = '3.7.7'
+  VERSION = '3.7.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 3.7.7
+  version: 3.7.9
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine