slack-ruby-bot 0.15.0 → 0.16.0

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

@@ -17,7 +17,7 @@ module SlackRubyBot
                  general_text
                end
 
-        client.say(channel: data.channel, text: text, gif: 'help')
+        client.say(channel: data.channel, text: text)
       end
 
       class << self

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

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

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

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

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

@@ -4,7 +4,7 @@ module SlackRubyBot
   module Config
     extend self
 
-    ATTRS = %i[token url aliases user user_id team team_id allow_bot_messages allow_message_loops send_gifs logger].freeze
+    ATTRS = %i[token url aliases user user_id team team_id allow_bot_messages allow_message_loops logger].freeze
     attr_accessor(*ATTRS)
 
     def allow_bot_messages?
@@ -15,13 +15,6 @@ module SlackRubyBot
       !!allow_message_loops
     end
 
-    def send_gifs?
-      return false unless defined?(Giphy)
-
-      v = boolean_from_env('SLACK_RUBY_BOT_SEND_GIFS')
-      send_gifs.nil? ? (v.nil? || v) : send_gifs
-    end
-
     def reset!
       ATTRS.each { |attr| send("#{attr}=", nil) }
     end

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

@@ -18,12 +18,6 @@ module SlackRubyBot
         end
       end
 
-      # Instance stuff
-      def hooks
-        warn Kernel.caller.first + ' [DEPRECATION] `hooks` method is deprecated. Please use `server.on` instead to register a hook.'
-        _hooks
-      end
-
       def on(event_name, handler)
         _hooks.add(event_name, handler)
       end

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

@@ -4,10 +4,11 @@ module SlackRubyBot
   module Hooks
     class Message
       def call(client, data)
-        return if message_to_self_not_allowed? && message_to_self?(client, data)
-        return if bot_message_not_allowed? && bot_message?(client, data)
+        return if !client.allow_message_loops? && client.message_to_self?(data)
+        return if !client.allow_bot_messages? && client.bot_message?(data)
+
+        prepare!(data)
 
-        data.text = data.text.strip if data.text
         result = child_command_classes.detect { |d| d.invoke(client, data) }
         result ||= built_in_command_classes.detect { |d| d.invoke(client, data) }
         result ||= SlackRubyBot::Commands::Unknown.tap { |d| d.invoke(client, data) }
@@ -16,20 +17,8 @@ module SlackRubyBot
 
       private
 
-      def message_to_self_not_allowed?
-        !SlackRubyBot::Config.allow_message_loops?
-      end
-
-      def message_to_self?(client, data)
-        client.self && client.self.id == data.user
-      end
-
-      def bot_message_not_allowed?
-        !SlackRubyBot::Config.allow_bot_messages?
-      end
-
-      def bot_message?(_client, data)
-        data.subtype == 'bot_message'
+      def prepare!(data)
+        data.text = data.text.strip if data.text
       end
 
       #

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

@@ -9,8 +9,6 @@ RSpec::Matchers.define :respond_with_error do |error, error_message|
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)
 
-    allow(Giphy).to receive(:random) if defined?(Giphy)
-
     begin
       expect do
         message_command.call(client, Hashie::Mash.new(text: message, channel: channel, user: user, attachments: attachments))

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

@@ -11,8 +11,6 @@ RSpec::Matchers.define :respond_with_slack_message do |expected|
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)
 
-    allow(Giphy).to receive(:random) if defined?(Giphy)
-
     allow(client).to receive(:message) do |options|
       @messages ||= []
       @messages.push options

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

@@ -13,8 +13,6 @@ RSpec::Matchers.define :respond_with_slack_messages do |expected|
     message_command = SlackRubyBot::Hooks::Message.new
     channel, user, message, attachments = parse(actual)
 
-    allow(Giphy).to receive(:random) if defined?(Giphy)
-
     @messages ||= []
     allow(client).to receive(:message) do |options|
       @messages.push options

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

@@ -4,7 +4,7 @@ module SlackRubyBot
   class Server
     include Loggable
 
-    attr_accessor :token, :aliases, :send_gifs
+    attr_accessor :token, :aliases
 
     include SlackRubyBot::Hooks::HookSupport
 
@@ -13,7 +13,6 @@ module SlackRubyBot
     def initialize(options = {})
       @token = options[:token]
       @aliases = options[:aliases]
-      @send_gifs = options[:send_gifs]
 
       # Hook Handling
       flush_hook_blocks
@@ -57,7 +56,7 @@ module SlackRubyBot
       else
         raise e
       end
-    rescue Faraday::Error::TimeoutError, Faraday::Error::ConnectionFailed, Faraday::Error::SSLError => e
+    rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Faraday::SSLError => e
       logger.error e
       sleep 1 # ignore, try again
     rescue StandardError => e
@@ -79,7 +78,7 @@ module SlackRubyBot
 
     def client
       @client ||= begin
-        client = SlackRubyBot::Client.new(aliases: aliases, send_gifs: send_gifs, token: token)
+        client = SlackRubyBot::Client.new(aliases: aliases, token: token)
         _hooks.client = client
 
         client

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SlackRubyBot
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/spec/slack-ruby-bot/client_spec.rb

@@ -1,41 +1,114 @@
 # frozen_string_literal: true
 
 describe SlackRubyBot::Client do
-  describe '#send_gifs?' do
-    context 'without giphy is false', unless: WithGiphy.env? do
-      it 'by default' do
-        expect(subject.send_gifs?).to be false
+  describe '#allow_message_loops?' do
+    context 'with global allow_message_loops set to true' do
+      before do
+        SlackRubyBot::Config.allow_message_loops = true
       end
-
-      it 'when set to true' do
-        subject.send_gifs = true
-        expect(subject.send_gifs?).to be false
+      it do
+        expect(subject.allow_message_loops?).to be true
       end
-
-      it 'when set to true via config' do
-        SlackRubyBot::Config.send_gifs = true
-        expect(SlackRubyBot::Config.send_gifs?).to be false
+      context 'overridden locally' do
+        subject do
+          SlackRubyBot::Client.new(allow_message_loops: false)
+        end
+        it do
+          expect(subject.allow_message_loops?).to be false
+        end
       end
     end
-
-    context 'with giphy', if: WithGiphy.env? do
-      it 'default is true' do
-        expect(subject.send_gifs?).to be true
+    context 'with global allow_message_loops set to false' do
+      before do
+        SlackRubyBot::Config.allow_message_loops = false
       end
-
-      it 'defaults to SlackRubyBot::Config.send_gifs? if set' do
-        SlackRubyBot::Config.send_gifs = false
-        expect(subject.send_gifs?).to be false
+      it do
+        expect(subject.allow_message_loops?).to be false
       end
-
-      it 'client setting takes precedence' do
-        SlackRubyBot::Config.send_gifs = true
-        subject.send_gifs = false
-        expect(subject.send_gifs?).to be false
-        SlackRubyBot::Config.send_gifs = false
-        subject.send_gifs = true
-        expect(subject.send_gifs?).to be true
+      context 'overridden locally' do
+        subject do
+          SlackRubyBot::Client.new(allow_message_loops: true)
+        end
+        it do
+          expect(subject.allow_message_loops?).to be true
+        end
+      end
+    end
+    context 'overridden locally' do
+      subject do
+        SlackRubyBot::Client.new(allow_message_loops: true)
+      end
+      it do
+        expect(subject.allow_message_loops?).to be true
+      end
+    end
+  end
+  describe '#allow_bot_messages?' do
+    context 'with global allow_bot_messages set to true' do
+      before do
+        SlackRubyBot::Config.allow_bot_messages = true
+      end
+      it do
+        expect(subject.allow_bot_messages?).to be true
+      end
+      context 'overridden locally' do
+        subject do
+          SlackRubyBot::Client.new(allow_bot_messages: false)
+        end
+        it do
+          expect(subject.allow_bot_messages?).to be false
+        end
+      end
+    end
+    context 'with global allow_bot_messages set to false' do
+      before do
+        SlackRubyBot::Config.allow_bot_messages = false
       end
+      it do
+        expect(subject.allow_bot_messages?).to be false
+      end
+      context 'overridden locally' do
+        subject do
+          SlackRubyBot::Client.new(allow_bot_messages: true)
+        end
+        it do
+          expect(subject.allow_bot_messages?).to be true
+        end
+      end
+    end
+    context 'overridden locally' do
+      subject do
+        SlackRubyBot::Client.new(allow_bot_messages: true)
+      end
+      it do
+        expect(subject.allow_bot_messages?).to be true
+      end
+    end
+  end
+  describe '#message_to_self?' do
+    before do
+      allow(subject).to receive(:self).and_return(Hashie::Mash.new({ 'id' => 'U0K8CKKT1' }))
+    end
+    context 'with message to self' do
+      it do
+        expect(subject.message_to_self?(Hashie::Mash.new(user: 'U0K8CKKT1'))).to be true
+      end
+    end
+    context 'with message to another user' do
+      it do
+        expect(subject.message_to_self?(Hashie::Mash.new(user: 'U0K8CKKT2'))).to be false
+      end
+    end
+  end
+  describe '#bot_message?' do
+    it 'bot message' do
+      expect(subject.bot_message?(Hashie::Mash.new(subtype: 'bot_message'))).to be true
+    end
+    it 'not bot message' do
+      expect(subject.bot_message?(Hashie::Mash.new(subtype: 'other'))).to be false
+    end
+    it 'no subtype' do
+      expect(subject.bot_message?(Hashie::Mash.new)).to be false
     end
   end
 end

data/spec/slack-ruby-bot/config_spec.rb

@@ -1,63 +1,6 @@
 # frozen_string_literal: true
 
 describe SlackRubyBot::Config do
-  describe '.send_gifs?' do
-    after { ENV.delete 'SLACK_RUBY_BOT_SEND_GIFS' }
-
-    context 'without giphy is false', unless: WithGiphy.env? do
-      it 'by default' do
-        expect(SlackRubyBot::Config.send_gifs?).to be false
-      end
-      it 'when set to true' do
-        SlackRubyBot::Config.send_gifs = true
-        expect(SlackRubyBot::Config.send_gifs?).to be false
-      end
-      it 'when set to true via SLACK_RUBY_BOT_SEND_GIFS' do
-        ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
-        expect(SlackRubyBot::Config.send_gifs?).to be false
-      end
-    end
-    context 'with giphy', if: WithGiphy.env? do
-      it 'default is true' do
-        expect(SlackRubyBot::Config.send_gifs?).to be true
-      end
-      context 'set to false' do
-        it 'is false' do
-          SlackRubyBot::Config.send_gifs = false
-          expect(SlackRubyBot::Config.send_gifs?).to be false
-        end
-      end
-      context 'set to false via SLACK_RUBY_BOT_SEND_GIFS' do
-        it 'is false' do
-          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
-          expect(SlackRubyBot::Config.send_gifs?).to be false
-        end
-      end
-      context 'set to true' do
-        it 'is true' do
-          SlackRubyBot::Config.send_gifs = true
-          expect(SlackRubyBot::Config.send_gifs?).to be true
-        end
-      end
-      context 'set to true via SLACK_RUBY_BOT_SEND_GIFS' do
-        it 'is true' do
-          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
-          expect(SlackRubyBot::Config.send_gifs?).to be true
-        end
-      end
-      context 'when using both methods' do
-        it 'config setting takes precedence' do
-          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'true'
-          SlackRubyBot::Config.send_gifs = false
-          expect(SlackRubyBot::Config.send_gifs?).to be false
-          ENV['SLACK_RUBY_BOT_SEND_GIFS'] = 'false'
-          SlackRubyBot::Config.send_gifs = true
-          expect(SlackRubyBot::Config.send_gifs?).to be true
-        end
-      end
-    end
-  end
-
   describe '#reset!' do
     it 'sets all config attributes to nil' do
       SlackRubyBot::Config::ATTRS.each do |attr|

data/spec/slack-ruby-bot/hooks/hook_support_spec.rb

@@ -56,11 +56,6 @@ describe SlackRubyBot::Hooks::HookSupport do
     end
   end
 
-  describe '#hooks' do
-    subject { super().new }
-    it { expect(subject.hooks).to eq subject.send(:_hooks) }
-  end
-
   describe '#_hooks' do
     it 'returns a SlackRubyBot::Hooks::Set instance' do
       hooks_set = subject.new.send(:_hooks)

data/spec/slack-ruby-bot/hooks/message_spec.rb

@@ -5,10 +5,12 @@ describe SlackRubyBot::Hooks::Message do
 
   describe '#call' do
     it 'doesn\'t raise an error when message is a frozen string' do
-      message_hook.call(
-        SlackRubyBot::Client.new,
-        Hashie::Mash.new(text: 'message')
-      )
+      expect do
+        message_hook.call(
+          SlackRubyBot::Client.new,
+          Hashie::Mash.new(text: 'message'.freeze) # rubocop:disable Style/RedundantFreeze
+        )
+      end.to_not raise_error
     end
   end
 
@@ -32,55 +34,6 @@ describe SlackRubyBot::Hooks::Message do
       expect(built_in_command_classes).to_not include SlackRubyBot::Commands::Unknown
     end
   end
-  describe '#message_to_self_not_allowed?' do
-    context 'with allow_message_loops set to true' do
-      before do
-        SlackRubyBot::Config.allow_message_loops = true
-      end
-      it do
-        expect(message_hook.send(:message_to_self_not_allowed?)).to be false
-      end
-    end
-    context 'with allow_message_loops set to false' do
-      before do
-        SlackRubyBot::Config.allow_message_loops = false
-      end
-      it do
-        expect(message_hook.send(:message_to_self_not_allowed?)).to be true
-      end
-    end
-  end
-  describe '#bot_message_not_allowed?' do
-    context 'with allow_bot_messages set to true' do
-      before do
-        SlackRubyBot::Config.allow_bot_messages = true
-      end
-      it do
-        expect(message_hook.send(:bot_message_not_allowed?)).to be false
-      end
-    end
-    context 'with allow_bot_messages set to false' do
-      before do
-        SlackRubyBot::Config.allow_bot_messages = false
-      end
-      it do
-        expect(message_hook.send(:bot_message_not_allowed?)).to be true
-      end
-    end
-  end
-  describe '#message_to_self?' do
-    let(:client) { Hashie::Mash.new(self: { 'id' => 'U0K8CKKT1' }) }
-    context 'with message to self' do
-      it do
-        expect(message_hook.send(:message_to_self?, client, Hashie::Mash.new(user: 'U0K8CKKT1'))).to be true
-      end
-    end
-    context 'with message to another user' do
-      it do
-        expect(message_hook.send(:message_to_self?, client, Hashie::Mash.new(user: 'U0K8CKKT2'))).to be false
-      end
-    end
-  end
   describe '#message' do
     let(:client) { Hashie::Mash.new(self: { 'id' => 'U0K8CKKT1' }) }
     it 'invokes a command' do