punchblock 1.8.0 → 1.8.1

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

@@ -93,7 +93,7 @@ module Punchblock
                 end
 
                 it "should not process further dtmf events" do
-                  subject.should_receive(:process_dtmf!).never
+                  subject.async.should_receive(:process_dtmf).never
                   send_ami_events_for_dtmf 3
                 end
               end

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

@@ -70,12 +70,13 @@ module Punchblock
               end
 
               it "should execute Swift" do
-                mock_call.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options
+                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
                 subject.execute
               end
 
               it 'should send a complete event when Swift completes' do
-                def mock_call.send_agi_action!(*args, &block)
+                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
                 subject.execute
@@ -86,7 +87,7 @@ module Punchblock
                 context "set to nil" do
                   let(:command_opts) { { :interrupt_on => nil } }
                   it "should not add interrupt arguments" do
-                    mock_call.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options
+                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
                     subject.execute
                   end
                 end
@@ -95,7 +96,7 @@ module Punchblock
                   let(:command_opts) { { :interrupt_on => :any } }
                   it "should add the interrupt options to the argument" do
                     expect_answered
-                    mock_call.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
+                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
                     subject.execute
                   end
                 end
@@ -104,7 +105,7 @@ module Punchblock
                   let(:command_opts) { { :interrupt_on => :dtmf } }
                   it "should add the interrupt options to the argument" do
                     expect_answered
-                    mock_call.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
+                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('', '|1|1')
                     subject.execute
                   end
                 end
@@ -123,7 +124,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.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options
+                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options
                     subject.execute
                   end
                 end
@@ -131,7 +132,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.should_receive(:send_agi_action!).once.with 'EXEC Swift', ssml_with_options('Leonard^', '')
+                    mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Swift', ssml_with_options('Leonard^', '')
                     subject.execute
                   end
                 end
@@ -158,14 +159,14 @@ module Punchblock
               end
 
               def expect_mrcpsynth_with_options(options)
-                mock_call.should_receive(:send_agi_action!).once.with do |*args|
+                mock_call.async.should_receive(:send_agi_action).once.with do |*args|
                   args[0].should be == 'EXEC MRCPSynth'
                   args[2].should match options
                 end
               end
 
               it "should execute MRCPSynth" do
-                mock_call.should_receive(:send_agi_action!).once.with 'EXEC MRCPSynth', ssml_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }, ''
+                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC MRCPSynth', ssml_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }, ''
                 subject.execute
               end
 
@@ -177,7 +178,7 @@ module Punchblock
                 end
 
                 it 'should escape TTS strings containing a comma' do
-                  mock_call.should_receive(:send_agi_action!).once.with do |*args|
+                  mock_call.async.should_receive(:send_agi_action).once.with do |*args|
                     args[0].should be == 'EXEC MRCPSynth'
                     args[1].should match(/this\\, here\\, is a test/)
                   end
@@ -186,7 +187,8 @@ module Punchblock
               end
 
               it 'should send a complete event when MRCPSynth completes' do
-                def mock_call.send_agi_action!(*args, &block)
+                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
                 subject.execute
@@ -358,11 +360,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.should_receive(:send_agi_action!).once.with 'EXEC Playback', filename
+                  mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', filename
                 end
 
                 def expect_playback_noanswer
-                  mock_call.should_receive(:send_agi_action!).once.with 'EXEC Playback', audio_filename + ',noanswer'
+                  mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', audio_filename + ',noanswer'
                 end
 
                 let(:audio_filename) { 'http://foo.com/bar.mp3' }
@@ -411,7 +413,8 @@ module Punchblock
                       def mock_call.answered?
                         true
                       end
-                      def mock_call.send_agi_action!(*args, &block)
+                      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
                       subject.execute
@@ -435,7 +438,8 @@ module Punchblock
 
                     it 'should send a complete event when the file finishes playback' do
                       expect_answered
-                      def mock_call.send_agi_action!(*args, &block)
+                      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
                       subject.execute
@@ -503,7 +507,8 @@ module Punchblock
 
                     it 'should send a complete event after the final file has finished playback' do
                       expect_answered
-                      def mock_call.send_agi_action!(*args, &block)
+                      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
                       latch = CountDownLatch.new 1
@@ -682,7 +687,7 @@ module Punchblock
                     it "does not redirect the call" do
                       expect_answered
                       expect_playback
-                      mock_call.should_receive(:redirect_back!).never
+                      mock_call.async.should_receive(:redirect_back).never
                       subject.execute
                       original_command.response(0.1).should be_a Ref
                       send_ami_events_for_dtmf 1
@@ -699,19 +704,19 @@ module Punchblock
 
                     context "when a DTMF digit is received" do
                       it "sends the correct complete event" do
-                        mock_call.should_receive :redirect_back!
+                        mock_call.async.should_receive :redirect_back
                         subject.execute
                         original_command.response(0.1).should be_a Ref
                         original_command.should_not be_complete
                         send_ami_events_for_dtmf 1
-                        mock_call.process_ami_event! ami_event
+                        mock_call.async.process_ami_event ami_event
                         sleep 0.2
                         original_command.should be_complete
                         reason.should be_a Punchblock::Component::Output::Complete::Success
                       end
 
                       it "redirects the call back to async AGI" do
-                        mock_call.should_receive(:redirect_back!).once
+                        mock_call.async.should_receive(:redirect_back).once
                         subject.execute
                         original_command.response(0.1).should be_a Ref
                         send_ami_events_for_dtmf 1
@@ -729,19 +734,19 @@ module Punchblock
 
                     context "when a DTMF digit is received" do
                       it "sends the correct complete event" do
-                        mock_call.should_receive :redirect_back!
+                        mock_call.async.should_receive :redirect_back
                         subject.execute
                         original_command.response(0.1).should be_a Ref
                         original_command.should_not be_complete
                         send_ami_events_for_dtmf 1
-                        mock_call.process_ami_event! ami_event
+                        mock_call.async.process_ami_event ami_event
                         sleep 0.2
                         original_command.should be_complete
                         reason.should be_a Punchblock::Component::Output::Complete::Success
                       end
 
                       it "redirects the call back to async AGI" do
-                        mock_call.should_receive(:redirect_back!).once
+                        mock_call.async.should_receive(:redirect_back).once
                         subject.execute
                         original_command.response(0.1).should be_a Ref
                         send_ami_events_for_dtmf 1
@@ -782,7 +787,7 @@ module Punchblock
 
               it "should use the media renderer set and not the platform default" do
                 expect_answered
-                mock_call.should_receive(:send_agi_action!).once.with 'EXEC Playback', audio_filename
+                mock_call.async.should_receive(:send_agi_action).once.with 'EXEC Playback', audio_filename
                 subject.execute
               end
             end
@@ -818,13 +823,13 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                mock_call.should_receive(:redirect_back!)
+                mock_call.async.should_receive(:redirect_back)
                 subject.execute_command command
                 command.response(0.1).should be == true
               end
 
               it "sends the correct complete event" do
-                mock_call.should_receive(:redirect_back!)
+                mock_call.async.should_receive(:redirect_back)
                 subject.execute_command command
                 original_command.should_not be_complete
                 mock_call.process_ami_event ami_event
@@ -833,7 +838,7 @@ module Punchblock
               end
 
               it "redirects the call by unjoining it" do
-                mock_call.should_receive(:redirect_back!)
+                mock_call.async.should_receive(:redirect_back)
                 subject.execute_command command
               end
             end

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

@@ -40,7 +40,7 @@ module Punchblock
             before { mock_call.stub(:answered?).and_return(true) }
 
             it "sets command response to a reference to the component" do
-              mock_call.should_receive(:send_ami_action!)
+              mock_call.async.should_receive(:send_ami_action)
               subject.execute
               original_command.response(0.1).should be_a Ref
               original_command.component_id.should be == subject.id
@@ -48,13 +48,13 @@ module Punchblock
 
             it "starts a recording via AMI, using the component ID as the filename" do
               filename = "#{Record::RECORDING_BASE_PATH}/#{subject.id}"
-              mock_call.should_receive(:send_ami_action!).once.with('Monitor', 'Channel' => channel, 'File' => filename, 'Format' => 'wav', 'Mix' => true)
+              mock_call.async.should_receive(:send_ami_action).once.with('Monitor', 'Channel' => channel, 'File' => filename, 'Format' => 'wav', 'Mix' => true)
               subject.execute
             end
 
             it "sends a success complete event when the recording ends" do
               full_filename = "file://#{Record::RECORDING_BASE_PATH}/#{subject.id}.wav"
-              mock_call.should_receive(:send_ami_action!)
+              mock_call.async.should_receive(:send_ami_action)
               subject.execute
               monitor_stop_event = RubyAMI::Event.new('MonitorStop').tap do |e|
                 e['Channel'] = channel
@@ -65,15 +65,15 @@ module Punchblock
               original_command.should be_complete
             end
 
-            it "can be called multiple times on the same call" do 
-              mock_call.should_receive(:send_ami_action!).twice
+            it "can be called multiple times on the same call" do
+              mock_call.async.should_receive(:send_ami_action).twice
               subject.execute
 
               monitor_stop_event = RubyAMI::Event.new('MonitorStop').tap do |e|
                 e['Channel'] = channel
               end
 
-              mock_call.process_ami_event monitor_stop_event 
+              mock_call.process_ami_event monitor_stop_event
 
               (Record.new original_command, mock_call).execute
               (Punchblock::Component::Record.new command_options).request!
@@ -84,7 +84,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :start_paused => nil } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -93,7 +93,7 @@ module Punchblock
               context "set to false" do
                 let(:command_options) { { :start_paused => false } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -102,7 +102,7 @@ module Punchblock
               context "set to true" do
                 let(:command_options) { { :start_paused => true } }
                 it "should return an error and not execute any actions" do
-                  mock_call.should_receive(:send_agi_action!).never
+                  mock_call.async.should_receive(:send_agi_action).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A start-paused value of true is unsupported.'
                   original_command.response(0.1).should be == error
@@ -114,7 +114,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :initial_timeout => nil } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -123,7 +123,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :initial_timeout => -1 } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -132,7 +132,7 @@ module Punchblock
               context "set to a positive number" do
                 let(:command_options) { { :initial_timeout => 10 } }
                 it "should return an error and not execute any actions" do
-                  mock_call.should_receive(:send_agi_action!).never
+                  mock_call.async.should_receive(:send_agi_action).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'An initial-timeout value is unsupported.'
                   original_command.response(0.1).should be == error
@@ -144,7 +144,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :final_timeout => nil } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -153,7 +153,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :final_timeout => -1 } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -162,7 +162,7 @@ module Punchblock
               context "set to a positive number" do
                 let(:command_options) { { :final_timeout => 10 } }
                 it "should return an error and not execute any actions" do
-                  mock_call.should_receive(:send_agi_action!).never
+                  mock_call.async.should_receive(:send_agi_action).never
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A final-timeout value is unsupported.'
                   original_command.response(0.1).should be == error
@@ -174,13 +174,13 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :format => nil } }
                 it "should execute as 'wav'" do
-                  mock_call.should_receive(:send_ami_action!).once.with('Monitor', hash_including('Format' => 'wav'))
+                  mock_call.async.should_receive(:send_ami_action).once.with('Monitor', hash_including('Format' => 'wav'))
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
 
                 it "provides the correct filename in the recording" do
-                  mock_call.should_receive(:send_ami_action!)
+                  mock_call.async.should_receive(:send_ami_action)
                   subject.execute
                   monitor_stop_event = RubyAMI::Event.new('MonitorStop').tap do |e|
                     e['Channel'] = channel
@@ -193,13 +193,13 @@ module Punchblock
               context "set to 'mp3'" do
                 let(:command_options) { { :format => 'mp3' } }
                 it "should execute as 'mp3'" do
-                  mock_call.should_receive(:send_ami_action!).once.with('Monitor', hash_including('Format' => 'mp3'))
+                  mock_call.async.should_receive(:send_ami_action).once.with('Monitor', hash_including('Format' => 'mp3'))
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
 
                 it "provides the correct filename in the recording" do
-                  mock_call.should_receive(:send_ami_action!)
+                  mock_call.async.should_receive(:send_ami_action)
                   subject.execute
                   monitor_stop_event = RubyAMI::Event.new('MonitorStop').tap do |e|
                     e['Channel'] = channel
@@ -214,8 +214,8 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :start_beep => nil } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_agi_action!).never.with('STREAM FILE', 'beep', '""')
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_agi_action).never.with('STREAM FILE', 'beep', '""')
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -224,8 +224,8 @@ module Punchblock
               context "set to false" do
                 let(:command_options) { { :start_beep => false } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_agi_action!).never.with('STREAM FILE', 'beep', '""')
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_agi_action).never.with('STREAM FILE', 'beep', '""')
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -236,17 +236,18 @@ module Punchblock
 
                 it "should play a beep before recording" do
                   subject.wrapped_object.should_receive(:wait).once
-                  mock_call.should_receive(:send_agi_action!).once.with('STREAM FILE', 'beep', '""').ordered
-                  mock_call.should_receive(:send_ami_action!).once.ordered
+                  mock_call.async.should_receive(:send_agi_action).once.with('STREAM FILE', 'beep', '""').ordered
+                  mock_call.async.should_receive(:send_ami_action).once.ordered
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
 
                 it "should wait for the beep to finish before starting recording" do
-                  def mock_call.send_agi_action!(*args)
+                  async_proxy = mock_call.async
+                  def async_proxy.send_agi_action(*args)
                     yield
                   end
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -257,7 +258,7 @@ module Punchblock
               context "set to nil" do
                 let(:command_options) { { :max_duration => nil } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -266,7 +267,7 @@ module Punchblock
               context "set to -1" do
                 let(:command_options) { { :max_duration => -1 } }
                 it "should execute normally" do
-                  mock_call.should_receive(:send_ami_action!).once
+                  mock_call.async.should_receive(:send_ami_action).once
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -288,14 +289,15 @@ module Punchblock
                 let(:command_options) { { :max_duration => 1000 } }
 
                 it "executes a StopMonitor action" do
-                  mock_call.should_receive :send_ami_action!
-                  mock_call.should_receive(:send_ami_action!).once.with('StopMonitor', 'Channel' => channel)
+                  mock_call.async.should_receive :send_ami_action
+                  mock_call.async.should_receive(:send_ami_action).once.with('StopMonitor', 'Channel' => channel)
                   subject.execute
                   sleep 1.2
                 end
 
                 it "sends the correct complete event" do
-                  def mock_call.send_ami_action!(*args, &block)
+                  async_proxy = mock_call.async
+                  def async_proxy.send_ami_action(*args, &block)
                     block.call Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new if block
                   end
                   full_filename = "file://#{Record::RECORDING_BASE_PATH}/#{subject.id}.wav"
@@ -333,7 +335,7 @@ module Punchblock
               let(:command) { Punchblock::Component::Stop.new }
 
               before do
-                mock_call.should_receive :send_ami_action!
+                mock_call.async.should_receive :send_ami_action
                 mock_call.should_receive(:answered?).and_return(true)
                 command.request!
                 original_command.request!
@@ -348,25 +350,25 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                mock_call.should_receive :send_ami_action!
+                mock_call.async.should_receive :send_ami_action
                 subject.execute_command command
                 send_stop_event
                 command.response(0.1).should be == true
               end
 
               it "executes a StopMonitor action" do
-                mock_call.should_receive(:send_ami_action!).once.with('StopMonitor', 'Channel' => channel)
+                mock_call.async.should_receive(:send_ami_action).once.with('StopMonitor', 'Channel' => channel)
                 subject.execute_command command
               end
 
               it "sends the correct complete event" do
-                mock_call.instance_exec do
+                mock_call.async.instance_exec do
                   class << self
-                    undef :send_ami_action! # This is here because mocha has already defined #send_ami_action! above. We need to undef it to prevent a warning on redefinition.
+                    undef :send_ami_action # This is here because mocha has already defined #send_ami_action above. We need to undef it to prevent a warning on redefinition.
                   end
 
-                  def send_ami_action!(*args, &block)
-                    block.call Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new if block
+                  def send_ami_action(*args, &block)
+                    block.call ::Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new if block
                   end
                 end
 
@@ -389,7 +391,8 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                def mock_call.send_ami_action!(*args, &block)
+                async_proxy = mock_call.async
+                def async_proxy.send_ami_action(*args, &block)
                   block.call Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new if block
                 end
                 subject.execute_command command
@@ -397,7 +400,7 @@ module Punchblock
               end
 
               it "pauses the recording via AMI" do
-                mock_call.should_receive(:send_ami_action!).once.with('PauseMonitor', 'Channel' => channel)
+                mock_call.async.should_receive(:send_ami_action).once.with('PauseMonitor', 'Channel' => channel)
                 subject.execute_command command
               end
             end
@@ -412,7 +415,8 @@ module Punchblock
               end
 
               it "sets the command response to true" do
-                def mock_call.send_ami_action!(*args, &block)
+                async_proxy = mock_call.async
+                def async_proxy.send_ami_action(*args, &block)
                   block.call Punchblock::Component::Asterisk::AMI::Action::Complete::Success.new if block
                 end
                 subject.execute_command command
@@ -420,7 +424,7 @@ module Punchblock
               end
 
               it "resumes the recording via AMI" do
-                mock_call.should_receive(:send_ami_action!).once.with('ResumeMonitor', 'Channel' => channel)
+                mock_call.async.should_receive(:send_ami_action).once.with('ResumeMonitor', 'Channel' => channel)
                 subject.execute_command command
               end
             end