pubnub 4.0.19 → 4.0.20

data/spec/lib/client_spec.rb

@@ -72,19 +72,19 @@ describe Pubnub::Client do
       context 'validates' do
         context 'parameter :origin' do
           it 'must be valid' do
-            expect { Pubnub.new(origins_pool: 123, subscribe_key: 'key') }
+            expect { Pubnub.new(origin: 123, subscribe_key: 'key') }
             .to raise_error(Pubnub::InitializationError)
 
-            expect { Pubnub.new(origins_pool: { a: :b }, subscribe_key: 'key') }
+            expect { Pubnub.new(origin: { a: :b }, subscribe_key: 'key') }
             .to raise_error(Pubnub::InitializationError)
 
-            expect { Pubnub.new(origins_pool: nil, subscribe_key: 'key') }
+            expect { Pubnub.new(origin: nil, subscribe_key: 'key') }
             .not_to raise_error
 
-            expect { Pubnub.new(origins_pool: '', subscribe_key: 'key') }
+            expect { Pubnub.new(origin: '', subscribe_key: 'key') }
             .not_to raise_error
 
-            expect { Pubnub.new(origins_pool: %w(http://a.com), subscribe_key: 'key') }
+            expect { Pubnub.new(origin: 'http://a.com', subscribe_key: 'key') }
             .not_to raise_error
           end
         end

data/spec/lib/events/presence_delta_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe Pubnub::Presence do
+  around :each do |example|
+    Celluloid.boot
+    example.run
+    Celluloid.shutdown
+  end
+
+  context 'with interval events and delta' do
+    before :each do
+      @messages = []
+      @statuses = []
+
+      @callbacks = Pubnub::SubscribeCallback.new(
+          message: ->(_envelope) {  },
+          presence: ->(envelope) { @messages << envelope },
+          status: ->(envelope) { @statuses << envelope }
+      )
+    end
+
+    it 'works' do
+      pubnub = Pubnub.new(subscribe_key: 'sub-c-9fb06248-0a21-11e7-91d0-02ee2ddab7fe', publish_key: 'pub-c-7a6fa2a4-a4c4-4eb4-9a21-a3334d38209d', uuid: '')
+      pubnub.add_listener(callback: @callbacks)
+
+      VCR.use_cassette('lib/events/presence_delta', record: :once) do
+        pubnub.presence(channel: :demo)
+
+        eventually do
+          expect(@messages[0].result[:data]).to eq({:message=>{"action"=>"interval", "timestamp"=>1490958575, "occupancy"=>3}, :subscribed_channel=>"demo-pnpres", :actual_channel=>"demo-pnpres", :publish_time_object=>{:timetoken=>"14909585750910131", :region_code=>1}, :message_meta_data=>nil, :presence_event=>"interval", :presence=>{:uuid=>nil, :timestamp=>1490958575, :state=>nil, :occupancy=>3}})
+          expect(@messages[1].result[:data]).to eq({:message=>{"action"=>"interval", "timestamp"=>1490958585, "occupancy"=>4, "join"=>["Client-d39lr"]}, :subscribed_channel=>"demo-pnpres", :actual_channel=>"demo-pnpres", :publish_time_object=>{:timetoken=>"14909585850925693", :region_code=>1}, :message_meta_data=>nil, :presence_event=>"interval", :presence=>{:uuid=>nil, :timestamp=>1490958585, :state=>nil, :occupancy=>4}})
+          expect(@messages[2].result[:data]).to eq({:message=>{"action"=>"interval", "timestamp"=>1490958595, "occupancy"=>3, "leave"=>["another-client"]}, :subscribed_channel=>"demo-pnpres", :actual_channel=>"demo-pnpres", :publish_time_object=>{:timetoken=>"14909585950916556", :region_code=>1}, :message_meta_data=>nil, :presence_event=>"interval", :presence=>{:uuid=>nil, :timestamp=>1490958595, :state=>nil, :occupancy=>3}})
+          expect(@messages[3].result[:data]).to eq({:message=>{"action"=>"interval", "timestamp"=>1490958605, "occupancy"=>2, "join"=>["another-client"], "leave"=>["Client-d39lr", "client0"]}, :subscribed_channel=>"demo-pnpres", :actual_channel=>"demo-pnpres", :publish_time_object=>{:timetoken=>"14909586050915528", :region_code=>1}, :message_meta_data=>nil, :presence_event=>"interval", :presence=>{:uuid=>nil, :timestamp=>1490958605, :state=>nil, :occupancy=>2}})
+        end
+      end
+    end
+  end
+end

data/spec/lib/multiple_ciphers_spec.rb

@@ -0,0 +1,145 @@
+require 'spec_helper'
+
+describe 'Using multiple cipher keys' do
+
+  around :each do |example|
+    Celluloid.boot
+    example.run
+    Celluloid.shutdown
+  end
+
+  it 'works with publish' do
+    @pubnub = Pubnub.new(subscribe_key: :demo, publish_key: :demo, cipher_key: 'this_doesnt_fit_anywhere')
+
+    VCR.use_cassette('lib/multiple_ciphers', record: :once) do
+      # Fetch current timestamp
+      @pubnub.subscribe(channel: :multiple_cipher_test, http_sync: true)
+
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Some test message',
+        cipher_key: 'super_secret',
+        http_sync: true
+      )
+
+      e0 = @pubnub.subscribe(
+        channel: :multiple_cipher_test,
+        cipher_key: 'super_secret',
+        http_sync: true
+      ).first
+
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Another test message',
+        cipher_key: 'another_secret',
+        http_sync: true
+      )
+
+      e1 = @pubnub.subscribe(
+        channel: :multiple_cipher_test,
+        cipher_key: 'another_secret',
+        http_sync: true
+      ).first
+
+      expect(e0.result[:data][:message]).to eq 'Some test message'
+      expect(e1.result[:data][:message]).to eq 'Another test message'
+    end
+  end
+
+  it 'works with history' do
+    @pubnub = Pubnub.new(subscribe_key: :demo, publish_key: :demo, cipher_key: 'this_doesnt_fit_anywhere')
+
+    VCR.use_cassette('lib/multiple_ciphers_history', record: :once) do
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Some test message',
+        cipher_key: 'super_secret',
+        http_sync: true
+      )
+
+      e0 = @pubnub.history(
+        channel: :multiple_cipher_test,
+        cipher_key: 'super_secret',
+        count: 1,
+        http_sync: true
+      )
+
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Another test message',
+        cipher_key: 'another_secret',
+        http_sync: true
+      )
+
+      e1 = @pubnub.history(
+        channel: :multiple_cipher_test,
+        cipher_key: 'another_secret',
+        count: 1,
+        http_sync: true
+      )
+
+      expect(e0.result[:data][:messages].first).to eq 'Some test message'
+      expect(e1.result[:data][:messages].first).to eq 'Another test message'
+    end
+  end
+
+  it 'works with async history' do
+    @pubnub = Pubnub.new(subscribe_key: :demo, publish_key: :demo, cipher_key: 'this_doesnt_fit_anywhere')
+
+    VCR.use_cassette('lib/multiple_ciphers_history', record: :once) do
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Some test message',
+        cipher_key: 'super_secret',
+        http_sync: true
+      )
+
+      e0 = @pubnub.history(
+        channel: :multiple_cipher_test,
+        cipher_key: 'super_secret',
+        count: 1
+      ).value
+
+      @pubnub.publish(
+        channel: :multiple_cipher_test,
+        message: 'Another test message',
+        cipher_key: 'another_secret',
+        http_sync: true
+      )
+
+      e1 = @pubnub.history(
+        channel: :multiple_cipher_test,
+        cipher_key: 'another_secret',
+        count: 1
+      ).value
+
+      expect(e0.result[:data][:messages].first).to eq 'Some test message'
+      expect(e1.result[:data][:messages].first).to eq 'Another test message'
+    end
+  end
+  
+  it 'works with asynchronous subscribe and callable cipher key argument' do
+    @message = nil
+    cb = Pubnub::SubscribeCallback.new(
+      message: ->(envelope){ @message = envelope.result[:data][:message] }
+    )
+
+    ciphers = {
+      'some-uuid' => 'secret'
+    }
+
+    lambda_cipher_key = ->(data) do
+      ciphers[data[:issuing_client_id]]
+    end
+
+    @pubnub = Pubnub.new(subscribe_key: :demo, publish_key: :demo, cipher_key_selector: lambda_cipher_key)
+    @pubnub.add_listener(callback: cb)
+
+    VCR.use_cassette('lib/callable_cipher_key', record: :once) do
+      @pubnub.subscribe(channel: :multiple_cipher_test)
+      sleep(1)
+      expect(@message).to eq('hello ruby!')
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -26,7 +26,7 @@ Celluloid.task_class = Celluloid::Task::Threaded
 # AsyncHelper allows us to wait for async operations
 module AsyncHelper
   def eventually(options = {})
-    timeout = options[:timeout] || 20
+    timeout = options[:timeout] || 30
     interval = options[:interval] || 0.1
     time_limit = Time.now + timeout
     loop_it(interval, time_limit) do yield end
@@ -73,6 +73,6 @@ VCR.configure do |c|
   c.ignore_hosts 'api.codacy.com'
   c.default_cassette_options = {
     match_requests_on: [:method,
-                        VCR.request_matchers.uri_without_param(:pnsdk, :uuid, :ortt, :seqn)]
+                        VCR.request_matchers.uri_without_param(:pnsdk, :uuid, :ortt, :seqn, :t)]
   }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 4.0.19
+  version: 4.0.20
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-06 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -10435,6 +10435,7 @@ files:
 - fixtures/vcr_cassettes/examples/where_now/4.yml
 - fixtures/vcr_cassettes/examples/where_now/5.yml
 - fixtures/vcr_cassettes/integration/publish/publish-store-replicate.yml
+- fixtures/vcr_cassettes/lib/callable_cipher_key.yml
 - fixtures/vcr_cassettes/lib/events/audit-error.yml
 - fixtures/vcr_cassettes/lib/events/audit-json-error.yml
 - fixtures/vcr_cassettes/lib/events/audit-works.yml
@@ -10455,6 +10456,7 @@ files:
 - fixtures/vcr_cassettes/lib/events/presence-async.yml
 - fixtures/vcr_cassettes/lib/events/presence-sync-error.yml
 - fixtures/vcr_cassettes/lib/events/presence-sync.yml
+- fixtures/vcr_cassettes/lib/events/presence_delta.yml
 - fixtures/vcr_cassettes/lib/events/publish-error.yml
 - fixtures/vcr_cassettes/lib/events/publish.yml
 - fixtures/vcr_cassettes/lib/events/revoke-error.yml
@@ -10473,6 +10475,8 @@ files:
 - fixtures/vcr_cassettes/lib/events/time.yml
 - fixtures/vcr_cassettes/lib/events/where-now-error.yml
 - fixtures/vcr_cassettes/lib/events/where-now.yml
+- fixtures/vcr_cassettes/lib/multiple_ciphers.yml
+- fixtures/vcr_cassettes/lib/multiple_ciphers_history.yml
 - fixtures/vcr_cassettes/lib/ssl-error.yml
 - fixtures/vcr_cassettes/lib/super_admin/cg.yml
 - fixtures/vcr_cassettes/lib/super_admin/here_now.yml
@@ -10488,6 +10492,7 @@ files:
 - lib/pubnub.rb
 - lib/pubnub/client.rb
 - lib/pubnub/client/events.rb
+- lib/pubnub/client/getters_setters.rb
 - lib/pubnub/client/helpers.rb
 - lib/pubnub/client/paged_history.rb
 - lib/pubnub/configuration.rb
@@ -10497,6 +10502,8 @@ files:
 - lib/pubnub/error.rb
 - lib/pubnub/error_envelope.rb
 - lib/pubnub/event.rb
+- lib/pubnub/event/formatter.rb
+- lib/pubnub/event/signature.rb
 - lib/pubnub/events/audit.rb
 - lib/pubnub/events/channel_registration.rb
 - lib/pubnub/events/grant.rb
@@ -10575,6 +10582,7 @@ files:
 - spec/lib/events/here_now_spec.rb
 - spec/lib/events/history_spec.rb
 - spec/lib/events/leave_spec.rb
+- spec/lib/events/presence_delta_spec.rb
 - spec/lib/events/presence_spec.rb
 - spec/lib/events/publish_spec.rb
 - spec/lib/events/revoke_spec.rb
@@ -10583,6 +10591,7 @@ files:
 - spec/lib/events/time_spec.rb
 - spec/lib/events/timeout_handling_spec.rb
 - spec/lib/events/where_now_spec.rb
+- spec/lib/multiple_ciphers_spec.rb
 - spec/lib/pubnub_spec.rb
 - spec/lib/ssl_error_spec.rb
 - spec/lib/super_admin_spec.rb
@@ -10593,10 +10602,7 @@ homepage: http://github.com/pubnub/ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: |-
-  -----
-  UPGRADE NOTICE: Pubnub 3.8.0 and higher versions are using Celluloid instead of EventMachine for asynchronous processing.
-  -----
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -10612,7 +10618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: PubNub Official Ruby gem.
@@ -10645,6 +10651,7 @@ test_files:
 - spec/lib/events/here_now_spec.rb
 - spec/lib/events/history_spec.rb
 - spec/lib/events/leave_spec.rb
+- spec/lib/events/presence_delta_spec.rb
 - spec/lib/events/presence_spec.rb
 - spec/lib/events/publish_spec.rb
 - spec/lib/events/revoke_spec.rb
@@ -10653,6 +10660,7 @@ test_files:
 - spec/lib/events/time_spec.rb
 - spec/lib/events/timeout_handling_spec.rb
 - spec/lib/events/where_now_spec.rb
+- spec/lib/multiple_ciphers_spec.rb
 - spec/lib/pubnub_spec.rb
 - spec/lib/ssl_error_spec.rb
 - spec/lib/super_admin_spec.rb