slack-ruby-client 0.4.0 → 0.5.0

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

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+begin
+  RSpec.describe Slack::RealTime::Concurrency::Celluloid::Socket do
+    context 'with url' do
+      let(:url) { 'wss://echo.websocket.org/websocket/xyz' }
+      subject(:socket) { described_class.new(url, ping: 42) }
+      let(:driver) { WebSocket::Driver::Client }
+      let(:ws) { double(driver) }
+
+      describe '#initialize' do
+        it 'sets url' do
+          expect(socket.url).to eq url
+        end
+      end
+
+      describe '#connect!' do
+        before do
+          allow(ws).to receive(:on).with(:close)
+        end
+
+        xit 'connects' do
+          expect(socket.driver).to receive(:start)
+
+          socket.connect!
+        end
+
+        xit 'pings every 30s' do
+          expect(driver).to receive(:client).with(socket).and_return(ws)
+          socket.connect!
+        end
+      end
+
+      describe '#disconnect!' do
+        it 'closes and nils the websocket' do
+          socket.instance_variable_set('@driver', ws)
+          expect(ws).to receive(:close)
+          socket.disconnect!
+        end
+      end
+
+      describe 'send_data' do
+        let(:driver) { socket.driver }
+        before do
+          allow(driver).to receive(:start)
+          allow(subject).to receive(:run_loop)
+          socket.connect!
+        end
+
+        it 'sends data' do
+          expect(driver).to receive(:text).with('data')
+          subject.send_data('data')
+        end
+      end
+    end
+  end
+rescue LoadError
+end

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

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+begin
+  RSpec.describe Slack::RealTime::Concurrency::Eventmachine::Socket do
+    context 'with url' do
+      let(:url) { 'wss://ms174.slack-msgs.com/websocket/xyz' }
+      let(:socket) { described_class.new(url, ping: 42) }
+      let(:ws) { double(Faye::WebSocket::Client) }
+      describe '#initialize' do
+        it 'sets url' do
+          expect(socket.url).to eq url
+        end
+      end
+      describe '#connect!' do
+        before do
+          allow(ws).to receive(:on).with(:close)
+        end
+        it 'connects' do
+          allow(Faye::WebSocket::Client).to receive(:new).and_return(ws)
+          socket.connect!
+          expect(socket.instance_variable_get('@driver')).to eq ws
+        end
+        it 'pings every 30s' do
+          expect(Faye::WebSocket::Client).to receive(:new).with(url, nil, ping: 42).and_return(ws)
+          socket.connect!
+        end
+      end
+      describe '#disconnect!' do
+        it 'closes and nils the websocket' do
+          socket.instance_variable_set('@driver', ws)
+          expect(ws).to receive(:close)
+          socket.disconnect!
+        end
+      end
+      describe 'send_data' do
+        before do
+          allow(Faye::WebSocket::Client).to receive(:new).and_return(ws)
+          allow(ws).to receive(:on)
+          socket.connect!
+        end
+        it 'sends data' do
+          expect(ws).to receive(:send).with('data')
+          socket.send_data('data')
+        end
+      end
+    end
+  end
+rescue LoadError
+end

data/spec/slack/slack_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe Slack do
+  let(:slack) { File.expand_path(File.join(__FILE__, '../../../bin/slack')) }
+  describe '#help' do
+    it 'displays help' do
+      help = `"#{slack}" help`
+      expect(help).to include 'slack - Slack client.'
+    end
+  end
+  context 'globals' do
+    it 'enables request and response logging with -d' do
+      output = `"#{slack}" --vcr-cassette-name=web/auth_test_success --slack-api-token=token -d auth test 2>&1`
+      expect(output).to include 'post https://slack.com/api/auth.test'
+      expect(output).to include 'Status: 200'
+    end
+    it 'requires --slack-api-token' do
+      err = `"#{slack}" auth test 2>&1`
+      expect(err).to start_with 'error: parse error: Set Slack API token via --slack-api-token or SLACK_API_TOKEN.'
+    end
+  end
+  describe '#auth' do
+    context 'bad auth' do
+      it 'fails with an exception' do
+        err = `"#{slack}" --vcr-cassette-name=web/auth_test_error --slack-api-token=token auth test 2>&1`
+        expect(err).to eq "error: not_authed\n"
+      end
+    end
+    context 'good auth' do
+      it 'succeeds' do
+        json = JSON.parse `"#{slack}" --vcr-cassette-name=web/auth_test_success --slack-api-token=token auth test 2>&1`
+        expect(json).to eq(
+          'ok' => true,
+          'url' => 'https://rubybot.slack.com/',
+          'team' => 'team_name',
+          'user' => 'user_name',
+          'team_id' => 'TDEADBEEF',
+          'user_id' => 'UBAADFOOD'
+        )
+        expect(json['ok']).to be true
+      end
+    end
+  end
+  describe '#users' do
+    it 'list' do
+      json = JSON.parse `"#{slack}" --vcr-cassette-name=web/users_list --slack-api-token=token users list --presence=true 2>&1`
+      expect(json['ok']).to be true
+      expect(json['members'].size).to eq 9
+      expect(json['members'].first['presence']).to eq 'away'
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ RSpec.describe Slack::Web::Api::Endpoints::Auth do
   let(:client) { Slack::Web::Client.new }
   context 'without auth', vcr: { cassette_name: 'web/auth_test_error' } do
     it 'fails with an exception' do
-      expect { client.auth_test }.to raise_error Slack::Web::Api::Error
+      expect { client.auth_test }.to raise_error Slack::Web::Api::Error, 'not_authed'
     end
   end
   context 'with auth', vcr: { cassette_name: 'web/auth_test_success' } do
@@ -12,4 +12,9 @@ RSpec.describe Slack::Web::Api::Endpoints::Auth do
       expect { client.auth_test }.to_not raise_error
     end
   end
+  context '429 error', vcr: { cassette_name: 'web/429_error' } do
+    it 'fails with an exception' do
+      expect { client.auth_test }.to raise_error Faraday::ClientError
+    end
+  end
 end

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

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Endpoints::Users do
+  let(:client) { Slack::Web::Client.new }
+  context 'users' do
+    it 'list', vcr: { cassette_name: 'web/users_list' } do
+      json = client.users_list(presence: true)
+      expect(json['ok']).to be true
+      expect(json['members'].size).to eq 9
+      expect(json['members'].first['presence']).to eq 'away'
+    end
+  end
+end

data/spec/slack/web/api/error_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+RSpec.describe Slack::Web::Api::Error do
+  let(:client) { Slack::Web::Client.new }
+  it 'provides access to the response object', vcr: { cassette_name: 'web/auth_test_error' } do
+    begin
+      client.auth_test
+      fail 'Expected to receive Slack::Web::Api::Error.'
+    rescue Slack::Web::Api::Error => e
+      expect(e.response).to_not be_nil
+      expect(e.response.status).to eq 200
+    end
+  end
+end

data/spec/slack/web/client_spec.rb

@@ -111,5 +111,21 @@ RSpec.describe Slack::Web::Client do
         end
       end
     end
+    context 'logger option' do
+      let(:logger) { Logger.new(STDOUT) }
+      before do
+        Slack::Web::Client.configure do |config|
+          config.logger = logger
+        end
+      end
+      describe '#initialize' do
+        it 'sets logger' do
+          expect(client.logger).to eq logger
+        end
+        it 'creates a connection with a logger' do
+          expect(client.send(:connection).builder.handlers).to include ::Faraday::Response::Logger
+        end
+      end
+    end
   end
 end

data/spec/support/real_time/concurrency/mock.rb

@@ -0,0 +1,31 @@
+module Slack
+  module RealTime
+    module Concurrency
+      module Mock
+        class WebSocket
+        end
+
+        class Socket < ::Slack::RealTime::Socket
+          def self.close
+          end
+
+          def start_async
+            reactor = Thread.new {}
+            yield self if block_given?
+            reactor
+          end
+
+          def send_data(message)
+            driver.send(message)
+          end
+
+          protected
+
+          def connect
+            @driver = WebSocket.new(url, nil, options)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/real_time/connected_client.rb

@@ -1,11 +1,14 @@
 RSpec.shared_context 'connected client' do
   let(:client) { Slack::RealTime::Client.new }
-  let(:ws) { double(Faye::WebSocket::Client) }
+  let(:ws) { double(Slack::RealTime::Concurrency::Mock::WebSocket) }
   let(:url) { 'wss://ms173.slack-msgs.com/websocket/lqcUiAvrKTP-uuid=' }
   let(:socket) { double(Slack::RealTime::Socket, connected?: true) }
   before do
-    allow(EM).to receive(:run).and_yield
+    Slack::RealTime.configure do |config|
+      config.concurrency = Slack::RealTime::Concurrency::Mock
+    end
     allow(Slack::RealTime::Socket).to receive(:new).with(url, ping: 30).and_return(socket)
+    allow(socket).to receive(:start_sync).and_yield
     allow(socket).to receive(:connect!).and_yield(ws)
     allow(ws).to receive(:on)
     client.start!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faye-websocket
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: eventmachine
+  name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -180,7 +180,8 @@ dependencies:
         version: 0.35.0
 description: 
 email: dblock@dblock.org
-executables: []
+executables:
+- slack
 extensions: []
 extra_rdoc_files: []
 files:
@@ -197,12 +198,35 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- UPGRADING.md
+- bin/commands.rb
+- bin/commands/api.rb
+- bin/commands/auth.rb
+- bin/commands/channels.rb
+- bin/commands/chat.rb
+- bin/commands/emoji.rb
+- bin/commands/files.rb
+- bin/commands/groups.rb
+- bin/commands/im.rb
+- bin/commands/mpim.rb
+- bin/commands/oauth.rb
+- bin/commands/pins.rb
+- bin/commands/reactions.rb
+- bin/commands/rtm.rb
+- bin/commands/search.rb
+- bin/commands/stars.rb
+- bin/commands/team.rb
+- bin/commands/usergroups.rb
+- bin/commands/users.rb
+- bin/slack
 - examples/hi_real_time/Gemfile
 - examples/hi_real_time/hi.gif
 - examples/hi_real_time/hi.rb
 - examples/hi_real_time_and_web/Gemfile
 - examples/hi_real_time_and_web/hi.gif
 - examples/hi_real_time_and_web/hi.rb
+- examples/hi_real_time_async/Gemfile
+- examples/hi_real_time_async/hi.rb
 - examples/hi_web/Gemfile
 - examples/hi_web/hi.gif
 - examples/hi_web/hi.rb
@@ -216,6 +240,9 @@ files:
 - lib/slack/real_time/api/ping.rb
 - lib/slack/real_time/api/typing.rb
 - lib/slack/real_time/client.rb
+- lib/slack/real_time/concurrency.rb
+- lib/slack/real_time/concurrency/celluloid.rb
+- lib/slack/real_time/concurrency/eventmachine.rb
 - lib/slack/real_time/config.rb
 - lib/slack/real_time/socket.rb
 - lib/slack/version.rb
@@ -237,12 +264,16 @@ files:
 - lib/slack/web/api/endpoints/search.rb
 - lib/slack/web/api/endpoints/stars.rb
 - lib/slack/web/api/endpoints/team.rb
+- lib/slack/web/api/endpoints/usergroups.rb
 - lib/slack/web/api/endpoints/users.rb
 - lib/slack/web/api/error.rb
 - lib/slack/web/api/patches/chat.1.text-attachments-required.patch
 - lib/slack/web/api/patches/chat.2.attachments-json.patch
+- lib/slack/web/api/schema/group.json
 - lib/slack/web/api/schema/method.json
 - lib/slack/web/api/tasks/generate.rake
+- lib/slack/web/api/templates/command.erb
+- lib/slack/web/api/templates/commands.erb
 - lib/slack/web/api/templates/endpoints.erb
 - lib/slack/web/api/templates/method.erb
 - lib/slack/web/client.rb
@@ -254,20 +285,28 @@ files:
 - screenshots/register-bot.png
 - slack-ruby-client.gemspec
 - slack.png
+- spec/fixtures/slack/web/429_error.yml
 - spec/fixtures/slack/web/auth_test_error.yml
 - spec/fixtures/slack/web/auth_test_success.yml
 - spec/fixtures/slack/web/rtm_start.yml
+- spec/fixtures/slack/web/users_list.yml
+- spec/integration/integration_spec.rb
 - spec/slack/config_spec.rb
 - spec/slack/real_time/api/message_spec.rb
 - spec/slack/real_time/api/ping_spec.rb
 - spec/slack/real_time/api/typing_spec.rb
 - spec/slack/real_time/client_spec.rb
-- spec/slack/real_time/socket_spec.rb
+- spec/slack/real_time/concurrency/celluloid_spec.rb
+- spec/slack/real_time/concurrency/eventmachine_spec.rb
+- spec/slack/slack_spec.rb
 - spec/slack/version_spec.rb
 - spec/slack/web/api/endpoints/auth_spec.rb
 - spec/slack/web/api/endpoints/chat_spec.rb
+- spec/slack/web/api/endpoints/users_spec.rb
+- spec/slack/web/api/error_spec.rb
 - spec/slack/web/client_spec.rb
 - spec/spec_helper.rb
+- spec/support/real_time/concurrency/mock.rb
 - spec/support/real_time/connected_client.rb
 - spec/support/token.rb
 - spec/support/vcr.rb
@@ -296,20 +335,28 @@ signing_key:
 specification_version: 4
 summary: Slack Web and RealTime API client.
 test_files:
+- spec/fixtures/slack/web/429_error.yml
 - spec/fixtures/slack/web/auth_test_error.yml
 - spec/fixtures/slack/web/auth_test_success.yml
 - spec/fixtures/slack/web/rtm_start.yml
+- spec/fixtures/slack/web/users_list.yml
+- spec/integration/integration_spec.rb
 - spec/slack/config_spec.rb
 - spec/slack/real_time/api/message_spec.rb
 - spec/slack/real_time/api/ping_spec.rb
 - spec/slack/real_time/api/typing_spec.rb
 - spec/slack/real_time/client_spec.rb
-- spec/slack/real_time/socket_spec.rb
+- spec/slack/real_time/concurrency/celluloid_spec.rb
+- spec/slack/real_time/concurrency/eventmachine_spec.rb
+- spec/slack/slack_spec.rb
 - spec/slack/version_spec.rb
 - spec/slack/web/api/endpoints/auth_spec.rb
 - spec/slack/web/api/endpoints/chat_spec.rb
+- spec/slack/web/api/endpoints/users_spec.rb
+- spec/slack/web/api/error_spec.rb
 - spec/slack/web/client_spec.rb
 - spec/spec_helper.rb
+- spec/support/real_time/concurrency/mock.rb
 - spec/support/real_time/connected_client.rb
 - spec/support/token.rb
 - spec/support/vcr.rb