pubnub 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 242c68a87d13a592b515cb79a777a446dd116c1c695572ff380f6cf4dad7cfa3
-  data.tar.gz: bced3ce328f2d1f5c19c99c07046d55805a9d2518b812c42a77b629e6094eb61
+  metadata.gz: 04517d5210c2213931c074c40ecbeeb804179cf8ce28c4f21350321e560b5560
+  data.tar.gz: 8a8b59f386f3d62e747707762856d517e936f0983a3ee393a39e7b97d515bd5b
 SHA512:
-  metadata.gz: c99236e15a94867504dd45f3992d1cc5fb7dacd8bba2a81ec69c8cb5cec15b6a62c14a0116e439ce25a840f624299fdde1a41ab999547493fd12bfb9312d284a
-  data.tar.gz: 71d4d5f51af2032fa75a93e0541bc4dc3e17cf60309c54ec49f852d7dd61166988888e68948e06b2aef5500902dfd260d05bbbd2219d25d6845c5c83cb8b9842
+  metadata.gz: f294ccd614f20cc7d2ec694ecc9cf493d65c2460833638ec316d793b628e225d7d36c2827491ce4ca77eaf24d1f2daab6e2ede0bcd082123f9bc0aadbf8a266f
+  data.tar.gz: ffb4e0e6977f9efc895abf1fb20e4235fca9fe78a0ed8d8a3d52e2eac9f4bfe8d4d79f5161994df95592996a8925bb2a9c2d48ec0806f5467eee44eac3c1c0a0

data/.pubnub.yml

@@ -1,6 +1,11 @@
 ---
-version: "4.1.5"
+version: "4.1.6"
 changelog:
+  - changes:
+        - text: "Added signal feature"
+          type: feature
+      date: 21-8-2019
+      version: "4.1.6"
   -
     changes:
       -
@@ -295,6 +300,8 @@ features:
     - SUBSCRIBE-WITH-TIMETOKEN
     - SUBSCRIBE-WILDCARD
     - SUBSCRIBE-FILTER-EXPRESSION
+  signal:
+    - SIGNAL-SEND
   time: 
     - TIME-TIME
 name: ruby
@@ -303,15 +310,13 @@ scm: github.com/pubnub/ruby
 supported-platforms: 
   - 
     editors: 
-      - "ruby 2.4.0"
-      - "ruby 2.3.3"
-      - "ruby 2.2.6"
-      - "ruby 2.1.10"
-      - jruby-9.1.8.0
+      - "ruby 2.6"
+      - "ruby 2.5"
+      - "ruby 2.4"
     platforms: 
-      - "FreeBSD 8-STABLE or later, amd64, 386."
-      - "Linux 2.6 or later, amd64, 386."
-      - "Mac OS X 10.8 or later, amd64"
-      - "Windows 7 or later, amd64, 386, use rubyinstaller and dev pack."
-      - "Apart from the above, PubNub Ruby SDK works on mostly all platforms where the supported Ruby versions work. To use ssl connection, Ruby should be compiled with openssl support."
+      - "FreeBSD 8-STABLE or later, amd64, 386"
+      - "Linux 2.6 or later, amd64, 386"
+      - "macOS 10.8 or later, amd64"
+      - "Windows 7 or later, amd64, 386, use rubyinstaller and dev pack"
+      - "Apart from the above, the PubNub Ruby SDK works on almost every platform where the supported Ruby versions work. To use an SSL connection, Ruby should be compiled with OpenSSL support."
     version: "PubNub Ruby SDK"

data/.rubocop.yml

@@ -1,4 +1,5 @@
 AllCops:
+  TargetRubyVersion: 2.4
   Exclude:
     - 'spec/**/*'
     - 'examples/**/*'
@@ -24,4 +25,3 @@ Metrics/PerceivedComplexity:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-TargetRubyVersion: 2.4

data/.travis.yml

@@ -23,5 +23,5 @@ matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -J-Xms1500m -J-Xmx1500m -J-XX:+UseConcMarkSweepGC -J-XX:-UseGCOverheadLimit -J-XX:+CMSClassUnloadingEnabled"
-      jdk: oraclejdk8
+      jdk: oraclejdk9
 

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+##### 4.1.6
+* Added signal feature
+
 ##### 4.1.5
 * Update dependency dry-validation
 * Includes minimum Ruby version requirement of 2.4+

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (4.1.5)
+    pubnub (4.1.6)
       concurrent-ruby (~> 1.1.5)
       concurrent-ruby-edge (~> 0.5.0)
       dry-validation (~> 1.0)

data/README.md

@@ -7,7 +7,7 @@
 # Complete Documentation
 Available at https://www.pubnub.com/docs/ruby/pubnub-ruby-sdk-v4 **v4.x**
 
-## PubNub Gem version 4.1.5
+## PubNub Gem version 4.1.6
 
 ##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
 ##### http://www.pubnub.com/account

data/VERSION

@@ -1 +1 @@
-4.1.5
+4.1.6

data/fixtures/vcr_cassettes/lib/events/signal-error.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ps.pndsn.com/signal/demo/demo/0/demo/0/%2200000000000000000000000000000000000000000000000000%22?auth=ruby-test-auth&ortt=%7B%22t%22:15663104632819572%7D&pnsdk=PubNub-Ruby/4.1.5&seqn=1&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.4.6 (2019-04-01))
+      Accept:
+      - "*/*"
+      Date:
+      - Tue, 20 Aug 2019 14:14:23 GMT
+  response:
+    status:
+      code: 400
+      message: INVALID
+    headers:
+      Date:
+      - Tue, 20 Aug 2019 14:14:25 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '47'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[0,"Signal size too large","15663104658224536"]'
+    http_version: 
+  recorded_at: Tue, 20 Aug 2019 14:14:23 GMT
+recorded_with: VCR 5.0.0

data/fixtures/vcr_cassettes/lib/events/signal.yml

@@ -0,0 +1,40 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://ps.pndsn.com/signal/demo/demo/0/demo/0/%22whatever%22?auth=ruby-test-auth&ortt=%7B%22t%22:15663104631310930%7D&pnsdk=PubNub-Ruby/4.1.5&seqn=1&uuid=ruby-test-uuid
+    body:
+      encoding: UTF-8
+      string: ''
+    headers:
+      User-Agent:
+      - HTTPClient/1.0 (2.8.3, ruby 2.4.6 (2019-04-01))
+      Accept:
+      - "*/*"
+      Date:
+      - Tue, 20 Aug 2019 14:14:23 GMT
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 20 Aug 2019 14:14:25 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '30'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - "*"
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[1,"Sent","15663104657143915"]'
+    http_version: 
+  recorded_at: Tue, 20 Aug 2019 14:14:23 GMT
+recorded_with: VCR 5.0.0

data/lib/pubnub/client.rb

@@ -49,6 +49,7 @@ require 'pubnub/validators/where_now'
 require 'pubnub/validators/delete'
 require 'pubnub/validators/message_counts'
 require 'pubnub/validators/push'
+require 'pubnub/validators/signal'
 
 Dir[File.join(File.dirname(__dir__), 'pubnub', 'events', '*.rb')].each do |file|
   require file

data/lib/pubnub/client/events.rb

@@ -5,7 +5,7 @@ module Pubnub
     # Module that holds generator for all events
     module Events
       EVENTS = %w[publish subscribe presence leave history here_now audit grant delete_messages
-                  revoke time heartbeat where_now set_state state channel_registration message_counts
+                  revoke time heartbeat where_now set_state state channel_registration message_counts signal
                   add_channels_to_push list_push_provisions remove_channels_from_push remove_device_from_push].freeze
 
       EVENTS.each do |event_name|

data/lib/pubnub/constants.rb

@@ -65,6 +65,7 @@ module Pubnub
     OPERATION_LIST_PUSH_PROVISIONS = :list_push_provisions
     OPERATION_REMOVE_CHANNELS_FROM_PUSH = :remove_channels_from_push
     OPERATION_REMOVE_DEVICE_FROM_PUSH = :remove_device_from_push
+    OPERATION_SIGNAL = :signal
 
     OPERATIONS = [
       OPERATION_SUBSCRIBE, OPERATION_HEARTBEAT, OPERATION_PRESENCE, OPERATION_TIME, OPERATION_HISTORY,
@@ -72,7 +73,7 @@ module Pubnub
       OPERATION_LIST_ALL_CHANNELS_IN_CHANNEL_GROUP, OPERATION_CHANNEL_GROUP_ADD, OPERATION_CHANNEL_GROUP_REMOVE,
       OPERATION_AUDIT, OPERATION_GRANT, OPERATION_REVOKE, OPERATION_WHERE_NOW, OPERATION_MESSAGE_COUNTS,
       OPERATION_ADD_CHANNELS_TO_PUSH, OPERATION_LIST_PUSH_PROVISIONS, OPERATION_REMOVE_CHANNELS_FROM_PUSH,
-      OPERATION_REMOVE_DEVICE_FROM_PUSH
+      OPERATION_REMOVE_DEVICE_FROM_PUSH, OPERATION_SIGNAL
     ].freeze
 
     # Announcements

data/lib/pubnub/events/signal.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+# Toplevel Pubnub module.
+module Pubnub
+  # Holds history functionality
+  class Signal < SingleEvent
+    include Concurrent::Async
+    include Pubnub::Validator::Signal
+
+    attr_reader :store
+
+    def initialize(options, app)
+      @event = :signal
+      @telemetry_name = :l_sig
+      super
+      @sequence_number = sequence_number!
+      @origination_time_token = @app.generate_ortt
+    end
+
+    private
+
+    def current_operation
+      Pubnub::Constants::OPERATION_SIGNAL
+    end
+
+    def parameters(*_args)
+      params = super
+
+      params = params.merge(seqn: @sequence_number,
+                            ortt: { t: @origination_time_token })
+      params
+    end
+
+    def path
+      '/' + [
+        'signal',
+        @publish_key,
+        @subscribe_key,
+        '0',
+        Formatter.format_channel(@channel, true),
+        '0',
+        Formatter.format_message(@message, @cipher_key)
+      ].join('/')
+    end
+
+    def sequence_number!
+      @app.sequence_number_for_publish!
+    end
+
+    def timetoken(parsed_response)
+      parsed_response[2]
+    rescue StandardError
+      nil
+    end
+
+    def response_message(parsed_response)
+      parsed_response[1]
+    rescue StandardError
+      nil
+    end
+
+    def valid_envelope(parsed_response, req_res_objects)
+      Pubnub::Envelope.new(
+        event: @event,
+        event_options: @given_options,
+        timetoken: timetoken(parsed_response),
+        status: {
+          code: req_res_objects[:response].code,
+          operation: Pubnub::Constants::OPERATION_SIGNAL,
+          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/subscribe_callback.rb

@@ -8,7 +8,8 @@ module Pubnub
       @callbacks = {
         message: options[:message],
         status: options[:status],
-        presence: options[:presence]
+        presence: options[:presence],
+        signal: options[:signal]
       }
       validate!
     end

data/lib/pubnub/subscribe_event/formatter.rb

@@ -164,6 +164,8 @@ module Pubnub
           Pubnub::Constants::OPERATION_TIME
         elsif message[:channel].to_s.index(/pnpres\z/)
           Pubnub::Constants::OPERATION_PRESENCE
+        elsif message[:type] == 1
+          Pubnub::Constants::OPERATION_SIGNAL
         else
           Pubnub::Constants::OPERATION_SUBSCRIBE
         end
@@ -193,6 +195,7 @@ module Pubnub
             channel: m['c'],
             subscription_match: m['b'],
             payload: m['d'],
+            type: m['e'],
             flags: m['f'],
             issuing_client_id: m['i'],
             subscribe_key: m['k'],

data/lib/pubnub/subscriber.rb

@@ -71,6 +71,8 @@ module Pubnub
             case envelope.result[:operation]
             when Pubnub::Constants::OPERATION_SUBSCRIBE
               secure_call callbacks.callbacks[:message], envelope
+            when Pubnub::Constants::OPERATION_SIGNAL
+              secure_call callbacks.callbacks[:signal], envelope
             when Pubnub::Constants::OPERATION_PRESENCE
               secure_call callbacks.callbacks[:presence], envelope
             else

data/lib/pubnub/validators/signal.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Toplevel Pubnub module.
+module Pubnub
+  # Validator module that holds all validators modules
+  module Validator
+    # Validator for Signal event
+    module Signal
+      include CommonValidator
+
+      def validate!
+        return if @skip_validate
+
+        validate_publish_key!
+        validate_channel!
+        validate_message!
+      end
+
+      private
+
+      def validate_publish_key!
+        return unless @publish_key.nil?
+
+        raise(
+          ArgumentError.new,
+          ':publish_key is required for publish event.'
+        )
+      end
+
+      def validate_channel!
+        return unless @channel.nil? || @channel.empty?
+
+        raise(
+          ArgumentError.new,
+          ':channel is required for publish event.'
+        )
+      end
+
+      def validate_message!
+        return unless @message.nil?
+
+        raise(
+          ArgumentError.new,
+          ':message is required for publish event.'
+        )
+      end
+    end
+  end
+end

data/lib/pubnub/version.rb

@@ -1,4 +1,4 @@
 # Toplevel Pubnub module.
 module Pubnub
-  VERSION = '4.1.5'.freeze
+  VERSION = '4.1.6'.freeze
 end

data/spec/examples/presence_examples_spec.rb

@@ -29,7 +29,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403696, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036961172863", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403696, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036961172863", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654036961931472)
@@ -54,7 +54,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403696, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036965065315", :region_code => 2}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403696, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036965065315", :region_code => 2}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654036965469160)
@@ -79,7 +79,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403698, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036986516448", :region_code => 2}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403698, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036986516448", :region_code => 2}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654036986900265)
@@ -203,7 +203,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403699, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036996668692", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403699, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654036996668692", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654036997432530)
@@ -228,7 +228,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403700, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037002398263", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403700, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037002398263", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654037003110327)
@@ -253,7 +253,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403702, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037023404890", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403702, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037023404890", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654037024165554)
@@ -377,7 +377,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403703, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037039766378", :region_code => 2}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "leave", "timestamp" => 1465403703, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654037039766378", :region_code => 2}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654037040157428)
@@ -402,7 +402,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465405069, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654050693824272", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465405069, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654050693824272", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654050694555754)
@@ -427,7 +427,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403890, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038904558577", :region_code => 2}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => nil, :payload => {"action" => "join", "timestamp" => 1465403890, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038904558577", :region_code => 2}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654038904954461)
@@ -551,7 +551,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => "demo-pnpres", :payload => {"action" => "leave", "timestamp" => 1465403891, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038913084722", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => "demo-pnpres", :payload => {"action" => "leave", "timestamp" => 1465403891, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038913084722", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654038913920232)
@@ -576,7 +576,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => "demo.*-pnpres", :payload => {"action" => "leave", "timestamp" => 1465403892, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038929920942", :region_code => 1}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo.*-pnpres", :subscription_match => "demo.*-pnpres", :payload => {"action" => "leave", "timestamp" => 1465403892, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 0}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038929920942", :region_code => 1}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654038931856126)
@@ -601,7 +601,7 @@ describe Pubnub::Presence do
       end
 
       expect(envelopes[0].status[:code]).to eq(200)
-      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => "demo-pnpres", :payload => {"action" => "join", "timestamp" => 1465403893, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038934962157", :region_code => 2}})
+      expect(envelopes[0].status[:data]).to eq({:shard => "5", :channel => "demo-pnpres", :subscription_match => "demo-pnpres", :payload => {"action" => "join", "timestamp" => 1465403893, "uuid" => "ruby-test-uuid-client-two", "occupancy" => 1}, :flags => 0, :issuing_client_id => nil, :subscribe_key => "sub-a-mock-key", :sequence_number => nil, :user_meta_data => nil, :replication_map => nil, :eat_after_reading => nil, :type => nil, :waypoint_list => nil, :origination_time_token => nil, :publish_timetoken => {:timetoken => "14654038934962157", :region_code => 2}})
       expect(envelopes[0].status[:category]).to eq(:ack)
       expect(envelopes[0].status[:auto_retried]).to eq(true)
       expect(envelopes[0].status[:current_timetoken]).to eq(14654038935342617)