punchblock 0.11.0 → 0.12.0

data/lib/punchblock/translator/asterisk/component.rb

@@ -40,8 +40,8 @@ module Punchblock
           end
 
           def send_event(event)
-            event.component_id  = id
-            event.call_id       = call_id
+            event.component_id    = id
+            event.target_call_id  = call_id
             pb_logger.debug "Sending event #{event}"
             if internal
               @component_node.add_event event

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/spec/punchblock/command/dial_spec.rb

@@ -10,7 +10,7 @@ module Punchblock
         RayoNode.class_from_registration(:dial, 'urn:xmpp:rayo:1').should be == Dial
       end
 
-      let(:join_params) { {:other_call_id => 'abc123'} }
+      let(:join_params) { {:call_id => 'abc123'} }
 
       describe "when setting options in initializer" do
         subject { Dial.new :to => 'tel:+14155551212', :from => 'tel:+13035551212', :timeout => 30000, :headers => { :x_skill => 'agent', :x_customer_id => 8877 }, :join => join_params }
@@ -57,7 +57,7 @@ module Punchblock
 
         it "should set the call ID from the ref" do
           subject.response = ref
-          subject.call_id.should be == call_id
+          subject.target_call_id.should be == call_id
         end
       end
     end

data/spec/punchblock/command/join_spec.rb

@@ -11,12 +11,12 @@ module Punchblock
       end
 
       describe "when setting options in initializer" do
-        subject { Join.new :other_call_id => 'abc123', :mixer_name => 'blah', :direction => :duplex, :media => :bridge }
+        subject { Join.new :call_id => 'abc123', :mixer_name => 'blah', :direction => :duplex, :media => :bridge }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
-        its(:direction)     { should be == :duplex }
-        its(:media)         { should be == :bridge }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
+        its(:direction)   { should be == :duplex }
+        its(:media)       { should be == :bridge }
       end
 
       describe "from a stanza" do
@@ -34,10 +34,10 @@ module Punchblock
 
         it { should be_instance_of Join }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
-        its(:direction)     { should be == :duplex }
-        its(:media)         { should be == :bridge }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
+        its(:direction)   { should be == :duplex }
+        its(:media)       { should be == :bridge }
       end
     end
   end

data/spec/punchblock/command/unjoin_spec.rb

@@ -11,10 +11,10 @@ module Punchblock
       end
 
       describe "when setting options in initializer" do
-        subject { Unjoin.new :other_call_id => 'abc123', :mixer_name => 'blah' }
+        subject { Unjoin.new :call_id => 'abc123', :mixer_name => 'blah' }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
       end
 
       describe "from a stanza" do
@@ -30,8 +30,8 @@ module Punchblock
 
         it { should be_instance_of Unjoin }
 
-        its(:other_call_id) { should be == 'abc123' }
-        its(:mixer_name)    { should be == 'blah' }
+        its(:call_id)     { should be == 'abc123' }
+        its(:mixer_name)  { should be == 'blah' }
       end
     end
   end

data/spec/punchblock/command_node_spec.rb

@@ -11,12 +11,12 @@ module Punchblock
         describe "with a call/component ID" do
           let(:call_id)       { 'abc123' }
           let(:component_id)  { 'abc123' }
-          let(:args)          { [{:call_id => call_id, :component_id => component_id}] }
+          let(:args)          { [{:target_call_id => call_id, :component_id => component_id}] }
 
           subject { CommandNode.new(*args) }
 
-          its(:call_id)       { should be == call_id }
-          its(:component_id)  { should be == component_id }
+          its(:target_call_id)  { should be == call_id }
+          its(:component_id)    { should be == component_id }
         end
       end
 

data/spec/punchblock/component/input_spec.rb

@@ -140,7 +140,7 @@ module Punchblock
 
         before do
           command.component_id = 'abc123'
-          command.call_id = '123abc'
+          command.target_call_id = '123abc'
           command.client = mock_client
         end
 
@@ -149,7 +149,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#stop!' do
@@ -160,7 +160,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.stop_action, :call_id => '123abc', :component_id => 'abc123')
+              mock_client.expects(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
               command.stop!
             end
           end

data/spec/punchblock/component/output_spec.rb

@@ -104,7 +104,7 @@ module Punchblock
 
         before do
           command.component_id = 'abc123'
-          command.call_id = '123abc'
+          command.target_call_id = '123abc'
           command.client = mock_client
         end
 
@@ -113,7 +113,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<pause xmlns="urn:xmpp:rayo:output:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#pause!' do
@@ -124,7 +124,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.pause_action, :call_id => '123abc', :component_id => 'abc123').returns true
+              mock_client.expects(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
               command.expects :paused!
               command.pause!
             end
@@ -156,7 +156,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<resume xmlns="urn:xmpp:rayo:output:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#resume!' do
@@ -168,7 +168,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.resume_action, :call_id => '123abc', :component_id => 'abc123').returns true
+              mock_client.expects(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
               command.expects :resumed!
               command.resume!
             end
@@ -201,7 +201,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#stop!' do
@@ -212,7 +212,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.stop_action, :call_id => '123abc', :component_id => 'abc123')
+              mock_client.expects(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
               command.stop!
             end
           end
@@ -232,7 +232,7 @@ module Punchblock
 
             its(:to_xml) { should be == '<seek xmlns="urn:xmpp:rayo:output:1" direction="forward" amount="1500"/>' }
             its(:component_id) { should be == 'abc123' }
-            its(:call_id) { should be == '123abc' }
+            its(:target_call_id) { should be == '123abc' }
           end
 
           describe '#seek!' do
@@ -245,7 +245,7 @@ module Punchblock
               it "should send its command properly" do
                 seek_action = command.seek_action seek_options
                 command.stubs(:seek_action).returns seek_action
-                mock_client.expects(:execute_command).with(seek_action, :call_id => '123abc', :component_id => 'abc123').returns true
+                mock_client.expects(:execute_command).with(seek_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
                 command.expects :seeking!
                 command.expects :stopped_seeking!
                 command.seek! seek_options
@@ -299,7 +299,7 @@ module Punchblock
 
             its(:to_xml) { should be == '<speed-up xmlns="urn:xmpp:rayo:output:1"/>' }
             its(:component_id) { should be == 'abc123' }
-            its(:call_id) { should be == '123abc' }
+            its(:target_call_id) { should be == '123abc' }
           end
 
           describe '#speed_up!' do
@@ -312,7 +312,7 @@ module Punchblock
               it "should send its command properly" do
                 speed_up_action = command.speed_up_action
                 command.stubs(:speed_up_action).returns speed_up_action
-                mock_client.expects(:execute_command).with(speed_up_action, :call_id => '123abc', :component_id => 'abc123').returns true
+                mock_client.expects(:execute_command).with(speed_up_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
                 command.expects :speeding_up!
                 command.expects :stopped_speeding!
                 command.speed_up!
@@ -357,7 +357,7 @@ module Punchblock
 
             its(:to_xml) { should be == '<speed-down xmlns="urn:xmpp:rayo:output:1"/>' }
             its(:component_id) { should be == 'abc123' }
-            its(:call_id) { should be == '123abc' }
+            its(:target_call_id) { should be == '123abc' }
           end
 
           describe '#slow_down!' do
@@ -370,7 +370,7 @@ module Punchblock
               it "should send its command properly" do
                 slow_down_action = command.slow_down_action
                 command.stubs(:slow_down_action).returns slow_down_action
-                mock_client.expects(:execute_command).with(slow_down_action, :call_id => '123abc', :component_id => 'abc123').returns true
+                mock_client.expects(:execute_command).with(slow_down_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
                 command.expects :slowing_down!
                 command.expects :stopped_speeding!
                 command.slow_down!
@@ -432,7 +432,7 @@ module Punchblock
 
             its(:to_xml) { should be == '<volume-up xmlns="urn:xmpp:rayo:output:1"/>' }
             its(:component_id) { should be == 'abc123' }
-            its(:call_id) { should be == '123abc' }
+            its(:target_call_id) { should be == '123abc' }
           end
 
           describe '#volume_up!' do
@@ -445,7 +445,7 @@ module Punchblock
               it "should send its command properly" do
                 volume_up_action = command.volume_up_action
                 command.stubs(:volume_up_action).returns volume_up_action
-                mock_client.expects(:execute_command).with(volume_up_action, :call_id => '123abc', :component_id => 'abc123').returns true
+                mock_client.expects(:execute_command).with(volume_up_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
                 command.expects :voluming_up!
                 command.expects :stopped_voluming!
                 command.volume_up!
@@ -490,7 +490,7 @@ module Punchblock
 
             its(:to_xml) { should be == '<volume-down xmlns="urn:xmpp:rayo:output:1"/>' }
             its(:component_id) { should be == 'abc123' }
-            its(:call_id) { should be == '123abc' }
+            its(:target_call_id) { should be == '123abc' }
           end
 
           describe '#volume_down!' do
@@ -503,7 +503,7 @@ module Punchblock
               it "should send its command properly" do
                 volume_down_action = command.volume_down_action
                 command.stubs(:volume_down_action).returns volume_down_action
-                mock_client.expects(:execute_command).with(volume_down_action, :call_id => '123abc', :component_id => 'abc123').returns true
+                mock_client.expects(:execute_command).with(volume_down_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
                 command.expects :voluming_down!
                 command.expects :stopped_voluming!
                 command.volume_down!

data/spec/punchblock/component/record_spec.rb

@@ -62,7 +62,7 @@ module Punchblock
 
         before do
           command.component_id = 'abc123'
-          command.call_id = '123abc'
+          command.target_call_id = '123abc'
           command.client = mock_client
         end
 
@@ -71,7 +71,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<pause xmlns="urn:xmpp:rayo:record:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#pause!' do
@@ -82,7 +82,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.pause_action, :call_id => '123abc', :component_id => 'abc123').returns true
+              mock_client.expects(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
               command.expects :paused!
               command.pause!
             end
@@ -114,7 +114,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<resume xmlns="urn:xmpp:rayo:record:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#resume!' do
@@ -126,7 +126,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.resume_action, :call_id => '123abc', :component_id => 'abc123').returns true
+              mock_client.expects(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
               command.expects :resumed!
               command.resume!
             end
@@ -159,7 +159,7 @@ module Punchblock
 
           its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
           its(:component_id) { should be == 'abc123' }
-          its(:call_id) { should be == '123abc' }
+          its(:target_call_id) { should be == '123abc' }
         end
 
         describe '#stop!' do
@@ -170,7 +170,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.stop_action, :call_id => '123abc', :component_id => 'abc123')
+              mock_client.expects(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
               command.stop!
             end
           end

data/spec/punchblock/connection/asterisk_spec.rb

@@ -72,7 +72,7 @@ module Punchblock
       describe 'when a rayo event is received from the translator' do
         it 'should call the event handler with the event' do
           offer = Event::Offer.new
-          offer.call_id = '9f00061'
+          offer.target_call_id = '9f00061'
 
           mock_event_handler.expects(:call).once.with offer
           subject.handle_event offer

data/spec/punchblock/connection/xmpp_spec.rb

@@ -21,40 +21,40 @@ module Punchblock
           let(:options) { { :username => '1@app.rayo.net' } }
 
           its(:root_domain)   { should be == 'app.rayo.net' }
-          its(:calls_domain)   { should be == 'calls.app.rayo.net' }
-          its(:mixers_domain)  { should be == 'mixers.app.rayo.net' }
+          its(:calls_domain)  { should be == 'calls.app.rayo.net' }
+          its(:mixers_domain) { should be == 'mixers.app.rayo.net' }
         end
 
         context "with only a rayo domain set" do
           let(:options) { { :rayo_domain => 'rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
-          its(:calls_domain)   { should be == 'calls.rayo.org' }
-          its(:mixers_domain)  { should be == 'mixers.rayo.org' }
+          its(:calls_domain)  { should be == 'calls.rayo.org' }
+          its(:mixers_domain) { should be == 'mixers.rayo.org' }
         end
 
         context "with only a root domain set" do
           let(:options) { { :root_domain => 'rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
-          its(:calls_domain)   { should be == 'calls.rayo.org' }
-          its(:mixers_domain)  { should be == 'mixers.rayo.org' }
+          its(:calls_domain)  { should be == 'calls.rayo.org' }
+          its(:mixers_domain) { should be == 'mixers.rayo.org' }
         end
 
         context "with a root domain and calls domain set" do
           let(:options) { { :root_domain => 'rayo.org', :calls_domain => 'phone_calls.rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
-          its(:calls_domain)   { should be == 'phone_calls.rayo.org' }
-          its(:mixers_domain)  { should be == 'mixers.rayo.org' }
+          its(:calls_domain)  { should be == 'phone_calls.rayo.org' }
+          its(:mixers_domain) { should be == 'mixers.rayo.org' }
         end
 
         context "with a root domain and mixers domain set" do
           let(:options) { { :root_domain => 'rayo.org', :mixers_domain => 'conferences.rayo.org' } }
 
           its(:root_domain)   { should be == 'rayo.org' }
-          its(:calls_domain)   { should be == 'calls.rayo.org' }
-          its(:mixers_domain)  { should be == 'conferences.rayo.org' }
+          its(:calls_domain)  { should be == 'calls.rayo.org' }
+          its(:mixers_domain) { should be == 'conferences.rayo.org' }
         end
       end
 
@@ -182,7 +182,7 @@ module Punchblock
             it 'should call the event handler with the event' do
               mock_event_handler.expects(:call).once.with do |event|
                 event.should be_instance_of Event::Offer
-                event.call_id.should be == '9f00061'
+                event.target_call_id.should be == '9f00061'
                 event.domain.should be == 'call.rayo.net'
               end
               handle_presence
@@ -259,7 +259,7 @@ module Punchblock
         end
 
         context "with a call command" do
-          let(:command)       { Command::Answer.new.tap { |a| a.call_id = 'abc123' } }
+          let(:command)       { Command::Answer.new.tap { |a| a.target_call_id = 'abc123' } }
           let(:expected_jid)  { 'abc123@calls.rayo.net' }
 
           it "should use the correct JID" do
@@ -268,7 +268,7 @@ module Punchblock
         end
 
         context "with a call component" do
-          let(:command)       { Component::Output.new :call_id => 'abc123' }
+          let(:command)       { Component::Output.new :target_call_id => 'abc123' }
           let(:expected_jid)  { 'abc123@calls.rayo.net' }
 
           it "should use the correct JID" do
@@ -277,7 +277,7 @@ module Punchblock
         end
 
         context "with a call component command" do
-          let(:command)       { Component::Stop.new :call_id => 'abc123', :component_id => 'foobar' }
+          let(:command)       { Component::Stop.new :target_call_id => 'abc123', :component_id => 'foobar' }
           let(:expected_jid)  { 'abc123@calls.rayo.net/foobar' }
 
           it "should use the correct JID" do
@@ -286,7 +286,7 @@ module Punchblock
         end
 
         context "with a mixer component" do
-          let(:command)       { Component::Output.new :mixer_name => 'abc123' }
+          let(:command)       { Component::Output.new :target_mixer_name => 'abc123' }
           let(:expected_jid)  { 'abc123@mixers.rayo.net' }
 
           it "should use the correct JID" do
@@ -295,7 +295,7 @@ module Punchblock
         end
 
         context "with a mixer component command" do
-          let(:command)       { Component::Stop.new :mixer_name => 'abc123', :component_id => 'foobar' }
+          let(:command)       { Component::Stop.new :target_mixer_name => 'abc123', :component_id => 'foobar' }
           let(:expected_jid)  { 'abc123@mixers.rayo.net/foobar' }
 
           it "should use the correct JID" do
@@ -303,6 +303,35 @@ module Punchblock
           end
         end
       end
+
+      describe "receiving events from a mixer" do
+        context "after joining the mixer" do
+          before do
+            subject.send(:client).expects :write_with_handler
+            subject.write Command::Join.new(:mixer_name => 'foomixer')
+          end
+
+          let :active_speaker_xml do
+            <<-MSG
+<presence to='16577@app.rayo.net/1' from='foomixer@mixers.rayo.net'>
+  <started-speaking xmlns="urn:xmpp:rayo:1" call-id="foocall"/>
+</presence>
+            MSG
+          end
+
+          let(:active_speaker_event) { import_stanza active_speaker_xml }
+
+          it "should tag those events with a mixer name, rather than a call ID" do
+            mock_event_handler.expects(:call).once.with do |event|
+              event.should be_instance_of Event::StartedSpeaking
+              event.target_mixer_name.should be == 'foomixer'
+              event.target_call_id.should be nil
+              event.domain.should be == 'mixers.rayo.net'
+            end
+            connection.__send__ :handle_presence, active_speaker_event
+          end
+        end
+      end
     end # describe XMPP
   end # XMPP
 end # Punchblock