slack-ruby-client 0.7.2 → 1.0.0

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require_relative 'ids.id'
+
+module Slack
+  module Web
+    module Api
+      module Mixins
+        module Conversations
+          include Ids
+          #
+          # This method returns a channel ID given a channel name.
+          #
+          # @option options [channel] :channel
+          #   Channel to get ID for, prefixed with #.
+          def conversations_id(options = {})
+            name = options[:channel]
+            throw ArgumentError.new('Required arguments :channel missing') if name.nil?
+
+            id_for :channel, name, '#', :conversations_list, :channels, 'channel_not_found'
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+module Slack
+  module Web
+    module Api
+      module Mixins
+        module Ids
+          private
+
+          def id_for(key, name, prefix, enum_method, list_method, not_found_error)
+            return { 'ok' => true, key.to_s => { 'id' => name } } unless name[0] == prefix
+
+            public_send enum_method do |list|
+              list.public_send(list_method).each do |li|
+                return Slack::Messages::Message.new('ok' => true, key.to_s => { 'id' => li.id }) if li.name == name[1..-1]
+              end
+            end
+
+            raise Slack::Web::Api::Errors::SlackError, not_found_error
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,12 @@
+# frozen_string_literal: true
+require_relative 'ids.id'
+
 module Slack
   module Web
     module Api
       module Mixins
         module Users
+          include Ids
           #
           # This method returns a user ID given a user name.
           #
@@ -11,13 +15,8 @@ module Slack
           def users_id(options = {})
             name = options[:user]
             throw ArgumentError.new('Required arguments :user missing') if name.nil?
-            return { 'ok' => true, 'user' => { 'id' => name } } unless name[0] == '@'
-            users_list.tap do |list|
-              list.members.each do |user|
-                return Slack::Messages::Message.new('ok' => true, 'user' => { 'id' => user.id }) if user.name == name[1..-1]
-              end
-            end
-            fail Slack::Web::Api::Error, 'user_not_found'
+
+            id_for :user, name, '@', :users_list, :members, 'user_not_found'
           end
         end
       end

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

@@ -1,43 +1,46 @@
-module Slack
-  module Web
-    module Api
-      module Mixins
-        module Users
-          Member = Struct.new :id, :name, :first_name, :last_name, :real_name, :email
+# frozen_string_literal: true
+if defined?(Picky)
+  module Slack
+    module Web
+      module Api
+        module Mixins
+          module Users
+            Member = Struct.new :id, :name, :first_name, :last_name, :real_name, :email
 
-          #
-          # This method searches for users.
-          #
-          # @option options [user] :user
-          #   Free-formed text to search for.
-          def users_search(options = {})
-            query = options[:user]
-            throw ArgumentError.new('Required arguments :user missing') if query.nil?
-            index = Picky::Index.new(:users) do
-              category :name
-              category :first_name
-              category :last_name
-              category :real_name
-              category :email
+            #
+            # This method searches for users.
+            #
+            # @option options [user] :user
+            #   Free-formed text to search for.
+            def users_search(options = {})
+              query = options[:user]
+              throw ArgumentError.new('Required arguments :user missing') if query.nil?
+              index = Picky::Index.new(:users) do
+                category :name
+                category :first_name
+                category :last_name
+                category :real_name
+                category :email
+              end
+              members = users_list.members
+              members.each_with_index do |member, id|
+                user = Member.new(
+                  id,
+                  member.name,
+                  member.profile.first_name,
+                  member.profile.last_name,
+                  member.profile.real_name,
+                  member.profile.email
+                )
+                index.add(user)
+              end
+              ids = Picky::Search.new(index).search(query, 5, 0, unique: true).ids
+              results = ids.map { |id| members[id] }
+              Slack::Messages::Message.new('ok' => true, 'members' => results)
             end
-            members = users_list.members
-            members.each_with_index do |member, id|
-              user = Member.new(
-                id,
-                member.name,
-                member.profile.first_name,
-                member.profile.last_name,
-                member.profile.real_name,
-                member.profile.email
-              )
-              index.add(user)
-            end
-            ids = Picky::Search.new(index).search(query, 5, 0, unique: true).ids
-            results = ids.map { |id| members[id] }
-            Slack::Messages::Message.new('ok' => true, 'members' => results)
           end
         end
       end
     end
   end
-end if defined?(Picky)
+end

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

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

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

@@ -0,0 +1,70 @@
+diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
+index d090ae2..50186d5 100644
+--- a/lib/slack/web/api/endpoints/chat.rb
++++ b/lib/slack/web/api/endpoints/chat.rb
+@@ -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 :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?
+             throw ArgumentError.new('Required arguments :user missing') if options[:user].nil?
+             options = options.merge(user: users_id(options)['user']['id']) if options[:user]
++            # attachments must be passed as an encoded JSON string
++            if options.key?(:attachments)
++              attachments = options[:attachments]
++              attachments = JSON.dump(attachments) unless attachments.is_a?(String)
++              options = options.merge(attachments: attachments)
++            end
++            # blocks must be passed as an encoded JSON string
++            if options.key?(:blocks)
++              blocks = options[:blocks]
++              blocks = JSON.dump(blocks) unless blocks.is_a?(String)
++              options = options.merge(blocks: blocks)
++            end
+             post('chat.postEphemeral', options)
+           end
+ 
+@@ -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, :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)
++              attachments = options[:attachments]
++              attachments = JSON.dump(attachments) unless attachments.is_a?(String)
++              options = options.merge(attachments: attachments)
++            end
++            # blocks must be passed as an encoded JSON string
++            if options.key?(:blocks)
++              blocks = options[:blocks]
++              blocks = JSON.dump(blocks) unless blocks.is_a?(String)
++              options = options.merge(blocks: blocks)
++            end
+             post('chat.postMessage', options)
+           end
+ 
+@@ -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 :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
++            if options.key?(:attachments)
++              attachments = options[:attachments]
++              attachments = JSON.dump(attachments) unless attachments.is_a?(String)
++              options = options.merge(attachments: attachments)
++            end
++            # blocks must be passed as an encoded JSON string
++            if options.key?(:blocks)
++              blocks = options[:blocks]
++              blocks = JSON.dump(blocks) unless blocks.is_a?(String)
++              options = options.merge(blocks: blocks)
++            end
+             post('chat.update', options)
+           end
+         end

data/lib/slack/web/api/patches/dialog.1.open-json-support.patch

@@ -0,0 +1,17 @@
+diff --git a/lib/slack/web/api/endpoints/dialog.rb b/lib/slack/web/api/endpoints/dialog.rb
+index 01f9dfd..d017adf 100644
+--- a/lib/slack/web/api/endpoints/dialog.rb
++++ b/lib/slack/web/api/endpoints/dialog.rb
+@@ -17,6 +17,12 @@ module Slack
+           def dialog_open(options = {})
+             throw ArgumentError.new('Required arguments :dialog missing') if options[:dialog].nil?
+             throw ArgumentError.new('Required arguments :trigger_id missing') if options[:trigger_id].nil?
++            # dialog must be passed as an encoded JSON string
++            if options.key?(:dialog)
++              dialog = options[:dialog]
++              dialog = JSON.dump(dialog) unless dialog.is_a?(String)
++              options = options.merge(dialog: dialog)
++            end
+             post('dialog.open', options)
+           end
+         end

data/lib/slack/web/api/patches/views.1.view-json.patch

@@ -0,0 +1,40 @@
+diff --git a/lib/slack/web/api/endpoints/views.rb b/lib/slack/web/api/endpoints/views.rb
+index 3d7ac8e..10de15c 100644
+--- a/lib/slack/web/api/endpoints/views.rb
++++ b/lib/slack/web/api/endpoints/views.rb
+@@ -18,6 +18,11 @@ module Slack
+           def views_open(options = {})
+             throw ArgumentError.new('Required arguments :trigger_id missing') if options[:trigger_id].nil?
+             throw ArgumentError.new('Required arguments :view missing') if options[:view].nil?
++            if options.key?(:view)
++              view = options[:view]
++              view = JSON.dump(view) unless view.is_a?(String)
++              options = options.merge(view: view)
++            end
+             post('views.open', options)
+           end
+ 
+@@ -33,6 +38,11 @@ module Slack
+           def views_push(options = {})
+             throw ArgumentError.new('Required arguments :trigger_id missing') if options[:trigger_id].nil?
+             throw ArgumentError.new('Required arguments :view missing') if options[:view].nil?
++            if options.key?(:view)
++              view = options[:view]
++              view = JSON.dump(view) unless view.is_a?(String)
++              options = options.merge(view: view)
++            end
+             post('views.push', options)
+           end
+ 
+@@ -51,6 +61,11 @@ module Slack
+           # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/views/views.update.json
+           def views_update(options = {})
+             throw ArgumentError.new('Required arguments :view missing') if options[:view].nil?
++            if options.key?(:view)
++              view = options[:view]
++              view = JSON.dump(view) unless view.is_a?(String)
++              options = options.merge(view: view)
++            end
+             post('views.update', options)
+           end
+         end

data/lib/slack/web/api/patches/views.1.views-published.patch

@@ -0,0 +1,16 @@
+diff --git a/lib/slack/web/api/endpoints/views.rb b/lib/slack/web/api/endpoints/views.rb
+index 31626b9..8182a9c 100644
+--- a/lib/slack/web/api/endpoints/views.rb
++++ b/lib/slack/web/api/endpoints/views.rb
+@@ -40,6 +40,11 @@ module Slack
+           def views_publish(options = {})
+             throw ArgumentError.new('Required arguments :user_id missing') if options[:user_id].nil?
+             throw ArgumentError.new('Required arguments :view missing') if options[:view].nil?
++            if options.key?(:view)
++              view = options[:view]
++              view = JSON.dump(view) unless view.is_a?(String)
++              options = options.merge(view: view)
++            end
+             post('views.publish', options)
+           end
+ 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 <% desc = group['desc'] || "#{group['name'].gsub(".", "_").camelize} methods." %>
@@ -7,11 +8,12 @@ desc "<%= desc %>"
 desc '<%= desc %>'
 <% end %>
 command '<%= group['name'].gsub(".", "_") %>' do |g|
-<% names.each_with_index do |(name, data), index| %>
+<% names.sort.each_with_index do |(name, data), index| %>
 <% if index > 0 %>
 
 <% end %>
   <% short_desc = data["desc"].split("\n").first %>
+  <% short_desc += ' (undocumented)' if data['undocumented'] %>
   <% if short_desc.include?("'")  %>
   g.desc "<%= short_desc %>"
   <% else %>
@@ -20,8 +22,8 @@ command '<%= group['name'].gsub(".", "_") %>' do |g|
   g.long_desc %( <%= data["desc"].split("\n").join(" ") %> )
   g.command '<%= name %>' do |c|
   <% data["args"].each do |arg_name, arg_v| %>
-    <% if arg_v["desc"].include?("'")  %>
-    c.flag '<%= arg_name %>', desc: "<%= arg_v["desc"] %>"
+    <% if arg_v["desc"].include?("'") %>
+    c.flag '<%= arg_name %>', desc: "<%= arg_v["desc"].gsub('"', '\'') %>"
     <% else %>
     c.flag '<%= arg_name %>', desc: '<%= arg_v["desc"] %>'
     <% end %>

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

@@ -1,5 +1,6 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-<% files.each do |f| %>
+<% files.sort.each do |f| %>
 require 'commands/<%= f %>'
 <% end %>

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

@@ -1,18 +1,18 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
-<% files.each do |f| %>
-require 'slack/web/api/endpoints/<%= f %>'
+<% files.sort.each do |f| %>
+require_relative 'endpoints/<%= f %>'
 <% end %>
 
 module Slack
   module Web
     module Api
       module Endpoints
-        include Slack::Web::Api::Mixins::Channels
+        include Slack::Web::Api::Mixins::Conversations
         include Slack::Web::Api::Mixins::Users
-        include Slack::Web::Api::Mixins::Groups
 
-<% files.each do |f| %>
+<% files.sort.each do |f| %>
         include <%= f.camelize %>
 <% end %>
       end

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+# This file was auto-generated by lib/tasks/web.rake
+
+module Slack
+  module Web
+    module Api
+      module Errors
+        <% errors.each do |e| %>
+        class <%= e.camelize %> < SlackError; end
+        <% end %>
+
+        ERROR_CLASSES = {
+          <% errors.each do |e| %>
+          '<%= e %>' => <%= e.camelize %>,
+          <% end %>
+        }.freeze
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 module Slack
@@ -5,13 +6,14 @@ module Slack
     module Api
       module Endpoints
         module <%= group.gsub(".", "_").camelize %>
-<% names.each_with_index do |(name, data), index| %>
+<% names.sort.each_with_index do |(name, data), index| %>
 <% next if data['mixin'] %>
 <% if index > 0 %>
 
 <% end %>
           #
-<% data['desc'].split("\n").each do |line| %>
+<% data['desc'].split("\n").each_with_index do |line, index| %>
+  <% line += ' (undocumented)' if data['undocumented'] && index == 0 %>
           # <%= line %>
 <% end %>
           #
@@ -25,8 +27,12 @@ module Slack
 <% end %>
 <% end %>
 <% end %>
+<% if data['undocumented'] %>
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/undocumented/<%= group %>/<%= group %>.<%= name %>.json
+<% else %>
           # @see https://api.slack.com/methods/<%= group %>.<%= name %>
-          # @see https://github.com/dblock/slack-api-ref/blob/master/methods/<%= group %>/<%= group %>.<%= name %>.json
+          # @see https://github.com/slack-ruby/slack-api-ref/blob/master/methods/<%= group %>/<%= group %>.<%= name %>.json
+<% end %>
           def <%= group.gsub(".", "_") %>_<%= name %>(options = {})
 <% data['args'].select{ |k, v| v['required'] }.each do |arg_name, arg_v| %>
             throw ArgumentError.new('Required arguments :<%= arg_name %> missing') if options[:<%= arg_name %>].nil?
@@ -34,12 +40,28 @@ module Slack
 <% if data['group'] == 'groups' && data['args']['channel'] && !data['args']['channel']['desc'].include?('Can be an encoded ID, or a name.') %>
             options = options.merge(channel: groups_id(options)['group']['id']) if options[:channel]
 <% elsif data['args']['channel'] && !data['args']['channel']['desc'].include?('Can be an encoded ID, or a name.') %>
-            options = options.merge(channel: channels_id(options)['channel']['id']) if options[:channel]
+            options = options.merge(channel: conversations_id(options)['channel']['id']) if options[:channel]
 <% end %>
 <% if data['args']['user'] %>
             options = options.merge(user: users_id(options)['user']['id']) if options[:user]
 <% end %>
+<% if data['undocumented'] %>
+            logger.warn('The <%= group %>.<%= name %> method is undocumented.')
+<% end %>
+<% if data['deprecated'] %>
+            logger.warn('<%= group %>.<%= name %>: <%= data['deprecation']['deprecation_warning']%> Alternative methods: <%= data['deprecation']['alternative_methods'].join(', ')%>.')
+<% end %>
+<% if data['args'].keys.include?('cursor') %>
+            if block_given?
+              Pagination::Cursor.new(self, :<%= group.gsub(".", "_") %>_<%= name %>, options).each do |page|
+                yield page
+              end
+            else
+              post('<%= group %>.<%= name %>', options)
+            end
+<% else %>
             post('<%= group %>.<%= name %>', options)
+<% end %>
           end
 <% end %>
         end

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

@@ -1,17 +1,18 @@
+# frozen_string_literal: true
 # This file was auto-generated by lib/tasks/web.rake
 
 require 'spec_helper'
 
 RSpec.describe Slack::Web::Api::Endpoints::<%= group.gsub(".", "_").camelize %> do
   let(:client) { Slack::Web::Client.new }
-<% names.each_with_index do |(name, data), index| %>
+<% names.sort.each_with_index do |(name, data), index| %>
 <% next if data['mixin'] %>
 <% required_params = data['args'].select{ |k, v| v['required'] } %>
 <% next if required_params.none? %>
   context '<%= group %>_<%= name %>' do
 <% required_params.each do |arg_name, arg_v| %>
     it 'requires <%= arg_name %>' do
-<% params_except_required = required_params.reject{ |name, _| name == arg_name  }.map{|var, opts| "#{var}: '#{opts['example']}'"}.join(', ') %>
+<% params_except_required = required_params.reject{ |name, _| name == arg_name  }.map{ |var, opts| "#{var}: %q[#{opts['example']}]"}.join(', ') %>
       expect { client.<%= group.gsub(".", "_") %>_<%= name %><%= params_except_required.empty? ? '' : "(#{params_except_required})" %> }.to raise_error ArgumentError, /Required arguments :<%= arg_name %> missing/
     end
 <% end %>

data/lib/slack/web/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module Web
     class Client
@@ -9,7 +10,7 @@ module Slack
 
       def initialize(options = {})
         Slack::Web::Config::ATTRIBUTES.each do |key|
-          send("#{key}=", options[key] || Slack::Web.config.send(key))
+          send("#{key}=", options.fetch(key, Slack::Web.config.send(key)))
         end
         @logger ||= Slack::Config.logger || Slack::Logger.default
         @token ||= Slack.config.token

data/lib/slack/web/config.rb

@@ -1,16 +1,22 @@
+# frozen_string_literal: true
 module Slack
   module Web
     module Config
       extend self
 
-      ATTRIBUTES = [
-        :proxy,
-        :user_agent,
-        :ca_path,
-        :ca_file,
-        :logger,
-        :endpoint,
-        :token
+      ATTRIBUTES = %i[
+        proxy
+        user_agent
+        ca_path
+        ca_file
+        logger
+        endpoint
+        token
+        timeout
+        open_timeout
+        default_page_size
+        default_max_retries
+        adapter
       ].freeze
 
       attr_accessor(*Config::ATTRIBUTES)
@@ -18,11 +24,16 @@ module Slack
       def reset
         self.endpoint = 'https://slack.com/api/'
         self.user_agent = "Slack Ruby Client/#{Slack::VERSION}"
-        self.ca_path = `openssl version -a | grep OPENSSLDIR | awk '{print $2}'|sed -e 's/\"//g'`
-        self.ca_file = "#{ca_path}/ca-certificates.crt"
+        self.ca_path = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_DIR : nil
+        self.ca_file = defined?(OpenSSL) ? OpenSSL::X509::DEFAULT_CERT_FILE : nil
         self.token = nil
         self.proxy = nil
         self.logger = nil
+        self.timeout = nil
+        self.open_timeout = nil
+        self.default_page_size = 100
+        self.default_max_retries = 100
+        self.adapter = ::Faraday.default_adapter
       end
     end
 

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module Web
     module Faraday
@@ -5,24 +6,32 @@ module Slack
         private
 
         def connection
-          options = {
-            headers: { 'Accept' => 'application/json; charset=utf-8' }
-          }
+          @connection ||=
+            begin
+              options = {
+                headers: { 'Accept' => 'application/json; charset=utf-8' }
+              }
 
-          options[:headers]['User-Agent'] = user_agent if user_agent
-          options[:proxy] = proxy if proxy
-          options[:ssl] = { ca_path: ca_path, ca_file: ca_file }
+              options[:headers]['User-Agent'] = user_agent if user_agent
+              options[:proxy] = proxy if proxy
+              options[:ssl] = { ca_path: ca_path, ca_file: ca_file } if ca_path || ca_file
 
-          ::Faraday::Connection.new(endpoint, options) do |connection|
-            connection.use ::Faraday::Request::Multipart
-            connection.use ::Faraday::Request::UrlEncoded
-            connection.use ::Slack::Web::Faraday::Response::RaiseError
-            connection.use ::FaradayMiddleware::Mashify, mash_class: Slack::Messages::Message
-            connection.use ::FaradayMiddleware::ParseJson
-            connection.use ::Faraday::Response::RaiseError
-            connection.response :logger, logger if logger
-            connection.adapter ::Faraday.default_adapter
-          end
+              request_options = {}
+              request_options[:timeout] = timeout if timeout
+              request_options[:open_timeout] = open_timeout if open_timeout
+              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::RaiseError
+                connection.use ::FaradayMiddleware::Mashify, mash_class: Slack::Messages::Message
+                connection.use ::FaradayMiddleware::ParseJson
+                connection.use ::Slack::Web::Faraday::Response::WrapError
+                connection.response :logger, logger if logger
+                connection.adapter adapter
+              end
+            end
         end
       end
     end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Slack
   module Web
     module Faraday
@@ -21,15 +22,17 @@ 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
         end