pubnub 4.0.9 → 4.0.12

data/lib/pubnub/events/history.rb

@@ -12,6 +12,10 @@ module Pubnub
 
     private
 
+    def current_operation
+      Pubnub::Constants::OPERATION_HISTORY
+    end
+
     def timetoken(message)
       message['timetoken'] if @include_token
     end
@@ -41,7 +45,7 @@ module Pubnub
       ].join('/')
     end
 
-    def parameters
+    def parameters(*_args)
       params = super
       params.merge!(start:   @start)       if @start
       params.merge!(end:     @end)         if @end
@@ -51,18 +55,6 @@ module Pubnub
       params
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      if error
-        error_envelope(parsed_response, error, request: uri, response: response)
-      else
-        valid_envelope(parsed_response, request: request, response: response)
-                  end
-    end
-
     def valid_envelope(parsed_response, req_res_objects)
       messages = parsed_response[0]
 
@@ -110,30 +102,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_HEARTBEAT,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          current_timetoken: nil,
-          last_timetoken: nil,
-          subscribed_channels: nil,
-          subscribed_channel_groups: nil,
-
-          config: get_config
-        }
-      )
-    end
   end
 end

data/lib/pubnub/events/leave.rb

@@ -18,6 +18,10 @@ module Pubnub
 
     private
 
+    def current_operation
+      Pubnub::Constants::OPERATION_PRESENCE_LEAVE
+    end
+
     def path
       '/' + [
         'v2',
@@ -30,20 +34,6 @@ module Pubnub
       ].join('/')
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      envelopes = if error
-                    error_envelope(parsed_response, error, request: request, response: response)
-                  else
-                    valid_envelope(parsed_response, request: request, response: response)
-                  end
-
-      envelopes
-    end
-
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event: @event,
@@ -68,30 +58,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_HEARTBEAT,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          current_timetoken: nil,
-          last_timetoken: nil,
-          subscribed_channels: nil,
-          subscribed_channel_groups: nil,
-
-          config: get_config
-        }
-      )
-    end
   end
 end

data/lib/pubnub/events/presence.rb

@@ -15,5 +15,11 @@ module Pubnub
       @channel = Formatter.format_channel(@channel || @channels)
       @channel = @channel.map { |c| c + '-pnpres' }
     end
+
+    private
+
+    def current_operation
+      Pubnub::Constants::OPERATION_PRESENCE
+    end
   end
 end

data/lib/pubnub/events/publish.rb

@@ -10,7 +10,9 @@ module Pubnub
     def initialize(options, app)
       @event = :publish
       super
-      @sequence_number = nil
+      @sequence_number        = sequence_number!
+      @origination_time_token = @app.generate_ortt
+
       @store = case @store
                when false
                  0
@@ -33,15 +35,17 @@ module Pubnub
       finalize_event(envelopes)
       envelopes
     ensure
-      # sender.terminate if @http_sync
       terminate unless @stay_alive
     end
 
     private
 
-    def parameters
-      @sequence_number        = sequence_number!
-      @origination_time_token = @app.generate_ortt
+    def current_operation
+      Pubnub::Constants::OPERATION_PUBLISH
+    end
+
+    def parameters(*_args)
+      params = super
 
       empty_if_blank = {
         store: @store,
@@ -51,12 +55,12 @@ module Pubnub
       replication = @replicate == false ? { norep: true } : {}
 
       empty_if_blank.delete_if { |_k, v| v.blank? }
-      params = {}
+
       params = params.merge(empty_if_blank)
       params = params.merge(replication)
       params = params.merge(seqn: @sequence_number,
-                            ortt: Formatter.encode({ t: @origination_time_token }.to_json))
-      super.merge(params)
+                            ortt: { t: @origination_time_token })
+      params
     end
 
     def path
@@ -91,18 +95,6 @@ module Pubnub
       nil
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      if error
-        error_envelope(parsed_response, error, request: request, response: response)
-      else
-        valid_envelope(parsed_response, request: request, response: response)
-                  end
-    end
-
     def valid_envelope(_parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event: @event,
@@ -127,30 +119,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_PUBLISH,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          current_timetoken: nil,
-          last_timetoken: nil,
-          subscribed_channels: nil,
-          subscribed_channel_groups: nil,
-
-          config: get_config
-        }
-      )
-    end
   end
 end

data/lib/pubnub/events/revoke.rb

@@ -13,6 +13,10 @@ module Pubnub
 
     private
 
+    def current_operation
+      Pubnub::Constants::OPERATION_REVOKE
+    end
+
     def parameters(signature = false)
       write  = [0, '0', false].include?(@write) ? 1 : 0
       read   = [0, '0', false].include?(@read) ? 1 : 0

data/lib/pubnub/events/set_state.rb

@@ -13,7 +13,11 @@ module Pubnub
 
     private
 
-    def parameters
+    def current_operation
+      Pubnub::Constants::OPERATION_SET_STATE
+    end
+
+    def parameters(*_args)
       parameters = super
       parameters.merge!(state: encode_parameter(@state))
       parameters.merge!('channel-group' => format_channel_group(@group).join(',')) unless @group.blank?
@@ -34,18 +38,6 @@ module Pubnub
       ].join('/')
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      if error
-        error_envelope(parsed_response, error, request: request, response: response)
-      else
-        valid_envelope(parsed_response, request: request, response: response)
-      end
-    end
-
     def valid_envelope(_parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event: @event,
@@ -70,25 +62,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_SET_STATE,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          config: get_config
-        }
-      )
-    end
   end
 end

data/lib/pubnub/events/state.rb

@@ -14,7 +14,11 @@ module Pubnub
 
     private
 
-    def parameters
+    def current_operation
+      Pubnub::Constants::OPERATION_GET_STATE
+    end
+
+    def parameters(*_args)
       parameters = super
       parameters.merge!(
         'channel-group' => @group.join(',')
@@ -35,18 +39,6 @@ module Pubnub
       ].join('/')
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      if error
-        error_envelope(parsed_response, error, request: request, response: response)
-      else
-        valid_envelope(parsed_response, request: request, response: response)
-                 end
-    end
-
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event:         @event,
@@ -82,30 +74,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_HEARTBEAT,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          current_timetoken: nil,
-          last_timetoken: nil,
-          subscribed_channels: nil,
-          subscribed_channel_groups: nil,
-
-          config: get_config
-        }
-      )
-    end
   end
 end

data/lib/pubnub/events/subscribe.rb

@@ -15,5 +15,11 @@ module Pubnub
     def clear_state
       @state = nil
     end
+
+    private
+
+    def current_operation
+      Pubnub::Constants::OPERATION_SUBSCRIBE
+    end
   end
 end

data/lib/pubnub/events/time.rb

@@ -12,6 +12,10 @@ module Pubnub
 
     private
 
+    def current_operation
+      Pubnub::Constants::OPERATION_TIME
+    end
+
     def path
       '/time/0'
     end
@@ -22,18 +26,6 @@ module Pubnub
       nil
     end
 
-    def format_envelopes(response, request)
-      parsed_response, error = Formatter.parse_json(response.body)
-
-      error = response if parsed_response && response.code.to_i != 200
-
-      if error
-        error_envelope(parsed_response, error, request: request, response: response)
-      else
-        valid_envelope(parsed_response, request: request, response: response)
-                 end
-    end
-
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event: @event,
@@ -64,30 +56,5 @@ module Pubnub
         }
       )
     end
-
-    def error_envelope(_parsed_response, error, req_res_objects)
-      Pubnub::ErrorEnvelope.new(
-        event: @event,
-        event_options: @given_options,
-        timetoken: nil,
-        status: {
-          code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_HEARTBEAT,
-          client_request: req_res_objects[:request],
-          server_response: req_res_objects[:response],
-          data: nil,
-          category: (error ? Pubnub::Constants::STATUS_NON_JSON_RESPONSE : Pubnub::Constants::STATUS_ERROR),
-          error: true,
-          auto_retried: false,
-
-          current_timetoken: nil,
-          last_timetoken: nil,
-          subscribed_channels: nil,
-          subscribed_channel_groups: nil,
-
-          config: get_config
-        }
-      )
-    end
   end
 end