slack-ruby-bot 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d913551cd5d7c5dd77eca6b408afc4f429db43dc
-  data.tar.gz: 5e96cb15043a4cf9cd39a661182ba0a1320872a6
+  metadata.gz: 6b27b94f1f7396de181c038e27e4896b1754dc4b
+  data.tar.gz: aae8cf08bbc1839ee45efa03fb752080290c3216
 SHA512:
-  metadata.gz: e01fadbae26b2a4bb53794dbe587b635b72ec30dc1b1d18cab3a71adbf061446084890ad9851c9814336ed09c6f48589fa76a82498010ce5f00ebb21dacb3034
-  data.tar.gz: 19df60970882c526023310c6b33aae3f7c8236f71aa59aae0ec741290bc0fb6ffb27a2ddef1bd757483a49ad73109661cc3ddf620531b806a67157d9829b8bf7
+  metadata.gz: 96b648ba4ab3cc77c37bc351f5cdb77efd92b427763e0f90627d8e2d1389035cf3ff7fb06ef0a59f7be70fe7e06cd95af3cfd67adb007a2f9bef769b0387e9e3
+  data.tar.gz: 3a8d709cda131675445dc986ecb67d7e62f63a17bae29820a89622f4dff2701d3d7f2b701ee416e2cde9b67577b38e51f628bb14d4ad48514d0b46516f390a7b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.6.0 (1/9/2016)
+
+* Deprecated `SlackRubyBot::Base#send_message`, `send_message_with_gif` and `send_gif` in favor of `client.say` - [@dblock](https://github.com/dblock).
+
 ### 0.5.5 (1/4/2016)
 
 * Added `SlackRubyBot::Bot` DSL sugar - [@dblock](https://github.com/dblock).

data/README.md

@@ -17,7 +17,7 @@ A generic Slack bot framework written in Ruby on top of [slack-ruby-client](http
 
 ## Stable Release
 
-You're reading the documentation for the **stable** release of slack-ruby-bot, 0.5.5.
+You're reading the documentation for the **stable** release of slack-ruby-bot, 0.6.0. See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING.md) for how to upgrade to more recent versions.
 
 ## Usage
 
@@ -38,7 +38,7 @@ require 'slack-ruby-bot'
 
 class PongBot < SlackRubyBot::Bot
   command 'ping' do |client, data, match|
-    client.message text: 'pong', channel: data.channel
+    client.say(text: 'pong', channel: data.channel)
   end
 end
 
@@ -65,13 +65,13 @@ The following examples of bots based on slack-ruby-bot are listed in growing ord
 
 ### Commands and Operators
 
-Bots are addressed by name, they respond to commands and operators.
-
-You can combine multiple commands and use a block to implement them.
+Bots are addressed by name, they respond to commands and operators. You can combine multiple commands.
 
 ```ruby
-command 'call', '呼び出し' do |client, data, match|
-  send_message client, data.channel, 'called'
+class CallBot < SlackRubyBot::Bot
+  command 'call', '呼び出し' do |client, data, match|
+    client.say(channel: data.channel, text: 'called')
+  end
 end
 ```
 
@@ -80,8 +80,10 @@ Command match data includes `match['bot']`, `match['command']` and `match['expre
 Operators are 1-letter long and are similar to commands. They don't require addressing a bot nor separating an operator from its arguments. The following class responds to `=2+2`.
 
 ```ruby
-operator '=' do |data, match|
-  # implementation detail
+class MathBot < SlackRubyBot::Bot
+  operator '=' do |client, data, match|
+    # implementation detail
+  end
 end
 ```
 
@@ -116,7 +118,7 @@ Commands and operators are generic versions of bot routes. You can respond to ju
 ```ruby
 class Weather < SlackRubyBot::Bot
   match /^How is the weather in (?<location>\w*)\?$/ do |client, data, match|
-    send_message client, data.channel, "The weather in #{match[:location]} is nice."
+    client.say(channel: data.channel, text: "The weather in #{match[:location]} is nice.")
   end
 end
 ```
@@ -125,14 +127,14 @@ end
 
 ### SlackRubyBot::Commands::Base
 
-The `SlackRubyBot::Bot` class is just sugare deriving from `SlackRubyBot::Commands::Base`. You can divide the bot implementation into subclasses of `SlackRubyBot::Commands::Base` manually. By default a command class responds, case-insensitively, to its name. A class called `Phone` that inherits from `SlackRubyBot::Commands::Base` responds to `phone` and `Phone` and calls the `call` method when implemented.
+The `SlackRubyBot::Bot` class is DSL sugar deriving from `SlackRubyBot::Commands::Base`. For more involved bots you can organize the bot implementation into subclasses of `SlackRubyBot::Commands::Base` manually. By default a command class responds, case-insensitively, to its name. A class called `Phone` that inherits from `SlackRubyBot::Commands::Base` responds to `phone` and `Phone` and calls the `call` method when implemented.
 
 ```ruby
 class Phone < SlackRubyBot::Commands::Base
   command 'call'
 
   def self.call(client, data, match)
-    send_message client, data.channel, 'called'
+    client.say(channel: data.channel, text: 'called')
   end
 end
 ```
@@ -145,24 +147,16 @@ class Phone < SlackRubyBot::Commands::Base
   command '呼び出し'
 
   def self.call(client, data, match)
-    send_message client, data.channel, 'called'
+    client.say(channel: data.channel, text: 'called')
   end
 end
 ```
 
-Other available functions include the following.
-
-#### send_message(client, channel, text)
-
-Send text using a RealTime client to a channel.
+The `SlackRubyBot::Client` implementation comes with GIF support.
 
-#### send_message_with_gif(client, channel, text, keyword)
+#### say(channel: ..., text: ..., gif: ...)
 
-Send text along with a random animated GIF based on a keyword.
-
-## send_gif(client, channel, keyword)
-
-Send a random animated GIF based on a keyword.
+Sends text and/or a random GIF that matches a keyword using a RealTime client to a channel.
 
 ### Built-In Commands
 
@@ -248,6 +242,10 @@ Slack-ruby-bot ships with a number of shared RSpec behaviors that can be used in
 * [respond with slack message](lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_slack_message.rb): The bot responds with a message.
 * [respond with error](lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_error.rb): An exception is raised inside a bot command.
 
+### Useful Libraries
+
+* [newrelic-slack-ruby-bot](https://github.com/dblock/newrelic-slack-ruby-bot): NewRelic instrumentation for slack-ruby-bot.
+
 ## Contributing
 
 See [CONTRIBUTING](CONTRIBUTING.md).

data/TUTORIAL.md

@@ -34,11 +34,11 @@ Run `bundle install` to get all the gems.
 
 #### Application
 
-Create a folder called `slack-mathbot` and inside of it create `app.rb`.
+Create a folder called `slack-mathbot` and inside of it create `bot.rb`.
 
 ```ruby
 module SlackMathbot
-  class App < SlackRubyBot::App
+  class Bot < SlackRubyBot::Bot
   end
 end
 ```
@@ -52,7 +52,7 @@ module SlackMathbot
   module Commands
     class Calculate < SlackRubyBot::Commands::Base
       command 'calculate' do |client, data, _match|
-        send_message client, data.channel, '4'
+        client.say(chanbel: data.channel, text: '4')
       end
     end
   end
@@ -66,7 +66,7 @@ Create a `slack-mathbot.rb` at the root and require the above files.
 ```ruby
 require 'slack-ruby-bot'
 require 'slack-mathbot/commands/calculate'
-require 'slack-mathbot/app'
+require 'slack-mathbot/bot'
 ```
 
 #### Web Server
@@ -99,7 +99,7 @@ Thread.abort_on_exception = true
 
 Thread.new do
   begin
-    SlackMathbot::App.instance.run
+    SlackMathbot::Bot.run
   rescue Exception => e
     STDERR.puts "ERROR: #{e}"
     STDERR.puts e.backtrace
@@ -175,7 +175,7 @@ require 'spec_helper'
 
 describe SlackMathbot::App do
   def app
-    SlackMathbot::App.new
+    SlackMathbot::Bot.instance
   end
   it_behaves_like 'a slack ruby bot'
 end
@@ -190,7 +190,7 @@ require 'spec_helper'
 
 describe SlackMathbot::Commands::Calculate do
   def app
-    SlackMathbot::App.new
+    SlackMathbot::Bot.instance
   end
   it 'returns 4' do
     expect(message: "#{SlackRubyBot.config.user} calculate 2+2", channel: 'channel').to respond_with_slack_message('4')

data/UPGRADING.md

@@ -1,6 +1,111 @@
 Upgrading SlackRubyBot
 ======================
 
+### Upgrading to >= 0.6.0
+
+While entirely compatible with the 0.5.x series, a number of methods have been deprecated and will be removed in the next release.
+
+#### Replace SlackRubyBot::Commands::Base#call with command, operator or match
+
+Prefer `command`, `operator` or `match` with a block instead of implementing a `self.call` method.
+
+Before:
+
+```ruby
+require 'slack-ruby-bot'
+
+class Bot < SlackRubyBot::Bot
+  command 'ping'
+
+  def self.call(client, data, match)
+    ...
+  end
+end
+```
+
+After:
+
+```ruby
+require 'slack-ruby-bot'
+
+class Bot < SlackRubyBot::Bot
+  command 'ping' do |client, data, match|
+    ...
+  end
+end
+```
+
+#### Replace send_message, send_message_with_gif and send_gif with client.say
+
+Use `client.say` instead of `send_message`, `send_message_with_gif` and `send_gif` in commands.
+
+Before:
+
+```ruby
+class Bot < SlackRubyBot::Bot
+ command 'one' do |client, data, match|
+  send_message client, data.channel, 'Text.'
+ end
+
+ command 'two' do |client, data, match|
+  send_message_with_gif client, data.channel, "Text.", 'keyword'
+ end
+
+ command 'three' do |client, data, match|
+  send_gif client, data.channel, 'keyword'
+ end
+end
+```
+
+After:
+
+```ruby
+class Bot < SlackRubyBot::Bot
+ command 'one' do |client, data, match|
+  client.say(channel: data.channel, text: 'Text.')
+ end
+
+ command 'two' do |client, data, match|
+  client.say(channel: data.channel, text: 'Text.', gif: 'keyword')
+ end
+
+ command 'three' do |client, data, match|
+  client.say(channel: data.channel, gif: 'keyword')
+ end
+end
+```
+
+#### For basic bots replace SlackRubyBot::App with SlackRubyBot::Bot and implement commands inline
+
+Before:
+
+```ruby
+module PongBot
+  class App < SlackRubyBot::App
+  end
+
+  class Ping < SlackRubyBot::Commands::Base
+    command 'ping' do |client, data, _match|
+      client.message(text: 'pong', channel: data.channel)
+    end
+  end
+end
+
+PongBot::App.instance.run
+```
+
+After:
+
+```ruby
+class Bot < SlackRubyBot::Bot
+  command 'ping' do |client, data, _match|
+    client.say(text: 'pong', channel: data.channel)
+  end
+end
+
+Bot.run
+```
+
 ### Upgrading to >= 0.4.0
 
 This version uses [slack-ruby-client](https://github.com/dblock/slack-ruby-client) instead of [slack-ruby-gem](https://github.com/aki017/slack-ruby-gem).

data/examples/minimal/pongbot.rb

@@ -2,7 +2,7 @@ require 'slack-ruby-bot'
 
 class Bot < SlackRubyBot::Bot
   command 'ping' do |client, data, _match|
-    client.message text: 'pong', channel: data.channel
+    client.say(text: 'pong', channel: data.channel)
   end
 end
 

data/examples/weather/weatherbot.rb

@@ -2,7 +2,7 @@ require 'slack-ruby-bot'
 
 class WeatherBot < SlackRubyBot::Bot
   match(/^How is the weather in (?<location>\w*)\?$/i) do |client, data, match|
-    send_message client, data.channel, "The weather in #{match[:location]} is nice."
+    client.say(channel: data.channel, text: "The weather in #{match[:location]} is nice.")
   end
 end
 

data/lib/slack-ruby-bot/bot.rb

@@ -1,7 +1,13 @@
 module SlackRubyBot
   class Bot < SlackRubyBot::Commands::Base
+    delegate :client, to: :instance
+
     def self.run
-      SlackRubyBot::App.instance.run
+      instance.run
+    end
+
+    def self.instance
+      SlackRubyBot::App.instance
     end
   end
 end

data/lib/slack-ruby-bot/client.rb

@@ -40,5 +40,28 @@ module SlackRubyBot
     def url
       SlackRubyBot.config.url || (auth && auth['url'])
     end
+
+    def logger
+      @logger ||= begin
+        $stdout.sync = true
+        Logger.new(STDOUT)
+      end
+    end
+
+    def say(options = {})
+      options = options.dup
+      # get GIF
+      keywords = options.delete(:gif)
+      # text
+      text = options.delete(:text)
+      gif = begin
+        Giphy.random(keywords)
+      rescue StandardError => e
+        logger.warn "Giphy.random: #{e.message}"
+        nil
+      end if SlackRubyBot::Config.send_gifs? && send_gifs? && keywords
+      text = [text, gif && gif.image_url.to_s].compact.join("\n")
+      message({ text: text }.merge(options))
+    end
   end
 end

data/lib/slack-ruby-bot/commands/about.rb

@@ -5,7 +5,7 @@ module SlackRubyBot
       match(/^(?<bot>[[:alnum:][:punct:]@<>]*)$/u)
 
       def self.call(client, data, _match)
-        send_message_with_gif client, data.channel, SlackRubyBot::ABOUT, 'selfie'
+        client.say(channel: data.channel, text: SlackRubyBot::ABOUT, gif: 'selfie')
       end
     end
   end

data/lib/slack-ruby-bot/commands/base.rb

@@ -4,28 +4,22 @@ module SlackRubyBot
       class_attribute :routes
 
       def self.send_message(client, channel, text, options = {})
+        logger.warn '[DEPRECATION] `send_message` is deprecated.  Please use `client.say` instead.'
         if text && text.length > 0
-          send_client_message(client, { channel: channel, text: text }.merge(options))
+          client.say(options.merge(channel: channel, text: text))
         else
-          send_message_with_gif client, channel, 'Nothing to see here.', 'nothing', options
+          client.say(options.merge(channel: channel, text: 'Nothing to see here.', gif: 'nothing'))
         end
       end
 
       def self.send_message_with_gif(client, channel, text, keywords, options = {})
-        get_gif_and_send({
-          client: client,
-          channel: channel,
-          text: text,
-          keywords: keywords
-        }.merge(options))
+        logger.warn '[DEPRECATION] `send_message_with_gif` is deprecated.  Please use `client.say` instead.'
+        client.say(options.merge(channel: channel, text: text, gif: keywords))
       end
 
       def self.send_gif(client, channel, keywords, options = {})
-        get_gif_and_send({
-          client: client,
-          channel: channel,
-          keywords: keywords
-        }.merge(options))
+        logger.warn '[DEPRECATION] `send_gif` is deprecated.  Please use `client.say` instead.'
+        client.say(options.merge(channel: channel, text: '', gif: keywords))
       end
 
       def self.logger
@@ -97,25 +91,6 @@ module SlackRubyBot
         return if self.routes && self.routes.any?
         command default_command_name
       end
-
-      def self.get_gif_and_send(options = {})
-        options = options.dup
-        keywords = options.delete(:keywords)
-        client = options.delete(:client)
-        gif = begin
-          Giphy.random(keywords)
-        rescue StandardError => e
-          logger.warn "Giphy.random: #{e.message}"
-          nil
-        end if SlackRubyBot::Config.send_gifs? && client.send_gifs?
-        text = options.delete(:text)
-        text = [text, gif && gif.image_url.to_s].compact.join("\n")
-        send_client_message(client, { text: text }.merge(options))
-      end
-
-      def self.send_client_message(client, data)
-        client.message(data)
-      end
     end
   end
 end

data/lib/slack-ruby-bot/commands/help.rb

@@ -2,7 +2,7 @@ module SlackRubyBot
   module Commands
     class Help < Base
       def self.call(client, data, _match)
-        send_message_with_gif client, data.channel, 'See https://github.com/dblock/slack-ruby-bot, please.', 'help'
+        client.say(channel: data.channel, text: 'See https://github.com/dblock/slack-ruby-bot, please.', gif: 'help')
       end
     end
   end

data/lib/slack-ruby-bot/commands/hi.rb

@@ -2,7 +2,7 @@ module SlackRubyBot
   module Commands
     class Hi < Base
       def self.call(client, data, _match)
-        send_message_with_gif client, data.channel, "Hi <@#{data.user}>!", 'hi'
+        client.say(channel: data.channel, text: "Hi <@#{data.user}>!", gif: 'hi')
       end
     end
   end

data/lib/slack-ruby-bot/commands/unknown.rb

@@ -4,7 +4,7 @@ module SlackRubyBot
       match(/^(?<bot>\S*)[\s]*(?<expression>.*)$/)
 
       def self.call(client, data, _match)
-        send_message_with_gif client, data.channel, "Sorry <@#{data.user}>, I don't understand that command!", 'idiot'
+        client.say(channel: data.channel, text: "Sorry <@#{data.user}>, I don't understand that command!", gif: 'idiot')
       end
     end
   end

data/lib/slack-ruby-bot/rspec/support/slack-ruby-bot/respond_with_slack_message.rb

@@ -5,7 +5,7 @@ RSpec::Matchers.define :respond_with_slack_message do |expected|
     channel, user, message = parse(actual)
     allow(Giphy).to receive(:random)
     client = app.send(:client)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: channel, text: expected)
+    expect(client).to receive(:message).with(channel: channel, text: expected)
     app.send(:message, client, text: message, channel: channel, user: user)
     true
   end

data/lib/slack-ruby-bot/version.rb

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.5.5'
+  VERSION = '0.6.0'
 end

data/spec/slack-ruby-bot/commands/bot_spec.rb

@@ -4,16 +4,19 @@ describe SlackRubyBot::Bot do
   let! :command do
     Class.new(SlackRubyBot::Bot) do
       command 'bot_spec' do |client, data, match|
-        send_message client, data.channel, match['expression']
+        client.say(channel: data.channel, text: match['expression'])
       end
     end
   end
   def app
-    SlackRubyBot::App.new
+    SlackRubyBot::Bot.instance
   end
   let(:client) { app.send(:client) }
   it 'sends a message' do
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+    expect(client).to receive(:message).with(channel: 'channel', text: 'message')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} bot_spec message", channel: 'channel', user: 'user')
   end
+  it 'sends a message' do
+    expect(message: "#{SlackRubyBot.config.user} bot_spec message").to respond_with_slack_message('message')
+  end
 end

data/spec/slack-ruby-bot/commands/commands_precedence_spec.rb

@@ -4,11 +4,11 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'tomato' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
 
       command 'tomatoes' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/commands_regexp_escape_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command '(' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/commands_spaces_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'space' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/commands_spec.rb

@@ -7,7 +7,7 @@ describe SlackRubyBot::Commands do
       command 'saybye'
 
       def self.call(client, data, match)
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/commands_with_block_spec.rb

@@ -4,11 +4,11 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'sayhi' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
 
       command 'one', 'two' do |client, data, match|
-        send_message client, data.channel, "#{match[:command]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:command]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/empty_text_spec.rb

@@ -6,7 +6,7 @@ describe SlackRubyBot::Commands do
       command 'empty_text'
 
       def self.call(client, data, _match)
-        send_message client, data.channel, nil
+        client.say(channel: data.channel)
       end
     end
   end
@@ -16,7 +16,7 @@ describe SlackRubyBot::Commands do
   let(:client) { app.send(:client) }
   it 'sends default text' do
     allow(Giphy).to receive(:random)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_message_with_gif).with(client, 'channel', 'Nothing to see here.', 'nothing', {})
+    expect(client).to receive(:message).with(channel: 'channel', text: '')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} empty_text", channel: 'channel', user: 'user')
   end
 end

data/spec/slack-ruby-bot/commands/match_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       match(/^Reticulate (?<spline_name>\w*)$/) do |client, data, match|
-        send_message client, data.channel, "Reticulated #{match[:spline_name]}."
+        client.say(channel: data.channel, text: "Reticulated #{match[:spline_name]}.")
       end
     end
   end

data/spec/slack-ruby-bot/commands/message_loop_spec.rb

@@ -11,7 +11,7 @@ describe SlackRubyBot::App do
   end
   context 'default' do
     it 'does not respond to self' do
-      expect(SlackRubyBot::Commands::Base).to_not receive(:send_client_message)
+      expect(client).to_not receive(:message)
       subject.send(:message, client, text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF')
     end
   end
@@ -27,7 +27,7 @@ describe SlackRubyBot::App do
       end
     end
     it 'responds to self' do
-      expect(SlackRubyBot::Commands::Base).to receive(:send_client_message)
+      expect(client).to receive(:message)
       subject.send(:message, client, text: "#{SlackRubyBot.config.user} hi", channel: 'channel', user: 'UDEADBEEF')
     end
   end

data/spec/slack-ruby-bot/commands/nil_message_spec.rb

@@ -16,7 +16,7 @@ describe SlackRubyBot::Commands do
   let(:client) { app.send(:client) }
   it 'ignores nil messages' do
     allow(Giphy).to receive(:random)
-    expect(SlackRubyBot::Commands::Base).to_not receive(:send_message_with_gif)
+    expect(client).to_not receive(:message)
     app.send(:message, client, text: nil, channel: 'channel', user: 'user')
   end
 end

data/spec/slack-ruby-bot/commands/operators_spec.rb

@@ -7,7 +7,7 @@ describe SlackRubyBot::Commands do
       operator '-'
 
       def self.call(client, data, match)
-        send_message client, data.channel, "#{match[:operator]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:operator]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/operators_with_block_spec.rb

@@ -4,11 +4,11 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       operator '=' do |client, data, match|
-        send_message client, data.channel, "#{match[:operator]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:operator]}: #{match[:expression]}")
       end
 
       operator '+', '-' do |client, data, match|
-        send_message client, data.channel, "#{match[:operator]}: #{match[:expression]}"
+        client.say(channel: data.channel, text: "#{match[:operator]}: #{match[:expression]}")
       end
     end
   end

data/spec/slack-ruby-bot/commands/send_gif_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'send_gif_spec' do |client, data, _match|
-        send_gif client, data.channel, 'dummy'
+        client.say(channel: data.channel, gif: 'dummy')
       end
     end
   end
@@ -16,17 +16,17 @@ describe SlackRubyBot::Commands do
   it 'sends a gif' do
     gif = Giphy::RandomGif.new('image_url' => gif_image_url)
     expect(Giphy).to receive(:random).and_return(gif)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: gif_image_url)
+    expect(client).to receive(:message).with(channel: 'channel', text: gif_image_url)
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
   end
   it 'eats up the error' do
     expect(Giphy).to receive(:random) { fail 'oh no!' }
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: '')
+    expect(client).to receive(:message).with(channel: 'channel', text: '')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
   end
   it 'eats up nil gif' do
     expect(Giphy).to receive(:random).and_return(nil)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: '')
+    expect(client).to receive(:message).with(channel: 'channel', text: '')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_gif_spec message", channel: 'channel', user: 'user')
   end
 end

data/spec/slack-ruby-bot/commands/send_message_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'send_message_spec' do |client, data, match|
-        send_message client, data.channel, match['expression']
+        client.say(channel: data.channel, text: match['expression'])
       end
     end
   end
@@ -13,7 +13,7 @@ describe SlackRubyBot::Commands do
   end
   let(:client) { app.send(:client) }
   it 'sends a message' do
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+    expect(client).to receive(:message).with(channel: 'channel', text: 'message')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_spec message", channel: 'channel', user: 'user')
   end
 end

data/spec/slack-ruby-bot/commands/send_message_with_gif_spec.rb

@@ -4,7 +4,7 @@ describe SlackRubyBot::Commands do
   let! :command do
     Class.new(SlackRubyBot::Commands::Base) do
       command 'send_message_with_gif_spec' do |client, data, match|
-        send_message_with_gif client, data.channel, match['expression'], 'dummy'
+        client.say(channel: data.channel, text: match['expression'], gif: 'dummy')
       end
     end
   end
@@ -16,17 +16,17 @@ describe SlackRubyBot::Commands do
   it 'sends a message with gif' do
     gif = Giphy::RandomGif.new('image_url' => gif_image_url)
     expect(Giphy).to receive(:random).and_return(gif)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: "message\n#{gif_image_url}")
+    expect(client).to receive(:message).with(channel: 'channel', text: "message\n#{gif_image_url}")
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
   end
   it 'eats up the error' do
     expect(Giphy).to receive(:random) { fail 'oh no!' }
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+    expect(client).to receive(:message).with(channel: 'channel', text: 'message')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
   end
   it 'eats up nil gif' do
     expect(Giphy).to receive(:random).and_return(nil)
-    expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+    expect(client).to receive(:message).with(channel: 'channel', text: 'message')
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
   end
   context 'send_gifs' do
@@ -36,7 +36,7 @@ describe SlackRubyBot::Commands do
       end
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
-        expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+        expect(client).to receive(:message).with(channel: 'channel', text: 'message')
         app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
       end
       after do
@@ -49,7 +49,7 @@ describe SlackRubyBot::Commands do
       end
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
-        expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+        expect(client).to receive(:message).with(channel: 'channel', text: 'message')
         app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
       end
       after do
@@ -62,7 +62,7 @@ describe SlackRubyBot::Commands do
       end
       it 'does not send a gif' do
         expect(Giphy).to_not receive(:random)
-        expect(SlackRubyBot::Commands::Base).to receive(:send_client_message).with(client, channel: 'channel', text: 'message')
+        expect(client).to receive(:message).with(channel: 'channel', text: 'message')
         app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
       end
       after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie