lita-slack 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f2cd3d13734b1d4f33b836c9c72a01b7bc6f2b9
-  data.tar.gz: b88e3e65f52bd8b0a8856d0bfa1af5f280a4a6ae
+  metadata.gz: c31d5c7f496a749e2903cabfb691bd7056e50a07
+  data.tar.gz: 5fa2a8da529285c189f7b2aa1c789d9252d05f36
 SHA512:
-  metadata.gz: da158116c3b5e68c6f521d31220e9551ec09bc5e10026ab25eb24633039dd50ed71aa247237ead686c4cc0179ae53ffae86fa2441df0681e280631ffac2efcef
-  data.tar.gz: f2315307596784cc435e4cbc908a72faad4ae383ee0be4e58df522a6a93cd4955511519110459b329fda4f8ad47332011b505884187388e94a08879440168e82
+  metadata.gz: 0f5c045ba0e230b6a869692221d67836af7dc92c568d31802bbf9d1e2b0351d9678f64f48762526cbac01a4bbb2e0a0f41b80db76f9fa3b550e446de05c83102
+  data.tar.gz: bce6039b1f1dc91d4e4930386b7e38e88cb964f346af89c7fe6ed5b2fa5ba717990a29fd9e0333f043b7d237b8acc613622535ea32a14df19ed4f27248d5f8f8

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

@@ -0,0 +1,23 @@
+require 'eventmachine'
+
+module Lita
+  module Adapters
+    class Slack < Adapter
+      class EventLoop
+        class << self
+          def defer
+            EM.defer { yield }
+          end
+
+          def run
+            EM.run { yield }
+          end
+
+          def safe_stop
+            EM.stop if EM.reactor_running?
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
-require 'eventmachine'
 require 'faye/websocket'
 require 'multi_json'
 
 require 'lita/adapters/slack/api'
+require 'lita/adapters/slack/event_loop'
 require 'lita/adapters/slack/im_mapping'
 require 'lita/adapters/slack/message_handler'
 require 'lita/adapters/slack/user_creator'
@@ -34,7 +34,7 @@ module Lita
         end
 
         def run(queue = nil, options = {})
-          EM.run do
+          EventLoop.run do
             log.debug("Connecting to the Slack Real Time Messaging API.")
             @websocket = Faye::WebSocket::Client.new(
               websocket_url,
@@ -56,7 +56,7 @@ module Lita
 
         def send_messages(channel, strings)
           strings.each do |string|
-            websocket.send(safe_payload_for(channel, string))
+            EventLoop.defer { websocket.send(safe_payload_for(channel, string)) }
           end
         end
 
@@ -66,7 +66,7 @@ module Lita
             websocket.close
           end
 
-          EM.stop if EM.reactor_running?
+          EventLoop.safe_stop
         end
 
         private
@@ -94,7 +94,7 @@ module Lita
         def receive_message(event)
           data = MultiJson.load(event.data)
 
-          MessageHandler.new(robot, robot_id, data).handle
+          EventLoop.defer { MessageHandler.new(robot, robot_id, data).handle }
         end
 
         def safe_payload_for(channel, string)

data/lita-slack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-slack"
-  spec.version       = "1.1.0"
+  spec.version       = "1.1.1"
   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/event_loop_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe Lita::Adapters::Slack::EventLoop, lita: true do
+  describe '.defer' do
+    it 'defers the provided block with Eventmachine' do
+      allow(EM).to receive(:defer).and_yield
+      ran = false
+
+      described_class.defer { ran = true }
+
+      expect(ran).to be_truthy
+    end
+  end
+
+  describe '.run' do
+    it 'runs the provided block in Eventmachine' do
+      allow(EM).to receive(:run).and_yield
+      ran = false
+
+      described_class.run { ran = true }
+
+      expect(ran).to be_truthy
+    end
+  end
+
+  describe '.safe_stop' do
+    it 'stops Eventmachine when the reactor is running' do
+      described_class.run do
+        expect(EM.reactor_running?).to be_truthy
+
+        described_class.safe_stop
+      end
+
+      expect(EM.reactor_running?).to be_falsy
+    end
+
+    it 'does nothing when the reactor is not running' do
+      expect(EM).not_to receive(:stop)
+
+      described_class.safe_stop
+    end
+  end
+end

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

@@ -67,11 +67,8 @@ describe Lita::Adapters::Slack::RTMConnection, lita: true do
   end
 
   describe "#run" do
-    it "starts the reactor" do
-      with_websocket(subject, queue) do |websocket|
-        expect(EM.reactor_running?).to be_truthy
-      end
-    end
+    let(:event) { double('Event', data: '{}') }
+    let(:message_handler) { instance_double('Lita::Adapters::Slack::MessageHandler') }
 
     it "creates the WebSocket" do
       with_websocket(subject, queue) do |websocket|
@@ -91,14 +88,20 @@ describe Lita::Adapters::Slack::RTMConnection, lita: true do
       end
     end
 
-    context "when the WebSocket is closed" do
-      it "shuts down the reactor" do
-        with_websocket(subject, queue) do |websocket|
-          websocket.close
+    it "dispatches incoming data to MessageHandler" do
+      allow(Lita::Adapters::Slack::EventLoop).to receive(:defer).and_yield
+      allow(Lita::Adapters::Slack::MessageHandler).to receive(:new).with(
+        robot,
+        'U12345678',
+        {}
+      ).and_return(message_handler)
 
-          expect(EM.reactor_running?).to be_falsy
-        end
-      end
+      expect(message_handler).to receive(:handle)
+
+      # Testing private methods directly is bad, but it's difficult to get
+      # the timing right when testing it by emitting the "message" event on
+      # the WebSocket.
+      subject.send(:receive_message, event)
     end
   end
 
@@ -112,6 +115,7 @@ describe Lita::Adapters::Slack::RTMConnection, lita: true do
       allow(Faye::WebSocket::Client).to receive(:new).and_return(websocket)
       allow(websocket).to receive(:on)
       allow(websocket).to receive(:close)
+      allow(Lita::Adapters::Slack::EventLoop).to receive(:defer).and_yield
     end
 
     it "writes messages to the WebSocket" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-slack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ken J.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -182,6 +182,7 @@ files:
 - lib/lita-slack.rb
 - lib/lita/adapters/slack.rb
 - lib/lita/adapters/slack/api.rb
+- lib/lita/adapters/slack/event_loop.rb
 - lib/lita/adapters/slack/im_mapping.rb
 - lib/lita/adapters/slack/message_handler.rb
 - lib/lita/adapters/slack/rtm_connection.rb
@@ -192,6 +193,7 @@ files:
 - lita-slack.gemspec
 - locales/en.yml
 - spec/lita/adapters/slack/api_spec.rb
+- spec/lita/adapters/slack/event_loop_spec.rb
 - spec/lita/adapters/slack/im_mapping_spec.rb
 - spec/lita/adapters/slack/message_handler_spec.rb
 - spec/lita/adapters/slack/rtm_connection_spec.rb
@@ -227,6 +229,7 @@ specification_version: 4
 summary: Lita adapter for Slack.
 test_files:
 - spec/lita/adapters/slack/api_spec.rb
+- spec/lita/adapters/slack/event_loop_spec.rb
 - spec/lita/adapters/slack/im_mapping_spec.rb
 - spec/lita/adapters/slack/message_handler_spec.rb
 - spec/lita/adapters/slack/rtm_connection_spec.rb