pubnub 5.3.5 → 5.5.0

data/lib/pubnub/client.rb

@@ -1,85 +1,86 @@
 # frozen_string_literal: true
 
-require 'base64'
-
-require 'pubnub/error'
-require 'pubnub/uuid'
-require 'pubnub/formatter'
-require 'pubnub/constants'
-require 'pubnub/configuration'
-require 'pubnub/subscribe_callback'
-
-require 'pubnub/modules/crypto/module'
-
-require 'pubnub/schemas/envelope_schema'
-
-require 'pubnub/event'
-require 'pubnub/single_event'
-require 'pubnub/subscribe_event/callbacks'
-require 'pubnub/subscribe_event/formatter'
-require 'pubnub/subscribe_event/heartbeat'
-require 'pubnub/subscribe_event/adding'
-require 'pubnub/subscribe_event/removing'
-require 'pubnub/subscribe_event'
-require 'pubnub/pam'
-require 'pubnub/heart'
-require 'pubnub/subscriber'
-require 'pubnub/telemetry'
-
-require 'pubnub/envelope'
-require 'pubnub/error_envelope'
-
-require 'pubnub/client/events'
-require 'pubnub/client/paged_history'
-require 'pubnub/client/helpers'
-require 'pubnub/client/getters_setters'
-
-require 'pubnub/validators/get_message_actions'
-require 'pubnub/validators/add_message_action'
-require 'pubnub/validators/remove_message_action'
-require 'pubnub/validators/common_validator'
-require 'pubnub/validators/client'
-require 'pubnub/validators/audit'
-require 'pubnub/validators/channel_registration'
-require 'pubnub/validators/grant'
-require 'pubnub/validators/grant_token'
-require 'pubnub/validators/revoke_token'
-require 'pubnub/validators/heartbeat'
-require 'pubnub/validators/here_now'
-require 'pubnub/validators/history'
-require 'pubnub/validators/leave'
-require 'pubnub/validators/presence'
-require 'pubnub/validators/publish'
-require 'pubnub/validators/revoke'
-require 'pubnub/validators/set_state'
-require 'pubnub/validators/state'
-require 'pubnub/validators/subscribe'
-require 'pubnub/validators/time'
-require 'pubnub/validators/where_now'
-require 'pubnub/validators/delete'
-require 'pubnub/validators/message_counts'
-require 'pubnub/validators/add_channels_to_push'
-require 'pubnub/validators/list_push_provisions'
-require 'pubnub/validators/remove_channels_from_push'
-require 'pubnub/validators/remove_device_from_push'
-require 'pubnub/validators/signal'
-require 'pubnub/validators/set_uuid_metadata'
-require 'pubnub/validators/set_channel_metadata'
-require 'pubnub/validators/remove_uuid_metadata'
-require 'pubnub/validators/remove_channel_metadata'
-require 'pubnub/validators/get_uuid_metadata'
-require 'pubnub/validators/get_all_uuid_metadata'
-require 'pubnub/validators/get_channel_metadata'
-require 'pubnub/validators/get_all_channels_metadata'
-require 'pubnub/validators/get_channel_members'
-require 'pubnub/validators/get_memberships'
-require 'pubnub/validators/set_channel_members'
-require 'pubnub/validators/set_memberships'
-require 'pubnub/validators/remove_channel_members'
-require 'pubnub/validators/remove_memberships'
-require 'pubnub/cbor'
-
-Dir[File.join(File.dirname(__dir__), 'pubnub', 'events', '*.rb')].each do |file|
+require "base64"
+
+require "pubnub/error"
+require "pubnub/uuid"
+require "pubnub/formatter"
+require "pubnub/constants"
+require "pubnub/configuration"
+require "pubnub/subscribe_callback"
+
+require "pubnub/modules/crypto/module"
+
+require "pubnub/schemas/envelope_schema"
+
+require "pubnub/event"
+require "pubnub/single_event"
+require "pubnub/subscribe_event/callbacks"
+require "pubnub/subscribe_event/formatter"
+require "pubnub/subscribe_event/heartbeat"
+require "pubnub/subscribe_event/adding"
+require "pubnub/subscribe_event/removing"
+require "pubnub/subscribe_event"
+require "pubnub/pam"
+require "pubnub/heart"
+require "pubnub/subscriber"
+require "pubnub/telemetry"
+
+require "pubnub/envelope"
+require "pubnub/error_envelope"
+
+require "pubnub/client/events"
+require "pubnub/client/paged_history"
+require "pubnub/client/helpers"
+require "pubnub/client/getters_setters"
+
+require "pubnub/validators/get_message_actions"
+require "pubnub/validators/add_message_action"
+require "pubnub/validators/remove_message_action"
+require "pubnub/validators/common_validator"
+require "pubnub/validators/client"
+require "pubnub/validators/audit"
+require "pubnub/validators/channel_registration"
+require "pubnub/validators/grant"
+require "pubnub/validators/grant_token"
+require "pubnub/validators/revoke_token"
+require "pubnub/validators/heartbeat"
+require "pubnub/validators/here_now"
+require "pubnub/validators/history"
+require "pubnub/validators/fetch_messages"
+require "pubnub/validators/leave"
+require "pubnub/validators/presence"
+require "pubnub/validators/publish"
+require "pubnub/validators/revoke"
+require "pubnub/validators/set_state"
+require "pubnub/validators/state"
+require "pubnub/validators/subscribe"
+require "pubnub/validators/time"
+require "pubnub/validators/where_now"
+require "pubnub/validators/delete"
+require "pubnub/validators/message_counts"
+require "pubnub/validators/add_channels_to_push"
+require "pubnub/validators/list_push_provisions"
+require "pubnub/validators/remove_channels_from_push"
+require "pubnub/validators/remove_device_from_push"
+require "pubnub/validators/signal"
+require "pubnub/validators/set_uuid_metadata"
+require "pubnub/validators/set_channel_metadata"
+require "pubnub/validators/remove_uuid_metadata"
+require "pubnub/validators/remove_channel_metadata"
+require "pubnub/validators/get_uuid_metadata"
+require "pubnub/validators/get_all_uuid_metadata"
+require "pubnub/validators/get_channel_metadata"
+require "pubnub/validators/get_all_channels_metadata"
+require "pubnub/validators/get_channel_members"
+require "pubnub/validators/get_memberships"
+require "pubnub/validators/set_channel_members"
+require "pubnub/validators/set_memberships"
+require "pubnub/validators/remove_channel_members"
+require "pubnub/validators/remove_memberships"
+require "pubnub/cbor"
+
+Dir[File.join(File.dirname(__dir__), "pubnub", "events", "*.rb")].each do |file|
   require file
 end
 
@@ -188,7 +189,7 @@ module Pubnub
       validate! @env
       setup_crypto_module
       @telemetry = Telemetry.new
-      Pubnub.logger.debug('Pubnub::Client') do
+      Pubnub.logger.debug("Pubnub::Client") do
         "Created new Pubnub::Client instance. Version: #{Pubnub::VERSION}"
       end
     end
@@ -260,8 +261,8 @@ module Pubnub
     # created and returns it if created, otherwise creates it, assigns
     # it in @env and returns newly created dispatcher.
     def request_dispatcher(origin, event_type, sync)
-      Pubnub.logger.debug('Pubnub::Client') do
-        "Looking for requester for #{sync ? 'sync' : 'async'} #{event_type}"
+      Pubnub.logger.debug("Pubnub::Client") do
+        "Looking for requester for #{sync ? "sync" : "async"} #{event_type}"
       end
 
       if sync
@@ -289,21 +290,21 @@ module Pubnub
     # ==============
     # Terminates request dispatcher for given origin and event type. Usable while restarting subscription.
     def kill_request_dispatcher(origin, event_type)
-      Pubnub.logger.debug('Pubnub::Client') { 'Killing requester' }
+      Pubnub.logger.debug("Pubnub::Client") { "Killing requester" }
       # @env[:req_dispatchers_pool][origin][event_type].async.terminate
       @env[:req_dispatchers_pool][:async][origin][event_type].reset_all
       @env[:req_dispatchers_pool][:async][origin][event_type] = nil
-    rescue StandardError
-      Pubnub.logger.debug('Pubnub::Client') { 'There\'s no requester' }
+    rescue
+      Pubnub.logger.debug("Pubnub::Client") { "There's no requester" }
     end
 
     def sequence_number_for_publish!
       @env[:sequence_number_for_publish] += 1
-      @env[:sequence_number_for_publish] % 2 ** 32
+      @env[:sequence_number_for_publish] % 2**32
     end
 
     def apply_state(event)
-      Pubnub.logger.debug('Pubnub::Client') { 'Apply state' }
+      Pubnub.logger.debug("Pubnub::Client") { "Apply state" }
       create_state_pools(event)
 
       return unless event.state
@@ -361,11 +362,11 @@ module Pubnub
     end
 
     def setup_httpclient(event_type)
-      hc = if ENV['HTTP_PROXY']
-             HTTPClient.new(ENV['HTTP_PROXY'])
-           else
-             HTTPClient.new
-           end
+      hc = if ENV["HTTP_PROXY"]
+        HTTPClient.new(ENV["HTTP_PROXY"])
+      else
+        HTTPClient.new
+      end
 
       case event_type
       when :subscribe_event
@@ -394,14 +395,14 @@ module Pubnub
     end
 
     def setup_app(options)
-      Pubnub.logger = options[:logger] || Logger.new('pubnub.log')
+      Pubnub.logger = options[:logger] || Logger.new("pubnub.log")
       Concurrent.global_logger = Pubnub.logger
       @subscriber = Subscriber.new(self)
       options[:user_id] = options[:uuid] if options[:user_id].nil?
 
       if options[:cipher_key] && options[:crypto_module]
-        puts 'It is expected that only cipherKey or cryptoModule will be configured ' \
-               'at once. PubNub client will use the configured cryptoModule.'
+        puts "It is expected that only cipherKey or cryptoModule will be configured " \
+               "at once. PubNub client will use the configured cryptoModule."
       end
 
       @env = options

data/lib/pubnub/constants.rb

@@ -48,6 +48,8 @@ module Pubnub
     OPERATION_PRESENCE_LEAVE = :leave
     OPERATION_TIME = :time
     OPERATION_HISTORY = :history
+    OPERATION_FETCH_MESSAGES = :fetch_messages
+    OPERATION_FETCH_MESSAGES_WITH_ACTIONS = :fetch_messages_with_actions
     OPERATION_HERE_NOW = :here_now
     OPERATION_WHERE_NOW = :where_now
     OPERATION_GLOBAL_HERE_NOW = :global_here_now
@@ -89,7 +91,8 @@ module Pubnub
 
     OPERATIONS = [
       OPERATION_SUBSCRIBE, OPERATION_HEARTBEAT, OPERATION_PRESENCE, OPERATION_TIME, OPERATION_HISTORY,
-      OPERATION_HERE_NOW, OPERATION_GLOBAL_HERE_NOW, OPERATION_GET_STATE, OPERATION_ADD_MESSAGE_ACTION,
+      OPERATION_FETCH_MESSAGES, OPERATION_FETCH_MESSAGES_WITH_ACTIONS, OPERATION_HERE_NOW,
+      OPERATION_GLOBAL_HERE_NOW, OPERATION_GET_STATE, OPERATION_ADD_MESSAGE_ACTION,
       OPERATION_REMOVE_MESSAGE_ACTION, OPERATION_GET_MESSAGE_ACTIONS, OPERATION_LIST_ALL_CHANNEL_GROUPS,
       OPERATION_LIST_ALL_CHANNELS_IN_CHANNEL_GROUP, OPERATION_CHANNEL_GROUP_ADD, OPERATION_CHANNEL_GROUP_REMOVE,
       OPERATION_AUDIT, OPERATION_GRANT, OPERATION_GRANT_TOKEN, OPERATION_REVOKE, OPERATION_WHERE_NOW,

data/lib/pubnub/event.rb

@@ -65,14 +65,14 @@ module Pubnub
 
       begin
         @app.record_telemetry(@telemetry_name, telemetry_time_start, ::Time.now.to_f)
-      rescue StandardError => error
-        Pubnub.logger.warn('Pubnub::Event') { "Couldn't record telemetry because of #{error}\n#{error.backtrace.join("\n")}" }
+      rescue StandardError => e
+        Pubnub.logger.warn('Pubnub::Event') { "Couldn't record telemetry because of #{e}\n#{e.backtrace.join("\n")}" }
       end
 
       response
-    rescue StandardError => error
-      Pubnub.logger.error('Pubnub::Event') { error }
-      error
+    rescue StandardError => e
+      Pubnub.logger.error('Pubnub::Event') { e }
+      e
     end
 
     def uri(memo = true)
@@ -133,8 +133,8 @@ module Pubnub
 
     def secure_call(cb, arg)
       cb.call arg
-    rescue StandardError => error
-      Pubnub.logger.error('Pubnub::Event') { "Error while calling callback #{error.inspect}" }
+    rescue StandardError => e
+      Pubnub.logger.error('Pubnub::Event') { "Error while calling callback #{e.inspect}" }
     end
 
     def fire_callbacks(envelope)
@@ -150,7 +150,7 @@ module Pubnub
 
       token = @app.env[:token]
       empty_if_blank = {
-        auth: token ? token : @auth_key,
+        auth: token || @auth_key,
         uuid: @app.user_id,
         @telemetry_name => @current_telemetry
       }
@@ -169,21 +169,26 @@ module Pubnub
     end
 
     def create_variables_from_options(options)
-      variables = %w[channel channels message http_sync callback
-                     ssl cipher_key random_iv crypto_module secret_key auth_key
-                     publish_key subscribe_key timetoken action_timetoken message_timetoken
-                     open_timeout read_timeout idle_timeout heartbeat
-                     group action read write delete manage ttl presence start
-                     end count limit reverse presence_callback store skip_validate
-                     state channel_group channel_groups compressed meta customs include_token
-                     replicate with_presence cipher_key_selector include_meta join update get
-                     add remove push_token push_gateway environment topic authorized_uuid
-                     authorized_user_id token type value
-                   ]
+      variables = %w[channel channels message http_sync callback ssl cipher_key random_iv
+                     crypto_module secret_key auth_key publish_key subscribe_key timetoken
+                     action_timetoken message_timetoken open_timeout read_timeout idle_timeout
+                     heartbeat group action read write delete manage ttl presence start end count
+                     limit max reverse presence_callback store skip_validate state channel_group
+                     channel_groups compressed meta customs custom_message_type include_token
+                     include_custom_message_type include_message_actions include_message_type
+                     replicate with_presence cipher_key_selector include_meta include_uuid join
+                     update get add remove push_token push_gateway environment topic
+                     authorized_uuid authorized_user_id token type status value]
 
       options = options.each_with_object({}) { |option, obj| obj[option.first.to_sym] = option.last }
 
-      variables.each { |variable| instance_variable_set('@' + variable, options[variable.to_sym]) unless variable.nil? }
+      # variables.each { |variable| instance_variable_set('@' + variable, options[variable.to_sym]) unless variable.nil? }
+      variables.each do |variable|
+        next if variable.nil?
+
+        ivar = "@#{variable}"
+        instance_variable_set(ivar, options[variable.to_sym]) unless instance_variable_defined?(ivar) && !instance_variable_get(ivar).nil?
+      end
 
       return if @event != :subscribe && @event != :presence
 
@@ -208,12 +213,14 @@ module Pubnub
     def compute_cipher_key(data)
       ck = @compute_cipher_key || @cipher_key || @app.env[:cipher_key_selector] || @app.env[:cipher_key].to_s
       return ck unless ck.respond_to?(:call)
+
       ck.call(data)
     end
 
     def compute_random_iv(data)
       ck = @compute_random_iv || @random_iv || @app.env[:random_iv_selector] || @app.env[:random_iv].to_s
       return ck unless ck.respond_to?(:call)
+
       ck.call(data)
     end
 
@@ -221,9 +228,7 @@ module Pubnub
     #
     # @return [Pubnub::Crypto::CryptoProvider, nil] Crypto module for data encryption and
     #   decryption.
-    def crypto_module
-      @crypto_module
-    end
+    attr_reader :crypto_module
 
     def error_message(parsed_response)
       parsed_response['message']

data/lib/pubnub/events/fetch_messages.rb

@@ -0,0 +1,128 @@
+# frozen_string_literal: true
+
+module Pubnub
+  # Holds functionality to fetch:
+  # - batch messages (for multiple channels)
+  # - messages with message actions.
+  class FetchMessages < SingleEvent
+    include Concurrent::Async
+    include Pubnub::Validator::FetchMessages
+
+    def initialize(options, app)
+      @telemetry_name = :l_hist
+      @include_custom_message_type = options.fetch(:include_custom_message_type, false)
+      @include_message_actions = options.fetch(:include_message_actions, false)
+      @include_message_type = options.fetch(:include_message_type, true)
+      @include_uuid = options.fetch(:include_uuid, true)
+      @include_meta = options.fetch(:include_meta, false)
+      @start = options[:start] if options.key?(:start)
+      @end = options[:end] if options.key?(:end)
+
+      channel = options[:channel] if options.key?(:channel) && !options[:channel].empty?
+      @channels = options[:channels] if options.key?(:channels) && !options[:channels].empty?
+      if @include_message_actions
+        @channel = channel
+      elsif @channels.nil? && !channel.nil?
+        @channels = [channel]
+        @channel = nil
+        options.delete :channel
+      end
+
+      maximum = @include_message_actions || @channels&.size == 1 ? 100 : 25
+      @max = [options[:max], maximum].min unless options[:max].nil?
+
+      @event = current_operation
+
+      # Override crypto module if custom cipher key has been used.
+      random_iv = options.key?(:random_iv) ? options[:random_iv] : true
+      options[:crypto_module] = Crypto::CryptoModule.new_legacy(options[:cipher_key], random_iv) if options[:cipher_key]
+
+      super
+    end
+
+    private
+
+    def current_operation
+      @include_message_actions ? Pubnub::Constants::OPERATION_FETCH_MESSAGES_WITH_ACTIONS : Pubnub::Constants::OPERATION_FETCH_MESSAGES
+    end
+
+    def parameters(signature: false)
+      parameters = super(signature)
+      parameters[:include_meta] = 'true' if @include_meta
+      parameters[:include_uuid] = 'true' if @include_uuid
+      parameters[:include_custom_message_type] = 'true' if @include_custom_message_type
+      parameters[:include_message_type] = 'true' if @include_message_type
+      parameters[:start] = @start unless @start.nil?
+      parameters[:end] = @end unless @end.nil?
+      parameters[:max] = @max unless @max.nil?
+
+      parameters
+    end
+
+    def path
+      storage_endpoint = @include_message_actions ? 'history-with-actions' : 'history'
+      "/v3/#{storage_endpoint}/sub-key/#{@subscribe_key}/channel/#{Pubnub::Formatter.channels_for_url((
+                                                                                                        unless @channel.nil?
+                                                                                                          [@channel]
+                                                                                                        end) || @channels)}"
+    end
+
+    def enable_format_channels?
+      false
+    end
+
+    def decrypt_history(crypto, message)
+      encrypted_message = Base64.strict_decode64(message['message'])
+      message['message'] = JSON.parse(crypto.decrypt(encrypted_message), quirks_mode: true)
+      message
+    rescue StandardError => e
+      puts "Pubnub :: DECRYPTION ERROR: #{e}"
+      message['decrypt_error'] = true
+      message
+    end
+
+    def valid_envelope(parsed_response, req_res_objects)
+      channels = parsed_response['channels'] unless parsed_response['error']
+      more = parsed_response['more'].transform_keys(&:to_sym) if parsed_response.key?('more')
+      more&.delete :url
+
+      if crypto_module && channels
+        crypto = crypto_module
+        channels.transform_values! do |channel_messages|
+          channel_messages.map(&method(:decrypt_history).curry[crypto])
+        end
+      end
+
+      Pubnub::Envelope.new(
+        event: @event,
+        event_options: @given_options,
+        timetoken: nil,
+        status: {
+          code: req_res_objects[:response].code,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+
+          category: Pubnub::Constants::STATUS_ACK,
+          error: false,
+          auto_retried: false,
+
+          data: nil,
+          current_timetoken: nil,
+          last_timetoken: nil,
+          subscribed_channels: nil,
+          subscribed_channel_groups: nil,
+
+          config: get_config
+        },
+        result: {
+          code: req_res_objects[:response].code,
+          operation: @event,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+
+          data: { channels: channels }.merge!(more.nil? ? {} : { more: more })
+        }
+      )
+    end
+  end
+end

data/lib/pubnub/events/get_all_channels_metadata.rb

@@ -11,18 +11,22 @@ module Pubnub
       @event = current_operation
       @telemetry_name = :l_obj
       @limit = [options[:limit], 100].min unless options[:limit].nil?
-      @sort = options[:sort].join(",") if options[:sort] && !options[:sort].empty?
+      @sort = options[:sort].join(',') if options[:sort] && !options[:sort].empty?
       @filter = options[:filter] if options[:filter] && !options[:filter].empty?
       @start = options[:start] if options[:start] && !options[:start].empty?
       @end = options[:end] if options[:start] && !options[:end].empty?
 
+      @include = []
       if options[:include]
-        @include_count = [0, '0', false].include?(options[:include][:count]) ? "0" : "1" unless options[:include][:count].nil?
-        @include = "custom" unless [0, '0', false].include?(options[:include][:custom])
+        include = options[:include]
+        @include.push('type') unless include[:type].nil? || [0, '0', false].include?(include[:type])
+        @include.push('status') unless include[:status].nil? || [0, '0', false].include?(include[:status])
+        @include.push('custom') unless include[:custom].nil? || [0, '0', false].include?(include[:custom])
+        @include_count = [0, '0', false].include?(include[:count]) ? '0' : '1' unless include[:count].nil?
       end
 
       # Collections by default return number of available entries.
-      @include_count = "1" if @include_count.nil?
+      @include_count = '1' if @include_count.nil?
 
       super
     end
@@ -41,7 +45,7 @@ module Pubnub
       parameters[:start] = @start unless @start.nil?
       parameters[:end] = @end if @end && !@start
       parameters[:count] = @include_count unless @include_count.nil?
-      parameters[:include] = @include unless @include.to_s.empty?
+      parameters[:include] = @include.sort.join(',') unless @include.empty?
 
       parameters
     end
@@ -56,12 +60,12 @@ module Pubnub
     end
 
     def valid_envelope(parsed_response, req_res_objects)
-      channels_metadata = parsed_response['data'].map { |uuid_metadata|
-        metadata = Hash.new
-        uuid_metadata.each{ |k,v| metadata[k.to_sym] = v }
+      channels_metadata = parsed_response['data'].map do |uuid_metadata|
+        metadata = {}
+        uuid_metadata.each { |k, v| metadata[k.to_sym] = v }
         metadata[:updated] = Date._parse(metadata[:updated]) unless metadata[:updated].nil?
         metadata
-      }
+      end
 
       Pubnub::Envelope.new(
         event: @event,

data/lib/pubnub/events/get_all_uuid_metadata.rb

@@ -11,18 +11,22 @@ module Pubnub
       @event = current_operation
       @telemetry_name = :l_obj
       @limit = [options[:limit], 100].min unless options[:limit].nil?
-      @sort = options[:sort].join(",") if options[:sort] && !options[:sort].empty?
+      @sort = options[:sort].join(',') if options[:sort] && !options[:sort].empty?
       @filter = options[:filter] if options[:filter] && !options[:filter].empty?
       @start = options[:start] if options[:start] && !options[:start].empty?
       @end = options[:end] if options[:start] && !options[:end].empty?
 
+      @include = []
       if options[:include]
-        @include_count = [0, '0', false].include?(options[:include][:count]) ? "0" : "1" unless options[:include][:count].nil?
-        @include = "custom" unless [0, '0', false].include?(options[:include][:custom])
+        include = options[:include]
+        @include.push('type') unless include[:type].nil? || [0, '0', false].include?(include[:type])
+        @include.push('status') unless include[:status].nil? || [0, '0', false].include?(include[:status])
+        @include.push('custom') unless include[:custom].nil? || [0, '0', false].include?(include[:custom])
+        @include_count = [0, '0', false].include?(include[:count]) ? '0' : '1' unless include[:count].nil?
       end
 
       # Collections by default return number of available entries.
-      @include_count = "1" if @include_count.nil?
+      @include_count = '1' if @include_count.nil?
 
       super
     end
@@ -41,7 +45,7 @@ module Pubnub
       parameters[:start] = @start unless @start.nil?
       parameters[:end] = @end if @end && !@start
       parameters[:count] = @include_count unless @include_count.nil?
-      parameters[:include] = @include unless @include.to_s.empty?
+      parameters[:include] = @include.sort.join(',') unless @include.empty?
 
       parameters
     end
@@ -56,12 +60,12 @@ module Pubnub
     end
 
     def valid_envelope(parsed_response, req_res_objects)
-      uuids_metadata = parsed_response['data'].map { |uuid_metadata|
-        metadata = Hash.new
-        uuid_metadata.each{ |k,v| metadata[k.to_sym] = v }
+      uuids_metadata = parsed_response['data'].map do |uuid_metadata|
+        metadata = {}
+        uuid_metadata.each { |k, v| metadata[k.to_sym] = v }
         metadata[:updated] = Date._parse(metadata[:updated]) unless metadata[:updated].nil?
         metadata
-      }
+      end
 
       Pubnub::Envelope.new(
         event: @event,