slack-ruby-client 0.13.0 → 0.17.0

data/examples/hi_real_time/Gemfile

@@ -1,5 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'slack-ruby-client', path: '../..'
-
-gem 'celluloid-io', require: ['celluloid/current', 'celluloid/io']

data/examples/hi_real_time/hi.rb

@@ -1,37 +0,0 @@
-require 'slack-ruby-client'
-
-Slack.configure do |config|
-  config.token = ENV['SLACK_API_TOKEN']
-  config.logger = Logger.new(STDOUT)
-  config.logger.level = Logger::INFO
-  raise 'Missing ENV[SLACK_API_TOKEN]!' unless config.token
-end
-
-client = Slack::RealTime::Client.new
-
-client.on :hello do
-  puts "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
-end
-
-client.on :message do |data|
-  puts data
-
-  client.typing channel: data.channel
-
-  case data.text
-  when 'bot hi' then
-    client.message channel: data.channel, text: "Hi <@#{data.user}>!"
-  when /^bot/ then
-    client.message channel: data.channel, text: "Sorry <@#{data.user}>, what?"
-  end
-end
-
-client.on :close do |_data|
-  puts 'Connection closing, exiting.'
-end
-
-client.on :closed do |_data|
-  puts 'Connection has been disconnected.'
-end
-
-client.start!

data/examples/hi_real_time_async_celluloid/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'slack-ruby-client', path: '../..'
-
-gem 'celluloid-io', require: ['celluloid/current', 'celluloid/io']
-gem 'foreman'

data/examples/hi_real_time_async_celluloid/Procfile

@@ -1,2 +0,0 @@
-console: bundle exec ruby hi.rb
-

data/examples/hi_real_time_async_celluloid/hi.rb

@@ -1,35 +0,0 @@
-require 'slack-ruby-client'
-
-raise 'Missing ENV[SLACK_API_TOKENS]!' unless ENV.key?('SLACK_API_TOKENS')
-
-$stdout.sync = true
-logger = Logger.new($stdout)
-logger.level = Logger::DEBUG
-threads = []
-
-ENV['SLACK_API_TOKENS'].split.each do |token|
-  logger.info "Starting #{token[0..12]} ..."
-
-  client = Slack::RealTime::Client.new(token: token)
-
-  client.on :hello do
-    logger.info "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
-  end
-
-  client.on :message do |data|
-    logger.info data
-
-    client.typing channel: data.channel
-
-    case data.text
-    when 'bot hi' then
-      client.message channel: data.channel, text: "Hi <@#{data.user}>!"
-    when /^bot/ then
-      client.message channel: data.channel, text: "Sorry <@#{data.user}>, what?"
-    end
-  end
-
-  threads << client.start_async
-end
-
-threads.each(&:join)

data/examples/hi_real_time_async_eventmachine/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'slack-ruby-client', path: '../..'
-
-gem 'faye-websocket'
-gem 'foreman'

data/examples/hi_real_time_async_eventmachine/Procfile

@@ -1,2 +0,0 @@
-console: bundle exec ruby hi.rb
-

data/examples/hi_real_time_async_eventmachine/hi.rb

@@ -1,35 +0,0 @@
-require 'slack-ruby-client'
-
-raise 'Missing ENV[SLACK_API_TOKENS]!' unless ENV.key?('SLACK_API_TOKENS')
-
-$stdout.sync = true
-logger = Logger.new($stdout)
-logger.level = Logger::DEBUG
-threads = []
-
-ENV['SLACK_API_TOKENS'].split.each do |token|
-  logger.info "Starting #{token[0..12]} ..."
-
-  client = Slack::RealTime::Client.new(token: token)
-
-  client.on :hello do
-    logger.info "Successfully connected, welcome '#{client.self.name}' to the '#{client.team.name}' team at https://#{client.team.domain}.slack.com."
-  end
-
-  client.on :message do |data|
-    logger.info data
-
-    client.typing channel: data.channel
-
-    case data.text
-    when 'bot hi' then
-      client.message channel: data.channel, text: "Hi <@#{data.user}>!"
-    when /^bot/ then
-      client.message channel: data.channel, text: "Sorry <@#{data.user}>, what?"
-    end
-  end
-
-  threads << client.start_async
-end
-
-threads.each(&:join)

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

@@ -1,103 +0,0 @@
-require 'websocket/driver'
-require 'socket'
-require 'forwardable'
-require 'celluloid/current'
-require 'celluloid/io'
-
-module Slack
-  module RealTime
-    module Concurrency
-      module Celluloid
-        class Socket < Slack::RealTime::Socket
-          include ::Celluloid::IO
-          include ::Celluloid::Internals::Logger
-
-          BLOCK_SIZE = 4096
-
-          extend ::Forwardable
-          def_delegators :driver, :text, :binary
-
-          attr_reader :socket
-
-          def initialize(*args)
-            super
-          end
-
-          def connect!
-            super
-            run_loop
-          end
-
-          def run_loop
-            @closing = false
-            @socket = build_socket
-            @connected = @socket.connect
-            driver.start
-            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
-          ensure
-            begin
-              current_actor.terminate if current_actor.alive?
-            rescue StandardError
-              nil
-            end
-          end
-
-          def close
-            @closing = true
-            driver.close
-            super
-          end
-
-          def read
-            buffer = socket.readpartial(BLOCK_SIZE)
-            raise EOFError unless buffer && !buffer.empty?
-            async.handle_read(buffer)
-          end
-
-          def handle_read(buffer)
-            logger.debug("#{self.class}##{__method__}") { buffer }
-            driver.parse buffer
-          end
-
-          def write(data)
-            logger.debug("#{self.class}##{__method__}") { data }
-            socket.write(data)
-          end
-
-          def start_async(client)
-            Thread.new do
-              client.run_loop
-            end
-          end
-
-          def connected?
-            !@connected.nil?
-          end
-
-          protected
-
-          def build_socket
-            socket = ::Celluloid::IO::TCPSocket.new(addr, port)
-            socket = ::Celluloid::IO::SSLSocket.new(socket, build_ssl_context) if secure?
-            socket
-          end
-
-          def build_ssl_context
-            OpenSSL::SSL::SSLContext.new(:TLSv1_2_client)
-          end
-
-          def build_driver
-            ::WebSocket::Driver.client(self)
-          end
-
-          def connect
-            @driver = build_driver
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,66 +0,0 @@
-require 'faye/websocket'
-require 'eventmachine'
-
-module Slack
-  module RealTime
-    module Concurrency
-      module Eventmachine
-        class Client < Faye::WebSocket::Client
-          attr_reader :logger
-          protected :logger
-
-          def initialize(url, protocols = nil, options = {})
-            @logger = options.delete(:logger) || Slack::RealTime::Config.logger || Slack::Config.logger
-            super
-          end
-
-          def parse(data)
-            logger.debug("#{self.class}##{__method__}") { data }
-            super data
-          end
-
-          def write(data)
-            logger.debug("#{self.class}##{__method__}") { data }
-            super data
-          end
-        end
-
-        class Socket < Slack::RealTime::Socket
-          def start_async(client)
-            @thread = ensure_reactor_running
-
-            client.run_loop
-
-            @thread
-          end
-
-          def close
-            super
-            EventMachine.stop if @thread
-            @thread = nil
-          end
-
-          def send_data(message)
-            logger.debug("#{self.class}##{__method__}") { message }
-            driver.send(message)
-          end
-
-          protected
-
-          # @return [Thread]
-          def ensure_reactor_running
-            return if EventMachine.reactor_running?
-
-            reactor = Thread.new { EventMachine.run }
-            Thread.pass until EventMachine.reactor_running?
-            reactor
-          end
-
-          def connect
-            @driver = Client.new(url, nil, options.merge(logger: logger))
-          end
-        end
-      end
-    end
-  end
-end

data/lib/slack/web/api/patches/chat.1.text-attachments-required.patch

@@ -1,13 +0,0 @@
-diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 1f7a8d7..2ec4bed 100644
---- a/lib/slack/web/api/endpoints/chat.rb
-+++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -49,7 +49,7 @@ 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 or :attachments missing') if options[:text].nil? && options[:attachments].nil?
-             post('chat.postMessage', options)
-           end
-

data/lib/slack/web/api/patches/chat.2.attachments-json.patch

@@ -1,17 +0,0 @@
-diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 1f7a8d7..89b1562 100644
---- a/lib/slack/web/api/endpoints/chat.rb
-+++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -50,6 +50,12 @@ module Slack
-           def chat_postMessage(options = {})
-             throw ArgumentError.new('Required arguments :channel missing') if options[:channel].nil?
-             throw ArgumentError.new('Required arguments :text or :attachments missing') if options[:text].nil? && options[:attachments].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
-             post('chat.postMessage', options)
-           end
-

data/lib/slack/web/api/patches/chat.3.update-attachments-support.patch

@@ -1,21 +0,0 @@
-diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 5186416..490bc91 100644
---- a/lib/slack/web/api/endpoints/chat.rb
-+++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -154,9 +154,15 @@ 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 missing') if options[:text].nil?
-+            throw ArgumentError.new('Required arguments :text or :attachments missing') if options[:text].nil? && options[:attachments].nil?
-             throw ArgumentError.new('Required arguments :ts missing') if options[:ts].nil?
-             options = options.merge(channel: channels_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
-             post('chat.update', options)
-           end
-         end

data/lib/slack/web/api/patches/chat.4.postEphemeral-attachments-support.patch

@@ -1,17 +0,0 @@
-diff --git a/lib/slack/web/api/endpoints/chat.rb b/lib/slack/web/api/endpoints/chat.rb
-index 846126e..0c254c6 100644
---- a/lib/slack/web/api/endpoints/chat.rb
-+++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -62,6 +62,12 @@ module Slack
-             throw ArgumentError.new('Required arguments :text missing') if options[:text].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
-             post('chat.postEphemeral', options)
-           end
- 

data/lib/slack/web/api/patches/chat.5.postEphemeral-text-or-attachments.patch

@@ -1,13 +0,0 @@
-diff --git a/slack-ruby-client/lib/slack/web/api/endpoints/chat.rb b/slack-ruby-client-original/lib/slack/web/api/endpoints/chat.rb
-index 194419e..2ef5c65 100644
---- a/lib/slack/web/api/endpoints/chat.rb
-+++ b/lib/slack/web/api/endpoints/chat.rb
-@@ -93,7 +93,7 @@ module Slack
-           # @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 or :attachments missing') if options[:text].nil? && options[:attachments].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

data/spec/slack/real_time/concurrency/celluloid_spec.rb

@@ -1,106 +0,0 @@
-require 'spec_helper'
-require_relative './it_behaves_like_a_realtime_socket'
-
-begin
-  RSpec.describe Slack::RealTime::Concurrency::Celluloid::Socket do
-    it_behaves_like 'a realtime socket'
-
-    let(:url) { 'wss://echo.websocket.org/websocket/xyz' }
-    let(:logger) { ::Logger.new(STDOUT) }
-
-    let(:driver) { WebSocket::Driver::Client }
-    let(:ws) { double(driver) }
-    subject { socket }
-
-    ['', nil].each do |data|
-      context "finishing run_loop with #{data ? 'empty' : 'nil'} read" do
-        let(:ssl_socket) do
-          Class.new(Celluloid::IO::SSLSocket) do
-            def initialize(data)
-              @data = data
-            end
-
-            def connect; end
-
-            def readpartial(_size)
-              @data
-            end
-          end
-        end
-
-        let(:test_socket) do
-          Class.new(described_class) do
-            def build_socket
-              options[:ssl_socket].new(options[:data])
-            end
-          end
-        end
-
-        let(:socket) do
-          test_socket.new(url, logger: logger, data: data, ssl_socket: ssl_socket)
-        end
-
-        context 'with a driver' do
-          before do
-            socket.instance_variable_set('@driver', ws)
-          end
-
-          context 'consumes data' do
-            it 'runs' do
-              expect(ws).to receive(:emit)
-              expect(ws).to receive(:start)
-              expect(logger).to receive(:debug).with("#{test_socket}#run_loop")
-              socket.run_loop
-            end
-          end
-        end
-      end
-    end
-
-    [EOFError, Errno::ECONNRESET, Errno::EPIPE].each do |err|
-      context "finishing run_loop with #{err}" do
-        let(:test_socket) do
-          Class.new(described_class) do
-            def read
-              raise options[:err]
-            end
-          end
-        end
-
-        let(:socket) do
-          test_socket.new(url, logger: logger, err: err)
-        end
-
-        context 'with a driver' do
-          before do
-            socket.instance_variable_set('@driver', ws)
-          end
-
-          describe '#disconnect!' do
-            it 'closes and nils the websocket' do
-              expect(ws).to receive(:close)
-              socket.disconnect!
-            end
-          end
-
-          context 'consumes data' do
-            it 'runs' do
-              expect(ws).to receive(:emit)
-              expect(ws).to receive(:start)
-              expect(logger).to receive(:debug).with("#{test_socket}#run_loop")
-              socket.run_loop
-            end
-          end
-        end
-      end
-    end
-
-    describe '#connect!' do
-      pending 'connects'
-      pending 'pings every 30s'
-    end
-
-    pending 'send_data'
-  end
-rescue LoadError
-end