slack-ruby-bot 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5cb3cefc95c4a84d5cbe3e99f5975496d9cdf5
-  data.tar.gz: a74bb7b70b4c750b12a038658ee88c8f3890b7dc
+  metadata.gz: eba2b910b92cbe628a3fb697a08dd62d0af70e5b
+  data.tar.gz: 470fb9481c91e1203ca4ef6ed320f86d3edfbb9d
 SHA512:
-  metadata.gz: 801999251e958c05df6f87fe890d03a16e4412e2dfd68e1fc1bde87ab03426ba86057ab20aeb8859b7717aeb484940cb477296ee04de04d2a05c76cad280a442
-  data.tar.gz: 58cee5862ee3f9879e1f5a04af69a9558eba67c81a444a9e8348372a08c4ff340f945614fd1e5a5a816dcfdc8ad83a3b017a66f9fc3d85ed53608c9ab4df3db3
+  metadata.gz: 5147a284b8b37f26417bddb8dc96c8a656e3426b108592b06d0815afb42725ba894dee61a72cc8d56526f0c184b76df160ed64f40fb20a8c0004f8377b9ef288
+  data.tar.gz: 96dc0cce71969ab11ef68f30f970876859d21c8a7aedf09222139bb80d6159c215a6218a1999fea8d4708423078af54137a2826e88051c2394e1574e9e2f58fe

data/.rubocop_todo.yml

@@ -1,5 +1,5 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-12-26 16:43:10 -0500 using RuboCop version 0.32.1.
+# on 2016-01-03 14:51:05 -0700 using RuboCop version 0.32.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -26,7 +26,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 8
 
-# Offense count: 102
+# Offense count: 104
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 145
@@ -44,6 +44,10 @@ Metrics/PerceivedComplexity:
 Style/Documentation:
   Enabled: false
 
+# Offense count: 2
+Style/DoubleNegation:
+  Enabled: false
+
 # Offense count: 1
 # Configuration parameters: Exclude.
 Style/FileName:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.5.4 (1/3/2016)
+
+* Enable setting `send_gifs` per instance of `SlackRubyBot::Server` - [@dblock](https://github.com/dblock).
+
 ### 0.5.3 (12/28/2015)
 
 * [#36](https://github.com/dblock/slack-ruby-bot/issues/36): Fix: non-English bot aliases now work - [@dblock](https://github.com/dblock).

data/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015 Daniel Doubrovkine, Artsy and Contributors
+Copyright (c) 2015-2016 Daniel Doubrovkine, Artsy and Contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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.3.
+You're reading the documentation for the **stable** release of slack-ruby-bot, 0.5.4.
 
 ## Usage
 
@@ -229,7 +229,7 @@ end
 
 ### Advanced Integration
 
-You may want to integrate a bot or multiple bots into other systems, in which case a globally configured bot may not work for you. You may create instances of [SlackRubyBot::Server](lib/slack-ruby-bot/server.rb) which accepts `token` and `aliases`.
+You may want to integrate a bot or multiple bots into other systems, in which case a globally configured bot may not work for you. You may create instances of [SlackRubyBot::Server](lib/slack-ruby-bot/server.rb) which accepts `token`, `aliases` and `send_gifs`.
 
 ```ruby
 EM.run do
@@ -237,7 +237,7 @@ EM.run do
   bot1.auth!
   bot1.start_async
 
-  bot2 = SlackRubyBot::Server.new(token: token2, aliases: ['bot2'])
+  bot2 = SlackRubyBot::Server.new(token: token2, send_gifs: false, aliases: ['bot2'])
   bot2.auth!
   bot2.start_async
 end
@@ -263,6 +263,6 @@ See [CHANGELOG](CHANGELOG.md) for a history of changes and [UPGRADING](UPGRADING
 
 ## Copyright and License
 
-Copyright (c) 2015, [Daniel Doubrovkine](https://twitter.com/dblockdotorg), [Artsy](https://www.artsy.net) and [Contributors](CHANGELOG.md).
+Copyright (c) 2015-2016, [Daniel Doubrovkine](https://twitter.com/dblockdotorg), [Artsy](https://www.artsy.net) and [Contributors](CHANGELOG.md).
 
 This project is licensed under the [MIT License](LICENSE.md).

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

@@ -1,6 +1,6 @@
 module SlackRubyBot
   class App < Server
-    def initialize
+    def initialize(options = {})
       SlackRubyBot.configure do |config|
         config.token = ENV['SLACK_API_TOKEN'] || fail("Missing ENV['SLACK_API_TOKEN'].")
         config.aliases = ENV['SLACK_RUBY_BOT_ALIASES'].split(' ') if ENV['SLACK_RUBY_BOT_ALIASES']
@@ -8,6 +8,7 @@ module SlackRubyBot
       Slack.configure do |config|
         config.token = SlackRubyBot.config.token
       end
+      super
     end
 
     def config

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

@@ -2,10 +2,12 @@ module SlackRubyBot
   class Client < Slack::RealTime::Client
     attr_accessor :auth
     attr_accessor :aliases
+    attr_accessor :send_gifs
 
     def initialize(attrs = {})
       super(attrs)
       @aliases = attrs[:aliases]
+      @send_gifs = attrs.key?(:send_gifs) ? !!attrs[:send_gifs] : true
     end
 
     def names
@@ -27,6 +29,10 @@ module SlackRubyBot
       name && names.include?(name.downcase)
     end
 
+    def send_gifs?
+      send_gifs
+    end
+
     def name
       SlackRubyBot.config.user || (auth && auth['user'])
     end

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

@@ -101,13 +101,13 @@ module SlackRubyBot
       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 = options.delete(:client)
+        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))

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

@@ -3,6 +3,7 @@ module SlackRubyBot
     cattr_accessor :hooks
     attr_accessor :token
     attr_accessor :aliases
+    attr_accessor :send_gifs
 
     include SlackRubyBot::Hooks::Hello
     include SlackRubyBot::Hooks::Message
@@ -10,6 +11,7 @@ module SlackRubyBot
     def initialize(options = {})
       @token = options[:token]
       @aliases = options[:aliases]
+      @send_gifs = options.key?(:send_gifs) ? !!options[:send_gifs] : true
     end
 
     def run
@@ -83,7 +85,7 @@ module SlackRubyBot
 
     def client
       @client ||= begin
-        client = SlackRubyBot::Client.new(aliases: aliases, token: token)
+        client = SlackRubyBot::Client.new(aliases: aliases, send_gifs: send_gifs, token: token)
         client.on :close do |_data|
           @client = nil
           restart! unless @stopping

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

@@ -1,3 +1,3 @@
 module SlackRubyBot
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

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

@@ -30,7 +30,20 @@ describe SlackRubyBot::Commands do
     app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
   end
   context 'send_gifs' do
-    context 'set to false' do
+    context 'set to false via client' do
+      before do
+        client.send_gifs = false
+      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')
+        app.send(:message, client, text: "#{SlackRubyBot.config.user} send_message_with_gif_spec message", channel: 'channel', user: 'user')
+      end
+      after do
+        client.send_gifs = true
+      end
+    end
+    context 'set to false via config' do
       before do
         SlackRubyBot::Config.send_gifs = false
       end

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

@@ -1,9 +1,21 @@
 require 'spec_helper'
 
 describe SlackRubyBot::Server do
+  let(:logger) { subject.send :logger }
+  let(:client) { Slack::RealTime::Client.new }
+  context 'with a token and disabled GIFs' do
+    subject do
+      SlackRubyBot::Server.new(token: 'token', send_gifs: false)
+    end
+    before do
+      allow(subject).to receive(:sleep)
+      allow(logger).to receive(:error)
+    end
+    it 'sets GIFs' do
+      expect(subject.send(:client).send_gifs?).to be false
+    end
+  end
   context 'with a token and aliases' do
-    let(:client) { Slack::RealTime::Client.new }
-    let(:logger) { subject.send :logger }
     subject do
       SlackRubyBot::Server.new(token: 'token', aliases: %w(foo bar))
     end
@@ -15,26 +27,27 @@ describe SlackRubyBot::Server do
       expect(subject.send(:client).aliases).to eq %w(foo bar)
       expect(subject.send(:client).names).to include 'foo'
     end
+    it 'sets GIFs' do
+      expect(subject.send(:client).send_gifs?).to be true
+    end
     it 'creates a client with a token' do
       expect(client).to receive(:start!) { fail 'expected' }
-      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: true, aliases: %w(foo bar)).and_return(client)
       expect { subject.start! }.to raise_error RuntimeError, 'expected'
     end
     it 'asynchronously creates a client with a token' do
       expect(client).to receive(:start_async) { fail 'expected' }
-      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: true, aliases: %w(foo bar)).and_return(client)
       expect { subject.start_async }.to raise_error RuntimeError, 'expected'
     end
     it 'stops client' do
-      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', aliases: %w(foo bar)).and_return(client)
+      expect(Slack::RealTime::Client).to receive(:new).with(token: 'token', send_gifs: true, aliases: %w(foo bar)).and_return(client)
       expect(subject.send(:client)).to_not be nil
       expect(client).to receive(:started?).and_return(true)
       subject.stop!
     end
   end
   context 'retries on rtm.start errors' do
-    let(:client) { Slack::RealTime::Client.new }
-    let(:logger) { subject.send :logger }
     before do
       allow(subject).to receive(:auth!)
       allow(subject).to receive(:sleep)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slack-ruby-bot
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Daniel Doubrovkine
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-28 00:00:00.000000000 Z
+date: 2016-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie