lita-sonos-commander 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8df08a9fd7ffbbe94ff51a5cc8ffbb77c26ab062
-  data.tar.gz: 6ce9bbb507eeec26eb03b8dc5715393762e487c6
+  metadata.gz: 2dc5e325b18f3682e6a3a1dc90e59be191506fb6
+  data.tar.gz: 343895e09282f80ab5c96ff48892b14ad0a4ad79
 SHA512:
-  metadata.gz: e9699b15935e3210d61dcc4414097d3a176de14674ec8fbe5849ece61e0db6b751636a006ec71890d58e4126a21f9ac7dc1603ac6fb1d1a5bcb44f4290191310
-  data.tar.gz: 5ee1e48df4353a064d6edde6166de70ff064891f7fd1435ce653f4ceaae92b1b579de7f8a39ce1bebd83f007fb2ca69e0d1465288b17faaa91c692bb2bb509f9
+  metadata.gz: 4bd63de801134e7bf98984b4c7ec2dc1358382ebd0384575cc2fcf9fa43253207294557004f5c76fd8b1ce9c8900ac082b2c470fcefa79db9f5ea07b40002558
+  data.tar.gz: 47f4c65ffa13e9794547bf02cbf814c9cea2bd8f6c0ada21f5b05dddc240e6bfc1291b41384c8c7d49e55188b5c7486f9fb13afa4fc29f6d10e6dc45b4b83872

data/lib/lita/commander_middleware.rb

@@ -1,23 +1,21 @@
 class Lita::CommanderMiddleware
   def self.build(open_sockets:)
-    new.build open_sockets: open_sockets
+    new(open_sockets: open_sockets).build
   end
 
   attr_reader :env, :open_sockets
 
-  def build(open_sockets:)
+  def initialize(open_sockets:)
     @open_sockets = open_sockets
+  end
 
-    return lambda do |env|
+  def build
+    lambda do |env|
       if Faye::WebSocket.websocket?(env)
         @env = env
         handle_env_has_socket
       else
-        [
-          200,
-          { 'Content-Type' => 'text/plain' },
-          ['Hello from a Lita chatbot! Feed me a websocket connection!']
-        ]
+        http_explainer_payload
       end
     end
   end
@@ -29,30 +27,39 @@ class Lita::CommanderMiddleware
     ws
   end
 
-  def close_socket(ws)
+  def close_socket(ws, event)
     open_sockets.delete_if { |s| s == ws }
     Lita.logger.debug "Sonos client count: #{open_sockets.count}"
-    p [:close, event.code, event.reason]
+    Lita.logger.debug "Socket close: #{[:close, event.code, event.reason]}"
     ws = nil
   end
 
   def handle_message(ws, event)
-    ws.send({ message: event.data }.to_json)
-    maybe_send_debug_message(ws)
+    ws.send({ message: "ACK: #{event.data}" }.to_json)
   end
 
-  def maybe_send_debug_message(ws)
-    sleep 0.5
-    ws.send({ message: 'WE DID IT TWITCH', command: 'echo' }.to_json)
+  def send_welcome_message(ws)
+    payload = { message: 'Welcome to Lita Sonos Commander!', command: 'echo' }
+    ws.send(payload.to_json)
   end
 
   def handle_env_has_socket
     ws = build_socket(env)
 
+    send_welcome_message(ws)
+
     ws.on(:message) { |event| handle_message(ws, event) }
-    ws.on(:close) { |event| close_socket(ws) }
+    ws.on(:close) { close_socket(ws, event) }
 
     # Return async Rack response
     ws.rack_response
   end
+
+  def http_explainer_payload
+    [
+      200,
+      { 'Content-Type' => 'text/plain' },
+      ['Hello from a Lita chatbot! Feed me a websocket connection!']
+    ]
+  end
 end

data/lita-sonos-commander.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'lita-sonos-commander'
-  spec.version       = '1.1.0'
+  spec.version       = '1.1.1'
   spec.authors       = ['Daniel J. Pritchett']
   spec.email         = ['dpritchett@gmail.com']
   spec.description   = 'Control your Sonos with Lita chatbot commands'

data/spec/lita/commander_middleware_spec.rb

@@ -1,12 +1,55 @@
 require 'spec_helper'
+require 'ostruct'
 require 'date'
 
 describe Lita::CommanderMiddleware do
   let(:handler) { double 'handler' }
   let(:result) { subject.build({}) }
+  let(:open_sockets) { [] }
+  let(:a_socket) { double 'a web socket' }
+
+  subject { Lita::CommanderMiddleware.new(open_sockets: open_sockets) }
 
   it 'returns a lambda' do
-    result = subject.class.build(open_sockets: [])
+    result = subject.build
     expect(result.is_a?(Proc)).to be_truthy
   end
+
+  context 'adding a new client' do
+    before { Faye::WebSocket.stub(:new).and_return(a_socket) }
+    let(:result) { subject.build_socket(nil) }
+
+    it 'builds websockets on demand' do
+      expect(result).to eq(a_socket)
+    end
+
+    it 'adds the new socket to :open_sockets' do
+      expect(open_sockets).to include(result)
+    end
+  end
+
+  context 'client disconnects' do
+    let(:event) { double 'socket event' }
+    before { a_socket.stub(:send) }
+    before { event.stub(:code) }
+    before { event.stub(:reason) }
+
+    it 'removes the client from :open_sockets' do
+      result = subject.close_socket(a_socket, event)
+      expect(result).to be_nil
+      expect(open_sockets).to_not include(a_socket)
+    end
+
+    it 'logs to debug' do
+      expect(Lita.logger).to receive(:debug).exactly(2).times
+      subject.close_socket(a_socket, event)
+    end
+  end
+
+  it 'acknowledges messages from clients' do
+    event = OpenStruct.new(data: 'This is a message!')
+    a_socket.stub(:send)
+    expect(a_socket).to receive(:send)
+    subject.handle_message(a_socket, event)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-sonos-commander
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel J. Pritchett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-28 00:00:00.000000000 Z
+date: 2018-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita