pubnub 4.0.27 → 4.0.28

data/spec/lib/ssl_error_spec.rb

@@ -1,37 +1,33 @@
-require 'spec_helper'
-
-describe 'Super admin mode' do
+require "spec_helper"
 
+describe "Super admin mode" do
   around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
+    example.run_with_retry retry: 10
   end
 
   before(:each) do
-    Pubnub::Client.any_instance.stub(:sdk_version).and_return('PubNub-Ruby/4.0.16')
+    Pubnub::Client.any_instance.stub(:sdk_version).and_return("PubNub-Ruby/4.0.16")
 
     @pubnub = Pubnub.new(
-        subscribe_key: 'sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe',
-        publish_key: 'pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11',
-        secret_key: 'sec-c-MjZkYmQyMDUtYmRhZi00ZDY3LThjZGQtNjU2NmNjNmJkODM3',
-        uuid: 'ruby-test',
-        reconnect_interval: 0,
-        ssl: true
+      subscribe_key: "sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe",
+      publish_key: "pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11",
+      secret_key: "sec-c-MjZkYmQyMDUtYmRhZi00ZDY3LThjZGQtNjU2NmNjNmJkODM3",
+      uuid: "ruby-test",
+      reconnect_interval: 0,
+      ssl: true,
     )
   end
 
-  describe 'OpenSSL error' do
-    it 'is caught' do
+  describe "OpenSSL error" do
+    it "is caught" do
       Pubnub::Publish.any_instance.stub(:current_time).and_return(1480343560)
       Pubnub::Publish.any_instance.stub(:send_request).and_return(OpenSSL::SSL::SSLError.new)
       Pubnub::Client.any_instance.stub(:generate_ortt).and_return(14803435605315392)
 
-      VCR.use_cassette('lib/ssl-error', record: :once) do
+      VCR.use_cassette("lib/ssl-error", record: :once) do
         pub = @pubnub.publish(channel: :demo, message: :demo)
         expect(pub.value.status[:category]).to eq Pubnub::Constants::SSL_ERROR
       end
     end
   end
-
-end
+end

data/spec/lib/super_admin_spec.rb

@@ -1,166 +1,158 @@
-require 'spec_helper'
-
-describe 'Super admin mode' do
+require "spec_helper"
 
+describe "Super admin mode" do
   around :each do |example|
-    Celluloid.boot
-    example.run
-    Celluloid.shutdown
+    example.run_with_retry retry: 10
   end
 
   before(:each) do
-    Pubnub::Client.any_instance.stub(:sdk_version).and_return('PubNub-Ruby/4.0.10')
+    Pubnub::Client.any_instance.stub(:sdk_version).and_return("PubNub-Ruby/4.0.10")
 
-    @messages  = []
-    @statuses  = []
+    @messages = []
+    @statuses = []
     @presences = []
 
     @callbacks = Pubnub::SubscribeCallback.new(
-        message:  ->(envelope) { @messages  << envelope },
-        presence: ->(envelope) { @presences << envelope },
-        status:   ->(envelope) { @statuses  << envelope }
+      message: -> (envelope) { @messages << envelope },
+      presence: -> (envelope) { @presences << envelope },
+      status: -> (envelope) { @statuses << envelope },
     )
 
     @pubnub = Pubnub.new(
-        subscribe_key: 'sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe',
-        publish_key: 'pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11',
-        secret_key: 'sec-c-MjZkYmQyMDUtYmRhZi00ZDY3LThjZGQtNjU2NmNjNmJkODM3',
-        uuid: 'ruby-test',
-        reconnect_interval: 0
+      subscribe_key: "sub-c-f9f24520-9c56-11e6-a681-02ee2ddab7fe",
+      publish_key: "pub-c-9bb9ae77-a60c-4788-96ab-75cbe5d5dd11",
+      secret_key: "sec-c-MjZkYmQyMDUtYmRhZi00ZDY3LThjZGQtNjU2NmNjNmJkODM3",
+      uuid: "ruby-test",
+      reconnect_interval: 0,
     )
 
     @pubnub.add_listener(callback: @callbacks)
   end
 
-  it 'works with channel registration' do
+  it "works with channel registration" do
     Pubnub::ChannelRegistration.any_instance.stub(:current_time).and_return(1477672650)
 
-    VCR.use_cassette('lib/super_admin/cg', record: :once) do
+    VCR.use_cassette("lib/super_admin/cg", record: :once) do
       envelope = @pubnub.channel_registration(
-          action: :add,
-          channel: :demo,
-          group: :demo
+        action: :add,
+        channel: :demo,
+        group: :demo,
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with here_now' do
+  it "works with here_now" do
     Pubnub::HereNow.any_instance.stub(:current_time).and_return(1477672650)
 
-    VCR.use_cassette('lib/super_admin/here_now', record: :once) do
+    VCR.use_cassette("lib/super_admin/here_now", record: :once) do
       envelope = @pubnub.here_now(
-          channel: :demo
+        channel: :demo,
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with history' do
+  it "works with history" do
     Pubnub::History.any_instance.stub(:current_time).and_return(1477672650)
 
-    VCR.use_cassette('lib/super_admin/history', record: :once) do
+    VCR.use_cassette("lib/super_admin/history", record: :once) do
       envelope = @pubnub.history(
-          channel: :demo
+        channel: :demo,
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
-
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with leave' do
+  it "works with leave" do
     Pubnub::Leave.any_instance.stub(:current_time).and_return(1477907746)
 
-    VCR.use_cassette('lib/super_admin/leave', record: :once) do
+    VCR.use_cassette("lib/super_admin/leave", record: :once) do
       envelope = @pubnub.leave(
-          channel: :demo
+        channel: :demo,
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with presence' do
-    VCR.use_cassette('lib/super_admin/presence', record: :once) do
+  it "works with presence" do
+    VCR.use_cassette("lib/super_admin/presence", record: :once) do
       Pubnub::Subscribe.any_instance.stub(:current_time).and_return(1477921137)
 
       @pubnub.presence(channel: :demo)
 
       eventually do
         envelope = @presences.first
-        expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+        expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
       end
-
     end
   end
 
-  it 'works with publish' do
+  it "works with publish" do
     Pubnub::Publish.any_instance.stub(:current_time).and_return(1477919007)
     Pubnub::Client.any_instance.stub(:generate_ortt).and_return(14779190077911314)
 
-    VCR.use_cassette('lib/super_admin/publish', record: :once) do
+    VCR.use_cassette("lib/super_admin/publish", record: :once) do
       envelope = @pubnub.publish(
-          channel: 'demo',
-          message: 'whatever',
-          http_sync: true
+        channel: "demo",
+        message: "whatever",
+        http_sync: true,
       )
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
       expect(envelope).to be_an_instance_of(Pubnub::Envelope)
     end
   end
 
-  it 'works with state' do
+  it "works with state" do
     Pubnub::State.any_instance.stub(:current_time).and_return(1477672672)
 
-    VCR.use_cassette('lib/super_admin/state', record: :once) do
+    VCR.use_cassette("lib/super_admin/state", record: :once) do
       envelope = @pubnub.state(
-          channel: :demo,
-          uuid: :whatever
+        channel: :demo,
+        uuid: :whatever,
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
-
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with subscribe' do
+  it "works with subscribe" do
     Pubnub::Subscribe.any_instance.stub(:current_time).and_return(1477921157)
 
-
-    VCR.use_cassette('lib/super_admin/subscribe', record: :once) do
+    VCR.use_cassette("lib/super_admin/subscribe", record: :once) do
       @pubnub.subscribe(channel: :demo)
 
       eventually do
         envelope = @messages.first
-        expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+        expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
       end
     end
   end
 
-  it 'works with time' do
+  it "works with time" do
     Pubnub::Time.any_instance.stub(:current_time).and_return(1477672693)
 
-    VCR.use_cassette('lib/super_admin/time', record: :once) do
+    VCR.use_cassette("lib/super_admin/time", record: :once) do
       envelope = @pubnub.time.value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
 
-  it 'works with where_now' do
+  it "works with where_now" do
     Pubnub::WhereNow.any_instance.stub(:current_time).and_return(1477672693)
-    
-    VCR.use_cassette('lib/super_admin/where_now', record: :once) do
+
+    VCR.use_cassette("lib/super_admin/where_now", record: :once) do
       envelope = @pubnub.where_now(
-          uuid: 'ruby-test'
+        uuid: "ruby-test",
       ).value
 
-      expect(envelope.status[:client_request].to_s.index('&signature=')).to be_truthy
-
+      expect(envelope.status[:client_request].to_s.index("&signature=")).to be_truthy
     end
   end
-end
+end

data/spec/lib/uuid_spec.rb

@@ -1,9 +1,8 @@
-require 'spec_helper'
+require "spec_helper"
 
 describe Pubnub::UUID do
-  it 'generates valid UUID' do
-    expect(Pubnub::UUID.generate)
-    .to match(
+  it "generates valid UUID" do
+    expect(Pubnub::UUID.generate).to match(
       /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}
       -[0-9a-f]{12}$/x
     )

data/spec/spec_expectations.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations'
+require "rspec/expectations"
 
 RSpec::Matchers.define :satisfies_schema do |expected|
   match do |actual|
@@ -8,6 +8,6 @@ RSpec::Matchers.define :satisfies_schema do |expected|
 
   failure_message do |actual|
     msg = "expected that given hash will fit the schema.\n"
-    msg + @check.messages.map { |k,v| "#{k}: #{v}" }.join("\n")
+    msg + @check.messages.map { |k, v| "#{k}: #{v}" }.join("\n")
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,55 +1,34 @@
-require 'rubygems'
-require 'rr'
-require 'stringio'
-require 'webmock/rspec'
-require 'vcr'
-require 'celluloid/current'
-require 'celluloid/test'
-require 'pry'
-require 'rspec/wait'
-require 'spec_expectations'
-
-require 'simplecov'
+require "rubygems"
+require "rr"
+require "stringio"
+require "webmock/rspec"
+require "vcr"
+require "pry"
+require "spec_expectations"
+require "concurrent"
+require "concurrent-edge"
+require "rspec/retry"
+require "simplecov"
 SimpleCov.start do
-  add_filter '/spec/'
+  add_filter "/spec/"
 end
 
-require 'pubnub'
-
-if ENV['CI'] == 'true'
-  require 'codacy-coverage'
+require "pubnub"
+Pubnub::Constants::DEFAULT_RECONNECT_INTERVAL = 0
+if ENV["CI"] == "true"
+  require "codacy-coverage"
   Codacy::Reporter.start
 end
 
-Celluloid.task_class = Celluloid::Task::Threaded
-
-module CelluloidHotFix
-  # We can't shutdown the actor if there is no actor running.
-  #
-  # See https://github.com/celluloid/celluloid/pull/766
-  def shutdown
-    super if @actor_system
-    @actor_system = nil
-  end
-
-  # We can't verify if the actor is running if there is no actor
-  # running.
-  #
-  # This is a problem generated by the hotfix above.
-  def running?
-    super if @actor_system
-  end
-end
-
-Celluloid.singleton_class.prepend(CelluloidHotFix)
-
 # AsyncHelper allows us to wait for async operations
 module AsyncHelper
   def eventually(options = {})
     timeout = options[:timeout] || 30
     interval = options[:interval] || 0.1
     time_limit = Time.now + timeout
-    loop_it(interval, time_limit) do yield end
+    loop_it(interval, time_limit) do
+      yield
+    end
   end
 
   def loop_it(interval, time_limit)
@@ -73,9 +52,9 @@ RSpec.configure do |config|
   config.mock_framework = :rspec
   config.tty = true
 
-  logfile = File.open(File.expand_path('../../test.log', __FILE__), 'a')
+  logfile = File.open(File.expand_path("../../test.log", __FILE__), "a")
   logfile.sync = true
-  Celluloid.logger = Logger.new(logfile)
+  Concurrent.global_logger = Logger.new(logfile)
 
   # config.around(:each) do |example|
   #   if example.metadata[:disable_vcr]
@@ -87,13 +66,17 @@ RSpec.configure do |config|
 end
 
 VCR.configure do |c|
-  c.cassette_library_dir = 'fixtures/vcr_cassettes'
+  ignored_params = [
+      :pnsdk, :uuid, :ortt, :seqn, :t,
+      :l_pres, :l_pub, :l_pres, :l_hist, :l_cg, :l_time
+  ]
+  c.cassette_library_dir = "fixtures/vcr_cassettes"
   c.hook_into :webmock
   c.allow_http_connections_when_no_cassette = false
-  c.ignore_hosts 'api.codacy.com'
+  c.ignore_hosts "api.codacy.com"
   c.default_cassette_options = {
     match_requests_on: [:method,
-                        VCR.request_matchers.uri_without_param(:pnsdk, :uuid, :ortt, :seqn, :t)]
+                        VCR.request_matchers.uri_without_param(*ignored_params)],
   }
-  c.debug_logger = File.open('vcr.log', 'w')
+  c.debug_logger = File.open("vcr.log", "w")
 end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 4.0.27
+  version: 4.0.28
 platform: ruby
 authors:
 - PubNub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: json
+  name: concurrent-ruby-edge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
-    - - "<"
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: dry-validation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -65,19 +73,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.8.3
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: timers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -10524,6 +10552,8 @@ files:
 - gemfiles/celluloid_018.gemfile.lock
 - gemfiles/celluloid_master.gemfile
 - gemfiles/celluloid_master.gemfile.lock
+- gemfiles/concurrent-ruby-1.0.5.gem
+- gemfiles/concurrent-ruby-edge-0.3.1.gem
 - lib/pubnub.rb
 - lib/pubnub/client.rb
 - lib/pubnub/client/events.rb
@@ -10555,9 +10585,9 @@ files:
 - lib/pubnub/events/subscribe.rb
 - lib/pubnub/events/time.rb
 - lib/pubnub/events/where_now.rb
+- lib/pubnub/format.rb
 - lib/pubnub/formatter.rb
 - lib/pubnub/heart.rb
-- lib/pubnub/message.rb
 - lib/pubnub/origin_manager.rb
 - lib/pubnub/pam.rb
 - lib/pubnub/schemas/envelope_schema.rb
@@ -10660,7 +10690,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PubNub Official Ruby gem.