slack-ruby-client 0.13.1 → 0.14.0

data/spec/slack/real_time/client_spec.rb

@@ -42,7 +42,7 @@ RSpec.describe Slack::RealTime::Client do
       end
     end
   end
-  context 'client with a full store', vcr: { cassette_name: 'web/rtm_start' } do
+  context 'client with a full store', vcr: { cassette_name: 'web/rtm_start', allow_playback_repeats: true } do
     let(:client) { Slack::RealTime::Client.new(store_class: Slack::RealTime::Stores::Store) }
     let(:url) { 'wss://ms173.slack-msgs.com/websocket/lqcUiAvrKTP-uuid=' }
     describe '#start!' do
@@ -127,6 +127,29 @@ RSpec.describe Slack::RealTime::Client do
         end
       end
     end
+    describe '#start_async' do
+      let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
+      before do
+        allow(Slack::RealTime::Socket).to receive(:new).with(url, ping: 30, logger: Slack::Logger.default).and_return(socket)
+        allow(socket).to receive(:connect!)
+        allow(socket).to receive(:start_async)
+        client.start_async
+      end
+      describe '#run_ping!' do
+        it 'sends ping messages when the websocket connection is idle' do
+          allow(socket).to receive(:time_since_last_message).and_return(30)
+          expect(socket).to receive(:send_data).with('{"type":"ping","id":1}')
+          client.run_ping!
+        end
+        it 'reconnects the websocket if it has been idle for too long' do
+          allow(socket).to receive(:time_since_last_message).and_return(75)
+          allow(socket).to receive(:connected?).and_return(true)
+          expect(socket).to receive(:close)
+          expect(socket).to receive(:restart_async)
+          client.run_ping!
+        end
+      end
+    end
   end
   context 'client with starter store', vcr: { cassette_name: 'web/rtm_connect' } do
     let(:client) { Slack::RealTime::Client.new(store_class: Slack::RealTime::Stores::Starter) }
@@ -241,6 +264,18 @@ RSpec.describe Slack::RealTime::Client do
         end
       end
     end
+    describe '#run_ping?' do
+      it 'returns true when websocket_ping is greater than 0' do
+        client.websocket_ping = 30
+        expect(client.run_ping?).to be true
+      end
+      it 'returns false when websocket_ping is less than 1' do
+        client.websocket_ping = 0
+        expect(client.run_ping?).to be false
+        client.websocket_ping = nil
+        expect(client.run_ping?).to be false
+      end
+    end
   end
   context 'with custom settings' do
     describe '#initialize' do

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

@@ -12,6 +12,7 @@ begin
       describe '#connect!' do
         before do
           allow(ws).to receive(:on).with(:close)
+          allow(ws).to receive(:on).with(:message)
         end
         it 'connects' do
           allow(Faye::WebSocket::Client).to receive(:new).and_return(ws)

data/spec/slack/web/api/endpoints/apps_spec.rb

@@ -0,0 +1,15 @@
+# This file was auto-generated by lib/tasks/web.rake
+
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Endpoints::Apps do
+  let(:client) { Slack::Web::Client.new }
+  context 'apps_uninstall' do
+    it 'requires client_id' do
+      expect { client.apps_uninstall(client_secret: 'f25b5ceaf8a3c2a2c4f52bb4f0b0499e') }.to raise_error ArgumentError, /Required arguments :client_id missing/
+    end
+    it 'requires client_secret' do
+      expect { client.apps_uninstall(client_id: '56579136444.26251006572') }.to raise_error ArgumentError, /Required arguments :client_secret missing/
+    end
+  end
+end

data/spec/slack/web/api/endpoints/custom_specs/chat_spec.rb

@@ -8,19 +8,20 @@ RSpec.describe Slack::Web::Api::Endpoints::Chat do
       allow(described_class).to receive(:users_id).and_return(user)
     end
 
-    it 'automatically converts attachments into JSON' do
+    it 'automatically converts attachments and blocks into JSON' do
       expect(client).to receive(:post).with(
         'chat.postEphemeral',
         channel: 'channel',
         text: 'text',
         user: '123',
-        attachments: '[]'
+        attachments: '[]',
+        blocks: '[]'
       )
-      client.chat_postEphemeral(channel: 'channel', text: 'text', user: '123', attachments: [])
+      client.chat_postEphemeral(channel: 'channel', text: 'text', user: '123', attachments: [], blocks: [])
     end
     context 'text and user arguments' do
       it 'requires text or attachments' do
-        expect { client.chat_postEphemeral(channel: 'channel') }.to raise_error ArgumentError, /Required arguments :text or :attachments missing/
+        expect { client.chat_postEphemeral(channel: 'channel') }.to raise_error ArgumentError, /Required arguments :text, :attachments or :blocks missing/
       end
       it 'requires user' do
         expect { client.chat_postEphemeral(channel: 'channel', text: 'text') }.to raise_error ArgumentError, /Required arguments :user missing/
@@ -40,21 +41,32 @@ RSpec.describe Slack::Web::Api::Endpoints::Chat do
         expect { client.chat_postEphemeral(channel: 'channel', attachments: [], user: '123') }.to_not raise_error
       end
     end
+    context 'blocks argument' do
+      it 'optional blocks' do
+        expect(client).to receive(:post).with('chat.postEphemeral', hash_including(blocks: '[]'))
+        expect { client.chat_postEphemeral(channel: 'channel', text: 'text', user: '123', blocks: []) }.to_not raise_error
+      end
+      it 'blocks without text' do
+        expect(client).to receive(:post).with('chat.postEphemeral', hash_including(blocks: '[]'))
+        expect { client.chat_postEphemeral(channel: 'channel', blocks: [], user: '123') }.to_not raise_error
+      end
+    end
   end
 
   context 'chat_postMessage' do
-    it 'automatically converts attachments into JSON' do
+    it 'automatically converts attachments and blocks into JSON' do
       expect(client).to receive(:post).with(
         'chat.postMessage',
         channel: 'channel',
         text: 'text',
-        attachments: '[]'
+        attachments: '[]',
+        blocks: '[]'
       )
-      client.chat_postMessage(channel: 'channel', text: 'text', attachments: [])
+      client.chat_postMessage(channel: 'channel', text: 'text', attachments: [], blocks: [])
     end
-    context 'text and attachment arguments' do
-      it 'requires text or attachments' do
-        expect { client.chat_postMessage(channel: 'channel') }.to raise_error ArgumentError, /Required arguments :text or :attachments missing/
+    context 'text, attachment and blocks arguments' do
+      it 'requires text, attachments or blocks' do
+        expect { client.chat_postMessage(channel: 'channel') }.to raise_error ArgumentError, /Required arguments :text, :attachments or :blocks missing/
       end
       it 'only text' do
         expect(client).to receive(:post).with('chat.postMessage', hash_including(text: 'text'))
@@ -64,33 +76,38 @@ RSpec.describe Slack::Web::Api::Endpoints::Chat do
         expect(client).to receive(:post).with('chat.postMessage', hash_including(attachments: '[]'))
         expect { client.chat_postMessage(channel: 'channel', attachments: []) }.to_not raise_error
       end
-      it 'both text and attachments' do
-        expect(client).to receive(:post).with('chat.postMessage', hash_including(text: 'text', attachments: '[]'))
-        expect { client.chat_postMessage(channel: 'channel', text: 'text', attachments: []) }.to_not raise_error
+      it 'only blocks' do
+        expect(client).to receive(:post).with('chat.postMessage', hash_including(blocks: '[]'))
+        expect { client.chat_postMessage(channel: 'channel', blocks: []) }.to_not raise_error
+      end
+      it 'all text, attachments and blocks' do
+        expect(client).to receive(:post).with('chat.postMessage', hash_including(text: 'text', attachments: '[]', blocks: '[]'))
+        expect { client.chat_postMessage(channel: 'channel', text: 'text', attachments: [], blocks: []) }.to_not raise_error
       end
     end
   end
 
   context 'chat_update' do
     let(:ts) { '1405894322.002768' }
-    it 'automatically converts attachments into JSON' do
+    it 'automatically converts attachments and blocks into JSON' do
       expect(client).to receive(:post).with(
         'chat.update',
-        attachments: '[]',
         channel: 'channel',
         text: 'text',
-        ts: ts
+        ts: ts,
+        attachments: '[]',
+        blocks: '[]'
       )
-      client.chat_update(attachments: [], channel: 'channel', text: 'text', ts: ts)
+      client.chat_update(channel: 'channel', text: 'text', ts: ts, attachments: [], blocks: [])
     end
     context 'ts arguments' do
       it 'requires ts' do
         expect { client.chat_update(channel: 'channel', text: 'text') }.to raise_error ArgumentError, /Required arguments :ts missing>/
       end
     end
-    context 'text and attachment arguments' do
-      it 'requires text or attachments' do
-        expect { client.chat_update(channel: 'channel', ts: ts) }.to raise_error ArgumentError, /Required arguments :text or :attachments missing/
+    context 'text, attachment and blocks arguments' do
+      it 'requires text, attachments or blocks' do
+        expect { client.chat_update(channel: 'channel', ts: ts) }.to raise_error ArgumentError, /Required arguments :text, :attachments or :blocks missing/
       end
       it 'only text' do
         expect(client).to receive(:post).with('chat.update', hash_including(text: 'text'))
@@ -98,11 +115,15 @@ RSpec.describe Slack::Web::Api::Endpoints::Chat do
       end
       it 'only attachments' do
         expect(client).to receive(:post).with('chat.update', hash_including(attachments: '[]'))
-        expect { client.chat_update(attachments: [], channel: 'channel', ts: ts) }.to_not raise_error
+        expect { client.chat_update(channel: 'channel', ts: ts, attachments: []) }.to_not raise_error
+      end
+      it 'only blocks' do
+        expect(client).to receive(:post).with('chat.update', hash_including(blocks: '[]'))
+        expect { client.chat_update(channel: 'channel', ts: ts, blocks: []) }.to_not raise_error
       end
-      it 'both text and attachments' do
-        expect(client).to receive(:post).with('chat.update', hash_including(text: 'text', attachments: '[]'))
-        expect { client.chat_update(attachments: [], channel: 'channel', text: 'text', ts: ts) }.to_not raise_error
+      it 'all text, attachments and blocks' do
+        expect(client).to receive(:post).with('chat.update', hash_including(text: 'text', attachments: '[]', blocks: '[]'))
+        expect { client.chat_update(channel: 'channel', text: 'text', ts: ts, attachments: [], blocks: []) }.to_not raise_error
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 
 require 'rubygems'
 require 'rspec'
+require 'timecop'
 
 require 'slack-ruby-client'
 

data/spec/support/queue_with_timeout.rb

@@ -6,15 +6,15 @@ class QueueWithTimeout
     @recieved = ConditionVariable.new
   end
 
-  def push(x)
+  def push(item)
     @mutex.synchronize do
-      @queue << x
+      @queue << item
       @recieved.signal
     end
   end
 
-  def <<(x)
-    push(x)
+  def <<(item)
+    push(item)
   end
 
   def pop(non_block = false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -156,14 +156,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.61.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.58.2
+        version: 0.61.1
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -216,6 +230,7 @@ files:
 - UPGRADING.md
 - bin/commands.rb
 - bin/commands/api.rb
+- bin/commands/apps.rb
 - bin/commands/apps_permissions.rb
 - bin/commands/apps_permissions_resources.rb
 - bin/commands/apps_permissions_scopes.rb
@@ -273,6 +288,8 @@ files:
 - lib/slack-ruby-client.rb
 - lib/slack.rb
 - lib/slack/config.rb
+- lib/slack/events/config.rb
+- lib/slack/events/request.rb
 - lib/slack/logger.rb
 - lib/slack/messages/formatting.rb
 - lib/slack/messages/message.rb
@@ -304,6 +321,7 @@ files:
 - lib/slack/version.rb
 - lib/slack/web/api/endpoints.rb
 - lib/slack/web/api/endpoints/api.rb
+- lib/slack/web/api/endpoints/apps.rb
 - lib/slack/web/api/endpoints/apps_permissions.rb
 - lib/slack/web/api/endpoints/apps_permissions_resources.rb
 - lib/slack/web/api/endpoints/apps_permissions_scopes.rb
@@ -356,6 +374,7 @@ files:
 - lib/slack/web/api/patches/chat.3.update-attachments-support.patch
 - lib/slack/web/api/patches/chat.4.postEphemeral-attachments-support.patch
 - lib/slack/web/api/patches/chat.5.postEphemeral-text-or-attachments.patch
+- lib/slack/web/api/patches/chat.6.block-kit-support.patch
 - lib/slack/web/api/patches/dialog.1.open-json-support.patch
 - lib/slack/web/api/schema/group.json
 - lib/slack/web/api/schema/method.json
@@ -391,6 +410,8 @@ files:
 - spec/fixtures/slack/web/users_list.yml
 - spec/integration/integration_spec.rb
 - spec/slack/config_spec.rb
+- spec/slack/events/config_spec.rb
+- spec/slack/events/request_spec.rb
 - spec/slack/messages/formatting_spec.rb
 - spec/slack/real_time/api/message_spec.rb
 - spec/slack/real_time/api/ping_spec.rb
@@ -416,6 +437,7 @@ files:
 - spec/slack/web/api/endpoints/apps_permissions_scopes_spec.rb
 - spec/slack/web/api/endpoints/apps_permissions_spec.rb
 - spec/slack/web/api/endpoints/apps_permissions_users_spec.rb
+- spec/slack/web/api/endpoints/apps_spec.rb
 - spec/slack/web/api/endpoints/bots_spec.rb
 - spec/slack/web/api/endpoints/conversations_spec.rb
 - spec/slack/web/api/endpoints/custom_specs/auth_spec.rb
@@ -499,6 +521,8 @@ test_files:
 - spec/fixtures/slack/web/users_list.yml
 - spec/integration/integration_spec.rb
 - spec/slack/config_spec.rb
+- spec/slack/events/config_spec.rb
+- spec/slack/events/request_spec.rb
 - spec/slack/messages/formatting_spec.rb
 - spec/slack/real_time/api/message_spec.rb
 - spec/slack/real_time/api/ping_spec.rb
@@ -524,6 +548,7 @@ test_files:
 - spec/slack/web/api/endpoints/apps_permissions_scopes_spec.rb
 - spec/slack/web/api/endpoints/apps_permissions_spec.rb
 - spec/slack/web/api/endpoints/apps_permissions_users_spec.rb
+- spec/slack/web/api/endpoints/apps_spec.rb
 - spec/slack/web/api/endpoints/bots_spec.rb
 - spec/slack/web/api/endpoints/conversations_spec.rb
 - spec/slack/web/api/endpoints/custom_specs/auth_spec.rb