punchblock 2.1.1 → 2.2.0

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

@@ -20,7 +20,7 @@ module Punchblock
           end
 
           def document
-            @component_node.render_documents.first.value.to_s
+            concatenated_render_doc.to_s
           end
         end
       end

data/lib/punchblock/version.rb

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

data/spec/punchblock/component/input_spec.rb

@@ -166,6 +166,10 @@ module Punchblock
             it { should be == grammar2 }
             it { should_not be == grammar3 }
           end
+
+          it "has children nested inside" do
+            subject.to_rayo.children.first.should be_a Nokogiri::XML::CDATA
+          end
         end
 
         describe 'with a grammar reference by URL' do
@@ -186,6 +190,14 @@ module Punchblock
             end
           end
         end
+
+        describe "with a CPA grammar" do
+          subject { Input::Grammar.new url: "urn:xmpp:rayo:cpa:beep:1" }
+
+          it "has no children" do
+            subject.to_rayo.children.count.should == 0
+          end
+        end
       end
 
       describe "actions" do
@@ -378,6 +390,85 @@ module Punchblock
 
         its(:name) { should be == :noinput }
       end
+
+      describe Input::Signal do
+        let :stanza do
+          <<-MESSAGE
+<signal xmlns="urn:xmpp:rayo:cpa:1" type="urn:xmpp:rayo:cpa:beep:1" duration="1000" value="8000"/>
+          MESSAGE
+        end
+
+        subject { RayoNode.from_xml(parse_stanza(stanza).root) }
+
+        it { should be_instance_of Input::Signal }
+
+        its(:name)      { should be == :signal }
+        its(:type)      { should be == 'urn:xmpp:rayo:cpa:beep:1' }
+        its(:duration)  { should be == 1000 }
+        its(:value)     { should be == '8000' }
+
+        describe "when creating from options" do
+          subject do
+            Input::Signal.new type: 'urn:xmpp:rayo:cpa:beep:1', duration: 1000, value: '8000'
+          end
+
+          its(:name)      { should be == :signal }
+          its(:type)      { should be == 'urn:xmpp:rayo:cpa:beep:1' }
+          its(:duration)  { should be == 1000 }
+          its(:value)     { should be == '8000' }
+        end
+
+        context "when in a complete event" do
+          let :stanza do
+            <<-MESSAGE
+<complete xmlns='urn:xmpp:rayo:ext:1'>
+  <signal xmlns="urn:xmpp:rayo:cpa:1" type="urn:xmpp:rayo:cpa:beep:1" duration="1000" value="8000"/>
+</complete>
+            MESSAGE
+          end
+
+          subject { RayoNode.from_xml(parse_stanza(stanza).root).reason }
+
+          it { should be_instance_of Input::Signal }
+
+          its(:name)      { should be == :signal }
+          its(:type)      { should be == 'urn:xmpp:rayo:cpa:beep:1' }
+          its(:duration)  { should be == 1000 }
+          its(:value)     { should be == '8000' }
+        end
+
+        describe "comparison" do
+          context "with the same options" do
+            it "should be equal" do
+              subject.should == RayoNode.from_xml(parse_stanza(stanza).root)
+            end
+          end
+
+          context "with different type" do
+            let(:other_stanza) { '<signal xmlns="urn:xmpp:rayo:cpa:1" type="urn:xmpp:rayo:cpa:ring:1" duration="1000" value="8000"/>' }
+
+            it "should not be equal" do
+              subject.should_not == RayoNode.from_xml(parse_stanza(other_stanza).root)
+            end
+          end
+
+          context "with different duration" do
+            let(:other_stanza) { '<signal xmlns="urn:xmpp:rayo:cpa:1" type="urn:xmpp:rayo:cpa:beep:1" duration="100" value="8000"/>' }
+
+            it "should not be equal" do
+              subject.should_not == RayoNode.from_xml(parse_stanza(other_stanza).root)
+            end
+          end
+
+          context "with different value" do
+            let(:other_stanza) { '<signal xmlns="urn:xmpp:rayo:cpa:1" type="urn:xmpp:rayo:cpa:beep:1" duration="1000" value="7000"/>' }
+
+            it "should not be equal" do
+              subject.should_not == RayoNode.from_xml(parse_stanza(other_stanza).root)
+            end
+          end
+        end
+      end
     end
   end
 end # Punchblock

data/spec/punchblock/component/output_spec.rb

@@ -12,7 +12,7 @@ module Punchblock
       describe 'default values' do
         its(:interrupt_on)     { should be nil }
         its(:start_offset)     { should be nil }
-        its(:start_paused)     { should be false }
+        its(:start_paused)     { should be nil }
         its(:repeat_interval)  { should be nil }
         its(:repeat_times)     { should be nil }
         its(:max_time)         { should be nil }
@@ -84,7 +84,6 @@ module Punchblock
 
           describe "exporting to Rayo" do
             it "should export to XML that can be understood by its parser" do
-              puts subject.to_rayo.to_xml
               new_instance = RayoNode.from_xml Nokogiri::XML(subject.to_rayo.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root
               new_instance.render_documents.should be == [Output::Document.new(content_type: 'text/uri-list', value: ['http://example.com/hello.mp3'])]
             end

data/spec/punchblock/component/receive_fax_spec.rb

@@ -0,0 +1,111 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Punchblock
+  module Component
+    describe ReceiveFax do
+      it 'registers itself' do
+        RayoNode.class_from_registration(:receivefax, 'urn:xmpp:rayo:fax:1').should be == described_class
+      end
+
+      describe "exporting to Rayo" do
+        it "should export to XML that can be understood by its parser" do
+          new_instance = RayoNode.from_xml subject.to_rayo
+          new_instance.should be_instance_of described_class
+        end
+
+        it "should render to a parent node if supplied" do
+          doc = Nokogiri::XML::Document.new
+          parent = Nokogiri::XML::Node.new 'foo', doc
+          doc.root = parent
+          rayo_doc = subject.to_rayo(parent)
+          rayo_doc.should == parent
+        end
+      end
+
+      describe "from a stanza" do
+        let :stanza do
+          <<-MESSAGE
+<receivefax xmlns="urn:xmpp:rayo:fax:1"/>
+          MESSAGE
+        end
+
+        subject { RayoNode.from_xml parse_stanza(stanza).root, '9f00061', '1' }
+
+        it { should be_instance_of described_class }
+      end
+
+      describe "actions" do
+        let(:mock_client) { double 'Client' }
+        let(:command) { described_class.new }
+
+        before do
+          command.component_id = 'abc123'
+          command.target_call_id = '123abc'
+          command.client = mock_client
+        end
+
+        describe '#stop_action' do
+          subject { command.stop_action }
+
+          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
+
+        describe '#stop!' do
+          describe "when the command is executing" do
+            before do
+              command.request!
+              command.execute!
+            end
+
+            it "should send its command properly" do
+              mock_client.should_receive(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
+              command.stop!
+            end
+          end
+
+          describe "when the command is not executing" do
+            it "should raise an error" do
+              lambda { command.stop! }.should raise_error(InvalidActionError, "Cannot stop a ReceiveFax that is new")
+            end
+          end
+        end
+      end
+
+      describe ReceiveFax::Complete::Finish do
+        let :stanza do
+          <<-MESSAGE
+<complete xmlns='urn:xmpp:rayo:ext:1'>
+  <finish xmlns='urn:xmpp:rayo:fax:complete:1'/>
+  <fax xmlns='urn:xmpp:rayo:fax:complete:1' url='http://shakespere.lit/faxes/fax1.tiff' resolution='595x841' size='12287492817' pages='3'/>
+  <metadata xmlns='urn:xmpp:rayo:fax:complete:1' name="fax-transfer-rate" value="10000" />
+  <metadata xmlns='urn:xmpp:rayo:fax:complete:1' name="foo" value="true" />
+</complete>
+          MESSAGE
+        end
+
+        subject(:complete_node) { RayoNode.from_xml(parse_stanza(stanza).root) }
+
+        it "should understand a finish reason" do
+          subject.reason.should be_instance_of ReceiveFax::Complete::Finish
+        end
+
+        describe "should make the fax data available" do
+          subject { complete_node.fax }
+
+          it { should be_instance_of ReceiveFax::Fax }
+
+          its(:url)         { should be == 'http://shakespere.lit/faxes/fax1.tiff' }
+          its(:resolution)  { should be == '595x841' }
+          its(:pages)       { should be == 3 }
+          its(:size)        { should be == 12287492817 }
+        end
+
+        its(:fax_metadata) { should == {'fax-transfer-rate' => '10000', 'foo' => 'true'} }
+      end
+    end
+  end
+end

data/spec/punchblock/component/send_fax_spec.rb

@@ -0,0 +1,110 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+module Punchblock
+  module Component
+    describe SendFax do
+      it 'registers itself' do
+        RayoNode.class_from_registration(:sendfax, 'urn:xmpp:rayo:fax:1').should be == described_class
+      end
+
+      subject do
+        SendFax.new render_documents: [SendFax::FaxDocument.new(url: 'http://example.com/faxes/document.tiff', pages: [1..4,5,7..9])]
+      end
+
+      its(:render_documents) { should be == [SendFax::FaxDocument.new(url: 'http://example.com/faxes/document.tiff', pages: [1..4,5,7..9])] }
+
+      describe "exporting to Rayo" do
+        it "should export to XML that can be understood by its parser" do
+          new_instance = RayoNode.from_xml Nokogiri::XML(subject.to_rayo.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root
+          new_instance.render_documents.should be == [SendFax::FaxDocument.new(url: 'http://example.com/faxes/document.tiff', pages: [1..4,5,7..9])]
+        end
+      end
+
+      context "without optional attributes" do
+        subject do
+          SendFax.new render_documents: [SendFax::FaxDocument.new(url: 'http://example.com/faxes/document.tiff')]
+        end
+
+        describe "exporting to Rayo" do
+          it "should export to XML that can be understood by its parser" do
+            new_instance = RayoNode.from_xml Nokogiri::XML(subject.to_rayo.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root
+            new_instance.render_documents.should be == [SendFax::FaxDocument.new(url: 'http://example.com/faxes/document.tiff')]
+          end
+        end
+      end
+
+      context "from a rayo stanza" do
+
+        subject { RayoNode.from_xml parse_stanza(stanza).root, '9f00061', '1' }
+
+        let :stanza do
+            <<-MESSAGE
+<sendfax xmlns='urn:xmpp:rayo:fax:1'>
+  <document xmlns='urn:xmpp:rayo:fax:1' url='http://shakespere.lit/my_fax.tiff' identity='+14045555555' header='Hello world' pages='1-4,5,7-9'/>
+</sendfax>
+            MESSAGE
+        end
+
+        its(:render_documents) { should be == [SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555555', header: 'Hello world', pages: [1..4,5,7..9])] }
+
+        context "without optional attributes" do
+          let :stanza do
+              <<-MESSAGE
+<sendfax xmlns='urn:xmpp:rayo:fax:1'>
+  <document xmlns='urn:xmpp:rayo:fax:1' url='http://shakespere.lit/my_fax.tiff'/>
+</sendfax>
+              MESSAGE
+          end
+
+          its(:render_documents) { should be == [SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff')] }
+        end
+      end
+    end
+
+    describe SendFax::FaxDocument do
+      it "registers itself" do
+        RayoNode.class_from_registration(:document, 'urn:xmpp:rayo:fax:1').should be == described_class
+      end
+
+      subject { SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555555', header: 'Hello world', pages: [1..4,5,7..9]) }
+
+      its(:url)       { should == 'http://shakespere.lit/my_fax.tiff' }
+      its(:identity)  { should == '+14045555555' }
+      its(:header)    { should == 'Hello world' }
+      its(:pages)     { should == [1..4,5,7..9] }
+
+      context "without optional attributes" do
+        subject { SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff') }
+
+        its(:url)       { should == 'http://shakespere.lit/my_fax.tiff' }
+        its(:identity)  { should be_nil }
+        its(:header)    { should be_nil }
+        its(:pages)     { should be_nil }
+      end
+
+      describe "comparison" do
+        it "should be the same with the same attributes" do
+          should be == SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555555', header: 'Hello world', pages: [1..4,5,7..9])
+        end
+
+        it "should be different with a different url" do
+          should_not be == SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_other_fax.tiff', identity: '+14045555555', header: 'Hello world', pages: [1..4,5,7..9])
+        end
+
+        it "should be different with a different identity" do
+          should_not be == SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555556', header: 'Hello world', pages: [1..4,5,7..9])
+        end
+
+        it "should be different with a different header" do
+          should_not be == SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555555', header: 'Hello Paul', pages: [1..4,5,7..9])
+        end
+
+        it "should be different with a different pages" do
+          should_not be == SendFax::FaxDocument.new(url: 'http://shakespere.lit/my_fax.tiff', identity: '+14045555555', header: 'Hello world', pages: [1..4,5,6..9])
+        end
+      end
+    end
+  end
+end

data/spec/punchblock/connection/asterisk_spec.rb

@@ -60,7 +60,7 @@ module Punchblock
         end
 
         it 'shuts down the translator' do
-          subject.translator.async.should_receive(:shutdown).once
+          subject.translator.should_receive(:terminate).once
           subject.stop
         end
       end

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

@@ -69,14 +69,6 @@ module Punchblock
 
         before { translator.stub :handle_pb_event }
 
-        describe '#shutdown' do
-          it 'should terminate the actor' do
-            subject.shutdown
-            sleep 0.5
-            subject.should_not be_alive
-          end
-        end
-
         describe '#register_component' do
           it 'should make the component accessible by ID' do
             component_id = 'abc123'
@@ -123,15 +115,15 @@ module Punchblock
         describe '#send_progress' do
           context "with a call that is already answered" do
             it 'should not send the EXEC Progress command' do
-              subject.wrapped_object.should_receive(:'answered?').and_return true
-              subject.wrapped_object.should_receive(:execute_agi_command).with("EXEC Progress").never
+              subject.should_receive(:'answered?').and_return true
+              subject.should_receive(:execute_agi_command).with("EXEC Progress").never
               subject.send_progress
             end
           end
 
           context "with an unanswered call" do
             before do
-              subject.wrapped_object.should_receive(:'answered?').at_least(:once).and_return(false)
+              subject.should_receive(:'answered?').at_least(:once).and_return(false)
             end
 
             context "with a call that is outbound" do
@@ -143,7 +135,7 @@ module Punchblock
               end
 
               it 'should not send the EXEC Progress command' do
-                subject.wrapped_object.should_receive(:execute_agi_command).with("EXEC Progress").never
+                subject.should_receive(:execute_agi_command).with("EXEC Progress").never
                 subject.send_progress
               end
             end
@@ -154,12 +146,12 @@ module Punchblock
               end
 
               it 'should send the EXEC Progress command to a call that is inbound and not answered' do
-                subject.wrapped_object.should_receive(:execute_agi_command).with("EXEC Progress").and_return code: 200, result: 0
+                subject.should_receive(:execute_agi_command).with("EXEC Progress").and_return code: 200, result: 0
                 subject.send_progress
               end
 
               it 'should send the EXEC Progress command only once if called twice' do
-                subject.wrapped_object.should_receive(:execute_agi_command).with("EXEC Progress").once.and_return code: 200, result: 0
+                subject.should_receive(:execute_agi_command).with("EXEC Progress").once.and_return code: 200, result: 0
                 subject.send_progress
                 subject.send_progress
               end
@@ -276,7 +268,7 @@ module Punchblock
             subject.dial dial_command
             accept_command = Command::Accept.new
             accept_command.request!
-            subject.wrapped_object.should_receive(:execute_agi_command).never
+            subject.should_receive(:execute_agi_command).never
             subject.execute_command accept_command
             accept_command.response(0.5).should be true
           end
@@ -297,13 +289,6 @@ module Punchblock
             let(:cause)     { '16' }
             let(:cause_txt) { 'Normal Clearing' }
 
-            it "should cause the actor to be terminated" do
-              translator.should_receive(:handle_pb_event).twice
-              subject.process_ami_event ami_event
-              Celluloid::Actor.join(subject, 1)
-              subject.should_not be_alive
-            end
-
             it "de-registers the call from the translator" do
               translator.stub :handle_pb_event
               translator.should_receive(:deregister_call).once.with(subject.id, subject.channel)
@@ -334,7 +319,7 @@ module Punchblock
               component = subject.execute_command comp_command
               comp_command.response(0.1).should be_a Ref
 
-              subject.async.process_ami_event ami_event
+              subject.process_ami_event ami_event
 
               comp_command = Punchblock::Component::Input.new :grammar => {:value => '<grammar root="foo"><rule id="foo"/></grammar>'}, :mode => :dtmf
               comp_command.request!
@@ -657,7 +642,7 @@ module Punchblock
               before do
                 translator.register_call other_call
                 command.request!
-                subject.wrapped_object.should_receive(:execute_agi_command).and_return code: 200
+                subject.should_receive(:execute_agi_command).and_return code: 200
                 subject.execute_command command
               end
 
@@ -860,6 +845,15 @@ module Punchblock
             subject.process_ami_event ami_event
           end
 
+          context "when the event doesn't pass the filter" do
+            before { Asterisk.event_filter = ->(event) { false } }
+            after { Asterisk.event_filter = nil }
+
+            it 'does not send the AMI event to the connection as a PB event' do
+              translator.should_receive(:handle_pb_event).never
+              subject.process_ami_event ami_event
+            end
+          end
         end
 
         describe '#execute_command' do
@@ -871,7 +865,7 @@ module Punchblock
             let(:command) { Command::Accept.new }
 
             it "should send an EXEC RINGING AGI command and set the command's response" do
-              subject.wrapped_object.should_receive(:execute_agi_command).with('EXEC RINGING').and_return code: 200
+              subject.should_receive(:execute_agi_command).with('EXEC RINGING').and_return code: 200
               subject.execute_command command
               command.response(0.5).should be true
             end
@@ -880,7 +874,7 @@ module Punchblock
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
 
-              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+              before { subject.should_receive(:execute_agi_command).and_raise error }
 
               it "should return an error with the message" do
                 subject.execute_command command
@@ -903,7 +897,7 @@ module Punchblock
 
             it "with a :busy reason should send an EXEC Busy AGI command and set the command's response" do
               command.reason = :busy
-              subject.wrapped_object.should_receive(:execute_agi_command).with('EXEC Busy').and_return code: 200
+              subject.should_receive(:execute_agi_command).with('EXEC Busy').and_return code: 200
               subject.execute_command command
               command.response(0.5).should be true
             end
@@ -917,7 +911,7 @@ module Punchblock
 
             it "with an :error reason should send an EXEC Congestion AGI command and set the command's response" do
               command.reason = :error
-              subject.wrapped_object.should_receive(:execute_agi_command).with('EXEC Congestion').and_return code: 200
+              subject.should_receive(:execute_agi_command).with('EXEC Congestion').and_return code: 200
               subject.execute_command command
               command.response(0.5).should be true
             end
@@ -926,7 +920,7 @@ module Punchblock
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
 
-              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+              before { subject.should_receive(:execute_agi_command).and_raise error }
 
               it "should return an error with the message" do
                 subject.execute_command command
@@ -948,13 +942,13 @@ module Punchblock
             let(:command) { Command::Answer.new }
 
             it "should send an ANSWER AGI command and set the command's response" do
-              subject.wrapped_object.should_receive(:execute_agi_command).with('ANSWER').and_return code: 200
+              subject.should_receive(:execute_agi_command).with('ANSWER').and_return code: 200
               subject.execute_command command
               command.response(0.5).should be true
             end
 
             it "should be answered" do
-              subject.wrapped_object.should_receive(:execute_agi_command)
+              subject.should_receive(:execute_agi_command)
               subject.execute_command command
               subject.should be_answered
             end
@@ -963,7 +957,7 @@ module Punchblock
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
 
-              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+              before { subject.should_receive(:execute_agi_command).and_raise error }
 
               it "should return an error with the message" do
                 subject.execute_command command
@@ -1042,7 +1036,7 @@ module Punchblock
             before { translator.should_receive(:call_with_id).with(other_call_id).and_return(other_call) }
 
             it "executes the proper dialplan Bridge application" do
-              subject.wrapped_object.should_receive(:execute_agi_command).with('EXEC Bridge', "#{other_channel},F(#{REDIRECT_CONTEXT},#{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY})").and_return code: 200
+              subject.should_receive(:execute_agi_command).with('EXEC Bridge', "#{other_channel},F(#{REDIRECT_CONTEXT},#{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY})").and_return code: 200
               subject.execute_command command
             end
 
@@ -1050,7 +1044,7 @@ module Punchblock
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
 
-              before { subject.wrapped_object.should_receive(:execute_agi_command).and_raise error }
+              before { subject.should_receive(:execute_agi_command).and_raise error }
 
               it "should return an error with the message" do
                 subject.execute_command command
@@ -1156,11 +1150,10 @@ module Punchblock
               Punchblock::Component::Asterisk::AGI::Command.new :name => 'Answer'
             end
 
-            let(:mock_action) { Translator::Asterisk::Component::Asterisk::AGICommand.new(command, subject) }
-
             it 'should create an AGI command component actor and execute it asynchronously' do
-              Component::Asterisk::AGICommand.should_receive(:new_link).once.with(command, subject).and_return mock_action
-              mock_action.async.should_receive(:execute).once
+              mock_action = Translator::Asterisk::Component::Asterisk::AGICommand.new(command, subject)
+              Component::Asterisk::AGICommand.should_receive(:new).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -1170,11 +1163,10 @@ module Punchblock
               Punchblock::Component::Output.new
             end
 
-            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.async.should_receive(:execute).once
+              mock_action = Translator::Asterisk::Component::Output.new(command, subject)
+              Component::Output.should_receive(:new).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -1184,11 +1176,10 @@ module Punchblock
               Punchblock::Component::Input.new
             end
 
-            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.async.should_receive(:execute).once
+              mock_action = Translator::Asterisk::Component::Input.new(command, subject)
+              Component::Input.should_receive(:new).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -1224,13 +1215,15 @@ module Punchblock
 
             let(:mock_action) { Translator::Asterisk::Component::MRCPPrompt.new(command, subject) }
 
+            before { mock_action}
+
             context "when the recognizer is unimrcp and the renderer is unimrcp" do
               let(:recognizer)  { :unimrcp }
               let(:renderer)    { :unimrcp }
 
               it 'should create an MRCPPrompt component and execute it asynchronously' do
-                Component::MRCPPrompt.should_receive(:new_link).once.with(command, subject).and_return mock_action
-                mock_action.async.should_receive(:execute).once
+                Component::MRCPPrompt.should_receive(:new).once.with(command, subject).and_return mock_action
+                mock_action.should_receive(:execute).once
                 subject.execute_command command
               end
             end
@@ -1240,8 +1233,8 @@ module Punchblock
               let(:renderer)    { :asterisk }
 
               it 'should create an MRCPPrompt component and execute it asynchronously' do
-                Component::MRCPNativePrompt.should_receive(:new_link).once.with(command, subject).and_return mock_action
-                mock_action.async.should_receive(:execute).once
+                Component::MRCPNativePrompt.should_receive(:new).once.with(command, subject).and_return mock_action
+                mock_action.should_receive(:execute).once
                 subject.execute_command command
               end
             end
@@ -1261,8 +1254,8 @@ module Punchblock
               let(:renderer)    { :unimrcp }
 
               it 'should create a ComposedPrompt component and execute it asynchronously' do
-                Component::ComposedPrompt.should_receive(:new_link).once.with(command, subject).and_return mock_action
-                mock_action.async.should_receive(:execute).once
+                Component::ComposedPrompt.should_receive(:new).once.with(command, subject).and_return mock_action
+                mock_action.should_receive(:execute).once
                 subject.execute_command command
               end
             end
@@ -1273,11 +1266,10 @@ module Punchblock
               Punchblock::Component::Record.new
             end
 
-            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.async.should_receive(:execute).once
+              mock_action = Translator::Asterisk::Component::Record.new(command, subject)
+              Component::Record.should_receive(:new).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -1327,9 +1319,8 @@ module Punchblock
                 it 'sends an error in response to the command' do
                   component = subject.component_with_id comp_id
 
-                  component.terminate
-                  sleep 0.1
-                  component.should_not be_alive
+                  component.send_complete_event Punchblock::Component::Asterisk::AGI::Command::Complete.new
+
                   subject.component_with_id(comp_id).should be_nil
 
                   subsequent_command.request!
@@ -1339,25 +1330,6 @@ module Punchblock
               end
 
               context "by crashing" do
-                it 'sends an error in response to the command' do
-                  component = subject.component_with_id comp_id
-
-                  component.wrapped_object.define_singleton_method(:oops) do
-                    raise 'Woops, I died'
-                  end
-
-                  translator.should_receive(:handle_pb_event).once.with expected_event
-
-                  lambda { component.oops }.should raise_error(/Woops, I died/)
-                  sleep 0.1
-                  component.should_not be_alive
-                  subject.component_with_id(comp_id).should be_nil
-
-                  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
-
                 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
@@ -1459,7 +1431,9 @@ module Punchblock
               end
 
               it 'should return the result' do
-                fut = subject.future.execute_agi_command 'EXEC ANSWER'
+                fut = Celluloid::Future.new { subject.execute_agi_command 'EXEC ANSWER' }
+
+                sleep 0.25
 
                 subject.process_ami_event ami_event