slack-ruby-client 0.16.0 → 1.1.0

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

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require_relative 'mixins/channels.id'
 require_relative 'mixins/conversations.id'
 require_relative 'mixins/users.id'
 require_relative 'mixins/users.search'
-require_relative 'mixins/groups.id'

data/lib/slack/web/api/patches/chat.1.patch

@@ -1,12 +1,11 @@
 diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 9de4aa9..8ed5625 100644
+index d090ae2..50186d5 100644
 --- a/lib/slack/web/api/endpoints/chat.rb
 +++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -121,11 +121,22 @@ module Slack
+@@ -121,10 +121,22 @@ module Slack
            # @see https://api.slack.com/methods/chat.postEphemeral
            # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/chat/chat.postEphemeral.json
            def chat_postEphemeral(options = {})
--            throw ArgumentError.new('Required arguments :attachments missing') if options[:attachments].nil?
              throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
 -            throw ArgumentError.new('Required arguments :text missing') if options[:text].nil?
 +            throw ArgumentError.new('Required arguments :text, :attachments or :blocks missing') if options[:text].nil? && options[:attachments].nil? && options[:blocks].nil?
@@ -26,12 +25,11 @@ index 9de4aa9..8ed5625 100644
 +            end
              post('chat.postEphemeral', options)
            end
-
-@@ -166,7 +177,19 @@ module Slack
+ 
+@@ -168,6 +179,19 @@ module Slack
            # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/chat/chat.postMessage.json
            def chat_postMessage(options = {})
              throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
--            throw ArgumentError.new('Required arguments :text missing') if options[:text].nil?
 +            throw ArgumentError.new('Required arguments :text, :attachments or :blocks missing') if options[:text].nil? && options[:attachments].nil? && options[:blocks].nil?
 +            # attachments must be passed as an encoded JSON string
 +            if options.key?(:attachments)
@@ -47,12 +45,12 @@ index 9de4aa9..8ed5625 100644
 +            end
              post('chat.postMessage', options)
            end
-
-@@ -254,8 +277,21 @@ module Slack
+ 
+@@ -257,8 +281,21 @@ module Slack
            # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/chat/chat.update.json
            def chat_update(options = {})
              throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-+            throw ArgumentError.new('Required arguments :text, :attachments or :blocks missing') if options[:text].nil? && options[:attachments].nil? && options[:blocks].nil?
++            throw ArgumentError.new('Required arguments :text, :attachments, :blocks or :reply_broadcast missing') if options[:text].nil? && options[:attachments].nil? && options[:blocks].nil? && options[:reply_broadcast].nil?
              throw ArgumentError.new('Required arguments :ts missing') if options[:ts].nil?
              options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
 +            # attachments must be passed as an encoded JSON string

data/lib/slack/web/api/templates/endpoints.erb

@@ -10,9 +10,7 @@ module Slack
     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
 
 <% files.sort.each do |f| %>
         include <%= f.camelize %>

data/lib/slack/web/faraday/connection.rb

@@ -22,12 +22,12 @@ module Slack
               options[:request] = request_options if request_options.any?
 
               ::Faraday::Connection.new(endpoint, options) do |connection|
-                connection.use ::Faraday::Request::Multipart
-                connection.use ::Faraday::Request::UrlEncoded
-                connection.use ::Slack::Web::Faraday::Response::WrapError
+                connection.request :multipart
+                connection.request :url_encoded
                 connection.use ::Slack::Web::Faraday::Response::RaiseError
-                connection.use ::FaradayMiddleware::Mashify, mash_class: Slack::Messages::Message
-                connection.use ::FaradayMiddleware::ParseJson
+                connection.response :mashify, mash_class: Slack::Messages::Message
+                connection.response :json, content_type: /\b*$/
+                connection.use ::Slack::Web::Faraday::Response::WrapError
                 connection.response :logger, logger if logger
                 connection.adapter adapter
               end

data/lib/slack/web/faraday/request.rb

@@ -22,18 +22,21 @@ module Slack
         private
 
         def request(method, path, options)
-          options = options.merge(token: token)
           response = connection.send(method) do |request|
             case method
             when :get, :delete
               request.url(path, options)
             when :post, :put
               request.path = path
+              options.compact!
               request.body = options unless options.empty?
             end
+            request.headers['Authorization'] = "Bearer #{token}" if token
             request.options.merge!(options.delete(:request)) if options.key?(:request)
           end
           response.body
+        rescue ::Faraday::ParsingError => e
+          raise Slack::Web::Api::Errors::ParsingError, e.response
         end
       end
     end

data/lib/slack/web/faraday/response/raise_error.rb

@@ -3,7 +3,7 @@ module Slack
   module Web
     module Faraday
       module Response
-        class RaiseError < ::Faraday::Response::Middleware
+        class RaiseError < ::Faraday::Middleware
           def on_complete(env)
             raise Slack::Web::Api::Errors::TooManyRequestsError, env.response if env.status == 429
 
@@ -13,23 +13,11 @@ module Slack
             return unless body
             return if body['ok']
 
-            error_message =
-              body['error'] || body['errors'].map { |message| message['error'] }.join(',')
-
+            error_message = body['error'] || body['errors'].map { |message| message['error'] }.join(',')
             error_class = Slack::Web::Api::Errors::ERROR_CLASSES[error_message]
             error_class ||= Slack::Web::Api::Errors::SlackError
             raise error_class.new(error_message, env.response)
           end
-
-          def call(env)
-            super
-          rescue Slack::Web::Api::Errors::SlackError, Slack::Web::Api::Errors::TooManyRequestsError
-            raise
-          rescue ::Faraday::ParsingError
-            raise Slack::Web::Api::Errors::ParsingError.new('parsing_error', env.response)
-          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
-            raise Slack::Web::Api::Errors::TimeoutError.new('timeout_error', env.response)
-          end
         end
       end
     end

data/lib/slack/web/faraday/response/wrap_error.rb

@@ -3,13 +3,19 @@ module Slack
   module Web
     module Faraday
       module Response
-        class WrapError < ::Faraday::Response::RaiseError
+        class WrapError < ::Faraday::Middleware
+          UNAVAILABLE_ERROR_STATUSES = (500..599).freeze
+
           def on_complete(env)
+            return unless UNAVAILABLE_ERROR_STATUSES.cover?(env.status)
+
+            raise Slack::Web::Api::Errors::UnavailableError, env.response
+          end
+
+          def call(env)
             super
-          rescue Slack::Web::Api::Errors::SlackError
-            raise
-          rescue ::Faraday::ServerError
-            raise Slack::Web::Api::Errors::UnavailableError.new('unavailable_error', env.response)
+          rescue ::Faraday::TimeoutError, ::Faraday::ConnectionFailed
+            raise Slack::Web::Api::Errors::TimeoutError, env.response
           end
         end
       end

data/lib/slack/web/pagination/cursor.rb

@@ -6,11 +6,7 @@ module Slack
         class Cursor
           include Enumerable
 
-          attr_reader :client
-          attr_reader :verb
-          attr_reader :sleep_interval
-          attr_reader :max_retries
-          attr_reader :params
+          attr_reader :client, :verb, :sleep_interval, :max_retries, :params
 
           def initialize(client, verb, params = {})
             @client = client

data/lib/slack-ruby-client.rb

@@ -10,7 +10,8 @@ require_relative 'slack/messages/formatting'
 
 # Web API
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/mashify'
+require 'faraday/multipart'
 require 'json'
 require 'logger'
 begin
@@ -28,7 +29,7 @@ require_relative 'slack/web/api/errors/slack_error'
 require_relative 'slack/web/api/errors/too_many_requests_error'
 require_relative 'slack/web/api/error'
 require_relative 'slack/web/api/errors'
-require_relative 'slack/web/api/errors/internal_error'
+require_relative 'slack/web/api/errors/server_error'
 require_relative 'slack/web/faraday/response/raise_error'
 require_relative 'slack/web/faraday/response/wrap_error'
 require_relative 'slack/web/faraday/connection'

data/lib/tasks/real_time.rake

@@ -49,9 +49,7 @@ namespace :slack do
             end
           end
 
-          File.open store_file, 'w' do |f|
-            f.write store_file_contents
-          end
+          File.write(store_file, store_file_contents)
 
           puts ' done.'
         end

data/lib/tasks/web.rake

@@ -32,6 +32,10 @@ namespace :slack do
           parsed = JSON.parse(File.read(path))
           parsed['undocumented'] = true if path =~ /undocumented/
           JSON::Validator.validate(method_schema, parsed, insert_defaults: true)
+          if parsed['deprecated'] && parsed['deprecation']['deprecation_warning'] =~ /It will stop functioning in February 2021/
+            next
+          end
+
           result[prefix][name] = parsed
         end
 

data/slack-ruby-client.gemspec

@@ -10,27 +10,18 @@ Gem::Specification.new do |s|
   s.authors = ['Daniel Doubrovkine']
   s.email = 'dblock@dblock.org'
   s.platform = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 2.7'
   s.required_rubygems_version = '>= 1.3.6'
   s.files = `git ls-files`.split("\n")
-  s.test_files = `git ls-files -- spec/*`.split("\n")
   s.require_paths = ['lib']
   s.homepage = 'http://github.com/slack-ruby/slack-ruby-client'
   s.licenses = ['MIT']
   s.summary = 'Slack Web and RealTime API client.'
-  s.add_dependency 'faraday', '>= 1.0'
-  s.add_dependency 'faraday_middleware'
+  s.add_dependency 'faraday', '>= 2.0'
+  s.add_dependency 'faraday-mashify'
+  s.add_dependency 'faraday-multipart'
   s.add_dependency 'gli'
   s.add_dependency 'hashie'
   s.add_dependency 'websocket-driver'
-  s.add_development_dependency 'activesupport'
-  s.add_development_dependency 'erubis'
-  s.add_development_dependency 'json-schema'
-  s.add_development_dependency 'rake', '~> 10'
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 0.82.0'
-  s.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  s.add_development_dependency 'rubocop-rspec', '~> 1.39.0'
-  s.add_development_dependency 'timecop'
-  s.add_development_dependency 'vcr'
-  s.add_development_dependency 'webmock'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

data/spec/fixtures/slack/web/429_error.yml

@@ -5,47 +5,14 @@ http_interactions:
     uri: https://slack.com/api/auth.test
     body:
       encoding: UTF-8
-      string: token=
-    headers:
-      Accept:
-      - application/json; charset=utf-8
-      User-Agent:
-      - Slack Ruby Client 0.1.0
-      Content-Type:
-      - application/x-www-form-urlencoded
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response:
-    status:
-      code: 429
-      message: OK
-    headers:
-      Access-Control-Allow-Origin:
-      - '*'
-      Retry-After:
-      - 3600
-      Date:
-      - Sat, 25 Jul 2015 14:42:07 GMT
-      Server:
-      - Apache
-      Connection:
-      - keep-alive
-    body:
-      encoding: US-ASCII
       string: ''
-    http_version: 
-  recorded_at: Sat, 25 Jul 2015 14:42:08 GMT
-- request:
-    method: post
-    uri: https://slack.com/api/auth.test
-    body:
-      encoding: UTF-8
-      string: token
     headers:
       Accept:
       - application/json; charset=utf-8
       User-Agent:
-      - Slack Ruby Client/0.5.0
+      - Slack Ruby Client/0.18.0
+      Authorization:
+      - Bearer <SLACK_API_TOKEN>
       Content-Type:
       - application/x-www-form-urlencoded
       Accept-Encoding:
@@ -55,31 +22,60 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Origin:
-      - '*'
-      Content-Security-Policy:
-      - referrer no-referrer;
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Tue, 24 Nov 2015 20:03:05 GMT
+      - Sat, 04 Dec 2021 20:13:19 GMT
       Server:
       - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      Referrer-Policy:
+      - no-referrer
+      X-Slack-Backend:
+      - r
       Strict-Transport-Security:
       - max-age=31536000; includeSubDomains; preload
-      X-Accepted-Oauth-Scopes:
-      - identify
-      X-Content-Type-Options:
-      - nosniff
+      Access-Control-Allow-Headers:
+      - slack-route, x-slack-version-ts, x-b3-traceid, x-b3-spanid, x-b3-parentspanid,
+        x-b3-sampled, x-b3-flags
+      Access-Control-Expose-Headers:
+      - x-slack-req-id, retry-after
+      X-Oauth-Scopes:
+      - identify,read,post,client,apps
+      Expires:
+      - Mon, 26 Jul 1997 05:00:00 GMT
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
       X-Xss-Protection:
       - '0'
+      X-Content-Type-Options:
+      - nosniff
+      X-Slack-Req-Id:
+      - 19b143ea43a655dcdc6c3debd59c41c0
+      Vary:
+      - Accept-Encoding
       Content-Length:
-      - '33'
-      Connection:
-      - keep-alive
+      - '165'
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Envoy-Upstream-Service-Time:
+      - '18'
+      X-Backend:
+      - main_normal main_bedrock_normal_with_overflow main_canary_with_overflow main_bedrock_canary_with_overflow
+        main_control_with_overflow main_bedrock_control_with_overflow
+      X-Server:
+      - slack-www-hhvm-main-iad-d5j5
+      X-Slack-Shared-Secret-Outcome:
+      - no-match
+      Via:
+      - envoy-www-iad-tdcc, envoy-edge-iad-olsk
+      X-Edge-Backend:
+      - envoy-www
+      X-Slack-Edge-Shared-Secret-Outcome:
+      - no-match
     body:
       encoding: UTF-8
-      string: '{"ok":false,"error":"not_authed"}'
-    http_version: 
-  recorded_at: Tue, 24 Nov 2015 20:03:05 GMT
-recorded_with: VCR 2.9.3
+      string: '{"ok":true,"url":"https:\/\/dblockdotorg.slack.com\/","team":"dblock","user":"travis-ci","team_id":"T04KB5WQH","user_id":"U0J1GAHN1","bot_id":"B0J1L75DY","is_enterprise_install":false}'
+  recorded_at: Sat, 19 Jan 2019 21:25:48 GMT
+recorded_with: VCR 6.0.0

data/spec/fixtures/slack/web/auth_test_error.yml

@@ -5,14 +5,16 @@ http_interactions:
     uri: https://slack.com/api/auth.test
     body:
       encoding: UTF-8
-      string: token=
+      string: ''
     headers:
       Accept:
       - application/json; charset=utf-8
       User-Agent:
-      - Slack Ruby Client 0.1.0
-      Content-Type:
-      - application/x-www-form-urlencoded
+      - Slack Ruby Client/0.18.0
+      Authorization:
+      - Bearer <SLACK_API_TOKEN>
+      Content-Length:
+      - '0'
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
   response:
@@ -20,29 +22,60 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Origin:
-      - "*"
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Sat, 25 Jul 2015 14:42:07 GMT
+      - Sat, 04 Dec 2021 20:13:18 GMT
       Server:
       - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      Referrer-Policy:
+      - no-referrer
+      X-Slack-Backend:
+      - r
       Strict-Transport-Security:
       - max-age=31536000; includeSubDomains; preload
-      Vary:
-      - Accept-Encoding
-      X-Content-Type-Options:
-      - nosniff
+      Access-Control-Allow-Headers:
+      - slack-route, x-slack-version-ts, x-b3-traceid, x-b3-spanid, x-b3-parentspanid,
+        x-b3-sampled, x-b3-flags
+      Access-Control-Expose-Headers:
+      - x-slack-req-id, retry-after
+      Expires:
+      - Mon, 26 Jul 1997 05:00:00 GMT
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
+      X-Robots-Tag:
+      - noindex,nofollow
       X-Xss-Protection:
       - '0'
+      X-Content-Type-Options:
+      - nosniff
+      X-Slack-Req-Id:
+      - ad5ac4ccd453f8d6e46e1cc41d6d8a7a
+      Vary:
+      - Accept-Encoding
       Content-Length:
       - '53'
-      Connection:
-      - keep-alive
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Envoy-Upstream-Service-Time:
+      - '5'
+      X-Backend:
+      - main_normal main_bedrock_normal_with_overflow main_canary_with_overflow main_bedrock_canary_with_overflow
+        main_control_with_overflow main_bedrock_control_with_overflow
+      X-Server:
+      - slack-www-hhvm-main-iad-6qbu
+      X-Slack-Shared-Secret-Outcome:
+      - no-match
+      Via:
+      - envoy-www-iad-fsrl, envoy-edge-iad-m7rj
+      X-Edge-Backend:
+      - envoy-www
+      X-Slack-Edge-Shared-Secret-Outcome:
+      - no-match
     body:
       encoding: UTF-8
       string: '{"ok":false,"error":"not_authed"}'
-    http_version: 
-  recorded_at: Sat, 25 Jul 2015 14:42:08 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Sat, 19 Jan 2019 21:25:48 GMT
+recorded_with: VCR 6.0.0

data/spec/fixtures/slack/web/auth_test_success.yml

@@ -5,12 +5,14 @@ http_interactions:
     uri: https://slack.com/api/auth.test
     body:
       encoding: UTF-8
-      string: token=token
+      string: ''
     headers:
       Accept:
       - application/json; charset=utf-8
       User-Agent:
-      - Slack Ruby Gem 1.1.1
+      - Slack Ruby Client/0.18.0
+      Authorization:
+      - Bearer <SLACK_API_TOKEN>
       Content-Type:
       - application/x-www-form-urlencoded
       Accept-Encoding:
@@ -20,38 +22,60 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Access-Control-Allow-Origin:
-      - '*'
-      Cache-Control:
-      - private, no-cache, no-store, must-revalidate
-      Content-Type:
-      - application/json; charset=utf-8
       Date:
-      - Tue, 28 Apr 2015 12:55:23 GMT
-      Expires:
-      - Mon, 26 Jul 1997 05:00:00 GMT
-      Pragma:
-      - no-cache
+      - Sat, 04 Dec 2021 20:13:19 GMT
       Server:
       - Apache
+      Access-Control-Allow-Origin:
+      - "*"
+      Referrer-Policy:
+      - no-referrer
+      X-Slack-Backend:
+      - r
       Strict-Transport-Security:
       - max-age=31536000; includeSubDomains; preload
-      Vary:
-      - Accept-Encoding
-      X-Accepted-Oauth-Scopes:
-      - identify
-      X-Content-Type-Options:
-      - nosniff
+      Access-Control-Allow-Headers:
+      - slack-route, x-slack-version-ts, x-b3-traceid, x-b3-spanid, x-b3-parentspanid,
+        x-b3-sampled, x-b3-flags
+      Access-Control-Expose-Headers:
+      - x-slack-req-id, retry-after
       X-Oauth-Scopes:
-      - identify,read,post,client
+      - identify,read,post,client,apps
+      Expires:
+      - Mon, 26 Jul 1997 05:00:00 GMT
+      Cache-Control:
+      - private, no-cache, no-store, must-revalidate
+      Pragma:
+      - no-cache
       X-Xss-Protection:
       - '0'
+      X-Content-Type-Options:
+      - nosniff
+      X-Slack-Req-Id:
+      - cf2877c6fab8f3aa7747f2e07d0b5fd5
+      Vary:
+      - Accept-Encoding
       Content-Length:
-      - '128'
-      Connection:
-      - keep-alive
+      - '165'
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Envoy-Upstream-Service-Time:
+      - '18'
+      X-Backend:
+      - main_normal main_bedrock_normal_with_overflow main_canary_with_overflow main_bedrock_canary_with_overflow
+        main_control_with_overflow main_bedrock_control_with_overflow
+      X-Server:
+      - slack-www-hhvm-main-iad-i2dg
+      X-Slack-Shared-Secret-Outcome:
+      - no-match
+      Via:
+      - envoy-www-iad-pwei, envoy-edge-iad-p7fn
+      X-Edge-Backend:
+      - envoy-www
+      X-Slack-Edge-Shared-Secret-Outcome:
+      - no-match
     body:
       encoding: UTF-8
-      string: '{"ok":true,"url":"https:\/\/rubybot.slack.com\/","team":"team_name","user":"user_name","team_id":"TDEADBEEF","user_id":"UBAADFOOD"}'
-    http_version:
-  recorded_at: Tue, 28 Apr 2015 12:55:22 GMT
+      string: '{"ok":true,"url":"https:\/\/rubybot.slack.com\/","team":"team_name","user":"user_name","team_id":"TDEADBEEF","user_id":"UBAADFOOD","bot_id":"B0J1L75DY","is_enterprise_install":false}'
+  recorded_at: Sat, 19 Jan 2019 21:25:48 GMT
+recorded_with: VCR 6.0.0