punchblock 1.8.2 → 1.9.0

data/spec/punchblock/translator/asterisk/component/asterisk/agi_command_spec.rb

@@ -11,8 +11,9 @@ module Punchblock
             include HasMockCallbackConnection
 
             let(:channel)       { 'SIP/foo' }
-            let(:translator)    { Punchblock::Translator::Asterisk.new mock('AMI'), connection }
-            let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new channel, translator }
+            let(:ami_client)    { stub('AMI Client').as_null_object }
+            let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection }
+            let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new channel, translator, ami_client, connection }
             let(:component_id)  { Punchblock.new_uuid }
 
             before { stub_uuids component_id }
@@ -23,31 +24,27 @@ module Punchblock
 
             subject { AGICommand.new original_command, mock_call }
 
-            let :expected_action do
-              RubyAMI::Action.new 'AGI', 'Channel' => channel, 'Command' => 'EXEC ANSWER', 'CommandID' => component_id
+            let :response do
+              RubyAMI::Response.new
             end
 
             context 'initial execution' do
               before { original_command.request! }
 
-              it 'should send the appropriate RubyAMI::Action' do
-                mock_call.should_receive(:send_ami_action).once.with(expected_action).and_return(expected_action)
+              it 'should send the appropriate action' do
+                ami_client.should_receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'EXEC ANSWER', 'CommandID' => component_id).and_return(response)
                 subject.execute
               end
 
               context 'with some parameters' do
                 let(:params) { [1000, 'foo'] }
 
-                let :expected_action do
-                  RubyAMI::Action.new 'AGI', 'Channel' => channel, 'Command' => 'WAIT FOR DIGIT "1000" "foo"', 'CommandID' => component_id
-                end
-
                 let :original_command do
                   Punchblock::Component::Asterisk::AGI::Command.new :name => 'WAIT FOR DIGIT', :params => params
                 end
 
-                it 'should send the appropriate RubyAMI::Action' do
-                  mock_call.should_receive(:send_ami_action).once.with(expected_action).and_return(expected_action)
+                it 'should send the appropriate action' do
+                  ami_client.should_receive(:send_action).once.with('AGI', 'Channel' => channel, 'Command' => 'WAIT FOR DIGIT "1000" "foo"', 'CommandID' => component_id).and_return(response)
                   subject.execute
                 end
               end
@@ -56,7 +53,6 @@ module Punchblock
             context 'when the AMI action completes' do
               before do
                 original_command.request!
-                original_command.execute!
               end
 
               let :expected_response do
@@ -64,25 +60,26 @@ module Punchblock
               end
 
               let :response do
-                RubyAMI::Response.new.tap do |r|
-                  r['ActionID'] = "552a9d9f-46d7-45d8-a257-06fe95f48d99"
-                  r['Message']  = 'Added AGI original_command to queue'
-                end
+                RubyAMI::Response.new 'ActionID' => "552a9d9f-46d7-45d8-a257-06fe95f48d99",
+                  'Message' => 'Added AGI original_command to queue'
               end
 
               it 'should send the component node a ref with the action ID' do
-                original_command.should_receive(:response=).once.with(expected_response)
-                subject.action << response
+                ami_client.should_receive(:send_action).once.and_return response
+                subject.execute
+                original_command.response(1).should eql(expected_response)
               end
 
               context 'with an error' do
-                let :error do
+                let :response do
                   RubyAMI::Error.new.tap { |e| e.message = 'Action failed' }
                 end
 
                 it 'should send the component node false' do
-                  original_command.should_receive(:response=).once.with false
-                  subject.action << error
+                  ami_client.should_receive(:send_action).once.and_raise response
+                  subject.execute
+                  original_command.response(1).should be_false
+                  subject.should_not be_alive
                 end
               end
             end
@@ -97,13 +94,12 @@ module Punchblock
 
               context 'of type Exec' do
                 let(:ami_event) do
-                  RubyAMI::Event.new("AsyncAGI").tap do |e|
-                    e["SubEvent"]   = "Exec"
-                    e["Channel"]    = channel
-                    e["CommandId"]  = component_id
-                    e["Command"]    = "EXEC ANSWER"
-                    e["Result"]     = "200%20result=123%20(timeout)%0A"
-                  end
+                  RubyAMI::Event.new 'AsyncAGI',
+                    "SubEvent"   => "Exec",
+                    "Channel"    => channel,
+                    "CommandId"  => component_id,
+                    "Command"    => "EXEC ANSWER",
+                    "Result"     => "200%20result=123%20(timeout)%0A"
                 end
 
                 let :expected_complete_reason do
@@ -122,6 +118,38 @@ module Punchblock
                   complete_event.component_id.should be == component_id.to_s
                   complete_event.reason.should be == expected_complete_reason
                 end
+
+                context "when the command was ASYNCAGI BREAK" do
+                  let :original_command do
+                    Punchblock::Component::Asterisk::AGI::Command.new :name => 'ASYNCAGI BREAK'
+                  end
+
+                  let(:chan_var) { nil }
+
+                  before do
+                    response = RubyAMI::Response.new 'Value' => chan_var
+                    ami_client.should_receive(:send_action).once.with('GetVar', 'Channel' => channel, 'Variable' => 'PUNCHBLOCK_END_ON_ASYNCAGI_BREAK').and_return response
+                  end
+
+                  it 'should not send an end (hangup) event to the translator' do
+                    translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                    translator.should_receive(:handle_pb_event).never.with kind_of(Punchblock::Event::End)
+                    subject.handle_ami_event ami_event
+                  end
+
+                  context "when the PUNCHBLOCK_END_ON_ASYNCAGI_BREAK channel var is set" do
+                    let(:chan_var) { 'true' }
+
+                    it 'should send an end (hangup) event to the translator' do
+                      expected_end_event = Punchblock::Event::End.new reason: :hangup,
+                                                                      target_call_id: mock_call.id
+
+                      translator.should_receive(:handle_pb_event).once.with kind_of(Punchblock::Event::Complete)
+                      translator.should_receive(:handle_pb_event).once.with expected_end_event
+                      subject.handle_ami_event ami_event
+                    end
+                  end
+                end
               end
             end
           end

data/spec/punchblock/translator/asterisk/component/asterisk/ami_action_spec.rb

@@ -10,18 +10,19 @@ module Punchblock
           describe AMIAction do
             include HasMockCallbackConnection
 
-            let(:mock_translator) { Punchblock::Translator::Asterisk.new mock('AMI'), connection }
+            let(:ami_client)      { stub('AMI Client').as_null_object }
+            let(:mock_translator) { Punchblock::Translator::Asterisk.new ami_client, connection }
 
             let :original_command do
               Punchblock::Component::Asterisk::AMI::Action.new :name => 'ExtensionStatus', :params => { :context => 'default', :exten => 'idonno' }
             end
 
-            subject { AMIAction.new original_command, mock_translator }
-
-            let :expected_action do
-              RubyAMI::Action.new 'ExtensionStatus', 'Context' => 'default', 'Exten' => 'idonno'
+            before do
+              original_command.request!
             end
 
+            subject { AMIAction.new original_command, mock_translator, ami_client }
+
             context 'initial execution' do
               let(:component_id) { Punchblock.new_uuid }
 
@@ -31,28 +32,21 @@ module Punchblock
 
               before { stub_uuids component_id }
 
-              it 'should send the appropriate RubyAMI::Action and send the component node a ref with the action ID' do
-                mock_translator.should_receive(:send_ami_action).once.with(expected_action).and_return(expected_action)
-                original_command.should_receive(:response=).once.with(expected_response)
+              it 'should send the appropriate RubyAMI::Action and send the component node a ref' do
+                ami_client.should_receive(:send_action).once.with('ExtensionStatus', 'Context' => 'default', 'Exten' => 'idonno').and_return(RubyAMI::Response.new)
                 subject.execute
+                original_command.response(1).should == expected_response
               end
             end
 
             context 'when the AMI action completes' do
-              before do
-                original_command.request!
-                original_command.execute!
-              end
-
               let :response do
-                RubyAMI::Response.new.tap do |r|
-                  r['ActionID'] = "552a9d9f-46d7-45d8-a257-06fe95f48d99"
-                  r['Message']  = 'Channel status will follow'
-                  r["Exten"]    = "idonno"
-                  r["Context"]  = "default"
-                  r["Hint"]     = ""
-                  r["Status"]   = "-1"
-                end
+                RubyAMI::Response.new 'ActionID'  => '552a9d9f-46d7-45d8-a257-06fe95f48d99',
+                                      'Message'   => 'Channel status will follow',
+                                      'Exten'     => 'idonno',
+                                      'Context'   => 'default',
+                                      'Hint'      => '',
+                                      'Status'    => '-1'
               end
 
               let :expected_complete_reason do
@@ -61,8 +55,9 @@ module Punchblock
 
               context 'for a non-causal action' do
                 it 'should send a complete event to the component node' do
+                  ami_client.should_receive(:send_action).once.and_return response
                   subject.wrapped_object.should_receive(:send_complete_event).once.with expected_complete_reason
-                  subject.handle_response response
+                  subject.execute
                 end
               end
 
@@ -76,24 +71,20 @@ module Punchblock
                 end
 
                 let :event do
-                  RubyAMI::Event.new('CoreShowChannel').tap do |e|
-                    e['ActionID']         = "552a9d9f-46d7-45d8-a257-06fe95f48d99"
-                    e['Channel']          = 'SIP/127.0.0.1-00000013'
-                    e['UniqueID']         = '1287686437.19'
-                    e['Context']          = 'adhearsion'
-                    e['Extension']        = '23432'
-                    e['Priority']         = '2'
-                    e['ChannelState']     = '6'
-                    e['ChannelStateDesc'] = 'Up'
-                  end
+                  RubyAMI::Event.new 'CoreShowChannel', 'ActionID' => "552a9d9f-46d7-45d8-a257-06fe95f48d99",
+                    'Channel'          => 'SIP/127.0.0.1-00000013',
+                    'UniqueID'         => '1287686437.19',
+                    'Context'          => 'adhearsion',
+                    'Extension'        => '23432',
+                    'Priority'         => '2',
+                    'ChannelState'     => '6',
+                    'ChannelStateDesc' => 'Up'
                 end
 
                 let :terminating_event do
-                  RubyAMI::Event.new('CoreShowChannelsComplete').tap do |e|
-                    e['EventList'] = 'Complete'
-                    e['ListItems'] = '3'
-                    e['ActionID'] = 'umtLtvSg-RN5n-GEay-Z786-YdiaSLNXkcYN'
-                  end
+                  RubyAMI::Event.new 'CoreShowChannelsComplete', 'EventList' => 'Complete',
+                    'ListItems' => '3',
+                    'ActionID' => 'umtLtvSg-RN5n-GEay-Z786-YdiaSLNXkcYN'
                 end
 
                 let :event_node do
@@ -112,21 +103,22 @@ module Punchblock
                   Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new :message => 'Channel status will follow', :attributes => {:exten => "idonno", :context => "default", :hint => "", :status => "-1", :eventlist => 'Complete', :listitems => '3'}
                 end
 
+                before { ami_client.should_receive(:send_action).once.and_return response }
+
                 it 'should send events to the component node' do
                   event_node
                   original_command.register_handler :internal, Punchblock::Event::Asterisk::AMI::Event do |event|
                     @event = event
                   end
-                  action = subject.action
-                  action << event
-                  subject.handle_response response
-                  action << terminating_event
+                  response.events << event << terminating_event
+                  subject.execute
                   @event.should be == event_node
                 end
 
                 it 'should send a complete event to the component node' do
-                  subject.action << response
-                  subject.action << terminating_event
+                  response.events << event << terminating_event
+
+                  subject.execute
 
                   original_command.complete_event(0.5).reason.should be == expected_complete_reason
                 end
@@ -138,12 +130,14 @@ module Punchblock
                 end
 
                 let :expected_complete_reason do
-                  Punchblock::Event::Complete::Error.new :details => 'Action failed'
+                  Punchblock::Event::Complete::Error.new :details => 'Action failed', component_id: subject.id
                 end
 
                 it 'should send a complete event to the component node' do
-                  subject.wrapped_object.should_receive(:send_complete_event).once.with expected_complete_reason
-                  subject.handle_response error
+                  ami_client.should_receive(:send_action).once.and_raise error
+                  expected_complete_reason
+                  subject.execute
+                  original_command.complete_event(0.5).reason.should be == expected_complete_reason
                 end
               end
             end

data/spec/punchblock/translator/asterisk/component/input_spec.rb

@@ -10,8 +10,9 @@ module Punchblock
           include HasMockCallbackConnection
 
           let(:media_engine)    { nil }
-          let(:translator)      { Punchblock::Translator::Asterisk.new mock('AMI'), connection, media_engine }
-          let(:call)            { Punchblock::Translator::Asterisk::Call.new 'foo', translator }
+          let(:ami_client)      { mock('AMI') }
+          let(:translator)      { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:call)            { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
           let(:original_command_options) { {} }
 
           let :original_command do
@@ -53,11 +54,10 @@ module Punchblock
             end
 
             def ami_event_for_dtmf(digit, position)
-              RubyAMI::Event.new('DTMF').tap do |e|
-                e['Digit']  = digit.to_s
-                e['Start']  = position == :start ? 'Yes' : 'No'
-                e['End']    = position == :end ? 'Yes' : 'No'
-              end
+              RubyAMI::Event.new 'DTMF',
+                'Digit' => digit.to_s,
+                'Start' => position == :start ? 'Yes' : 'No',
+                'End'   => position == :end ? 'Yes' : 'No'
             end
 
             def send_ami_events_for_dtmf(digit)

data/spec/punchblock/translator/asterisk/component/output_spec.rb

@@ -10,8 +10,9 @@ module Punchblock
           include HasMockCallbackConnection
 
           let(:media_engine)  { nil }
-          let(:translator)    { Punchblock::Translator::Asterisk.new mock('AMI'), connection, media_engine }
-          let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new 'foo', translator }
+          let(:ami_client)    { mock('AMI') }
+          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
 
           let :original_command do
             Punchblock::Component::Output.new command_options
@@ -70,24 +71,32 @@ module Punchblock
               end
 
               it "should execute Swift" do
-                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
+                mock_call.should_receive(:execute_agi_command).once.with 'EXEC Swift', ssml_with_options
                 subject.execute
               end
 
               it 'should send a complete event when Swift completes' do
-                async_proxy = mock_call.async
-                def async_proxy.send_agi_action(*args, &block)
-                  block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)
-                end
+                mock_call.should_receive(:execute_agi_command).and_return code: 200, result: 1
                 subject.execute
                 original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
               end
 
+              context "when we get a RubyAMI Error" do
+                it "should send an error complete event" do
+                  error = RubyAMI::Error.new.tap { |e| e.message = 'FooBar' }
+                  mock_call.should_receive(:execute_agi_command).and_raise error
+                  subject.execute
+                  complete_reason = original_command.complete_event(0.1).reason
+                  complete_reason.should be_a Punchblock::Event::Complete::Error
+                  complete_reason.details.should == "Terminated due to AMI error 'FooBar'"
+                end
+              end
+
               describe 'interrupt_on' do
                 context "set to nil" do
                   let(:command_opts) { { :interrupt_on => nil } }
                   it "should not add interrupt arguments" do
-                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
+                    mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options).and_return code: 200, result: 1
                     subject.execute
                   end
                 end
@@ -96,7 +105,7 @@ module Punchblock
                   let(:command_opts) { { :interrupt_on => :any } }
                   it "should add the interrupt options to the argument" do
                     expect_answered
-                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
+                    mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options('', '|1|1')).and_return code: 200, result: 1
                     subject.execute
                   end
                 end
@@ -105,7 +114,7 @@ module Punchblock
                   let(:command_opts) { { :interrupt_on => :dtmf } }
                   it "should add the interrupt options to the argument" do
                     expect_answered
-                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
+                    mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options('', '|1|1')).and_return code: 200, result: 1
                     subject.execute
                   end
                 end
@@ -124,7 +133,7 @@ module Punchblock
                 context "set to nil" do
                   let(:command_opts) { { :voice => nil } }
                   it "should not add a voice at the beginning of the argument" do
-                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
+                    mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options).and_return code: 200, result: 1
                     subject.execute
                   end
                 end
@@ -132,7 +141,7 @@ module Punchblock
                 context "set to Leonard" do
                   let(:command_opts) { { :voice => "Leonard" } }
                   it "should add a voice at the beginning of the argument" do
-                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('Leonard^', '')
+                    mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options('Leonard^', '')).and_return code: 200, result: 1
                     subject.execute
                   end
                 end
@@ -159,14 +168,14 @@ module Punchblock
               end
 
               def expect_mrcpsynth_with_options(options)
-                mock_call.async.should_receive(:send_agi_action).once.with do |*args|
+                mock_call.should_receive(:execute_agi_command).once.with do |*args|
                   args[0].should be == 'EXEC MRCPSynth'
                   args[2].should match options
-                end
+                end.and_return code: 200, result: 1
               end
 
               it "should execute MRCPSynth" do
-                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC MRCPSynth', ssml_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }, ''
+                mock_call.should_receive(:execute_agi_command).once.with('EXEC MRCPSynth', ssml_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }, '').and_return code: 200, result: 1
                 subject.execute
               end
 
@@ -178,23 +187,31 @@ module Punchblock
                 end
 
                 it 'should escape TTS strings containing a comma' do
-                  mock_call.async.should_receive(:send_agi_action).once.with do |*args|
+                  mock_call.should_receive(:execute_agi_command).once.with do |*args|
                     args[0].should be == 'EXEC MRCPSynth'
                     args[1].should match(/this\\, here\\, is a test/)
-                  end
+                  end.and_return code: 200, result: 1
                   subject.execute
                 end
               end
 
               it 'should send a complete event when MRCPSynth completes' do
-                async_proxy = mock_call.async
-                def async_proxy.send_agi_action(*args, &block)
-                  block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)
-                end
+                mock_call.should_receive(:execute_agi_command).and_return code: 200, result: 1
                 subject.execute
                 original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
               end
 
+              context "when we get a RubyAMI Error" do
+                it "should send an error complete event" do
+                  error = RubyAMI::Error.new.tap { |e| e.message = 'FooBar' }
+                  mock_call.should_receive(:execute_agi_command).and_raise error
+                  subject.execute
+                  complete_reason = original_command.complete_event(0.1).reason
+                  complete_reason.should be_a Punchblock::Event::Complete::Error
+                  complete_reason.details.should == "Terminated due to AMI error 'FooBar'"
+                end
+              end
+
               describe 'ssml' do
                 context 'unset' do
                   let(:command_opts) { { :ssml => nil } }
@@ -360,11 +377,11 @@ module Punchblock
             [:asterisk, nil].each do |media_engine|
               context "with a media engine of #{media_engine.inspect}" do
                 def expect_playback(filename = audio_filename)
-                  mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', filename
+                  mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', filename).and_return code: 200
                 end
 
                 def expect_playback_noanswer
-                  mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', audio_filename + ',noanswer'
+                  mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', audio_filename + ',noanswer').and_return code: 200
                 end
 
                 let(:audio_filename) { 'http://foo.com/bar.mp3' }
@@ -413,13 +430,22 @@ module Punchblock
                       def mock_call.answered?
                         true
                       end
-                      async_proxy = mock_call.async
-                      def async_proxy.send_agi_action(*args, &block)
-                        block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)
-                      end
+                      expect_playback
                       subject.execute
                       original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
                     end
+
+                    context "when we get a RubyAMI Error" do
+                      it "should send an error complete event" do
+                        expect_answered
+                        error = RubyAMI::Error.new.tap { |e| e.message = 'FooBar' }
+                        mock_call.should_receive(:execute_agi_command).and_raise error
+                        subject.execute
+                        complete_reason = original_command.complete_event(0.1).reason
+                        complete_reason.should be_a Punchblock::Event::Complete::Error
+                        complete_reason.details.should == "Terminated due to AMI error 'FooBar'"
+                      end
+                    end
                   end
 
                   context 'with a single text node without spaces' do
@@ -438,14 +464,23 @@ module Punchblock
 
                     it 'should send a complete event when the file finishes playback' do
                       expect_answered
-                      async_proxy = mock_call.async
-                      def async_proxy.send_agi_action(*args, &block)
-                        block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)
-                      end
+                      expect_playback
                       subject.execute
                       original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
                     end
 
+                    context "when we get a RubyAMI Error" do
+                      it "should send an error complete event" do
+                        expect_answered
+                        error = RubyAMI::Error.new.tap { |e| e.message = 'FooBar' }
+                        mock_call.should_receive(:execute_agi_command).and_raise error
+                        subject.execute
+                        complete_reason = original_command.complete_event(0.1).reason
+                        complete_reason.should be_a Punchblock::Event::Complete::Error
+                        complete_reason.details.should == "Terminated due to AMI error 'FooBar'"
+                      end
+                    end
+
                     context "with early media playback" do
                       it "should play the file with Playback" do
                         expect_answered false
@@ -507,10 +542,7 @@ module Punchblock
 
                     it 'should send a complete event after the final file has finished playback' do
                       expect_answered
-                      async_proxy = mock_call.async
-                      def async_proxy.send_agi_action(*args, &block)
-                        block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)
-                      end
+                      expect_playback [audio_filename1, audio_filename2].join('&')
                       latch = CountDownLatch.new 1
                       original_command.should_receive(:add_event).once.with do |e|
                         e.reason.should be_a Punchblock::Component::Output::Complete::Success
@@ -660,11 +692,10 @@ module Punchblock
 
                 describe 'interrupt_on' do
                   def ami_event_for_dtmf(digit, position)
-                    RubyAMI::Event.new('DTMF').tap do |e|
-                      e['Digit']  = digit.to_s
-                      e['Start']  = position == :start ? 'Yes' : 'No'
-                      e['End']    = position == :end ? 'Yes' : 'No'
-                    end
+                    RubyAMI::Event.new 'DTMF',
+                      'Digit' => digit.to_s,
+                      'Start' => position == :start ? 'Yes' : 'No',
+                      'End'   => position == :end ? 'Yes' : 'No'
                   end
 
                   def send_ami_events_for_dtmf(digit)
@@ -675,11 +706,10 @@ module Punchblock
                   let(:reason) { original_command.complete_event(5).reason }
                   let(:channel) { "SIP/1234-00000000" }
                   let :ami_event do
-                    RubyAMI::Event.new('AsyncAGI').tap do |e|
-                      e['SubEvent'] = "Start"
-                      e['Channel']  = channel
-                      e['Env']      = "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
-                    end
+                    RubyAMI::Event.new 'AsyncAGI',
+                      'SubEvent'  => "Start",
+                      'Channel'   => channel,
+                      'Env'       => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
                   end
 
                   context "set to nil" do
@@ -699,7 +729,8 @@ module Punchblock
 
                     before do
                       expect_answered
-                      expect_playback
+                      mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', audio_filename)
+                      subject.wrapped_object.should_receive(:send_success).and_return nil
                     end
 
                     context "when a DTMF digit is received" do
@@ -729,7 +760,8 @@ module Punchblock
 
                     before do
                       expect_answered
-                      expect_playback
+                      mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', audio_filename)
+                      subject.wrapped_object.should_receive(:send_success).and_return nil
                     end
 
                     context "when a DTMF digit is received" do
@@ -787,7 +819,7 @@ module Punchblock
 
               it "should use the media renderer set and not the platform default" do
                 expect_answered
-                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', audio_filename
+                mock_call.should_receive(:execute_agi_command).once.with 'EXEC Playback', audio_filename
                 subject.execute
               end
             end
@@ -809,11 +841,10 @@ module Punchblock
               let(:reason) { original_command.complete_event(5).reason }
               let(:channel) { "SIP/1234-00000000" }
               let :ami_event do
-                RubyAMI::Event.new('AsyncAGI').tap do |e|
-                  e['SubEvent'] = "Start"
-                  e['Channel']  = channel
-                  e['Env']      = "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
-                end
+                RubyAMI::Event.new 'AsyncAGI',
+                  'SubEvent'  => "Start",
+                  'Channel'   => channel,
+                  'Env'       => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
               end
 
               before do