slack-ruby-client 0.14.3 → 0.15.1

data/lib/slack/real_time/concurrency.rb

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

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'
@@ -34,14 +35,14 @@ module Slack
 
                   # The timer task will naturally exit after the driver is set to nil.
                   while @restart
-                    subtask.sleep client.websocket_ping
+                    subtask.sleep client.websocket_ping_timer
                     client.run_ping! if @restart
                   end
                 end
               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/concurrency/celluloid.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'websocket/driver'
 require 'socket'
 require 'forwardable'
@@ -36,12 +37,17 @@ module Slack
             loop { read } if socket
           rescue EOFError, Errno::ECONNRESET, Errno::EPIPE => e
             logger.debug("#{self.class}##{__method__}") { e }
-            driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'server closed connection')) unless @closing
+            unless @closing
+              driver.emit(
+                :close,
+                WebSocket::Driver::CloseEvent.new(1001, 'server closed connection')
+              )
+            end
           end
 
           def disconnect!
             super
-            @ping_timer.cancel if @ping_timer
+            @ping_timer&.cancel
           end
 
           def close
@@ -58,7 +64,7 @@ module Slack
 
           def handle_read(buffer)
             logger.debug("#{self.class}##{__method__}") { buffer }
-            driver.parse buffer if driver
+            driver&.parse buffer
           end
 
           def write(data)
@@ -82,7 +88,7 @@ module Slack
           def run_ping_loop
             return unless @client.run_ping?
 
-            @ping_timer = every @client.websocket_ping do
+            @ping_timer = every @client.websocket_ping_timer do
               @client.run_ping!
             end
           end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'faye/websocket'
 require 'eventmachine'
 
@@ -6,12 +7,10 @@ module Slack
     module Concurrency
       module Eventmachine
         class Client < Faye::WebSocket::Client
-          attr_reader :logger
-          protected :logger
-
           def initialize(url, protocols = nil, options = {})
-            @logger = options.fetch(:logger) || Slack::RealTime::Config.logger || Slack::Config.logger
-            super url, protocols, options.except(:logger)
+            options = options.dup
+            @logger = options.delete(:logger) || Slack::RealTime::Config.logger || Slack::Config.logger
+            super url, protocols, options
           end
 
           def parse(data)
@@ -23,6 +22,10 @@ module Slack
             logger.debug("#{self.class}##{__method__}") { data }
             super data
           end
+
+          protected
+
+          attr_reader :logger
         end
 
         class Socket < Slack::RealTime::Socket
@@ -30,7 +33,7 @@ module Slack
             @thread = ensure_reactor_running
 
             if client.run_ping?
-              EventMachine.add_periodic_timer(client.websocket_ping) do
+              EventMachine.add_periodic_timer client.websocket_ping_timer do
                 client.run_ping!
               end
             end

data/lib/slack/real_time/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Config
@@ -44,7 +45,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, faye-websocket ' \
+          'or celluloid-io 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

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

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

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module RealTime
     module Stores
@@ -26,39 +27,29 @@ module Slack
             @users = {}
           end
 
-          if attrs.users
-            attrs.users.each do |data|
-              user = Models::User.new(data)
-              @users[data.id] = @users.key?(data.id) ? @users[data.id].merge(user) : user
-            end
+          attrs.users&.each do |data|
+            user = Models::User.new(data)
+            @users[data.id] = @users.key?(data.id) ? @users[data.id].merge(user) : user
           end
 
           @channels = {}
-          if attrs.channels
-            attrs.channels.each do |data|
-              @channels[data.id] = Models::Channel.new(data)
-            end
+          attrs.channels&.each do |data|
+            @channels[data.id] = Models::Channel.new(data)
           end
 
           @bots = {}
-          if attrs.bots
-            attrs.bots.each do |data|
-              @bots[data.id] = Models::Bot.new(data)
-            end
+          attrs.bots&.each do |data|
+            @bots[data.id] = Models::Bot.new(data)
           end
 
           @groups = {}
-          if attrs.groups
-            attrs.groups.each do |data|
-              @groups[data.id] = Models::Group.new(data)
-            end
+          attrs.groups&.each do |data|
+            @groups[data.id] = Models::Group.new(data)
           end
 
           @ims = {}
-          if attrs.ims
-            attrs.ims.each do |data|
-              @ims[data.id] = Models::Im.new(data)
-            end
+          attrs.ims&.each do |data|
+            @ims[data.id] = Models::Im.new(data)
           end
         end
 
@@ -161,7 +152,7 @@ module Slack
         # @see https://github.com/slack-ruby/slack-api-ref/blob/master/events/bot_changed.json
         on :bot_changed do |data|
           bot = bots[data.bot.id]
-          bot.merge!(data.bot) if bot
+          bot&.merge!(data.bot)
         end
 
         # A team channel was archived.
@@ -343,7 +334,7 @@ module Slack
         # @see https://github.com/slack-ruby/slack-api-ref/blob/master/events/group_left.json
         on :group_left do |data|
           channel = groups[data.channel]
-          channel.members.delete(self.self.id) if channel && channel.key?(:members)
+          channel.members.delete(self.self.id) if channel&.key?(:members)
         end
 
         # A private group read marker was updated.
@@ -378,7 +369,7 @@ module Slack
         # @see https://api.slack.com/events/im_close
         # @see https://github.com/slack-ruby/slack-api-ref/blob/master/events/im_close.json
         on :im_close do |data|
-          return unless ims && ims.key?(data.channel)
+          return unless ims&.key?(data.channel)
 
           ims[data.channel].is_open = false
         end
@@ -404,7 +395,7 @@ module Slack
         # @see https://api.slack.com/events/im_open
         # @see https://github.com/slack-ruby/slack-api-ref/blob/master/events/im_open.json
         on :im_open do |data|
-          return unless ims && ims.key?(data.channel)
+          return unless ims&.key?(data.channel)
 
           ims[data.channel].is_open = true
         end

data/lib/slack/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
-  VERSION = '0.14.3'.freeze
+  VERSION = '0.15.1'
 end

data/lib/slack/web/api/endpoints.rb

@@ -1,5 +1,23 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
+require_relative 'endpoints/admin_apps'
+require_relative 'endpoints/admin_apps_approved'
+require_relative 'endpoints/admin_apps_requests'
+require_relative 'endpoints/admin_apps_restricted'
+require_relative 'endpoints/admin_conversations'
+require_relative 'endpoints/admin_conversations_restrictAccess'
+require_relative 'endpoints/admin_conversations_whitelist'
+require_relative 'endpoints/admin_emoji'
+require_relative 'endpoints/admin_inviteRequests'
+require_relative 'endpoints/admin_inviteRequests_approved'
+require_relative 'endpoints/admin_inviteRequests_denied'
+require_relative 'endpoints/admin_teams'
+require_relative 'endpoints/admin_teams_admins'
+require_relative 'endpoints/admin_teams_owners'
+require_relative 'endpoints/admin_teams_settings'
+require_relative 'endpoints/admin_usergroups'
+require_relative 'endpoints/admin_users'
 require_relative 'endpoints/admin_users_session'
 require_relative 'endpoints/api'
 require_relative 'endpoints/apps'
@@ -9,6 +27,8 @@ require_relative 'endpoints/apps_permissions_scopes'
 require_relative 'endpoints/apps_permissions_users'
 require_relative 'endpoints/auth'
 require_relative 'endpoints/bots'
+require_relative 'endpoints/calls'
+require_relative 'endpoints/calls_participants'
 require_relative 'endpoints/channels'
 require_relative 'endpoints/chat'
 require_relative 'endpoints/chat_scheduledMessages'
@@ -18,11 +38,13 @@ require_relative 'endpoints/dnd'
 require_relative 'endpoints/emoji'
 require_relative 'endpoints/files'
 require_relative 'endpoints/files_comments'
+require_relative 'endpoints/files_remote'
 require_relative 'endpoints/groups'
 require_relative 'endpoints/im'
 require_relative 'endpoints/migration'
 require_relative 'endpoints/mpim'
 require_relative 'endpoints/oauth'
+require_relative 'endpoints/oauth_v2'
 require_relative 'endpoints/pins'
 require_relative 'endpoints/reactions'
 require_relative 'endpoints/reminders'
@@ -37,15 +59,34 @@ require_relative 'endpoints/users'
 require_relative 'endpoints/users_admin'
 require_relative 'endpoints/users_prefs'
 require_relative 'endpoints/users_profile'
+require_relative 'endpoints/views'
 
 module Slack
   module Web
     module Api
       module Endpoints
+        include Slack::Web::Api::Mixins::Conversations
         include Slack::Web::Api::Mixins::Channels
         include Slack::Web::Api::Mixins::Users
         include Slack::Web::Api::Mixins::Groups
 
+        include AdminApps
+        include AdminAppsApproved
+        include AdminAppsRequests
+        include AdminAppsRestricted
+        include AdminConversations
+        include AdminConversationsRestrictaccess
+        include AdminConversationsWhitelist
+        include AdminEmoji
+        include AdminInviterequests
+        include AdminInviterequestsApproved
+        include AdminInviterequestsDenied
+        include AdminTeams
+        include AdminTeamsAdmins
+        include AdminTeamsOwners
+        include AdminTeamsSettings
+        include AdminUsergroups
+        include AdminUsers
         include AdminUsersSession
         include Api
         include Apps
@@ -55,6 +96,8 @@ module Slack
         include AppsPermissionsUsers
         include Auth
         include Bots
+        include Calls
+        include CallsParticipants
         include Channels
         include Chat
         include ChatScheduledmessages
@@ -64,11 +107,13 @@ module Slack
         include Emoji
         include Files
         include FilesComments
+        include FilesRemote
         include Groups
         include Im
         include Migration
         include Mpim
         include Oauth
+        include OauthV2
         include Pins
         include Reactions
         include Reminders
@@ -83,6 +128,7 @@ module Slack
         include UsersAdmin
         include UsersPrefs
         include UsersProfile
+        include Views
       end
     end
   end