ruboty-slack_rtm 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd0c0364ece9e2ebd2f1ce6a41a4311f73123fd
-  data.tar.gz: 4de299278c057094dd8cf13cbffe76ca13ced802
+  metadata.gz: b8b132d94e6b54aadda6cfe398f55e4431b165f5
+  data.tar.gz: 224dd734bc0e1bffdae46932d819c97ac74ef8e6
 SHA512:
-  metadata.gz: 3c24921dd9b60bd12ff632f9ff5f43149fe10e65623b9569df3c9edfd10ea091d698094d3355d869ae99243b78f2961d7006a5a2bda2c424942edde88c0cd54b
-  data.tar.gz: 0a2d3cc76986ed21306b069b8fb10cfd846f2c18922b228279f92b8bf5c733e5e8e5490dd04c33b86a105d3c48b980cb80988fca8490b24377672bbd9ad4920e
+  metadata.gz: e34dcdc874d34b809eae3aedf9c95a3faa8892f69ccf6cb31658caedf95500f9ecee5ba87ff91be2dcb364eeceba067818f254bfd85d63cb758265545969ce37
+  data.tar.gz: 163740287c666ca50ac2b96237c5b7bed57a51a1b395d80f71a9756c54f5c9f0977e7ce6eeb17643918d0e1e0122d8029070a8919dbbf0bfb8a76ddee1074591

data/lib/ruboty/adapters/slack_rtm.rb

@@ -8,6 +8,7 @@ module Ruboty
     class SlackRTM < Base
       env :SLACK_TOKEN, "Account's token. get one on https://api.slack.com/web#basics"
       env :SLACK_EXPOSE_CHANNEL_NAME, "if this set to 1, message.to will be channel name instead of id", optional: true
+      env :SLACK_IGNORE_BOT_MESSAGE, "If this set to 1, bot ignores bot_messages", optional: true
       env :SLACK_IGNORE_GENERAL, "if this set to 1, bot ignores all messages on #general channel", optional: true
       env :SLACK_GENERAL_NAME, "Set general channel name if your Slack changes general name", optional: true
 
@@ -25,7 +26,7 @@ module Ruboty
 
         return unless channel
 
-        realtime.send(
+        realtime.send_message(
           type: 'message',
           channel: channel,
           text: message[:code] ?  "```\n#{message[:body]}\n```" : resolve_send_mention(message[:body]),
@@ -49,7 +50,7 @@ module Ruboty
       end
 
       def bind
-        realtime.on(:message) do |data|
+        realtime.on_text do |data|
           method_name = "on_#{data['type']}".to_sym
           send(method_name, data) if respond_to?(method_name, true)
         end
@@ -103,6 +104,10 @@ module Ruboty
 
         channel = channel_info(data['channel'])
 
+        if data['type'] == 'bot_message' && ENV['SLACK_IGNORE_BOT_MESSAGE'] == '1'
+          return
+        end
+
         if channel
           return if channel['name'] == (ENV['SLACK_GENERAL_NAME'] || 'general') && ENV['SLACK_IGNORE_GENERAL'] == '1'
 
@@ -123,6 +128,8 @@ module Ruboty
         )
       end
 
+      alias on_bot_message on_message
+
       def on_channel_change(data)
         make_channels_cache
       end
@@ -289,7 +296,7 @@ module Ruboty
 
       def resolve_channel_id(name)
         ret_id = nil
-        @channel_info_cahces.each_pair do |id, channel|
+        @channel_info_caches.each_pair do |id, channel|
           if channel['name'] == name
             ret_id = id
             break

data/lib/ruboty/slack_rtm/client.rb

@@ -10,14 +10,24 @@ module Ruboty
         @queue = Queue.new
       end
 
-      def send(data)
+      def send_message(data)
         data[:id] = Time.now.to_i * 10 + rand(10)
         @queue.enq(data.to_json)
       end
 
-      def on(event, &block)
-        @client.on(event) do |message|
-          block.call(JSON.parse(message.data))
+      def on_text(&block)
+        @client.on(:message) do |message|
+          case message.type
+          when :ping
+            Ruboty.logger.debug("#{Client.name}: Received ping message")
+            send('', type: 'pong')
+          when :pong
+            Ruboty.logger.debug("#{Client.name}: Received pong message")
+          when :text
+            block.call(JSON.parse(message.data))
+          else
+            Ruboty.logger.warn("#{Client.name}: Received unknown message type=#{message.type}: #{message.data}")
+          end
         end
       end
 
@@ -33,7 +43,7 @@ module Ruboty
       private
 
       def create_client(url)
-        WebSocket::Client::Simple.connect(url).tap do |client|
+        WebSocket::Client::Simple.connect(url, verify_mode: OpenSSL::SSL::VERIFY_PEER).tap do |client|
           client.on(:error) do |err|
             Ruboty.logger.error("#{err.class}: #{err.message}\n#{err.backtrace.join("\n")}")
           end
@@ -44,7 +54,7 @@ module Ruboty
         Thread.start do
           loop do
             sleep(30)
-            @client.send(type: 'ping')
+            @client.send('', type: 'ping')
           end
         end
       end

data/lib/ruboty/slack_rtm/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module SlackRTM
-    VERSION = '2.2.0'
+    VERSION = '2.3.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-slack_rtm
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Sho Kusano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Slack real time messaging adapter for Ruboty