punchblock 1.8.0 → 1.8.1

data/lib/punchblock/translator/freeswitch.rb

@@ -19,6 +19,8 @@ module Punchblock
 
       trap_exit :actor_died
 
+      finalizer :finalize
+
       def initialize(connection, media_engine = nil, default_voice = nil)
         @connection, @media_engine, @default_voice = connection, media_engine, default_voice
         @calls, @components = {}, {}
@@ -60,18 +62,18 @@ module Punchblock
           call = Call.new event[:unique_id], current_actor, event.content.select { |k,v| k.to_s =~ /variable/ }, stream, @media_engine, @default_voice
           link call
           register_call call
-          call.send_offer!
+          call.async.send_offer
         end
 
-        register_handler :es, [:has_key?, :other_leg_unique_id] => true do |event|
+        register_handler :es, :event_name => ['CHANNEL_BRIDGE', 'CHANNEL_UNBRIDGE'], [:has_key?, :other_leg_unique_id] => true do |event|
           call = call_with_id event[:other_leg_unique_id]
-          call.handle_es_event! event if call
+          call.async.handle_es_event event if call
           throw :pass
         end
 
         register_handler :es, lambda { |event| es_event_known_call? event } do |event|
           call = call_with_id event[:unique_id]
-          call.handle_es_event! event
+          call.async.handle_es_event event
         end
       end
 
@@ -113,7 +115,7 @@ module Punchblock
 
       def execute_call_command(command)
         if call = call_with_id(command.target_call_id)
-          call.execute_command! command
+          call.async.execute_command command
         else
           command.response = ProtocolError.new.setup :item_not_found, "Could not find a call with ID #{command.target_call_id}", command.target_call_id
         end
@@ -121,7 +123,7 @@ module Punchblock
 
       def execute_component_command(command)
         if (component = component_with_id(command.component_id))
-          component.execute_command! command
+          component.async.execute_command command
         else
           command.response = ProtocolError.new.setup :item_not_found, "Could not find a component with ID #{command.component_id}", command.target_call_id, command.component_id
         end
@@ -132,7 +134,7 @@ module Punchblock
         when Punchblock::Command::Dial
           call = Call.new_link Punchblock.new_uuid, current_actor, nil, stream, @media_engine, @default_voice
           register_call call
-          call.dial! command
+          call.async.dial command
         else
           command.response = ProtocolError.new.setup 'command-not-acceptable', "Did not understand command"
         end

data/lib/punchblock/translator/freeswitch/call.rb

@@ -128,9 +128,11 @@ module Punchblock
           @direction = :outbound
 
           cid_number, cid_name = dial_command.from, nil
-          dial_command.from.match(/(?<cid_name>.*)<(?<cid_number>.*)>/) do |m|
-            cid_name = m[:cid_name].strip
-            cid_number = m[:cid_number]
+          if dial_command.from
+            dial_command.from.match(/(?<cid_name>.*)<(?<cid_number>.*)>/) do |m|
+              cid_name = m[:cid_name].strip
+              cid_number = m[:cid_number]
+            end
           end
 
           options = {
@@ -246,7 +248,7 @@ module Punchblock
         def execute_component(type, command, *execute_args)
           type.new_link(command, current_actor).tap do |component|
             register_component component
-            component.execute!(*execute_args)
+            component.async.execute(*execute_args)
           end
         end
 

data/lib/punchblock/translator/freeswitch/component/input.rb

@@ -11,10 +11,9 @@ module Punchblock
           private
 
           def register_dtmf_event_handler
-            component = current_actor
             call.register_handler :es, :event_name => 'DTMF' do |event|
               safe_from_dead_actors do
-                component.process_dtmf! event[:dtmf_digit]
+                @recognizer << event[:dtmf_digit]
               end
             end
           end

data/lib/punchblock/translator/freeswitch/component/output.rb

@@ -9,7 +9,6 @@ module Punchblock
 
           def validate
             super
-            raise OptionError, "A voice value is unsupported." if @component_node.voice
             filenames
           end
 
@@ -36,7 +35,7 @@ module Punchblock
           def playback(path)
             op = current_actor
             register_handler :es, :event_name => 'CHANNEL_EXECUTE_COMPLETE' do |event|
-              op.send_complete_event! complete_reason_for_event(event)
+              op.async.send_complete_event complete_reason_for_event(event)
             end
             application 'playback', path
           end

data/lib/punchblock/translator/freeswitch/component/tts_output.rb

@@ -10,7 +10,7 @@ module Punchblock
           def do_output(engine, default_voice = nil)
             op = current_actor
             register_handler :es, :event_name => 'CHANNEL_EXECUTE_COMPLETE' do |event|
-              op.send_complete_event! success_reason
+              op.async.send_complete_event success_reason
             end
             voice = @component_node.voice || default_voice || 'kal'
             application :speak, [engine, voice, document].join('|')

data/lib/punchblock/translator/input_component.rb

@@ -3,19 +3,16 @@
 module Punchblock
   module Translator
     module InputComponent
-      def setup
-        @buffer = ""
-        @initial_timeout = @component_node.initial_timeout || -1
-        @inter_digit_timeout = @component_node.inter_digit_timeout || -1
-      end
-
       def execute
         validate
-        send_ref
 
-        @grammar = prepare_grammar
+        component = current_actor
+        @recognizer = DTMFRecognizer.new current_actor,
+                                         @component_node.grammar.value,
+                                         (@component_node.initial_timeout || -1),
+                                         (@component_node.inter_digit_timeout || -1)
 
-        begin_initial_timer @initial_timeout/1000 unless @initial_timeout == -1
+        send_ref
 
         @dtmf_handler_id = register_dtmf_event_handler
       rescue OptionError => e
@@ -23,16 +20,7 @@ module Punchblock
       end
 
       def process_dtmf(digit)
-        @buffer << digit
-        cancel_initial_timer
-        case (match = @grammar.match @buffer.dup)
-        when RubySpeech::GRXML::Match
-          complete success_reason(match)
-        when RubySpeech::GRXML::NoMatch
-          complete Punchblock::Component::Input::Complete::NoMatch.new
-        when RubySpeech::GRXML::PotentialMatch
-          reset_inter_digit_timer
-        end
+        @recognizer << digit
       end
 
       def execute_command(command)
@@ -45,62 +33,27 @@ module Punchblock
         end
       end
 
-      private
-
-      def validate
-        raise OptionError, 'A grammar document is required.' unless @component_node.grammar
-        raise OptionError, 'A mode value other than DTMF is unsupported.' unless @component_node.mode == :dtmf
-        raise OptionError, 'An initial timeout value that is negative (and not -1) is invalid.' unless @initial_timeout >= -1
-        raise OptionError, 'An inter-digit timeout value that is negative (and not -1) is invalid.' unless @inter_digit_timeout >= -1
-      end
-
-      def prepare_grammar
-        @component_node.grammar.value.clone.tap do |grammar|
-          grammar.inline!
-          grammar.tokenize!
-          grammar.normalize_whitespace
-        end
-      end
-
-      def begin_initial_timer(timeout)
-        @initial_timer = after timeout do
-          complete Punchblock::Component::Input::Complete::NoInput.new
-        end
+      def match(mode, confidence, utterance, interpretation)
+        complete Punchblock::Component::Input::Complete::Success.new(:mode => mode, :confidence => confidence, :utterance => utterance, :interpretation => interpretation)
       end
 
-      def cancel_initial_timer
-        return unless instance_variable_defined?(:@initial_timer) && @initial_timer
-        @initial_timer.cancel
-        @initial_timer = nil
+      def nomatch
+        complete Punchblock::Component::Input::Complete::NoMatch.new
       end
 
-      def reset_inter_digit_timer
-        return if @inter_digit_timeout == -1
-        @inter_digit_timer ||= begin
-          after @inter_digit_timeout/1000 do
-            complete Punchblock::Component::Input::Complete::NoMatch.new
-          end
-        end
-        @inter_digit_timer.reset
+      def noinput
+        complete Punchblock::Component::Input::Complete::NoInput.new
       end
 
-      def cancel_inter_digit_timer
-        return unless instance_variable_defined?(:@inter_digit_timer) && @inter_digit_timer
-        @inter_digit_timer.cancel
-        @inter_digit_timer = nil
-      end
+      private
 
-      def success_reason(match)
-        Punchblock::Component::Input::Complete::Success.new :mode           => match.mode,
-                                                            :confidence     => match.confidence,
-                                                            :utterance      => match.utterance,
-                                                            :interpretation => match.interpretation
+      def validate
+        raise OptionError, 'A grammar document is required.' unless @component_node.grammar
+        raise OptionError, 'A mode value other than DTMF is unsupported.' unless @component_node.mode == :dtmf
       end
 
       def complete(reason)
         unregister_dtmf_event_handler
-        cancel_initial_timer
-        cancel_inter_digit_timer
         send_complete_event reason
       end
     end

data/lib/punchblock/version.rb

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

data/punchblock.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.5"]
-  s.add_runtime_dependency %q<celluloid>, ["~> 0.12", ">= 0.12.4"]
+  s.add_runtime_dependency %q<celluloid>, ["~> 0.13"]
   s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1"]
   s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]

data/spec/punchblock/component/input_spec.rb

@@ -150,7 +150,7 @@ module Punchblock
         describe '#stop_action' do
           subject { command.stop_action }
 
-          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
+          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:ext:1"/>' }
           its(:component_id) { should be == 'abc123' }
           its(:target_call_id) { should be == '123abc' }
         end

data/spec/punchblock/component/output_spec.rb

@@ -70,6 +70,36 @@ module Punchblock
         its(:voice)            { should be == 'allison' }
         its(:renderer)         { should be == 'swift' }
         its(:text)             { should be == 'Hello world' }
+
+        context "with SSML" do
+          let :stanza do
+            <<-MESSAGE
+<output xmlns='urn:xmpp:rayo:output:1'
+        interrupt-on='speech'
+        start-offset='2000'
+        start-paused='false'
+        repeat-interval='2000'
+        repeat-times='10'
+        max-time='30000'
+        voice='allison'
+        renderer='swift'>
+  <speak version="1.0"
+        xmlns="http://www.w3.org/2001/10/synthesis"
+        xml:lang="en-US">
+    <say-as interpret-as="ordinal">100</say-as>
+  </speak>
+</output>
+            MESSAGE
+          end
+
+          def ssml_doc(mode = :ordinal)
+            RubySpeech::SSML.draw do
+              say_as(:interpret_as => mode) { string '100' }
+            end
+          end
+
+          its(:ssml) { should be == ssml_doc }
+        end
       end
 
       describe "for text" do
@@ -82,7 +112,7 @@ module Punchblock
       describe "for SSML" do
         def ssml_doc(mode = :ordinal)
           RubySpeech::SSML.draw do
-            say_as(:interpret_as => mode) { 100 }
+            say_as(:interpret_as => mode) { string '100' }
           end
         end
 
@@ -93,7 +123,7 @@ module Punchblock
         its(:ssml) { should be == ssml_doc }
 
         describe "comparison" do
-          let(:output2) { Output.new :ssml => '<speak xmlns="http://www.w3.org/2001/10/synthesis" version="1.0" xml:lang="en-US"><say-as interpret-as="ordinal"/></speak>', :voice => 'kate'  }
+          let(:output2) { Output.new :ssml => '<speak xmlns="http://www.w3.org/2001/10/synthesis" version="1.0" xml:lang="en-US"><say-as interpret-as="ordinal">100</say-as></speak>', :voice => 'kate'  }
           let(:output3) { Output.new :ssml => ssml_doc, :voice => 'kate'  }
           let(:output4) { Output.new :ssml => ssml_doc(:normal), :voice => 'kate'  }
 
@@ -204,7 +234,7 @@ module Punchblock
         describe '#stop_action' do
           subject { command.stop_action }
 
-          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
+          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:ext:1"/>' }
           its(:component_id) { should be == 'abc123' }
           its(:target_call_id) { should be == '123abc' }
         end

data/spec/punchblock/component/record_spec.rb

@@ -209,7 +209,7 @@ module Punchblock
         describe '#stop_action' do
           subject { command.stop_action }
 
-          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:1"/>' }
+          its(:to_xml) { should be == '<stop xmlns="urn:xmpp:rayo:ext:1"/>' }
           its(:component_id) { should be == 'abc123' }
           its(:target_call_id) { should be == '123abc' }
         end

data/spec/punchblock/connection/asterisk_spec.rb

@@ -49,14 +49,14 @@ module Punchblock
         end
 
         it 'shuts down the translator' do
-          subject.translator.should_receive(:shutdown!).once
+          subject.translator.async.should_receive(:shutdown).once
           subject.stop
         end
       end
 
       it 'sends events from RubyAMI to the translator' do
         event = mock 'RubyAMI::Event'
-        subject.translator.should_receive(:handle_ami_event!).once.with event
+        subject.translator.async.should_receive(:handle_ami_event).once.with event
         subject.ami_client.handle_event event
       end
 
@@ -64,7 +64,7 @@ module Punchblock
         it 'sends a command to the translator' do
           command = mock 'Command'
           options = {:foo => :bar}
-          subject.translator.should_receive(:execute_command!).once.with command, options
+          subject.translator.async.should_receive(:execute_command).once.with command, options
           subject.write command, options
         end
       end

data/spec/punchblock/connection/freeswitch_spec.rb

@@ -63,7 +63,8 @@ module Punchblock
 
       it 'sends events from RubyFS to the translator' do
         event = mock 'RubyFS::Event'
-        subject.translator.should_receive(:handle_es_event!).once.with event
+        subject.translator.async.should_receive(:handle_es_event).once.with event
+        subject.translator.async.should_receive(:handle_es_event).once.with RubyFS::Stream::Disconnected.new
         subject.stream.fire_event event
       end
 
@@ -71,7 +72,7 @@ module Punchblock
         it 'sends a command to the translator' do
           command = mock 'Command'
           options = {:foo => :bar}
-          subject.translator.should_receive(:execute_command!).once.with command, options
+          subject.translator.async.should_receive(:execute_command).once.with command, options
           subject.write command, options
         end
       end

data/spec/punchblock/connection/xmpp_spec.rb

@@ -64,10 +64,11 @@ module Punchblock
       end
 
       it 'should properly set the Blather logger' do
+        old_logger = Punchblock.logger
         Punchblock.logger = :foo
         XMPP.new :username => '1@call.rayo.net', :password => 1
         Blather.logger.should be :foo
-        Punchblock.reset_logger
+        Punchblock.logger = old_logger
       end
 
       it "looking up original command by command ID" do
@@ -232,17 +233,28 @@ module Punchblock
         let(:example_error) { import_stanza error_xml }
         let(:cmd) { Component::Output.new }
 
-        before(:all) do
+        before do
           cmd.request!
           connection.__send__ :handle_error, example_error, cmd
         end
 
         subject { cmd.response }
 
-        its(:call_id)       { should be == call_id }
-        its(:component_id)  { should be == component_id }
-        its(:name)          { should be == :item_not_found }
-        its(:text)          { should be == 'Could not find call [id=f6d437f4-1e18-457b-99f8-b5d853f50347]' }
+        it "should have the correct call ID" do
+          subject.call_id.should be == call_id
+        end
+
+        it "should have the correct component ID" do
+          subject.component_id.should be == component_id
+        end
+
+        it "should have the correct name" do
+          subject.name.should be == :item_not_found
+        end
+
+        it "should have the correct text" do
+          subject.text.should be == 'Could not find call [id=f6d437f4-1e18-457b-99f8-b5d853f50347]'
+        end
       end
 
       describe "#prep_command_for_execution" do

data/spec/punchblock/translator/asterisk/call_spec.rb

@@ -7,7 +7,7 @@ module Punchblock
     class Asterisk
       describe Call do
         let(:channel)         { 'SIP/foo' }
-        let(:translator)      { stub('Translator::Asterisk').as_null_object }
+        let(:translator)      { Asterisk.new stub('AMI Client').as_null_object, stub('connection').as_null_object }
         let(:agi_env) do
           {
             :agi_request      => 'async',
@@ -65,6 +65,8 @@ module Punchblock
         its(:translator)  { should be translator }
         its(:agi_env)     { should be == agi_env }
 
+        before { translator.stub :handle_pb_event }
+
         describe '#shutdown' do
           it 'should terminate the actor' do
             subject.shutdown
@@ -170,7 +172,7 @@ module Punchblock
                                                                                  :variable    => "punchblock_call_id=#{subject.id}"
                                                                                }).tap { |a| a.request! }
 
-            translator.should_receive(:execute_global_command!).once.with expected_action
+            translator.async.should_receive(:execute_global_command).once.with expected_action
             subject.dial dial_command
           end
 
@@ -188,7 +190,7 @@ module Punchblock
                                                                                    :variable    => "punchblock_call_id=#{subject.id}"
                                                                                  }).tap { |a| a.request! }
 
-              translator.should_receive(:execute_global_command!).once.with expected_action
+              translator.async.should_receive(:execute_global_command).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -210,7 +212,7 @@ module Punchblock
                                                                                    :timeout     => 10000
                                                                                  }).tap { |a| a.request! }
 
-              translator.should_receive(:execute_global_command!).once.with expected_action
+              translator.async.should_receive(:execute_global_command).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -231,7 +233,7 @@ module Punchblock
                                                                                    :variable    => "punchblock_call_id=#{subject.id},SIPADDHEADER51=\"X-foo: bar\",SIPADDHEADER52=\"X-doo: dah\""
                                                                                  }).tap { |a| a.request! }
 
-              translator.should_receive(:execute_global_command!).once.with expected_action
+              translator.async.should_receive(:execute_global_command).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -302,6 +304,20 @@ module Punchblock
               subject.process_ami_event ami_event
             end
 
+            it "should not allow commands to be executed while components are shutting down" do
+              comp_command = Punchblock::Component::Input.new :grammar => {:value => '<grammar/>'}, :mode => :dtmf
+              comp_command.request!
+              component = subject.execute_command comp_command
+              comp_command.response(0.1).should be_a Ref
+
+              subject.async.process_ami_event ami_event
+
+              comp_command = Punchblock::Component::Input.new :grammar => {:value => '<grammar/>'}, :mode => :dtmf
+              comp_command.request!
+              subject.execute_command comp_command
+              comp_command.response(0.1).should == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+            end
+
             context "with an undefined cause" do
               let(:cause)     { '0' }
               let(:cause_txt) { 'Undefined' }
@@ -429,7 +445,7 @@ module Punchblock
           context 'with an event for a known AGI command component' do
             let(:mock_component_node) { mock 'Punchblock::Component::Asterisk::AGI::Command', :name => 'EXEC ANSWER', :params_array => [] }
             let :component do
-              Component::Asterisk::AGICommand.new mock_component_node, subject.translator
+              Component::Asterisk::AGICommand.new mock_component_node, subject
             end
 
             let(:ami_event) do
@@ -579,24 +595,54 @@ module Punchblock
                 e['Privilege'] = "call,all"
                 e['Response'] = "Success"
                 e['Channel1']  = "SIP/foo"
-                e['Channel2']  = "SIP/5678-00000000"
+                e['Channel2']  = other_channel
               end
             end
 
             let(:other_channel) { 'SIP/5678-00000000' }
-            let(:other_call_id) { 'def567' }
-            let :command do
-              Punchblock::Command::Join.new :call_id => other_call_id
-            end
 
-            before do
-              subject.pending_joins[other_channel] = command
-              command.request!
+            context "when a join has been executed against another call" do
+              let :other_call do
+                Call.new other_channel, translator
+              end
+
+              let(:other_call_id) { other_call.id }
+              let :command do
+                Punchblock::Command::Join.new :call_id => other_call_id
+              end
+
+              before do
+                translator.register_call other_call
+                command.request!
+                subject.execute_command command
+              end
+
+              it 'retrieves and sets success on the correct Join' do
+                subject.process_ami_event ami_event
+                command.response(0.5).should be == true
+              end
+
+              context "with the channel names reversed" do
+                let :ami_event do
+                  RubyAMI::Event.new('BridgeExec').tap do |e|
+                    e['Privilege'] = "call,all"
+                    e['Response'] = "Success"
+                    e['Channel1']  = other_channel
+                    e['Channel2']  = "SIP/foo"
+                  end
+                end
+
+                it 'retrieves and sets success on the correct Join' do
+                  subject.process_ami_event ami_event
+                  command.response(0.5).should be == true
+                end
+              end
             end
 
-            it 'retrieves and sets success on the correct Join' do
-              subject.process_ami_event ami_event
-              command.response(0.5).should be == true
+            context "with no matching join command" do
+              it "should do nothing" do
+                expect { subject.process_ami_event ami_event }.not_to raise_error
+              end
             end
           end
 
@@ -859,12 +905,12 @@ module Punchblock
               Punchblock::Component::Asterisk::AGI::Command.new :name => 'Answer'
             end
 
-            let(:mock_action) { mock 'Component::Asterisk::AGI::Command', :id => 'foo' }
+            let(:mock_action) { Translator::Asterisk::Component::Asterisk::AGICommand.new(command, subject) }
 
             it 'should create an AGI command component actor and execute it asynchronously' do
               mock_action.should_receive(:internal=).never
               Component::Asterisk::AGICommand.should_receive(:new_link).once.with(command, subject).and_return mock_action
-              mock_action.should_receive(:execute!).once
+              mock_action.async.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -874,12 +920,12 @@ module Punchblock
               Punchblock::Component::Output.new
             end
 
-            let(:mock_action) { mock 'Component::Asterisk::Output', :id => 'foo' }
+            let(:mock_action) { Translator::Asterisk::Component::Output.new(command, subject) }
 
             it 'should create an Output component and execute it asynchronously' do
               Component::Output.should_receive(:new_link).once.with(command, subject).and_return mock_action
               mock_action.should_receive(:internal=).never
-              mock_action.should_receive(:execute!).once
+              mock_action.async.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -889,12 +935,12 @@ module Punchblock
               Punchblock::Component::Input.new
             end
 
-            let(:mock_action) { mock 'Component::Asterisk::Input', :id => 'foo' }
+            let(:mock_action) { Translator::Asterisk::Component::Input.new(command, subject) }
 
             it 'should create an Input component and execute it asynchronously' do
               Component::Input.should_receive(:new_link).once.with(command, subject).and_return mock_action
               mock_action.should_receive(:internal=).never
-              mock_action.should_receive(:execute!).once
+              mock_action.async.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -904,12 +950,12 @@ module Punchblock
               Punchblock::Component::Record.new
             end
 
-            let(:mock_action) { mock 'Component::Asterisk::Record', :id => 'foo' }
+            let(:mock_action) { Translator::Asterisk::Component::Record.new(command, subject) }
 
             it 'should create a Record component and execute it asynchronously' do
               Component::Record.should_receive(:new_link).once.with(command, subject).and_return mock_action
               mock_action.should_receive(:internal=).never
-              mock_action.should_receive(:execute!).once
+              mock_action.async.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -974,6 +1020,18 @@ module Punchblock
                 subject.execute_command subsequent_command
                 subsequent_command.response.should be == ProtocolError.new.setup(:item_not_found, "Could not find a component with ID #{comp_id} for call #{subject.id}", subject.id, comp_id)
               end
+
+              context "when we dispatch the command to it" do
+                it 'sends an error in response to the command' do
+                  component = subject.component_with_id comp_id
+
+                  component.should_receive(:execute_command).and_raise(Celluloid::DeadActorError)
+
+                  subsequent_command.request!
+                  subject.execute_command subsequent_command
+                  subsequent_command.response.should be == ProtocolError.new.setup(:item_not_found, "Could not find a component with ID #{comp_id} for call #{subject.id}", subject.id, comp_id)
+                end
+              end
             end
 
             context "for an unknown component ID" do
@@ -1015,12 +1073,6 @@ module Punchblock
               agi_command.name.should be == "EXEC Bridge"
               agi_command.params_array.should be == [other_channel]
             end
-
-            it "adds the join to the @pending_joins hash" do
-              translator.should_receive(:call_with_id).with(other_call_id).and_return(other_call)
-              subject.execute_command command
-              subject.pending_joins[other_channel].should be command
-            end
           end
 
           context "with an unjoin command" do