slack-bot-server 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1086fe2f192f0ea950041f91799d67bc8e7966e
-  data.tar.gz: 85e02d179a2fb1ca62c8064206244fb3da90c197
+  metadata.gz: d6685270303a7d38f8c8b833048eec1a68c17680
+  data.tar.gz: 48e3b42af56269b7f9eba8acb397902a8e780bc8
 SHA512:
-  metadata.gz: 6c48425cac63a28ffe08a8af43702183b532127307f61807db94088470e6a4d050011fb5c5b732ba10d00ab8eab51736b73b9c98aa7d2e97fbc6fb5d803e6daa
-  data.tar.gz: 3a09cc3baa9e35cf4193a7638627e584b7b7413ea85fe06ed2b9470393fb295890255bd66cdb6bde928946c44df03d873c3fc373f7151a0a1210392d1b212b45
+  metadata.gz: 3efef59a7ef8be23ac6eece069f26d90f6f287b5049cf8e8d4ef4aee867e03ba2f3d461913a26c6b8d61b5a14c024c64b3f26303b1ae2a30cd5ce2cd17b377bf
+  data.tar.gz: edc37497ad3846105145918a74c9d507beb262c2105a7de03fe60f608102cfb76faf0010f01e1ccc8513ac3f6fb1a92f270bb16d856f13da8c782e9751dad58b

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Unreleased
 
+## 0.4.6
+
+### Added
+- New `client` method for accessing the underlying Slack ruby client; this is useful for getting the channels or users (e.g. `client.channels` or `client.users`).
+
+### Changes
+- Evaluate `on_slack_event` blocks against the bot instance, rather than the class.
+
+
 ## 0.4.5
 
 ### Added

data/lib/slack_bot_server/bot.rb

@@ -61,22 +61,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
@@ -93,10 +93,10 @@ class SlackBotServer::Bot
 
     if rtm_incompatible_message?(message)
       debug "Sending via Web API", message
-      @client.web_client.chat_postMessage(message)
+      client.web_client.chat_postMessage(message)
     else
       debug "Sending via RTM API", message
-      @client.message(message)
+      client.message(message)
     end
   end
 
@@ -104,7 +104,7 @@ class SlackBotServer::Bot
   # @param options [Hash] As {#say}, although the +:channel+ option is
   #   redundant
   def broadcast(options)
-    @client.channels.each do |id, _|
+    client.channels.each do |id, _|
       say(options.merge(channel: id))
     end
   end
@@ -123,7 +123,7 @@ class SlackBotServer::Bot
   # @param options [Hash] As {#say}, although the +:channel+ option is
   #    redundant
   def say_to(user_id, options)
-    result = @client.web_client.im_open(user: user_id)
+    result = client.web_client.im_open(user: user_id)
     channel = result.channel.id
     say(options.merge(channel: channel))
   end
@@ -134,14 +134,14 @@ class SlackBotServer::Bot
   def typing(options={})
     last_received_channel = @last_received_user_message ? @last_received_user_message.channel : nil
     default_options = {channel: last_received_channel}
-    @client.typing(default_options.merge(options))
+    client.typing(default_options.merge(options))
   end
 
   # Call a method directly on the Slack web API (via Slack::Web::Client).
   # Useful for debugging only.
   def call(method, args)
     args.symbolize_keys!
-    @client.web_client.send(method, args)
+    client.web_client.send(method, args)
   end
 
   # Starts the bot running.
@@ -152,13 +152,13 @@ class SlackBotServer::Bot
     @client = ::Slack::RealTime::Client.new(token: @token)
     @running = true
 
-    @client.on :open do |event|
+    client.on :open do |event|
       @connected = true
       log "connected to '#{team_name}'"
       run_callbacks(:start)
     end
 
-    @client.on :message do |data|
+    client.on :message do |data|
       begin
         debug message: data
         @last_received_user_message = data if user_message?(data)
@@ -168,15 +168,15 @@ class SlackBotServer::Bot
       end
     end
 
-    @client.on :close do |event|
+    client.on :close do |event|
       log "disconnected"
       @connected = false
       run_callbacks(:finish)
     end
 
-    register_low_level_callbacks_on(@client)
+    register_low_level_callbacks
 
-    @client.start_async
+    client.start_async
   rescue Slack::Web::Api::Error => e
     raise ConnectionError.new(e.message, e.response)
   end
@@ -187,7 +187,7 @@ class SlackBotServer::Bot
   def stop
     log "closing connection"
     @running = false
-    @client.stop!
+    client.stop!
     log "closed"
   end
 
@@ -356,6 +356,8 @@ class SlackBotServer::Bot
 
   private
 
+  attr_reader :client
+
   def handle_message(data)
     run_callbacks(data.type, data)
   end
@@ -368,11 +370,11 @@ class SlackBotServer::Bot
     end
   end
 
-  def register_low_level_callbacks_on(client)
+  def register_low_level_callbacks
     self.class.low_level_callbacks.each do |(type, callback)|
       client.on(type) do |*args|
         begin
-          callback.call(*args)
+          instance_exec(*args, &callback)
         rescue => e
           log_error e
         end
@@ -381,7 +383,7 @@ class SlackBotServer::Bot
   end
 
   def is_im_channel?(id)
-    @client.ims[id] != nil
+    client.ims[id] != nil
   end
 
   def bot_message?(data)

data/lib/slack_bot_server/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slack-bot-server
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - James Adam