pubnub 4.2.6 → 4.6.0

data/lib/pubnub/events/{delete_space.rb → remove_channel_metadata.rb}

@@ -2,22 +2,22 @@
 # frozen_string_literal: true
 
 module Pubnub
-  # Holds DeleteSpace functionality
-  class DeleteSpace < SingleEvent
+  # Holds RemoveChannelMetadata functionality
+  class RemoveChannelMetadata < SingleEvent
     include Concurrent::Async
-    include Pubnub::Validator::DeleteSpace
+    include Pubnub::Validator::RemoveChannelMetadata
 
     def initialize(options, app)
-      @event = :delete_space
+      @event = :remove_channel_metadata
       @telemetry_name = :l_obj
-      @space_id = options[:space_id]
+      @channel = options[:channel]
       super
     end
 
     def fire
-      Pubnub.logger.debug('Pubnub::DeleteSpace') { "Fired event #{self.class}" }
+      Pubnub.logger.debug('Pubnub::RemoveChannelMetadata') { "Fired event #{self.class}" }
 
-      body = Formatter.format_message(@data, @cipher_key, false)
+      body = Formatter.format_message(@data, "", @random_iv, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))
@@ -28,16 +28,16 @@ module Pubnub
     private
 
     def current_operation
-      Pubnub::Constants::OPERATION_DELETE_SPACE
+      Pubnub::Constants::OPERATION_REMOVE_CHANNEL_METADATA
     end
 
     def path
       '/' + [
-        'v1',
+        'v2',
         'objects',
         @subscribe_key,
-        'spaces',
-        @space_id
+        'channels',
+        Formatter.channels_for_url(@channel)
       ].join('/')
     end
 
@@ -49,7 +49,7 @@ module Pubnub
 
         result: {
           code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_DELETE_SPACE,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
           data: parsed_response
@@ -57,7 +57,7 @@ module Pubnub
 
         status: {
           code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_DELETE_SPACE,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
           data: nil,

data/lib/pubnub/events/remove_channels_from_push.rb

@@ -3,13 +3,14 @@ module Pubnub
   # Push related event
   class RemoveChannelsFromPush < SingleEvent
     include Concurrent::Async
-    include Pubnub::Validator::Push
+    include Pubnub::Validator::RemoveChannelsFromPush
 
     def initialize(options, app)
-      super
       @event = current_operation
-      @params = @given_options
-      @auth_key = options[:auth_key]
+      @telemetry_name = :l_push
+      super
+      # `environment` should
+      @environment ||= 'development' if @push_gateway.eql? 'apns2'
     end
 
     private
@@ -25,19 +26,33 @@ module Pubnub
     end
 
     def path
-      '/' + [
-        'v1',
-        'push',
-        'sub-key',
-        @subscribe_key,
-        'devices',
-        @params.fetch(:push_token)
-      ].join('/')
+      if @push_gateway.eql? 'apns2'
+        '/' + [
+          'v2',
+          'push',
+          'sub-key',
+          @subscribe_key,
+          'devices-apns2',
+          @push_token
+        ].join('/')
+      else
+        '/' + [
+          'v1',
+          'push',
+          'sub-key',
+          @subscribe_key,
+          'devices',
+          @push_token
+        ].join('/')
+      end
     end
 
     def parameters(*_args)
       params = super
-      params.merge!(@params.select { |p, _| required_params.include?(p) })
+      params[:remove] = Formatter.channels_for_url(@channel, false)
+      params[:type] = @push_gateway unless @push_gateway.eql? 'apns2'
+      params[:environment] = @environment if @push_gateway.eql? 'apns2'
+      params[:topic] = @topic if @push_gateway.eql? 'apns2'
       params
     end
 
@@ -48,6 +63,7 @@ module Pubnub
         timetoken: nil,
         status: {
           code: req_res_objects[:response].code,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
 

data/lib/pubnub/events/remove_device_from_push.rb

@@ -3,12 +3,14 @@ module Pubnub
   # Push related event
   class RemoveDeviceFromPush < SingleEvent
     include Concurrent::Async
-    include Pubnub::Validator::Push
+    include Pubnub::Validator::RemoveDeviceFromPush
 
     def initialize(options, app)
-      super
       @event = current_operation
-      @params = @given_options
+      @telemetry_name = :l_push
+      super
+      # `environment` should
+      @environment ||= 'development' if @push_gateway.eql? 'apns2'
     end
 
     private
@@ -24,21 +26,34 @@ module Pubnub
     end
 
     def path
-      '/' + [
-        'v1',
-        'push',
-        'sub-key',
-        @subscribe_key,
-        'devices',
-        @params.fetch(:push_token),
-        'remove'
-      ].join('/')
+      if @push_gateway.eql? 'apns2'
+        '/' + [
+          'v2',
+          'push',
+          'sub-key',
+          @subscribe_key,
+          'devices-apns2',
+          @push_token,
+          'remove'
+        ].join('/')
+      else
+        '/' + [
+          'v1',
+          'push',
+          'sub-key',
+          @subscribe_key,
+          'devices',
+          @push_token,
+          'remove'
+        ].join('/')
+      end
     end
 
     def parameters(*_args)
       params = super
-      params.merge!(@params.select { |p, _| required_params.include?(p) })
-      params[:uuid] = @params[:uuid] if @params.key?(:uuid)
+      params[:type] = @push_gateway unless @push_gateway.eql? 'apns2'
+      params[:environment] = @environment if @push_gateway.eql? 'apns2'
+      params[:topic] = @topic if @push_gateway.eql? 'apns2'
       params
     end
 
@@ -49,6 +64,7 @@ module Pubnub
         timetoken: nil,
         status: {
           code: req_res_objects[:response].code,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
 

data/lib/pubnub/events/remove_memberships.rb

@@ -0,0 +1,137 @@
+# Toplevel Pubnub module.
+# frozen_string_literal: true
+
+module Pubnub
+  # Holds RemoveMemberships functionality
+  class RemoveMemberships < SingleEvent
+    include Concurrent::Async
+    include Pubnub::Validator::RemoveMemberships
+
+    def initialize(options, app)
+      @event = current_operation
+      @telemetry_name = :l_obj
+      @uuid = options[:uuid].nil? ? app.env[:uuid] : options[:uuid]
+      @limit = [options[:limit], 100].min unless options[:limit].nil?
+      @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?
+
+      if options[:include]
+        include = options[:include]
+        @include_count = [0, '0', false].include?(include[:count]) ? "0" : "1" unless include[:count].nil?
+        @include_custom = "custom" if !include[:custom].nil? && ![0, '0', false].include?(include[:custom])
+        @include_channel_metadata = "channel" if !include[:channel_metadata].nil? && ![0, '0', false].include?(include[:channel_metadata])
+        @include_channel_custom = "channel.custom" if !include[:channel_custom].nil? && ![0, '0', false].include?(include[:channel_custom])
+
+        @include = [@include_custom, @include_channel_metadata, @include_channel_custom].reject { |flag| flag.to_s.empty? }
+      end
+
+      @channels = options[:channels] if options[:channels] && !options[:channels].empty?
+
+      # Collections by default return number of available entries.
+      @include_count = "1" if @include_count.nil?
+
+      super
+    end
+
+    def fire
+      Pubnub.logger.debug('Pubnub::RemoveMemberships') { "Fired event #{self.class}" }
+
+      memberships = @channels.map do |membership|
+        { channel: { id: membership } }
+      end
+
+      body = Formatter.format_message({ delete: memberships }, "", @random_iv, false)
+      response = send_request(body)
+
+      envelopes = fire_callbacks(handle(response, uri))
+      finalize_event(envelopes)
+      envelopes
+    end
+
+    private
+
+    def current_operation
+      Pubnub::Constants::OPERATION_REMOVE_MEMBERSHIPS
+    end
+
+    def parameters(signature = false)
+      parameters = super(signature)
+      parameters[:limit] = @limit unless @limit.nil?
+      parameters[:sort] = @sort unless @sort.nil?
+      parameters[:filter] = @filter unless @filter.nil?
+      parameters[:start] = @start unless @start.nil?
+      parameters[:end] = @end if @end && !@start
+      parameters[:count] = @include_count unless @include_count.nil?
+      parameters[:include] = @include.sort.join(",") if @include && !@include.empty?
+
+      parameters
+    end
+
+    def path
+      '/' + [
+        'v2',
+        'objects',
+        @subscribe_key,
+        'uuids',
+        Formatter.encode(@uuid),
+        'channels'
+      ].join('/')
+    end
+
+    def valid_envelope(parsed_response, req_res_objects)
+      memberships = parsed_response['data'].map { |uuid_membership|
+        membership = Hash.new
+        uuid_membership.each{ |k,v| membership[k.to_sym] = v }
+
+        unless membership[:channel].nil?
+          channel_metadata = Hash.new
+          membership[:channel].each{ |k,v| channel_metadata[k.to_sym] = v }
+          channel_metadata[:updated] = Date._parse(channel_metadata[:updated]) unless channel_metadata[:updated].nil?
+          membership[:channel] = channel_metadata
+        end
+        membership[:updated] = Date._parse(membership[:updated]) unless membership[:updated].nil?
+
+        membership
+      }
+
+      Pubnub::Envelope.new(
+        event: @event,
+        event_options: @given_options,
+        timetoken: nil,
+
+        result: {
+          code: req_res_objects[:response].code,
+          operation: current_operation,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+          data: {
+            memberships: memberships,
+            totalCount: parsed_response['totalCount'],
+            next: parsed_response['next'],
+            prev: parsed_response['prev']
+          }
+        },
+
+        status: {
+          code: req_res_objects[:response].code,
+          operation: current_operation,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+          data: nil,
+          category: Pubnub::Constants::STATUS_ACK,
+          error: false,
+          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/{delete_user.rb → remove_uuid_metadata.rb}

@@ -2,22 +2,22 @@
 # frozen_string_literal: true
 
 module Pubnub
-  # Holds DeleteUser functionality
-  class DeleteUser < SingleEvent
+  # Holds RemoveUuidMetadata functionality
+  class RemoveUuidMetadata < SingleEvent
     include Concurrent::Async
-    include Pubnub::Validator::DeleteUser
+    include Pubnub::Validator::RemoveUuidMetadata
 
     def initialize(options, app)
-      @event = :delete_user
+      @event = current_operation
       @telemetry_name = :l_obj
-      @user_id = options[:user_id]
+      @uuid = options[:uuid].nil? ? app.env[:uuid] : options[:uuid]
       super
     end
 
     def fire
-      Pubnub.logger.debug('Pubnub::DeleteUser') { "Fired event #{self.class}" }
+      Pubnub.logger.debug('Pubnub::RemoveUuidMetadata') { "Fired event #{self.class}" }
 
-      body = Formatter.format_message(@data, @cipher_key, false)
+      body = Formatter.format_message(@data, "", @random_iv, false)
       response = send_request(body)
 
       envelopes = fire_callbacks(handle(response, uri))
@@ -28,16 +28,16 @@ module Pubnub
     private
 
     def current_operation
-      Pubnub::Constants::OPERATION_DELETE_USER
+      Pubnub::Constants::OPERATION_REMOVE_UUID_METADATA
     end
 
     def path
       '/' + [
-        'v1',
+        'v2',
         'objects',
         @subscribe_key,
-        'users',
-        @user_id
+        'uuids',
+        Formatter.encode(@uuid)
       ].join('/')
     end
 
@@ -49,7 +49,7 @@ module Pubnub
 
         result: {
           code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_DELETE_USER,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
           data: parsed_response
@@ -57,7 +57,7 @@ module Pubnub
 
         status: {
           code: req_res_objects[:response].code,
-          operation: Pubnub::Constants::OPERATION_DELETE_USER,
+          operation: current_operation,
           client_request: req_res_objects[:request],
           server_response: req_res_objects[:response],
           data: nil,

data/lib/pubnub/events/set_channel_members.rb

@@ -0,0 +1,140 @@
+# Toplevel Pubnub module.
+# frozen_string_literal: true
+
+module Pubnub
+  # Holds SetChannelMembers functionality
+  class SetChannelMembers < SingleEvent
+    include Concurrent::Async
+    include Pubnub::Validator::SetChannelMembers
+
+    def initialize(options, app)
+      @event = current_operation
+      @telemetry_name = :l_obj
+      @channel = options[:channel]
+      @limit = [options[:limit], 100].min unless options[:limit].nil?
+      @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?
+
+      if options[:include]
+        include = options[:include]
+        @include_count = [0, '0', false].include?(include[:count]) ? "0" : "1" unless include[:count].nil?
+        @include_custom = "custom" if !include[:custom].nil? && ![0, '0', false].include?(include[:custom])
+        @include_uuid_metadata = "uuid" if !include[:uuid_metadata].nil? && ![0, '0', false].include?(include[:uuid_metadata])
+        @include_uuid_custom = "uuid.custom" if !include[:uuid_custom].nil? && ![0, '0', false].include?(include[:uuid_custom])
+
+        @include = [@include_custom, @include_uuid_metadata, @include_uuid_custom].reject { |flag| flag.to_s.empty? }
+      end
+
+      @uuids = options[:uuids] if options[:uuids] && !options[:uuids].empty?
+
+      # Collections by default return number of available entries.
+      @include_count = "1" if @include_count.nil?
+
+      super
+    end
+
+    def fire
+      Pubnub.logger.debug('Pubnub::SetChannelMembers') { "Fired event #{self.class}" }
+
+      members = @uuids.map do |member|
+        member_object = { uuid: { id: member[:uuid] } }
+        member_object[:custom] = member[:custom] if member[:custom] && !member[:custom].empty?
+
+        member_object
+      end
+
+      body = Formatter.format_message({ set: members }, "", @random_iv, false)
+      response = send_request(body)
+
+      envelopes = fire_callbacks(handle(response, uri))
+      finalize_event(envelopes)
+      envelopes
+    end
+
+    private
+
+    def current_operation
+      Pubnub::Constants::OPERATION_SET_CHANNEL_MEMBERS
+    end
+
+    def parameters(signature = false)
+      parameters = super(signature)
+      parameters[:limit] = @limit unless @limit.nil?
+      parameters[:sort] = @sort unless @sort.nil?
+      parameters[:filter] = @filter unless @filter.nil?
+      parameters[:start] = @start unless @start.nil?
+      parameters[:end] = @end if @end && !@start
+      parameters[:count] = @include_count unless @include_count.nil?
+      parameters[:include] = @include.sort.join(",") if @include && !@include.empty?
+
+      parameters
+    end
+
+    def path
+      '/' + [
+        'v2',
+        'objects',
+        @subscribe_key,
+        'channels',
+        Formatter.channels_for_url(@channel),
+        'uuids'
+      ].join('/')
+    end
+
+    def valid_envelope(parsed_response, req_res_objects)
+      members = parsed_response['data'].map { |channel_member|
+        member = Hash.new
+        channel_member.each{ |k,v| member[k.to_sym] = v }
+
+        unless member[:uuid].nil?
+          uuid_metadata = Hash.new
+          member[:uuid].each{ |k,v| uuid_metadata[k.to_sym] = v }
+          uuid_metadata[:updated] = Date._parse(uuid_metadata[:updated]) unless uuid_metadata[:updated].nil?
+          member[:uuid] = uuid_metadata
+        end
+        member[:updated] = Date._parse(member[:updated]) unless member[:updated].nil?
+
+        member
+      }
+
+      Pubnub::Envelope.new(
+        event: @event,
+        event_options: @given_options,
+        timetoken: nil,
+
+        result: {
+          code: req_res_objects[:response].code,
+          operation: current_operation,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+          data: {
+            members: members,
+            totalCount: parsed_response['totalCount'],
+            next: parsed_response['next'],
+            prev: parsed_response['prev']
+          }
+        },
+
+        status: {
+          code: req_res_objects[:response].code,
+          operation: current_operation,
+          client_request: req_res_objects[:request],
+          server_response: req_res_objects[:response],
+          data: nil,
+          category: Pubnub::Constants::STATUS_ACK,
+          error: false,
+          auto_retried: false,
+
+          current_timetoken: nil,
+          last_timetoken: nil,
+          subscribed_channels: nil,
+          subscribed_channel_groups: nil,
+
+          config: get_config
+        }
+      )
+    end
+  end
+end