lita-slack 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94fa7740895d09a183b18621b296e01c0b9bf4ba
-  data.tar.gz: 8d092bb60ea02b23c43f53551e6ca691d5654d00
+  metadata.gz: f17abc31f51924e4c36f96a2e4bfbdbb4ffd2d4f
+  data.tar.gz: 1df989c692141fcc9e052ffcd701fbefda6dcfb0
 SHA512:
-  metadata.gz: 9478684ba8c9c77579c3224559cff79b49a7fcf2f30c361997d2e1d53ee777269e6da9bcd0b542fac591a1b7ed20ce27a708ad25db19675bd7ca51367c83cb2b
-  data.tar.gz: 1746b869ac92e8a99d3cc8bcad47ea21707625b28dbc6607d6b8684d023e118eb8ec6cc06ed89082607ebf428a18de6bc3055da3eb32c1a59d062560d9650a42
+  metadata.gz: 5018da29c4758866976afc93ea3f649a27877b54ae1eb531e8f4af941b13e68e0f6793f3c157d6ff4b7885eddade956df031783d487c12604e8b76b08e00a2d2
+  data.tar.gz: 5c44dace1fa28b9af419a67d1718d104173d3ba7a3f397cf060467b5cbd1a174dbbd96d9e2c6da1b7881ebb69ed597fae3e331c723b5135ff1f96261ea70effd

data/lib/lita/adapters/slack/message_handler.rb

@@ -43,7 +43,9 @@ module Lita
 
         def dispatch_message(user)
           source = Source.new(user: user, room: channel)
+          source.private_message! if channel && channel[0] == "D"
           message = Message.new(robot, body, source)
+          message.command! if source.private_message?
           log.debug("Dispatching message to Lita from #{user.id}.")
           robot.receive(message)
         end

data/lib/lita/adapters/slack/rtm_connection.rb

@@ -21,7 +21,7 @@ module Lita
 
         def initialize(robot, token, team_data)
           @robot = robot
-          @im_mapping = IMMapping.new(token, team_data.ims)
+          @im_mapping = IMMapping.new(API.new(token), team_data.ims)
           @websocket_url = team_data.websocket_url
           @robot_id = team_data.self.id
 

data/lita-slack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-slack"
-  spec.version       = "1.0.4"
+  spec.version       = "1.0.5"
   spec.authors       = ["Ken J.", "Jimmy Cuadra"]
   spec.email         = ["kenjij@gmail.com", "jimmy@jimmycuadra.com"]
   spec.description   = %q{Lita adapter for Slack.}

data/spec/lita/adapters/slack/message_handler_spec.rb

@@ -26,8 +26,8 @@ describe Lita::Adapters::Slack::MessageHandler, lita: true do
           "text" => "Hello"
         }
       end
-      let(:message) { instance_double('Lita::Message') }
-      let(:source) { instance_double('Lita::Source') }
+      let(:message) { instance_double('Lita::Message', command!: false) }
+      let(:source) { instance_double('Lita::Source', private_message?: false) }
       let(:user) { instance_double('Lita::User', id: 'U023BECGF') }
 
       before do
@@ -46,6 +46,38 @@ describe Lita::Adapters::Slack::MessageHandler, lita: true do
         subject.handle
       end
 
+      context "when the message is a direct message" do
+        let(:data) do
+          {
+            "type" => "message",
+            "channel" => "D2147483705",
+            "user" => "U023BECGF",
+            "text" => "Hello"
+          }
+        end
+
+        before do
+          allow(Lita::Source).to receive(:new).with(
+            user: user,
+            room: "D2147483705"
+          ).and_return(source)
+          allow(source).to receive(:private_message!).and_return(true)
+          allow(source).to receive(:private_message?).and_return(true)
+        end
+
+        it "marks the source as a private message" do
+          expect(source).to receive(:private_message!)
+
+          subject.handle
+        end
+
+        it "marks the message as a command" do
+          expect(message).to receive(:command!)
+
+          subject.handle
+        end
+      end
+
       context "when the message starts with a Slack-style @-mention" do
         let(:data) do
           {

data/spec/lita/adapters/slack/rtm_connection_spec.rb

@@ -44,7 +44,10 @@ describe Lita::Adapters::Slack::RTMConnection, lita: true do
 
   describe "#im_for" do
     before do
-      allow(Lita::Adapters::Slack::IMMapping).to receive(:new).and_return(im_mapping)
+      allow(Lita::Adapters::Slack::API).to receive(:new).with(token).and_return(api)
+      allow(
+        Lita::Adapters::Slack::IMMapping
+      ).to receive(:new).with(api, []).and_return(im_mapping)
       allow(im_mapping).to receive(:im_for).with('U12345678').and_return('D024BFF1M')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-slack
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ken J.