slack-ruby-client 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cddbe0828a85f10ae1f1ba5750ebb7c2092ce320
-  data.tar.gz: 5e65e541eb3dc373a49772ab0b5584ed043e848c
+  metadata.gz: 2e1cd2d1d9cbc3663ae0616b48855f34454e8ad4
+  data.tar.gz: 0e7cc755aa5623005a60d5e2d7d62a8c70596bdb
 SHA512:
-  metadata.gz: 3b529246891dca92b7134462247c88a5b72730e5ebf1806fd15fcf55e72e709ce8134898c15aaeb777931a3f62c7b00c86579d877e3c234abc8ac0bee4883249
-  data.tar.gz: 0a7a750afdcef449823797818ea192a02093908b140e4db145f64369151e4a1a4ead6503f22372b2239d918cc20f6212daae7d4e81eaa099f94e886325e3c2f4
+  metadata.gz: 3080aca20cc3a8d3f2d873f9192842806db73f18297e0b41784f5bd3d028d18eabda168331b1f3d883a1699c39f1776adf3a6d5a0881b402408b480f3156c6fd
+  data.tar.gz: a8b263005432280abf2b89f6d2495eb63890024336ea2d9f19e04d2078c0c45704acdbda38cb018b75d5afd651ae226b9dbe6e7189d2e6caf5e26d33ad0a3fba

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.7.3 (5/14/2016)
+
+* [#90](https://github.com/dblock/slack-ruby-client/issues/90): Fix: Celluloid concurrency handles server-side connection closing - [@dblock](https://github.com/dblock).
+
 ### 0.7.2 (5/5/2016)
 
 * [#84](https://github.com/dblock/slack-ruby-client/issues/84): Fix: Celluloid concurrency doesn't parallelize the connection setup - [@dblock](https://github.com/dblock).

data/README.md

@@ -18,7 +18,7 @@ A Ruby client for the Slack [Web](https://api.slack.com/web) and [RealTime Messa
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-client, 0.7.2. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
+You're reading the documentation for the **next** release of slack-ruby-client. Please see the documentation for the [last stable release, v0.7.2](https://github.com/dblock/slack-ruby-client/blob/v0.7.2/README.md) unless you're integrating with HEAD. See [UPGRADING](UPGRADING.md) when upgrading from an older version.
 
 ## Installation
 
@@ -306,18 +306,14 @@ Slack::RealTime.configure do |config|
 end
 ```
 
-Use `client.start_async` instead of `client.start!` if you don't want the library to control the event run loop, such as when integrating into other applications that already use Eventmachine or Celluloid. A good example of such application is [slack-bot-server](https://github.com/dblock/slack-bot-server).
+Use `client.start_async` instead of `client.start!`. A good example of such application is [slack-bot-server](https://github.com/dblock/slack-bot-server).
 
 ```ruby
 client = Slack::RealTime::Client.new
 
-EM.run do
-  client.start_async
-end
+client.start_async
 ```
 
-See a fully working example in [examples/hi_real_time_async](examples/hi_real_time_async/hi.rb).
-
 ##### Faye::Websocket with Eventmachine
 
 Add the following to your Gemfile.
@@ -326,14 +322,20 @@ Add the following to your Gemfile.
 gem 'faye-websocket'
 ```
 
+See a fully working example in [examples/hi_real_time_async_eventmachine](examples/hi_real_time_async_eventmachine/hi.rb).
+
 ##### Celluloid
 
 Add the following to your Gemfile.
 
 ```
-gem 'celluloid-io'
+gem 'celluloid-io', require: ['celluloid/current', 'celluloid/io']
 ```
 
+See a fully working example in [examples/hi_real_time_async_celluloid](examples/hi_real_time_async_celluloid/hi.rb).
+
+Require
+
 ### Message Parsing
 
 All text in Slack uses the same [system of escaping](https://api.slack.com/docs/formatting): chat messages, direct messages, file comments, etc. Use [Slack::Messages::Formatting](lib/slack/messages/formatting.rb) to unescape incoming messages. This comes handy, for example, you want to treat all input to a real time bot as plain text.

data/examples/hi_real_time/Gemfile

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

data/examples/hi_real_time_async_celluloid/Gemfile

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

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

@@ -30,12 +30,19 @@ module Slack
           end
 
           def run_loop
+            @closing = false
             @socket = build_socket
             @connected = @socket.connect
             driver.start
             loop { read } if socket
-          rescue EOFError
-            # connection closed
+          rescue EOFError => e
+            logger.debug("#{self.class}##{__method__}") { e }
+            driver.emit(:close, WebSocket::Driver::CloseEvent.new(1001, 'server closed connection')) unless @closing
+          end
+
+          def close
+            @closing = true
+            driver.close
           end
 
           def read

data/lib/slack/version.rb

@@ -1,3 +1,3 @@
 module Slack
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -257,8 +257,6 @@ files:
 - 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_real_time_async_celluloid/Gemfile
 - examples/hi_real_time_async_celluloid/Procfile
 - examples/hi_real_time_async_celluloid/hi.rb
@@ -440,7 +438,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Slack Web and RealTime API client.

data/examples/hi_real_time_async/Gemfile

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

data/examples/hi_real_time_async/hi.rb

@@ -1,29 +0,0 @@
-require 'slack-ruby-client'
-
-Slack.configure do |config|
-  config.token = ENV['SLACK_API_TOKEN']
-  fail '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
-
-EM.run do
-  client.start_async
-end