slack-ruby-client 0.14.4 → 0.16.0

data/lib/slack/logger.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
 require 'logger'
 
 module Slack
   class Logger < ::Logger
     def self.default
-      @logger ||= begin
-        logger = new STDOUT
-        logger.level = Logger::WARN
-        logger
-      end
+      return @default if @default
+
+      logger = new STDOUT
+      logger.level = Logger::WARN
+      @default = logger
     end
   end
 end

data/lib/slack/messages/formatting.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module Messages
     module Formatting

data/lib/slack/messages/message.rb

@@ -1,10 +1,7 @@
+# frozen_string_literal: true
 module Slack
   module Messages
     class Message < Hashie::Mash
-      def presence
-        super['presence']
-      end
-
       def to_s
         keys.sort_by(&:to_s).map do |key|
           "#{key}=#{self[key]}"

data/lib/slack/real_time/api/message.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Api
@@ -6,7 +7,8 @@ module Slack
         # Sends a message to a channel.
         #
         # @option options [channel] :channel
-        #   Channel to send message to. Can be a public channel, private group or IM channel. Can be an encoded ID, or a name.
+        #   Channel to send message to. Can be a public channel, private group or IM channel.
+        #   Can be an encoded ID, or a name.
         # @option options [Object] :text
         #   Text of the message to send. See below for an explanation of formatting.
         def message(options = {})

data/lib/slack/real_time/api/message_id.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Api

data/lib/slack/real_time/api/ping.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Api
       module Ping
         #
-        # Clients should try to quickly detect disconnections, even in idle periods, so that users can easily tell the
-        # difference between being disconnected and everyone being quiet. Not all web browsers support the WebSocket
+        # Clients should try to quickly detect disconnections, even in idle periods, so that users
+        # can easily tell the
+        # difference between being disconnected and everyone being quiet. Not all web browsers
+        # support the WebSocket
         # ping spec, so the RTM protocol also supports ping/pong messages.
         #
         def ping(options = {})

data/lib/slack/real_time/api/typing.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Api
@@ -6,7 +7,8 @@ module Slack
         # Send a typing indicator to indicate that the user is currently writing a message.
         #
         # @option options [channel] :channel
-        #   Channel to send message to. Can be a public channel, private group or IM channel. Can be an encoded ID, or a name.
+        #   Channel to send message to. Can be a public channel, private group or IM channel.
+        #   Can be an encoded ID, or a name.
         def typing(options = {})
           throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
           send_json({ type: 'typing', id: next_id }.merge(options))

data/lib/slack/real_time/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     class Client
@@ -19,7 +20,6 @@ module Slack
       attr_accessor :store
       attr_accessor :url
       attr_accessor(*Config::ATTRIBUTES)
-      attr_accessor :logger
 
       protected :store_class, :store_class=
 
@@ -35,7 +35,7 @@ module Slack
 
       %i[users self channels team teams groups ims bots].each do |store_method|
         define_method store_method do
-          store.send(store_method) if store
+          store&.send(store_method)
         end
       end
 
@@ -62,11 +62,11 @@ module Slack
       def stop!
         raise ClientNotStartedError unless started?
 
-        @socket.disconnect! if @socket
+        @socket&.disconnect!
       end
 
       def started?
-        @socket && @socket.connected?
+        @socket&.connected?
       end
 
       class << self
@@ -83,7 +83,7 @@ module Slack
         @socket.connect! do |driver|
           driver.on :open do |event|
             logger.debug("#{self}##{__method__}") { event.class.name }
-            open(event)
+            open_event(event)
             callback(event, :open)
           end
 
@@ -100,7 +100,7 @@ module Slack
           end
 
           # This must be called last to ensure any events are registered before invoking user code.
-          @callback.call(driver) if @callback
+          @callback&.call(driver)
         end
       end
 
@@ -130,13 +130,21 @@ module Slack
         logger.warn(to_s) { 'is offline' }
 
         restart_async
+      rescue Slack::Web::Api::Errors::SlackError => e
+        # stop pinging if bot was uninstalled
+        case e.message
+        when 'account_inactive', 'invalid_auth' then
+          logger.warn(to_s) { e.message }
+          raise e
+        end
+        logger.debug("#{self}##{__method__}") { e }
       rescue StandardError => e
         # disregard all ping worker failures, keep pinging
         logger.debug("#{self}##{__method__}") { e }
       end
 
       def run_ping?
-        !websocket_ping.nil? && websocket_ping > 0
+        !websocket_ping.nil? && websocket_ping.positive?
       end
 
       def websocket_ping_timer
@@ -144,7 +152,7 @@ module Slack
       end
 
       def to_s
-        if store && store.team
+        if store&.team
           "id=#{store.team.id}, name=#{store.team.name}, domain=#{store.team.domain}"
         else
           super
@@ -204,7 +212,7 @@ module Slack
         @socket.send_data(data.to_json)
       end
 
-      def open(_event); end
+      def open_event(_event); end
 
       def close(_event)
         [@socket, socket_class].each do |s|
@@ -242,11 +250,11 @@ module Slack
       end
 
       def run_handlers(type, data)
+        return unless store.class.events
+
         handlers = store.class.events[type.to_s]
-        if handlers
-          handlers.each do |handler|
-            store.instance_exec(data, &handler)
-          end
+        handlers&.each do |handler|
+          store.instance_exec(data, &handler)
         end
       rescue StandardError => e
         logger.error("#{self}##{__method__}") { e }

data/lib/slack/real_time/concurrency.rb

@@ -1,9 +1,8 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Concurrency
       autoload :Async, 'slack/real_time/concurrency/async'
-      autoload :Eventmachine, 'slack/real_time/concurrency/eventmachine'
-      autoload :Celluloid, 'slack/real_time/concurrency/celluloid'
     end
   end
 end

data/lib/slack/real_time/concurrency/async.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'async/websocket'
 require 'async/notification'
 require 'async/clock'
@@ -41,7 +42,7 @@ module Slack
               end
 
               while @restart
-                @client_task.stop if @client_task
+                @client_task&.stop
 
                 @client_task = task.async do |subtask|
                   begin
@@ -57,7 +58,7 @@ module Slack
                 @restart.wait
               end
 
-              @ping_task.stop if @ping_task
+              @ping_task&.stop
             end
           end
 
@@ -65,7 +66,7 @@ module Slack
             @url = new_url
             @last_message_at = current_time
 
-            @restart.signal if @restart
+            @restart&.signal
           end
 
           def current_time
@@ -81,7 +82,7 @@ module Slack
           def disconnect!
             super
           ensure
-            if restart = @restart
+            if (restart = @restart)
               @restart = nil
               restart.signal
             end
@@ -98,7 +99,7 @@ module Slack
           end
 
           def run_loop
-            while @driver && @driver.next_event
+            while @driver&.next_event
               # $stderr.puts event.inspect
             end
           end
@@ -131,4 +132,9 @@ module Slack
   end
 end
 
-raise "Incompatible version of async-websocket, #{Async::WebSocket::VERSION}, use \"gem 'async-websocket', '~> 0.8.0'\"." if Gem::Version.new(Async::WebSocket::VERSION) >= Gem::Version.new('0.9.0')
+if Gem::Version.new(Async::WebSocket::VERSION) >= Gem::Version.new('0.9.0')
+  raise(
+    "Incompatible version of async-websocket, #{Async::WebSocket::VERSION}, " \
+    "use \"gem 'async-websocket', '~> 0.8.0'\"."
+  )
+end

data/lib/slack/real_time/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Config
@@ -16,7 +17,8 @@ module Slack
         logger
       ].freeze
 
-      attr_accessor(*Config::ATTRIBUTES)
+      attr_accessor(*Config::ATTRIBUTES - [:concurrency])
+      attr_writer :concurrency
 
       def reset
         self.websocket_ping = 30
@@ -36,7 +38,7 @@ module Slack
       private
 
       def detect_concurrency
-        %i[Async Eventmachine Celluloid].each do |concurrency|
+        %i[Async].each do |concurrency|
           begin
             return Slack::RealTime::Concurrency.const_get(concurrency)
           rescue LoadError, NameError
@@ -44,7 +46,11 @@ module Slack
           end
         end
 
-        raise NoConcurrencyError, 'Missing concurrency. Add async-websocket, faye-websocket or celluloid-io to your Gemfile.'
+        raise(
+          NoConcurrencyError,
+          'Missing concurrency. Add async-websocket or faye-websocket ' \
+          'to your Gemfile.'
+        )
       end
     end
 

data/lib/slack/real_time/models.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'models/base'
 require_relative 'models/user'
 require_relative 'models/bot'

data/lib/slack/real_time/models/base.rb

@@ -1,11 +1,8 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models
       class Base < Hashie::Mash
-        def presence
-          super['presence']
-        end
-
         # see https://github.com/intridea/hashie/issues/394
         def log_built_in_message(*); end
       end

data/lib/slack/real_time/models/bot.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/models/channel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/models/group.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/models/im.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/models/team.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/models/user.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Models

data/lib/slack/real_time/socket.rb

@@ -1,17 +1,16 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     class Socket
       attr_accessor :url
       attr_accessor :options
       attr_reader :driver
-      attr_reader :logger
-      protected :logger
 
       def initialize(url, options = {})
         @url = url
-        @options = options
+        @options = options.dup
         @driver = nil
-        @logger = options.delete(:logger) || Slack::RealTime::Config.logger || Slack::Config.logger
+        @logger = @options.delete(:logger) || Slack::RealTime::Config.logger || Slack::Config.logger
         @last_message_at = nil
       end
 
@@ -51,9 +50,9 @@ module Slack
 
       def start_sync(client)
         thread = start_async(client)
-        thread.join if thread
+        thread&.join
       rescue Interrupt
-        thread.exit if thread
+        thread&.exit
       end
 
       # @return [#join]
@@ -76,15 +75,19 @@ module Slack
       end
 
       def close
-        # When you call `driver.emit(:close)`, it will typically end up calling `client.close` which will call `@socket.close` and end up back here. In order to break this infinite recursion, we check and set `@driver = nil` before invoking `client.close`.
-        if driver = @driver
-          @driver = nil
-          driver.emit(:close)
-        end
+        # When you call `driver.emit(:close)`, it will typically end up calling `client.close`
+        # which will call `@socket.close` and end up back here. In order to break this infinite
+        # recursion, we check and set `@driver = nil` before invoking `client.close`.
+        return unless (driver = @driver)
+
+        @driver = nil
+        driver.emit(:close)
       end
 
       protected
 
+      attr_reader :logger
+
       def addr
         URI(url).host
       end
@@ -95,9 +98,9 @@ module Slack
 
       def port
         case (uri = URI(url)).scheme
-        when 'wss'.freeze, 'https'.freeze
+        when 'wss', 'https'
           URI::HTTPS::DEFAULT_PORT
-        when 'ws', 'http'.freeze
+        when 'ws', 'http'
           URI::HTTP::DEFAULT_PORT
         else
           uri.port

data/lib/slack/real_time/stores.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'stores/base'
 require_relative 'stores/starter'
 require_relative 'stores/store'

data/lib/slack/real_time/stores/base.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Stores
       # Doesn't store anything.
       class Base
-        class_attribute :events
+        class << self
+          attr_accessor :events
+        end
 
         attr_accessor :users
         attr_accessor :bots