slack-bot-server 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cc965f9cb1a969b0ea3f1b58f467084aa308552
-  data.tar.gz: b409898adb366f5420d6403f83015b0c05a366d1
+  metadata.gz: 504c4decb4b2eacb0315295a18eced229b625964
+  data.tar.gz: 212c468b3d11018a48c966a1db9b4152f61b4f49
 SHA512:
-  metadata.gz: e0488b12f7bb24e7310e974e07f24d0775bc4d977783066c94bd0460c27e36d56540807cbd498362d6b163cff19aff16266388dacd8f43123b056031288cba89
-  data.tar.gz: c6a89f534877ea4ca3433ad8ee2e732f2fc4c848750f90a6e7a129a98d4d0e724e2d0af7b027ba5b8b44f452d0f1514246d68e58bb3463acf7ab875a0bb3b55f
+  metadata.gz: f93f32bd83af717a663f5e995eea4678f24c5b2db744dbec043e40e5b7a79e52823130cbd22bad4821e87c89c429cd5322d06bccd12d04087ed9f410a6d313a2
+  data.tar.gz: a277171fd3fa7b384118992cf1b2d80777ab3ea05bbcbd2156f241c64d1063321190364b263d9e7497944aa991f88420cbfb01a5c6b6cc1328fbe8fae49b58c0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Unreleased
 
+## 0.4.3
+
+### Changes
+- Add `clear` method to queues
+- Upgrate `slack-ruby-client` dependency to latest version
+
+## 0.4.2
+
 ### Changes
 - Re-use error raising from within Slack::Web::Api
 - Prevent bots with the same key as existing bots from being added (@keydunov)

data/README.md

@@ -132,9 +132,9 @@ class SlackBotServer::SimpleBot < SlackBotServer::Bot
   # only 'how are you'.
   on_mention do |data|
     if data['message'] == 'who are you'
-      reply text: "I am #{user} (user id: #{user_id}, connected to team #{team} with team id #{team_id}"
+      reply text: "I am #{bot_user_name} (user id: #{bot_user_id}, connected to team #{team_name} with team id #{team_id}"
     else
-      reply text: "You said '#{data['message']}', and I'm frankly fascinated."
+      reply text: "You said '#{data.message}', and I'm frankly fascinated."
     end
   end
 

data/lib/slack_bot_server/bot.rb

@@ -18,7 +18,7 @@ require 'slack-ruby-client'
 #     # only 'how are you'.
 #     on_mention do |data|
 #       if data['message'] == 'who are you'
-#         reply text: "I am #{user} (user id: #{user_id}, connected to team #{team} with team id #{team_id}"
+#         reply text: "I am #{bot_user_name} (user id: #{bot_user_id}, connected to team #{team_name} with team id #{team_id}"
 #       else
 #         reply text: "You said '#{data['message']}', and I'm frankly fascinated."
 #       end
@@ -51,8 +51,6 @@ class SlackBotServer::Bot
   def initialize(token:, key: nil)
     @token = token
     @key = key || @token
-    @im_channels = []
-    @channels = []
     @connected = false
     @running = false
   end
@@ -60,22 +58,22 @@ class SlackBotServer::Bot
   # Returns the username (for @ replying) of the bot user we are connected as,
   # e.g. +'simple_bot'+
   def bot_user_name
-    @client.self['name']
+    @client.self.name
   end
 
   # Returns the ID of the bot user we are connected as, e.g. +'U123456'+
   def bot_user_id
-    @client.self['id']
+    @client.self.id
   end
 
   # Returns the name of the team we are connected to, e.g. +'My Team'+
   def team_name
-    @client.team['name']
+    @client.team.name
   end
 
   # Returns the ID of the team we are connected to, e.g. +'T234567'+
   def team_id
-    @client.team['id']
+    @client.team.id
   end
 
   # Send a message to Slack
@@ -103,8 +101,8 @@ class SlackBotServer::Bot
   # @param options [Hash] As {#say}, although the +:channel+ option is
   #   redundant
   def broadcast(options)
-    @channels.each do |channel|
-      say(options.merge(channel: channel['id']))
+    @client.channels.each do |id, _|
+      say(options.merge(channel: id))
     end
   end
 
@@ -113,7 +111,7 @@ class SlackBotServer::Bot
   # @param options [Hash] As {#say}, although the +:channel+ option is
   #    redundant
   def reply(options)
-    channel = @last_received_data['channel']
+    channel = @last_received_data.channel
     say(options.merge(channel: channel))
   end
 
@@ -123,7 +121,7 @@ class SlackBotServer::Bot
   #    redundant
   def say_to(user_id, options)
     result = @client.web_client.im_open(user: user_id)
-    channel = result['channel']['id']
+    channel = result.channel.id
     say(options.merge(channel: channel))
   end
 
@@ -131,7 +129,7 @@ class SlackBotServer::Bot
   # @param options [Hash] can contain +:channel+, which should be an ID; if no options
   #    are provided, the channel from the most recently recieved message is used
   def typing(options={})
-    last_received_channel = @last_received_data ? @last_received_data['channel'] : nil
+    last_received_channel = @last_received_data ? @last_received_data.channel : nil
     default_options = {channel: last_received_channel}
     @client.typing(default_options.merge(options))
   end
@@ -167,22 +165,6 @@ class SlackBotServer::Bot
       end
     end
 
-    @client.on :im_created do |data|
-      log "Adding new IM channel", data['channel']
-      @im_channels << data['channel']
-    end
-
-    @client.on :channel_joined do |data|
-      log "Adding new channel", data['channel']
-      @channels << data['channel']
-    end
-
-    @client.on :channel_left do |data|
-      channel_id = data['channel']
-      log "Removing channel: #{channel_id}"
-      @channels.delete_if { |c| c['id'] == channel_id }
-    end
-
     @client.on :close do |event|
       log "disconnected"
       @connected = false
@@ -326,10 +308,10 @@ class SlackBotServer::Bot
       on(:message) do |data|
         debug on_message: data, bot_message: bot_message?(data)
         if !bot_message?(data) &&
-           (data['text'] =~ /\A(#{mention_keywords.join('|')})[\s\:](.*)/i ||
-            data['text'] =~ /\A(<@#{bot_user_id}>)[\s\:](.*)/)
+           (data.text =~ /\A(#{mention_keywords.join('|')})[\s\:](.*)/i ||
+            data.text =~ /\A(<@#{bot_user_id}>)[\s\:](.*)/)
           message = $2.strip
-          @last_received_data = data.merge('message' => message)
+          @last_received_data = data.merge(message: message)
           instance_exec(@last_received_data, &block)
         end
       end
@@ -339,18 +321,18 @@ class SlackBotServer::Bot
     # to this bot
     def on_im(&block)
       on(:message) do |data|
-        debug on_im: data, bot_message: bot_message?(data), is_im_channel: is_im_channel?(data['channel'])
-        if is_im_channel?(data['channel']) && !bot_message?(data)
-          @last_received_data = data.merge('message' => data['text'])
+        debug on_im: data, bot_message: bot_message?(data), is_im_channel: is_im_channel?(data.channel)
+        if is_im_channel?(data.channel) && !bot_message?(data)
+          @last_received_data = data.merge(message: data.text)
           instance_exec(@last_received_data, &block)
         end
       end
     end
   end
 
-  on :start do
-    load_channels
-  end
+  # on :start do
+  #   load_channels
+  # end
 
   on :finish do
     start if @running
@@ -365,7 +347,7 @@ class SlackBotServer::Bot
   private
 
   def handle_message(data)
-    run_callbacks(data['type'], data)
+    run_callbacks(data.type, data)
   end
 
   def run_callbacks(type, data=nil)
@@ -393,32 +375,20 @@ class SlackBotServer::Bot
     "[BOT/#{bot_user_name}] #{text}"
   end
 
-  def load_channels
-    debug "Loading channels"
-    @im_channels = @client.ims
-    debug im_channels: @im_channels
-    @channels = @client.channels.select { |d| d['is_member'] == true }
-    debug channels: @channels
-  end
-
-  def channel(id)
-    (@channels + @im_channels).find { |c| c['id'] == id }
-  end
-
   def is_im_channel?(id)
-    channel(id)['is_im'] == true
+    @client.ims[id] != nil
   end
 
   def bot_message?(data)
-    data['subtype'] == 'bot_message' ||
-    data['user'] == SLACKBOT_USER_ID ||
-    data['user'] == bot_user_id ||
+    data.subtype == 'bot_message' ||
+    data.user == SLACKBOT_USER_ID ||
+    data.user == bot_user_id ||
     change_to_previous_bot_message?(data)
   end
 
   def change_to_previous_bot_message?(data)
-    data['subtype'] == 'message_changed' &&
-    data['previous_message']['user'] == bot_user_id
+    data.subtype == 'message_changed' &&
+    data.previous_message.user == bot_user_id
   end
 
   def rtm_incompatible_message?(data)

data/lib/slack_bot_server/local_queue.rb

@@ -21,4 +21,10 @@ class SlackBotServer::LocalQueue
     value = @queue.pop(true) rescue ThreadError
     value == ThreadError ? nil : value
   end
+
+  # Clear the queue
+  # @return [nil]
+  def clear
+    @queue = Queue.new
+  end
 end

data/lib/slack_bot_server/redis_queue.rb

@@ -34,4 +34,10 @@ class SlackBotServer::RedisQueue
       nil
     end
   end
+
+  # Clears the queue
+  # @return [nil]
+  def clear
+    @redis.del @key
+  end
 end

data/lib/slack_bot_server/simple_bot.rb

@@ -12,7 +12,7 @@ class SlackBotServer::SimpleBot < SlackBotServer::Bot
   # only 'how are you'.
   on_mention do |data|
     if data['message'] == 'who are you'
-      reply text: "I am #{user} (id: #{user_id}), connected to team #{team} (id #{team_id})"
+      reply text: "I am #{bot_user_name} (user id: #{bot_user_id}), connected to team #{team_name} with team id #{team_id}"
     else
       reply text: "You said '#{data['message']}', and I'm frankly fascinated."
     end

data/lib/slack_bot_server/version.rb

@@ -1,4 +1,4 @@
 module SlackBotServer
   # The current version of the +SlackBotServer+ framework
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/slack_bot_server.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "slack-ruby-client", "~> 0.5.3"
+  spec.add_dependency "slack-ruby-client", "~> 0.7"
   spec.add_dependency "faye-websocket", "~> 0.10"
   spec.add_dependency "multi_json"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - James Adam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-ruby-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement