pubnub 4.0.27 → 4.0.28

data/lib/pubnub/crypto.rb

@@ -26,7 +26,7 @@ module Pubnub
     def decrypt(cipher_text)
       decode_cipher = OpenSSL::Cipher.new(@alg).decrypt
       decode_cipher.key = @key
-      decode_cipher.iv  = @iv
+      decode_cipher.iv = @iv
 
       plain_text = decryption(cipher_text, decode_cipher)
       load_json(plain_text)
@@ -42,7 +42,7 @@ module Pubnub
       undecoded_text = Base64.decode64(cipher_text)
       plain_text = decode_cipher.update(undecoded_text)
       plain_text << decode_cipher.final
-    rescue => e
+    rescue StandardError => e
       Pubnub.error('Pubnub') { "DECRYPTION ERROR #{e}" }
       '"DECRYPTION ERROR"'
     end

data/lib/pubnub/envelope.rb

@@ -10,13 +10,13 @@ module Pubnub
     attr_accessor :status, :result, :timetoken
 
     def initialize(options)
-      @id            = UUID.generate # internal usage only
+      @id = UUID.generate # internal usage only
 
-      @event         = options[:event]
+      @event = options[:event]
       @event_options = options[:event_options]
-      @status        = options[:status]
-      @result        = options[:result]
-      @timetoken     = options[:timetoken]
+      @status = options[:status]
+      @result = options[:result]
+      @timetoken = options[:timetoken]
     end
 
     def repeat(client, changes = {})
@@ -31,12 +31,14 @@ module Pubnub
     def last?
       last
     end
+
     # :nocov:
 
     # :nocov:
     def first?
       first
     end
+
     # :nocov:
   end
 end

data/lib/pubnub/error.rb

@@ -5,9 +5,7 @@ module Pubnub
     attr_reader :env, :message
 
     def initialize(env = {})
-      unless env.instance_of? Hash
-        fail ::ArgumentError, 'Env passed to Pubnub::Error must be a hash'
-      end
+      raise ::ArgumentError, 'Env passed to Pubnub::Error must be a hash' unless env.instance_of? Hash
 
       @env = env
       @message = ''
@@ -20,13 +18,13 @@ module Pubnub
     private
 
     def build_message
-      insert_value 'operation',       @env[:operation]
-      insert_value 'request',         @env[:request]
-      insert_value 'env',             @env[:env]
-      insert_value 'app',             @env[:app]
-      insert_value 'response',        @env[:response]
-      insert_value 'error type',      @env[:error]
-      insert_value 'error message',   @env[:message]
+      insert_value 'operation', @env[:operation]
+      insert_value 'request', @env[:request]
+      insert_value 'env', @env[:env]
+      insert_value 'app', @env[:app]
+      insert_value 'response', @env[:response]
+      insert_value 'error type', @env[:error]
+      insert_value 'error message', @env[:message]
       insert_value 'error backtrace', backtrace
     end
 
@@ -39,9 +37,18 @@ module Pubnub
     end
   end
 
-  class JSONParseError < Error; end
-  class InitializationError < Error; end
-  class ArgumentError < Error; end
-  class RequestError < Error; end
-  class ResponseError < Error; end
+  class JSONParseError < Error
+  end
+
+  class InitializationError < Error
+  end
+
+  class ArgumentError < Error
+  end
+
+  class RequestError < Error
+  end
+
+  class ResponseError < Error
+  end
 end

data/lib/pubnub/event.rb

@@ -11,8 +11,8 @@ module Pubnub
                 :presence_callback, :wildcard_channel, :ssl, :state,
                 :given_options, :with_presence
 
-    alias_method :channels, :channel
-    alias_method :channel_groups, :channel_group
+    alias channels channel
+    alias channel_groups channel_group
 
     include Signature
     include EFormatter
@@ -41,8 +41,6 @@ module Pubnub
       envelopes = fire_callbacks(handle(response, uri))
       finalize_event(envelopes)
       envelopes
-    ensure
-      terminate unless @stay_alive
     end
 
     def send_request(compressed_body = '')
@@ -52,28 +50,28 @@ module Pubnub
       Pubnub.logger.debug('Pubnub::Event') { '#send_request got sender' }
 
       telemetry_time_start = ::Time.now.to_f
-      if @event == Pubnub::Constants::OPERATION_DELETE
-        response = sender.delete(uri.to_s)
-      elsif compressed_body.empty?
-        response = sender.get(uri.to_s)
-      else
-        response = sender.post(uri.to_s, body: compressed_body)
-      end
+      response = if @event == Pubnub::Constants::OPERATION_DELETE
+                   sender.delete(uri.to_s)
+                 elsif compressed_body.empty?
+                   sender.get(uri.to_s)
+                 else
+                   sender.post(uri.to_s, body: compressed_body)
+                 end
 
       begin
         @app.record_telemetry(@telemetry_name, telemetry_time_start, ::Time.now.to_f)
-      rescue => error
+      rescue StandardError => error
         Pubnub.logger.warn('Pubnub::Event') { "Couldn't record telemetry because of #{error}\n#{error.backtrace.join("\n")}" }
       end
 
-      return response
-    rescue => error
-      Pubnub.logger.error('Pubnub::Event'){ error }
+      response
+    rescue StandardError => error
+      Pubnub.logger.error('Pubnub::Event') { error }
       error
     end
 
     def uri(memo = true)
-      unless self.is_a? SubscribeEvent
+      unless is_a? SubscribeEvent
         return @uri = uri(false) if memo
         return @uri if @uri
       end
@@ -101,7 +99,7 @@ module Pubnub
 
     def secure_call(cb, arg)
       cb.call arg
-    rescue => error
+    rescue StandardError => error
       Pubnub.logger.error('Pubnub::Event') { "Error while calling callback #{error.inspect}" }
     end
 
@@ -122,10 +120,11 @@ module Pubnub
         @telemetry_name => @current_telemetry
       }
 
-      required.merge!(timestamp: @timestamp) if @app.env[:secret_key] && ![:grant, :revoke, :audit].include?(@event)
+      empty_if_blank[@telemetry_name] = nil if @app.env[:no_telemetry]
 
-      empty_if_blank.delete_if { |_k, v| v.blank? }
+      required[:timestamp] = @timestamp if @app.env[:secret_key] && !%i[grant revoke audit].include?(@event)
 
+      empty_if_blank.delete_if { |_k, v| v.blank? }
       required.merge(empty_if_blank)
     end
 
@@ -135,14 +134,14 @@ module Pubnub
     end
 
     def create_variables_from_options(options)
-      variables = %w(channel channels message http_sync callback
+      variables = %w[channel channels message http_sync callback
                      ssl cipher_key secret_key auth_key
                      publish_key subscribe_key timetoken
                      open_timeout read_timeout idle_timeout heartbeat
                      group action read write manage ttl presence start
                      end count reverse presence_callback store skip_validate
                      state channel_group channel_groups compressed meta customs include_token
-                     replicate with_presence cipher_key_selector)
+                     replicate with_presence cipher_key_selector]
 
       options = options.each_with_object({}) { |option, obj| obj[option.first.to_sym] = option.last }
 
@@ -176,16 +175,16 @@ module Pubnub
 
     def error_message(parsed_response)
       parsed_response['message']
-    rescue
+    rescue StandardError
       nil
     end
 
     def get_config
       {
-        tls:      @app.env[:ssl],
-        uuid:     @app.env[:uuid],
+        tls: @app.env[:ssl],
+        uuid: @app.env[:uuid],
         auth_key: @app.env[:auth_key],
-        origin:   @app.current_origin
+        origin: @app.current_origin
       }
     end
 

data/lib/pubnub/event/formatter.rb

@@ -5,12 +5,15 @@ module Pubnub
     # Module that holds formatters for events
     module EFormatter
       def format_envelopes(response, request)
-        if response.kind_of?(HTTPClient::TimeoutError) || response.is_a?(OpenSSL::SSL::SSLError)
-          return error_envelope(nil, response, request: request, response: response)
-        else
-          parsed_response, error = Formatter.parse_json(response.body)
+        if response.is_a?(HTTPClient::TimeoutError) || response.is_a?(OpenSSL::SSL::SSLError)
+          return error_envelope(nil,
+                                response,
+                                request: request,
+                                response: response)
         end
 
+        parsed_response, error = Formatter.parse_json(response.body)
+
         error = response if parsed_response && response.code.to_i != 200
 
         if error
@@ -21,7 +24,7 @@ module Pubnub
       end
 
       def format_channels
-        @channel =  Formatter.format_channel(@channel || @channels)
+        @channel = Formatter.format_channel(@channel || @channels)
         @channel += Formatter.format_presence_channel(@presence)
         @channel += Formatter.format_presence_channel(@channel || @channels) if @with_presence
         @wildcard_channel = @channel.select { |e| e.index('.*') } || []

data/lib/pubnub/event/signature.rb

@@ -13,7 +13,7 @@ module Pubnub
           @app.env[:subscribe_key],
           @app.env[:publish_key],
           path,
-          variables_for_signature.gsub(/[!~'()*]/) { |char| '%' + char.ord.to_s(16).upcase } # Replace ! ~ * ' ( )
+          variables_for_signature.gsub(/[!~'()*]/) { |char| '%' + char.ord.to_s(16).upcase }, # Replace ! ~ * ' ( )
         ].join("\n")
 
         URI.encode_www_form_component(Base64.encode64(
@@ -24,10 +24,10 @@ module Pubnub
 
       def variables_for_signature
         parameters(true).map do |k, v|
-          if %w(meta ortt).include?(k.to_s)
+          if %w[meta ortt].include?(k.to_s)
             encoded_value = URI.encode_www_form_component(v.to_json).gsub('+', '%20')
             "#{k}=#{encoded_value}"
-          elsif %w(t state filter-expr).include?(k.to_s)
+          elsif %w[t state filter-expr].include?(k.to_s)
             "#{k}=#{v}"
           else
             "#{k}=#{URI.encode_www_form_component(v.to_s).gsub('+', '%20')}"

data/lib/pubnub/events/audit.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds here_now functionality
   class Audit < PAM
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Audit
 
     def initialize(options, app)

data/lib/pubnub/events/channel_registration.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds channel_registration functionality
   class ChannelRegistration < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::ChannelRegistration
 
     def initialize(options, app)
@@ -16,13 +16,9 @@ module Pubnub
 
     def parameters(*_args)
       parameters = super
-      if @action == :add && !@channel.blank?
-        parameters.merge!(add: Formatter.channels_for_url(@channel, false))
-      end
+      parameters[:add] = Formatter.channels_for_url(@channel, false) if @action == :add && !@channel.blank?
 
-      if @action == :remove && !@channel.blank?
-        parameters.merge!(remove: Formatter.channels_for_url(@channel, false))
-      end
+      parameters[:remove] = Formatter.channels_for_url(@channel, false) if @action == :remove && !@channel.blank?
 
       parameters
     end
@@ -31,15 +27,15 @@ module Pubnub
       head = "/v1/channel-registration/sub-key/#{@subscribe_key}/"
 
       body = case @action
-             when :list_groups then
+             when :list_groups
                body_list_groups
-             when :list_namespaces then
+             when :list_namespaces
                body_list_namespaces
-             when :get then
+             when :get
                body_get
-             when :add then
+             when :add
                body_add
-             when :remove then
+             when :remove
                body_remove
              else
                raise_action_key_error
@@ -49,7 +45,7 @@ module Pubnub
     end
 
     def raise_action_key_error
-      fail ArgumentError.new(
+      raise ArgumentError.new(
         object: self,
         message: 'ChannelRegistration requires proper :action key'
       ), 'ChannelRegistration requires proper :action key'
@@ -102,7 +98,7 @@ module Pubnub
         event_options: @given_options,
         timetoken: nil,
         status: {
-          code: req_res_objects [:response].code,
+          code: req_res_objects[:response].code,
           operation: define_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
@@ -118,7 +114,6 @@ module Pubnub
 
           config: get_config
         },
-
         result: {
           data: parsed_response['payload'],
           code: req_res_objects[:response].code,

data/lib/pubnub/events/delete_messages.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds delete functionality
   class DeleteMessages < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Delete
 
     def initialize(options, app)
@@ -21,21 +21,21 @@ module Pubnub
       {
         start: @start,
         end: @end
-      }.select { |_, value| !value.blank? }.merge(super(signature))
+      }.reject { |_, value| value.blank? }.merge(super(signature))
     end
 
     def path
       '/' + [
-          'v3',
-          'history',
-          'sub-key',
-          @subscribe_key,
-          'channel',
-          @channel
+        'v3',
+        'history',
+        'sub-key',
+        @subscribe_key,
+        'channel',
+        @channel
       ].join('/')
     end
 
-    def valid_envelope(parsed_response, req_res_objects)
+    def valid_envelope(_parsed_response, req_res_objects)
       Pubnub::Envelope.new(
         event: @event,
         event_options: @given_options,

data/lib/pubnub/events/grant.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds grant functionality
   class Grant < PAM
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Grant
 
     def initialize(options, app)
@@ -18,8 +18,8 @@ module Pubnub
     end
 
     def parameters(signature = false)
-      write  = [0, '0', false].include?(@write) ? 0 : 1
-      read   = [0, '0', false].include?(@read) ? 0 : 1
+      write = [0, '0', false].include?(@write) ? 0 : 1
+      read = [0, '0', false].include?(@read) ? 0 : 1
       manage = [0, '0', false].include?(@manage) ? 0 : 1 # unless @group.blank?
 
       { timestamp: @timestamp,

data/lib/pubnub/events/heartbeat.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds heartbeat functionality
   class Heartbeat < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Heartbeat
     include Pubnub::Formatter
 
@@ -32,13 +32,9 @@ module Pubnub
 
     def parameters(*_args)
       parameters = super
-      if @app.env[:state] && @app.env[:state][@origin]
-        parameters.merge!(state: encode_state(@app.env[:state][@origin]))
-      end
-      parameters.merge!(heartbeat: @heartbeat)
-      parameters.merge!(
-        'channel-group' => @group.join(',')
-      ) unless @group.blank?
+      parameters[:state] = encode_state(@app.env[:state][@origin]) if @app.env[:state] && @app.env[:state][@origin]
+      parameters[:heartbeat] = @heartbeat
+      parameters['channel-group'] = @group.join(',') unless @group.blank?
       parameters
     end
 

data/lib/pubnub/events/here_now.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds here_now functionality
   class HereNow < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::HereNow
 
     def initialize(options, app)
@@ -49,17 +49,14 @@ module Pubnub
 
     def parameters(*_args)
       parameters = super
-      parameters.merge!(
-        'channel-group' => @group.join(',')
-      ) unless @group.blank?
+      parameters['channel-group'] = @group.join(',') unless @group.blank?
       parameters
     end
 
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
-        event:           @event,
-        event_options:   @given_options,
-
+        event: @event,
+        event_options: @given_options,
         result: {
           code: req_res_objects[:response].code,
           operation: get_operation,
@@ -73,7 +70,6 @@ module Pubnub
             channels: (parsed_response['payload'] ? parsed_response['payload']['channels'] : nil)
           }
         },
-
         status: {
           code: req_res_objects[:response].code,
           client_request: req_res_objects[:request],