pubnub 4.0.27 → 4.0.28

data/spec/lib/connection_callback_spec.rb

@@ -1,70 +1,64 @@
-require 'spec_helper'
-
-describe 'Connect, disconnect and reconnect callbacks' do
+require "spec_helper"
 
+describe "Connect, disconnect and reconnect callbacks" do
   around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
+    example.run_with_retry retry: 10
   end
 
   before(:each) do
     @connect_messages, @reconnect_messages, @disconnect_messages = [], [], []
 
     callback = Pubnub::SubscribeCallback.new(
-        message:  ->(_envelope) {  },
-        presence: ->(_envelope) {  },
-        status:   lambda do |envelope|
-
-          if envelope.error?
-            @disconnect_messages << envelope
-          else
-            if envelope.status[:last_timetoken] == 0 && !@disconnect_messages.empty?
-              @reconnect_messages << envelope
-            elsif envelope.status[:last_timetoken] == 0 # Connected!
-              @connect_messages << envelope
-              @pubnub.leave(channel: :demo)
-            end
+      message: -> (_envelope) { },
+      presence: -> (_envelope) { },
+      status: lambda do |envelope|
+        if envelope.error?
+          @disconnect_messages << envelope
+        else
+          if envelope.status[:last_timetoken] == 0 && !@disconnect_messages.empty?
+            @reconnect_messages << envelope
+          elsif envelope.status[:last_timetoken] == 0 # Connected!
+            @connect_messages << envelope
+            @pubnub.leave(channel: :demo)
           end
         end
+      end,
     )
 
     @pubnub = Pubnub.new(
-        subscribe_key: :demo,
-        publish_key: :demo,
-        reconnect_interval: 0
+      subscribe_key: :demo,
+      publish_key: :demo,
+      reconnect_interval: 0,
     )
 
     @pubnub.add_listener(callback: callback)
   end
 
-  it 'fire connect callback when connection is made' do
-    VCR.use_cassette('client/connection_callbacks_0', :record => :once) do
+  it "fire connect callback when connection is made" do
+    VCR.use_cassette("client/connection_callbacks_0", :record => :once) do
       @pubnub.subscribe(channel: :demo)
       sleep 0.5
       expect(@connect_messages.size).to be > 0
     end
   end
 
-  it 'fire status callback when connection is lost' do
+  it "fire status callback when connection is lost" do
+    Pubnub::SubscribeEvent.any_instance.stub(:request_dispatcher) { Pubnub::SubscribeEvent.any_instance.unstub(:request_dispatcher); raise "error" }
 
-    Pubnub::SubscribeEvent.any_instance.stub(:request_dispatcher) { Pubnub::SubscribeEvent.any_instance.unstub(:request_dispatcher); raise 'error' }
-
-    VCR.use_cassette('client/connection_callbacks_1', :record => :once) do
+    VCR.use_cassette("client/connection_callbacks_1", :record => :once) do
       @pubnub.subscribe(channel: :demo)
       sleep 0.5
       expect(@disconnect_messages.size).to be > 0
     end
   end
 
-  it 'fire reconnect callback when connection is reestablished' do
-    Pubnub::SubscribeEvent.any_instance.stub(:request_dispatcher) { Pubnub::SubscribeEvent.any_instance.unstub(:request_dispatcher); raise 'error' }
+  it "fire reconnect callback when connection is reestablished" do
+    Pubnub::SubscribeEvent.any_instance.stub(:request_dispatcher) { Pubnub::SubscribeEvent.any_instance.unstub(:request_dispatcher); raise "error" }
 
-    VCR.use_cassette('client/connection_callbacks_2', :record => :once) do
+    VCR.use_cassette("client/connection_callbacks_2", :record => :once) do
       @pubnub.subscribe(channel: :demo)
       sleep 0.5
       expect(@reconnect_messages.size).to be > 0
     end
   end
-
-end
+end

data/spec/lib/custom_retries_examples_spec.rb

@@ -1,19 +1,16 @@
-require 'spec_helper'
-
-describe 'Custom retries' do
+require "spec_helper"
 
+describe "Custom retries" do
   around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
+    example.run_with_retry retry: 10
   end
 
   before(:each) do
     @pubnub = Pubnub.new(
-        subscribe_key: 'sub-c-446d9780-c606-11e5-a316-0619f8945a4f',
-        publish_key: 'pub-c-63eb50a0-98ed-43b2-999a-c32efb85c747',
-        secret_key: 'sec-c-MTQyMzhjZGUtNTJiYi00MDU0LThkZWQtZDRmMGUwZDk4NjQz',
-        uuid: 'ruby-test-client'
+      subscribe_key: "sub-c-446d9780-c606-11e5-a316-0619f8945a4f",
+      publish_key: "pub-c-63eb50a0-98ed-43b2-999a-c32efb85c747",
+      secret_key: "sec-c-MTQyMzhjZGUtNTJiYi00MDU0LThkZWQtZDRmMGUwZDk4NjQz",
+      uuid: "ruby-test-client",
     )
   end
 
@@ -57,4 +54,4 @@ describe 'Custom retries' do
   #   expect(@success_envelope.timetoken).to eq '14573583203711342'
   # end
 
-end
+end

data/spec/lib/event_spec.rb

@@ -1,86 +1,79 @@
-require 'spec_helper'
-
-shared_examples 'an event' do
+require "spec_helper"
 
+shared_examples "an event" do
   around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
+    example.run_with_retry retry: 10
   end
 
-  it 'is a Celluloid actor' do
+  it "is async" do
     expect(
-        described_class.ancestors
-        .select { |o| o.class == Module }.include? Celluloid
+      described_class.ancestors
+        .select { |o| o.class == Module }.include? Concurrent::Async
     ).to eq true
   end
 
-  context '#initialize' do
-    let(:pubnub_client) { Pubnub.new(subscribe_key: 'demo') }
+  context "#initialize" do
+    let(:pubnub_client) { Pubnub.new(subscribe_key: "demo") }
 
-    it 'sets :channel_group parameter as @group internal variable' do
-      event = described_class.new({ channel_group: 'somegroup', skip_validate: true }, pubnub_client)
-      expect(event.instance_variable_get(:@group)).to eq ['somegroup']
+    it "sets :channel_group parameter as @group internal variable" do
+      event = described_class.new({channel_group: "somegroup", skip_validate: true}, pubnub_client)
+      expect(event.instance_variable_get(:@group)).to eq ["somegroup"]
     end
 
-    it 'sets Pubnub::Client as @app' do
-      event = described_class.new({ channel: 'channel', skip_validate: true }, pubnub_client)
-      expect(event.instance_variable_get('@app')).to eq pubnub_client
+    it "sets Pubnub::Client as @app" do
+      event = described_class.new({channel: "channel", skip_validate: true}, pubnub_client)
+      expect(event.instance_variable_get("@app")).to eq pubnub_client
     end
 
-    it 'logs when initialized' do
+    it "logs when initialized" do
       rd, wr = IO.pipe
       logger = Logger.new(wr)
       pubnub = Pubnub.new(subscribe_key: :key, logger: logger)
 
-      described_class.new({ channel: 'channel', skip_validate: true }, pubnub)
+      described_class.new({channel: "channel", skip_validate: true}, pubnub)
 
       wr.close
       messages = rd.read
 
-      expect(messages)
-      .to match(/.*Initialized\s#{described_class}.*/)
+      expect(messages).to match(/.*Initialized\s#{described_class}.*/)
     end
 
-
-    it 'creates specific instance variables from options' do
+    it "creates specific instance variables from options" do
       vars = [:@origin, :@channel, :@message, :@http_sync, :@callback,
               :@ssl, :@cipher_key,
               :@secret_key, :@auth_key, :@publish_key, :@subscribe_key,
               :@timetoken, :@channels, :@customs]
 
-      event = described_class.new({ channel: 'channel', skip_validate: true }, pubnub_client)
+      event = described_class.new({channel: "channel", skip_validate: true}, pubnub_client)
       expect(vars - event.instance_variables).to eq []
     end
 
-    context 'variables' do
-      it 'merges variables from app and options' do
-        event = described_class.new({ channel: 'chan', skip_validate: true }, pubnub_client)
-        expect(event.instance_variable_get(:@subscribe_key)).to eq 'demo'
+    context "variables" do
+      it "merges variables from app and options" do
+        event = described_class.new({channel: "chan", skip_validate: true}, pubnub_client)
+        expect(event.instance_variable_get(:@subscribe_key)).to eq "demo"
         if described_class == Pubnub::Presence
-          expect(event.instance_variable_get(:@channel)).to       eq ['chan-pnpres']
+          expect(event.instance_variable_get(:@channel)).to eq ["chan-pnpres"]
         else
-          expect(event.instance_variable_get(:@channel)).to       eq ['chan']
+          expect(event.instance_variable_get(:@channel)).to eq ["chan"]
         end
       end
 
-      it 'merges variables from app and options overwriting apps' do
-        event = described_class.new({ subscribe_key: 'key', skip_validate: true }, pubnub_client)
-        expect(event.instance_variable_get(:@subscribe_key)).to eq 'key'
+      it "merges variables from app and options overwriting apps" do
+        event = described_class.new({subscribe_key: "key", skip_validate: true}, pubnub_client)
+        expect(event.instance_variable_get(:@subscribe_key)).to eq "key"
       end
 
-      context '@channel' do
+      context "@channel" do
         if described_class == Pubnub::Presence
-          it 'is set properly when passed as :channels' do
-            event = described_class.new({ channels: 'chan', skip_validate: true }, pubnub_client)
-            expect(event.instance_variable_get(:@channel))
-                .to eq ['chan-pnpres']
+          it "is set properly when passed as :channels" do
+            event = described_class.new({channels: "chan", skip_validate: true}, pubnub_client)
+            expect(event.instance_variable_get(:@channel)).to eq ["chan-pnpres"]
           end
 
-          it 'is formatted to be an array' do
-            event = described_class.new({ channel: 'chan', skip_validate: true }, pubnub_client)
-            expect(event.instance_variable_get(:@channel).class)
-                .to eq Array
+          it "is formatted to be an array" do
+            event = described_class.new({channel: "chan", skip_validate: true}, pubnub_client)
+            expect(event.instance_variable_get(:@channel).class).to eq Array
           end
 
           # it 'is formatted when given as string' do

data/spec/lib/events/audit_spec.rb

@@ -1,32 +1,26 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Pubnub::Audit do
-  it_behaves_like 'an event'
+  it_behaves_like "an event"
 
-  around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
-  end
-
-  context 'given basic parameters' do
+  context "given basic parameters" do
     before :each do
       Pubnub::Audit.any_instance.stub(:current_time).and_return 1462972157
-      Pubnub::Audit.any_instance.stub(:signature).and_return 'P3xhzqxwFJSFthJbnByZog-U4j1S5TMFeuUxqKNgMM0='
+      Pubnub::Audit.any_instance.stub(:signature).and_return "P3xhzqxwFJSFthJbnByZog-U4j1S5TMFeuUxqKNgMM0="
 
       @pubnub = Pubnub::Client.new(
-          subscribe_key: 'sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f',
-          publish_key: 'pub-c-b42cec2f-f468-4784-8833-dd2b074538c4',
-          secret_key: 'sec-c-OWIyYmVlYWYtYWMxMS00OTcxLTlhZDAtZDBlYTM4ODE1MWUy',
-          auth_key: 'ruby-test-auth',
-          uuid: 'ruby-test-uuid'
+        subscribe_key: "sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f",
+        publish_key: "pub-c-b42cec2f-f468-4784-8833-dd2b074538c4",
+        secret_key: "sec-c-OWIyYmVlYWYtYWMxMS00OTcxLTlhZDAtZDBlYTM4ODE1MWUy",
+        auth_key: "ruby-test-auth",
+        uuid: "ruby-test-uuid",
       )
     end
 
-    it 'works' do
-      VCR.use_cassette('lib/events/audit-works', record: :once) do
+    it "works" do
+      VCR.use_cassette("lib/events/audit-works", record: :once) do
         envelope = @pubnub.audit(
-            channel: :demo
+          channel: :demo,
         ).value
 
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
@@ -34,10 +28,10 @@ describe Pubnub::Audit do
       end
     end
 
-    it 'forms valid ErrorEnvelope on error' do
-      VCR.use_cassette('lib/events/audit-error', record: :once) do
+    it "forms valid ErrorEnvelope on error" do
+      VCR.use_cassette("lib/events/audit-error", record: :once) do
         envelope = @pubnub.audit(
-            channel: :demo
+          channel: :demo,
         ).value
 
         expect(envelope.is_a?(Pubnub::ErrorEnvelope)).to eq true
@@ -46,10 +40,10 @@ describe Pubnub::Audit do
       end
     end
 
-    it 'forms valid ErrorEnvelope on json error' do
-      VCR.use_cassette('lib/events/audit-json-error', record: :once) do
+    it "forms valid ErrorEnvelope on json error" do
+      VCR.use_cassette("lib/events/audit-json-error", record: :once) do
         envelope = @pubnub.audit(
-            channel: :demo
+          channel: :demo,
         ).value
 
         expect(envelope.is_a?(Pubnub::ErrorEnvelope)).to eq true
@@ -58,4 +52,4 @@ describe Pubnub::Audit do
       end
     end
   end
-end
+end

data/spec/lib/events/channel_registration_spec.rb

@@ -1,30 +1,24 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Pubnub::ChannelRegistration do
   # it_behaves_like 'an event'
 
-  around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
-  end
-
-  context 'given basic parameters' do
+  context "given basic parameters" do
     before :each do
       @pubnub = Pubnub::Client.new(
-          subscribe_key: 'sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f',
-          publish_key: 'pub-c-b42cec2f-f468-4784-8833-dd2b074538c4',
-          auth_key: 'ruby-test-auth',
-          uuid: 'ruby-test-uuid'
+        subscribe_key: "sub-c-b7fb805a-1777-11e6-be83-0619f8945a4f",
+        publish_key: "pub-c-b42cec2f-f468-4784-8833-dd2b074538c4",
+        auth_key: "ruby-test-auth",
+        uuid: "ruby-test-uuid",
       )
     end
 
-    it 'works' do
-      VCR.use_cassette('lib/events/channel-registration', record: :once) do
+    it "works" do
+      VCR.use_cassette("lib/events/channel-registration", record: :once) do
         envelope = @pubnub.channel_registration(
-            action: :add,
-            channel: :demo,
-            group: :demo
+          action: :add,
+          channel: :demo,
+          group: :demo,
         ).value
 
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
@@ -32,12 +26,12 @@ describe Pubnub::ChannelRegistration do
       end
     end
 
-    it 'forms valid ErrorEnvelope on error' do
-      VCR.use_cassette('lib/events/channel-registration-error', record: :once) do
+    it "forms valid ErrorEnvelope on error" do
+      VCR.use_cassette("lib/events/channel-registration-error", record: :once) do
         envelope = @pubnub.channel_registration(
-            action: :add,
-            channel: :demo,
-            group: :demo
+          action: :add,
+          channel: :demo,
+          group: :demo,
         ).value
 
         expect(envelope.is_a?(Pubnub::ErrorEnvelope)).to eq true
@@ -45,4 +39,4 @@ describe Pubnub::ChannelRegistration do
       end
     end
   end
-end
+end

data/spec/lib/events/delete_messages_spec.rb

@@ -1,38 +1,32 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Pubnub::DeleteMessages do
-  it_behaves_like 'an event'
+  it_behaves_like "an event"
 
-  around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
-  end
-
-  context 'given basic parameters' do
+  context "given basic parameters" do
     before :each do
       @pubnub = Pubnub::Client.new(
-          subscribe_key: 'sub-c-fc6c9226-655d-11e7-b272-02ee2ddab7fe',
-          publish_key: 'pub-c-b458bb23-c95d-4f43-9992-e2c118557e80',
-          auth_key: 'ruby-test-auth',
-          uuid: 'ruby-test-uuid'
+        subscribe_key: "sub-c-fc6c9226-655d-11e7-b272-02ee2ddab7fe",
+        publish_key: "pub-c-b458bb23-c95d-4f43-9992-e2c118557e80",
+        auth_key: "ruby-test-auth",
+        uuid: "ruby-test-uuid",
       )
     end
 
-    it 'works' do
-      VCR.use_cassette('lib/events/delete_messages', record: :once) do
+    it "works" do
+      VCR.use_cassette("lib/events/delete_messages", record: :once) do
         envelope = @pubnub.delete_messages(
-            channel: :demo
+          channel: :demo,
         ).value
 
         expect(envelope.status).to satisfies_schema Pubnub::Schemas::Envelope::StatusSchema
       end
     end
 
-    it 'forms valid ErrorEnvelope on error' do
-      VCR.use_cassette('lib/events/delete_messages-error', record: :once) do
+    it "forms valid ErrorEnvelope on error" do
+      VCR.use_cassette("lib/events/delete_messages-error", record: :once) do
         envelope = @pubnub.delete_messages(
-            channel: :demo
+          channel: :demo,
         ).value
 
         expect(envelope.is_a?(Pubnub::ErrorEnvelope)).to eq true
@@ -40,4 +34,4 @@ describe Pubnub::DeleteMessages do
       end
     end
   end
-end
+end