pubnub 4.0.27 → 4.0.28

data/README.md

@@ -1,34 +1,34 @@
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b744287bb0324e2883f95525b12cf19f)](https://www.codacy.com/app/blazeroot/ruby?utm_source=github.com&utm_medium=referral&utm_content=pubnub/ruby&utm_campaign=badger)
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/b744287bb0324e2883f95525b12cf19f)](https://www.codacy.com/app/blazeroot/ruby?utm_source=github.com&utm_medium=referral&utm_content=pubnub/ruby&utm_campaign=Badge_Coverage)
-[![Build Status](https://travis-ci.org/pubnub/ruby.svg?branch=master)](https://travis-ci.org/pubnub/ruby)
-
-# Please direct all Support Questions and Concerns to Support@PubNub.com
-
-# Complete Documentation
-Available at https://www.pubnub.com/docs/ruby/pubnub-ruby-sdk-v4 **v4.x**
-
-## PubNub Gem version 4.0.27
-
-##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
-##### http://www.pubnub.com/account
-
-www.pubnub.com - PubNub Real-time Push Service in the Cloud.
-
-
-The PubNub Network is a blazingly fast Global Messaging Service for building real-time web and mobile apps. Thousands of apps and developers rely on PubNub for delivering human-perceptive real-time experiences that scale to millions of users worldwide. PubNub delivers the infrastructure needed to build amazing Mobile, MMO games, social apps, business collaborative solutions, and more.
-
-### Upgrading from PubNub 3.6.x / 3.7.x
-
-Main change is that we're no longer using EventMachine. Right now Celluloid is used. Public API remain unchanged.
-If you encounter any issues while upgrading from EventMachine version, please contact us at support@pubnub.com you can also find eventmachine version in "eventmachine" branch of this repo.
-
-### Upgrading from PubNub 3.5.x
-
-We've made the response format compatible across all operations. This may break existing parsing of where_now, leave, state, and PAM responses. So if you are monitoring these operation responses, please be sure to modify your code accordingly.
-
-Examples of affected operations can be found [here](3.5_to_3.6_upgrade_notes.md).
-
-### Upgrading from PubNub 3.3.x and Earlier
-PubNub 3.7.3 is NOT compatible with earlier than 3.4 versions of Pubnub Ruby Client.
-
-# Please direct all Support Questions and Concerns to Support@PubNub.com
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b744287bb0324e2883f95525b12cf19f)](https://www.codacy.com/app/blazeroot/ruby?utm_source=github.com&utm_medium=referral&utm_content=pubnub/ruby&utm_campaign=badger)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/b744287bb0324e2883f95525b12cf19f)](https://www.codacy.com/app/blazeroot/ruby?utm_source=github.com&utm_medium=referral&utm_content=pubnub/ruby&utm_campaign=Badge_Coverage)
+[![Build Status](https://travis-ci.org/pubnub/ruby.svg?branch=master)](https://travis-ci.org/pubnub/ruby)
+
+# Please direct all Support Questions and Concerns to Support@PubNub.com
+
+# Complete Documentation
+Available at https://www.pubnub.com/docs/ruby/pubnub-ruby-sdk-v4 **v4.x**
+
+## PubNub Gem version 4.0.27
+
+##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
+##### http://www.pubnub.com/account
+
+www.pubnub.com - PubNub Real-time Push Service in the Cloud.
+
+
+The PubNub Network is a blazingly fast Global Messaging Service for building real-time web and mobile apps. Thousands of apps and developers rely on PubNub for delivering human-perceptive real-time experiences that scale to millions of users worldwide. PubNub delivers the infrastructure needed to build amazing Mobile, MMO games, social apps, business collaborative solutions, and more.
+
+### Upgrading from PubNub 3.6.x / 3.7.x
+
+Main change is that we're no longer using EventMachine. Right now Celluloid is used. Public API remain unchanged.
+If you encounter any issues while upgrading from EventMachine version, please contact us at support@pubnub.com you can also find eventmachine version in "eventmachine" branch of this repo.
+
+### Upgrading from PubNub 3.5.x
+
+We've made the response format compatible across all operations. This may break existing parsing of where_now, leave, state, and PAM responses. So if you are monitoring these operation responses, please be sure to modify your code accordingly.
+
+Examples of affected operations can be found [here](3.5_to_3.6_upgrade_notes.md).
+
+### Upgrading from PubNub 3.3.x and Earlier
+PubNub 3.7.3 is NOT compatible with earlier than 3.4 versions of Pubnub Ruby Client.
+
+# Please direct all Support Questions and Concerns to Support@PubNub.com

data/VERSION

@@ -1 +1 @@
-4.0.27
+4.0.28

data/gemfiles/celluloid_017.gemfile

@@ -9,17 +9,17 @@ gem 'celluloid', '>= 0.17', '< 0.18'
 gem 'dry-validation', '>= 0.10', '< 0.11'
 
 group :test do
-  gem 'rubocop'
-  gem 'simplecov', '>= 0.12', require: false
   gem 'codacy-coverage', require: false
+  gem 'rr'
   gem 'rspec'
   gem 'rspec-wait'
+  gem 'rubocop'
+  gem 'simplecov', '>= 0.12', require: false
   gem 'vcr'
-  gem 'rr'
   gem 'webmock'
 end
 
 group :development, :test do
-  gem 'pry'
   gem 'awesome_print'
+  gem 'pry'
 end

data/gemfiles/celluloid_018.gemfile

@@ -9,17 +9,17 @@ gem 'celluloid', '>= 0.18.0.pre', '< 0.19'
 gem 'dry-validation', '>= 0.10', '< 0.11'
 
 group :test do
-  gem 'rubocop'
-  gem 'simplecov', '>= 0.12', require: false
   gem 'codacy-coverage', require: false
+  gem 'rr'
   gem 'rspec'
   gem 'rspec-wait'
+  gem 'rubocop'
+  gem 'simplecov', '>= 0.12', require: false
   gem 'vcr'
-  gem 'rr'
   gem 'webmock'
 end
 
 group :development, :test do
-  gem 'pry'
   gem 'awesome_print'
+  gem 'pry'
 end

data/gemfiles/celluloid_master.gemfile

@@ -9,17 +9,17 @@ gem 'celluloid', git: 'https://github.com/celluloid/celluloid.git'
 gem 'dry-validation', '>= 0.10', '< 0.11'
 
 group :test do
-  gem 'rubocop'
-  gem 'simplecov', '>= 0.12', require: false
   gem 'codacy-coverage', require: false
+  gem 'rr'
   gem 'rspec'
   gem 'rspec-wait'
+  gem 'rubocop'
+  gem 'simplecov', '>= 0.12', require: false
   gem 'vcr'
-  gem 'rr'
   gem 'webmock'
 end
 
 group :development, :test do
-  gem 'pry'
   gem 'awesome_print'
+  gem 'pry'
 end

data/lib/pubnub.rb

@@ -3,9 +3,6 @@ require 'base64'
 require 'zlib'
 require 'open-uri'
 require 'openssl'
-require 'celluloid/current'
-
-Celluloid.boot
 
 require 'timers'
 require 'httpclient'
@@ -13,6 +10,9 @@ require 'logger'
 require 'dry-validation'
 require 'cgi'
 
+require 'concurrent'
+require 'concurrent-edge'
+
 require 'pubnub/version'
 require 'pubnub/client'
 

data/lib/pubnub/client.rb

@@ -4,7 +4,6 @@ require 'pubnub/formatter'
 require 'pubnub/crypto'
 require 'pubnub/constants'
 require 'pubnub/configuration'
-require 'pubnub/message'
 require 'pubnub/subscribe_callback'
 
 require 'pubnub/schemas/envelope_schema'
@@ -243,11 +242,11 @@ module Pubnub
       if sync
         @env[:req_dispatchers_pool][:sync][origin] ||= {}
         @env[:req_dispatchers_pool][:sync][origin][event_type] ||=
-            setup_httpclient(event_type)
+          setup_httpclient(event_type)
       else
         @env[:req_dispatchers_pool][:async][origin] ||= {}
         @env[:req_dispatchers_pool][:async][origin][event_type] ||=
-            setup_httpclient(event_type)
+          setup_httpclient(event_type)
       end
     end
 
@@ -269,7 +268,7 @@ module Pubnub
       # @env[:req_dispatchers_pool][origin][event_type].async.terminate
       @env[:req_dispatchers_pool][:async][origin][event_type].reset_all
       @env[:req_dispatchers_pool][:async][origin][event_type] = nil
-    rescue
+    rescue StandardError
       Pubnub.logger.debug('Pubnub::Client') { 'There\'s no requester' }
     end
 
@@ -303,11 +302,11 @@ module Pubnub
     end
 
     def record_telemetry(telemetry_type, time_start, time_end)
-      @telemetry.record_request(telemetry_type, time_start, time_end)
+      @telemetry.async.record_request(telemetry_type, time_start, time_end)
     end
 
     def telemetry_for(event)
-      @telemetry.fetch_average(event)
+      @telemetry.await.fetch_average(event).value
     end
 
     private
@@ -320,23 +319,27 @@ module Pubnub
     end
 
     def setup_httpclient(event_type)
-      if ENV['HTTP_PROXY']
-        hc = HTTPClient.new(ENV['HTTP_PROXY'])
-      else
-        hc = HTTPClient.new
-      end
+      hc = if ENV['HTTP_PROXY']
+             HTTPClient.new(ENV['HTTP_PROXY'])
+           else
+             HTTPClient.new
+           end
 
       case event_type
       when :subscribe_event
-        hc.receive_timeout = 310
+        hc.connect_timeout = @env[:s_open_timeout]
+        hc.send_timeout = @env[:s_send_timeout]
+        hc.receive_timeout = @env[:s_read_timeout]
         unless @env[:disable_keepalive] || @env[:disable_subscribe_keepalive]
-          hc.keep_alive_timeout = 310
+          hc.keep_alive_timeout = @env[:idle_timeout]
           hc.tcp_keepalive = true
         end
       when :single_event
-        hc.receive_timeout = 5
+        hc.connect_timeout = @env[:open_timeout]
+        hc.send_timeout = @env[:send_timeout]
+        hc.receive_timeout = @env[:read_timeout]
         unless @env[:disable_keepalive] || @env[:disable_non_subscribe_keepalive]
-          hc.keep_alive_timeout = 310
+          hc.keep_alive_timeout = @env[:idle_timeout]
           hc.tcp_keepalive = true
         end
       end
@@ -350,7 +353,7 @@ module Pubnub
 
     def setup_app(options)
       Pubnub.logger = options[:logger] || Logger.new('pubnub.log')
-      Celluloid.logger = Pubnub.logger
+      Concurrent.global_logger = Pubnub.logger
       @subscriber = Subscriber.new(self)
       @env = options
     end

data/lib/pubnub/client/events.rb

@@ -4,8 +4,8 @@ module Pubnub
   class Client
     # 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)
+      EVENTS = %w[publish subscribe presence leave history here_now audit grant delete_messages
+                  revoke time heartbeat where_now set_state state channel_registration].freeze
 
       EVENTS.each do |event_name|
         define_method event_name do |options = {}, &block|
@@ -20,13 +20,13 @@ module Pubnub
             @subscriber.add_subscription(event)
             @subscriber.reset
           else
-            event.future.fire
+            Concurrent::Future.execute { event.fire }
           end
         end
       end
 
-      alias_method :unsubscribe, :leave
-      alias_method :get_state, :state
+      alias unsubscribe leave
+      alias get_state state
 
       def fire(options, &block)
         publish(options.merge(store: false, replicate: false), &block)

data/lib/pubnub/client/getters_setters.rb

@@ -24,15 +24,13 @@ module Pubnub
       # Can't change uuid while subscribed. You have to leave every subscribed channel.
       def change_uuid(uuid)
         Pubnub.logger.debug('Pubnub::Client') { 'Changing uuid' }
-        if subscribed?
-          fail('Cannot change UUID while subscribed.')
-        else
-          @env[:uuid] = uuid
-        end
+        raise('Cannot change UUID while subscribed.') if subscribed?
+        @env[:uuid] = uuid
       end
-      alias_method :session_uuid=, :change_uuid
-      alias_method :uuid=, :change_uuid
-      alias_method :set_uuid=, :change_uuid
+
+      alias session_uuid= change_uuid
+      alias uuid= change_uuid
+      alias set_uuid= change_uuid
 
       # Returns:
       # ========
@@ -40,7 +38,8 @@ module Pubnub
       def current_origin
         @env[:origin]
       end
-      alias_method :origin, :current_origin
+
+      alias origin current_origin
 
       # Returns:
       # ========
@@ -103,6 +102,7 @@ module Pubnub
       def events
         @env[:events]
       end
+
       # :nocov:
 
       def current_heartbeat
@@ -113,10 +113,9 @@ module Pubnub
         @env[:heartbeat] = value
       end
 
-      def subscribe_filter=(filter_expr)
-        @env[:subscribe_filter] = filter_expr
+      def subscribe_filter=(filter_exp)
         @subscriber.reset if subscribed?
-        filter_expr
+        @env[:subscribe_filter] = filter_exp
       end
 
       def subscribe_filter

data/lib/pubnub/client/paged_history.rb

@@ -5,13 +5,13 @@ module Pubnub
     # Module that holds paged_history event logic
     module PagedHistory
       def paged_history(options = {}, &block)
-        channel  = options.fetch(:channel)
-        page     = options.fetch(:page, 1)
-        limit    = options.fetch(:limit, 100)
+        channel = options.fetch(:channel)
+        page = options.fetch(:page, 1)
+        limit = options.fetch(:limit, 100)
         callback = options.fetch(:callback, block)
-        sync     = options[:http_sync]
+        sync = options[:http_sync]
         start_tt = options.fetch(:start)
-        end_tt   = options.fetch(:end)
+        end_tt = options.fetch(:end)
         if sync
           sync_paged_history(channel, page, limit, callback, start: start_tt, end: end_tt)
         else
@@ -40,7 +40,7 @@ module Pubnub
       end
 
       def async_paged_history(options)
-        Celluloid::Future.new do
+        Concurrent::Future.new do
           sync_options = options.dup
           sync_options[:http_sync] = true
           paged_history(sync_options, &block)
@@ -49,9 +49,11 @@ module Pubnub
 
       def call_callback(envelopes, callback)
         envelopes.flatten!
-        envelopes.each do |envelope|
-          secure_call callback, envelope
-        end if callback
+        if callback
+          envelopes.each do |envelope|
+            secure_call callback, envelope
+          end
+        end
         envelopes
       end
     end

data/lib/pubnub/configuration.rb

@@ -16,8 +16,7 @@ module Pubnub
         reconnect_interval: Pubnub::Constants::DEFAULT_RECONNECT_INTERVAL,
         region: Pubnub::Constants::DEFAULT_REGION,
         ssl: Pubnub::Constants::DEFAULT_SSL,
-        request_message_count_threshold: Pubnub::Constants::REQUEST_MESSAGE_COUNT_THRESHOLD
-      }
+        request_message_count_threshold: Pubnub::Constants::REQUEST_MESSAGE_COUNT_THRESHOLD }
     end
   end
 end

data/lib/pubnub/constants.rb

@@ -3,62 +3,62 @@ module Pubnub
   # Constants module holds all constants and default values.
   module Constants
     # Config constants
-    DEFAULT_READ_TIMEOUT               = 10
-    DEFAULT_OPEN_TIMEOUT               = 10
-    DEFAULT_IDLE_TIMEOUT               = 10
-    DEFAULT_S_READ_TIMEOUT             = 310
-    DEFAULT_S_OPEN_TIMEOUT             = 310
-    DEFAULT_S_IDLE_TIMEOUT             = 310
-    DEFAULT_H_READ_TIMEOUT             = 10
-    DEFAULT_H_OPEN_TIMEOUT             = 10
-    DEFAULT_H_IDLE_TIMEOUT             = 10
-    DEFAULT_RECONNECT_ATTEMPTS         = 10
-    DEFAULT_RECONNECT_INTERVAL         = 10
-    DEFAULT_ORIGIN                     = 'ps.pndsn.com'
-    DEFAULT_PORT                       = 80
-    PERIODIC_TIMER_INTERVAL            = 0.25
-    DEFAULT_TTL                        = 1440
-    DEFAULT_REGION                     = '0'
-    DEFAULT_SSL                        = false
-    REQUEST_MESSAGE_COUNT_THRESHOLD    = 0
+    DEFAULT_READ_TIMEOUT = 10
+    DEFAULT_OPEN_TIMEOUT = 10
+    DEFAULT_IDLE_TIMEOUT = 10
+    DEFAULT_S_READ_TIMEOUT = 310
+    DEFAULT_S_OPEN_TIMEOUT = 310
+    DEFAULT_S_IDLE_TIMEOUT = 310
+    DEFAULT_H_READ_TIMEOUT = 10
+    DEFAULT_H_OPEN_TIMEOUT = 10
+    DEFAULT_H_IDLE_TIMEOUT = 10
+    DEFAULT_RECONNECT_ATTEMPTS = 10
+    DEFAULT_RECONNECT_INTERVAL = 10
+    DEFAULT_ORIGIN = 'ps.pndsn.com'.freeze
+    DEFAULT_PORT = 80
+    PERIODIC_TIMER_INTERVAL = 0.25
+    DEFAULT_TTL = 1440
+    DEFAULT_REGION = '0'.freeze
+    DEFAULT_SSL = false
+    REQUEST_MESSAGE_COUNT_THRESHOLD = 0
 
     # Envelope values
     # Errors
-    STATUS_ACCESS_DENIED     = :access_denied
-    STATUS_TIMEOUT           = :timeout
+    STATUS_ACCESS_DENIED = :access_denied
+    STATUS_TIMEOUT = :timeout
     STATUS_NON_JSON_RESPONSE = :non_json_response
-    STATUS_ERROR             = :error
-    SSL_ERROR                = :ssl_error
-    STATUS_API_KEY_ERROR     = :api_key_error
+    STATUS_ERROR = :error
+    SSL_ERROR = :ssl_error
+    STATUS_API_KEY_ERROR = :api_key_error
     STATUS_REQUEST_MESSAGE_COUNT_EXCEEDED = :request_message_count_exceeded
 
     # Successes
     STATUS_ACK = :ack
 
-    STATUS_CATEGORY_ERRORS    = [STATUS_ACCESS_DENIED, STATUS_TIMEOUT, STATUS_NON_JSON_RESPONSE, STATUS_API_KEY_ERROR,
-                                 SSL_ERROR]
-    STATUS_CATEGORY_SUCCESSES = [STATUS_ACK]
+    STATUS_CATEGORY_ERRORS = [STATUS_ACCESS_DENIED, STATUS_TIMEOUT, STATUS_NON_JSON_RESPONSE, STATUS_API_KEY_ERROR,
+                              SSL_ERROR].freeze
+    STATUS_CATEGORY_SUCCESSES = [STATUS_ACK].freeze
 
     # Operations
-    OPERATION_SUBSCRIBE                          = :subscribe
-    OPERATION_PUBLISH                            = :publish
-    OPERATION_HEARTBEAT                          = :heartbeat
-    OPERATION_PRESENCE                           = :presence
-    OPERATION_PRESENCE_LEAVE                     = :leave
-    OPERATION_TIME                               = :time
-    OPERATION_HISTORY                            = :history
-    OPERATION_HERE_NOW                           = :here_now
-    OPERATION_WHERE_NOW                          = :where_now
-    OPERATION_GLOBAL_HERE_NOW                    = :global_here_now
-    OPERATION_GET_STATE                          = :get_state
-    OPERATION_SET_STATE                          = :set_state
-    OPERATION_CHANNEL_GROUP_ADD                  = :channel_group_add
-    OPERATION_CHANNEL_GROUP_REMOVE               = :channel_group_remove
-    OPERATION_AUDIT                              = :audit
-    OPERATION_GRANT                              = :grant
-    OPERATION_REVOKE                             = :revoke
-    OPERATION_DELETE                             = :delete
-    OPERATION_LIST_ALL_CHANNEL_GROUPS            = :list_all_channel_groups
+    OPERATION_SUBSCRIBE = :subscribe
+    OPERATION_PUBLISH = :publish
+    OPERATION_HEARTBEAT = :heartbeat
+    OPERATION_PRESENCE = :presence
+    OPERATION_PRESENCE_LEAVE = :leave
+    OPERATION_TIME = :time
+    OPERATION_HISTORY = :history
+    OPERATION_HERE_NOW = :here_now
+    OPERATION_WHERE_NOW = :where_now
+    OPERATION_GLOBAL_HERE_NOW = :global_here_now
+    OPERATION_GET_STATE = :get_state
+    OPERATION_SET_STATE = :set_state
+    OPERATION_CHANNEL_GROUP_ADD = :channel_group_add
+    OPERATION_CHANNEL_GROUP_REMOVE = :channel_group_remove
+    OPERATION_AUDIT = :audit
+    OPERATION_GRANT = :grant
+    OPERATION_REVOKE = :revoke
+    OPERATION_DELETE = :delete
+    OPERATION_LIST_ALL_CHANNEL_GROUPS = :list_all_channel_groups
     OPERATION_LIST_ALL_CHANNELS_IN_CHANNEL_GROUP = :list_all_channels_in_channel_group
 
     OPERATIONS = [
@@ -66,10 +66,10 @@ module Pubnub
       OPERATION_HERE_NOW, OPERATION_GLOBAL_HERE_NOW, OPERATION_GET_STATE, OPERATION_LIST_ALL_CHANNEL_GROUPS,
       OPERATION_LIST_ALL_CHANNELS_IN_CHANNEL_GROUP, OPERATION_CHANNEL_GROUP_ADD, OPERATION_CHANNEL_GROUP_REMOVE,
       OPERATION_AUDIT, OPERATION_GRANT, OPERATION_REVOKE, OPERATION_WHERE_NOW
-    ]
+    ].freeze
 
     # Announcements
-    TIMEOUT_ANNOUNCEMENT     = :disconnect
+    TIMEOUT_ANNOUNCEMENT = :disconnect
     RECONNECTED_ANNOUNCEMENT = :reconnected
   end
 end