pubnub 4.0.27 → 4.0.28

data/lib/pubnub/events/history.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds history functionality
   class History < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::History
 
     def initialize(options, app)
@@ -31,7 +31,7 @@ module Pubnub
 
     def response_message(parsed_response)
       parsed_response[1]
-    rescue
+    rescue StandardError
       nil
     end
 
@@ -42,17 +42,17 @@ module Pubnub
         'sub-key',
         @subscribe_key,
         'channel',
-        Formatter.channels_for_url(@channel),
+        Formatter.channels_for_url(@channel)
       ].join('/')
     end
 
     def parameters(*_args)
       params = super
-      params.merge!(start:   @start)       if @start
-      params.merge!(end:     @end)         if @end
-      params.merge!(count:   @count)       if @count
-      params.merge!(reverse: 'true')       if @reverse
-      params.merge!(include_token: 'true') if @include_token
+      params[:start] = @start if @start
+      params[:end] = @end if @end
+      params[:count] = @count if @count
+      params[:reverse] = 'true' if @reverse
+      params[:include_token] = 'true' if @include_token
       params
     end
 
@@ -69,9 +69,9 @@ module Pubnub
       finish = parsed_response[2]
 
       Pubnub::Envelope.new(
-        event:         @event,
+        event: @event,
         event_options: @given_options,
-        timetoken:     nil,
+        timetoken: nil,
         status: {
           code: req_res_objects[:response].code,
           client_request: req_res_objects[:request],

data/lib/pubnub/events/leave.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds leave functionality
   class Leave < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Leave
 
     def initialize(options, app)
@@ -37,7 +37,7 @@ module Pubnub
 
     def parameters(*_args)
       params = super
-      params.merge!('channel-group' => @group.join(',')) unless @group.empty?
+      params['channel-group'] = @group.join(',') unless @group.empty?
       params
     end
 

data/lib/pubnub/events/presence.rb

@@ -3,7 +3,7 @@ module Pubnub
   # Holds presence functionality, beware, most of presence functionality is
   # held by SubscribeEvent
   class Presence < SubscribeEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Presence
 
     def initialize(options, app)

data/lib/pubnub/events/publish.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds publish functionality
   class Publish < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Publish
 
     attr_reader :store
@@ -36,8 +36,6 @@ module Pubnub
       envelopes = fire_callbacks(handle(response, uri))
       finalize_event(envelopes)
       envelopes
-    ensure
-      terminate unless @stay_alive
     end
 
     private
@@ -88,13 +86,13 @@ module Pubnub
 
     def timetoken(parsed_response)
       parsed_response[2]
-    rescue
+    rescue StandardError
       nil
     end
 
     def response_message(parsed_response)
       parsed_response[1]
-    rescue
+    rescue StandardError
       nil
     end
 

data/lib/pubnub/events/revoke.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds revoke functionality
   class Revoke < PAM
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Revoke
 
     def initialize(options, app)
@@ -18,8 +18,8 @@ module Pubnub
     end
 
     def parameters(signature = false)
-      write  = [0, '0', false].include?(@write) ? 1 : 0
-      read   = [0, '0', false].include?(@read) ? 1 : 0
+      write = [0, '0', false].include?(@write) ? 1 : 0
+      read = [0, '0', false].include?(@read) ? 1 : 0
       manage = [0, '0', false].include?(@manage) ? 1 : 0 unless @group.blank?
 
       { timestamp: @timestamp,

data/lib/pubnub/events/set_state.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds SetState functionality
   class SetState < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::SetState
 
     def initialize(options, app)
@@ -20,8 +20,8 @@ module Pubnub
 
     def parameters(*_args)
       parameters = super
-      parameters.merge!(state: encode_parameter(@state))
-      parameters.merge!('channel-group' => format_channel_group(@group).join(',')) unless @group.blank?
+      parameters[:state] = encode_parameter(@state)
+      parameters['channel-group'] = format_channel_group(@group).join(',') unless @group.blank?
       parameters
     end
 

data/lib/pubnub/events/state.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds state functionality
   class State < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::State
 
     def initialize(options, app)
@@ -21,9 +21,7 @@ module Pubnub
 
     def parameters(*_args)
       parameters = super
-      parameters.merge!(
-        'channel-group' => @group.join(',')
-      ) unless @group.blank?
+      parameters['channel-group'] = @group.join(',') unless @group.blank?
       parameters
     end
 
@@ -42,9 +40,9 @@ module Pubnub
 
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
-        event:         @event,
+        event: @event,
         event_options: @given_options,
-        timetoken:     nil,
+        timetoken: nil,
         status: {
           code: req_res_objects[:response].code,
           client_request: req_res_objects[:request],

data/lib/pubnub/events/subscribe.rb

@@ -3,7 +3,7 @@ module Pubnub
   # Holds subscribe functionality, beware, most of subscribe functionality is
   # held by SubscribeEvent
   class Subscribe < SubscribeEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Subscribe
 
     def initialize(options, app)

data/lib/pubnub/events/time.rb

@@ -2,7 +2,7 @@
 module Pubnub
   # Holds time functionality
   class Time < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::Time
 
     def initialize(options, app)
@@ -23,7 +23,7 @@ module Pubnub
 
     def timetoken(parsed_response)
       parsed_response.first
-    rescue
+    rescue StandardError
       nil
     end
 

data/lib/pubnub/events/where_now.rb

@@ -2,15 +2,15 @@
 module Pubnub
   # Holds where_now functionality
   class WhereNow < SingleEvent
-    include Celluloid
+    include Concurrent::Async
     include Pubnub::Validator::WhereNow
 
     def initialize(options, app)
       super
-      @telemetry_name   = :l_pres
+      @telemetry_name = :l_pres
       @uuid_looking_for = options[:uuid] || options['uuid']
-      @uuid             = app.uuid
-      @event            = :where_now
+      @uuid = app.uuid
+      @event = :where_now
     end
 
     private
@@ -32,9 +32,9 @@ module Pubnub
 
     def valid_envelope(parsed_response, req_res_objects)
       Pubnub::Envelope.new(
-        event:         @event,
+        event: @event,
         event_options: @given_options,
-        timetoken:     nil,
+        timetoken: nil,
         status: {
           code: req_res_objects[:response].code,
           client_request: req_res_objects[:request],

data/lib/pubnub/format.rb

@@ -0,0 +1,73 @@
+# Toplevel Pubnub module.
+module Pubnub
+  input_paths = if ARGV.empty?
+                  Dir.glob("#{File.dirname(__FILE__)}/*.in.rb")
+                else
+                  ARGV
+                end.map { |p| File.expand_path p }
+
+  input_paths.each_with_index do |input_path, _i|
+    pid = fork do
+      require_relative 'init.rb'
+
+      begin
+        output_path = input_path.gsub /\.in\.rb$/, '.out.rb'
+        input = File.readlines(input_path)
+
+        chunks = []
+        line = ''
+
+        until input.empty?
+          line += input.shift
+          if Pry::Code.complete_expression? line
+            chunks << line
+            line = ''
+          end
+        end
+
+        raise unless line.empty?
+
+        chunks.map! { |chunk| [chunk, [chunk.split($INPUT_RECORD_SEPARATOR).size, 1].max] }
+        environment = Module.new.send :binding
+        evaluate = lambda do |code, line|
+          p 'eval'
+          eval(code, environment, input_path, line)
+        end
+
+        indent = 50
+
+        line_count = 1
+        output = ''
+        chunks.each do |chunk, lines|
+          result = evaluate.call(chunk, line_count)
+          if chunk.strip.empty? || chunk =~ /\A *#/
+            output << chunk
+          else
+            pre_lines = chunk.lines.to_a
+            last_line = pre_lines.pop
+            output << pre_lines.join
+
+            if last_line =~ /\#$/
+              output << last_line.gsub(/\#$/, '')
+            else
+              if last_line.size < indent && result.inspect.size < indent
+                output << format("%-#{indent}s %s", last_line.chomp, "# => #{result.inspect}\n")
+              else
+                output << last_line << "    # => #{result.inspect}\n"
+              end
+            end
+          end
+          line_count += lines
+        end
+
+        puts "#{input_path}\n -> #{output_path}"
+        # puts output
+        File.write(output_path, output)
+      rescue StandardError => ex
+        puts "#{ex} (#{ex.class})\n#{ex.backtrace * "\n"}"
+      end
+    end
+
+    Process.wait pid
+  end
+end

data/lib/pubnub/formatter.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 # Toplevel Pubnub module.
 module Pubnub
   # Bunch of useful methods that are used in many parts of Pubnub and and can be
@@ -32,19 +34,14 @@ module Pubnub
       def format_message(message, cipher_key, uri_escape = true)
         if cipher_key
           pc = Pubnub::Crypto.new(cipher_key)
-          message = pc.encrypt(message)
-          if uri_escape
-            URI.escape(message.to_json)
-          else
-            message.to_json
-          end
+          message = pc.encrypt(message).to_json
+          # rubocop:disable Lint/UriEscapeUnescape
+          message = URI.escape(message) if uri_escape
         else
-          if uri_escape
-            Formatter.encode(message.to_json)
-          else
-            message.to_json
-          end
+          message = message.to_json
+          message = Formatter.encode(message) if uri_escape
         end
+        message
       end
 
       # Quite lazy way, but good enough for current usage
@@ -58,13 +55,18 @@ module Pubnub
 
       def make_channel_array(channel)
         case channel.class.to_s
-        when 'String' then channel.to_s.split(',')
-        when 'Symbol' then channel.to_s.split(',')
-        when 'Array' then channel.map(&:to_s)
-        when 'NilClass' then []
-        else fail Pubnub::ArgumentError.new(
-          message: 'Channel has to be String, Symbol or Array'
-        ), 'Channel has to be String, Symbol or Array'
+        when 'String'
+          channel.to_s.split(',')
+        when 'Symbol'
+          channel.to_s.split(',')
+        when 'Array'
+          channel.map(&:to_s)
+        when 'NilClass'
+          []
+        else
+          raise Pubnub::ArgumentError.new(
+            message: 'Channel has to be String, Symbol or Array'
+          ), 'Channel has to be String, Symbol or Array'
         end
       end
 
@@ -79,10 +81,10 @@ module Pubnub
       def params_hash_to_url_params(hash)
         params = ''
         hash.sort_by { |k, _v| k.to_s }.to_h.each do |key, value|
-          if %w(meta ortt).include?(key.to_s)
+          if %w[meta ortt].include?(key.to_s)
             encoded_value = URI.encode_www_form_component(value.to_json).gsub('+', '%20')
             params << "#{key}=#{encoded_value}&"
-          elsif %w(t state filter-expr).include?(key.to_s)
+          elsif %w[t state filter-expr].include?(key.to_s)
             params << "#{key}=#{value}&"
           else
             params << "#{key}=#{URI.encode_www_form_component(value).gsub('+', '%20')}&"
@@ -93,7 +95,7 @@ module Pubnub
 
       # Returns string with all channels separated by comma or single coma
       def channels_for_url(channels, should_encode = true)
-        channel = channels.map{ |c| should_encode ? encode(c) : c }.sort.join(',')
+        channel = channels.map { |c| should_encode ? encode(c) : c }.sort.join(',')
         channel = ',' if channel.empty?
         channel
       end

data/lib/pubnub/heart.rb

@@ -2,12 +2,12 @@
 module Pubnub
   # Heart takes responsibility of heartbeat event
   class Heart
-    include Celluloid
+    include Concurrent::Async
 
     def initialize(options)
       @heartbeat = options[:heartbeat]
-      @channel   = options[:channel]
-      @app       = options[:app]
+      @channel = options[:channel]
+      @app = options[:app]
     end
 
     def start_beating
@@ -25,7 +25,7 @@ module Pubnub
 
     def beat
       @app.heartbeat(
-        channel:   @channel,
+        channel: @channel,
         heartbeat: @heartbeat,
         http_sync: true
       )

data/lib/pubnub/origin_manager.rb

@@ -43,7 +43,7 @@ module Pubnub
       response_valid? get_ping_response(uri)
     rescue Errno::ECONNREFUSED
       false
-    rescue => e
+    rescue StandardError => e
       Pubnub.logger.error('Pubnub::OriginManager') do
         "#{e.inspect} #{e.backtrace}"
       end
@@ -71,10 +71,8 @@ module Pubnub
       alive_and_valid?(@http)
     end
 
-    def bring_down(_origin)
-    end
+    def bring_down(_origin); end
 
-    def bring_up(_origin)
-    end
+    def bring_up(_origin); end
   end
 end

data/lib/pubnub/pam.rb

@@ -18,7 +18,7 @@ module Pubnub
         @subscribe_key,
         @publish_key,
         @event,
-        variables_for_signature.gsub(/[!~'()*]/) { |char| '%' + char.ord.to_s(16).upcase } # Replace ! ~ * ' ( )
+        variables_for_signature.gsub(/[!~'()*]/) { |char| '%' + char.ord.to_s(16).upcase }, # Replace ! ~ * ' ( )
       ].join("\n")
 
       Base64.urlsafe_encode64(
@@ -29,10 +29,10 @@ module Pubnub
 
     def parameters(set_signature = false)
       params = super()
-      params.merge!('channel-group' => @group.join(',')) unless @group.blank?
-      params.merge!(timestamp: @timestamp)
-      params.merge!(channel: @channel.join(',')) unless @channel.first.blank?
-      params.merge!(signature: signature) unless set_signature
+      params['channel-group'] = @group.join(',') unless @group.blank?
+      params[:timestamp] = @timestamp
+      params[:channel] = @channel.join(',') unless @channel.first.blank?
+      params[:signature] = signature unless set_signature
       params
     end