punchblock 1.6.1 → 1.7.0

data/spec/punchblock/component/output_spec.rb

@@ -17,6 +17,7 @@ module Punchblock
         its(:repeat_times)     { should be nil }
         its(:max_time)         { should be nil }
         its(:voice)            { should be nil }
+        its(:renderer)         { should be nil }
       end
 
       describe "when setting options in initializer" do
@@ -27,7 +28,8 @@ module Punchblock
                       :repeat_interval  => 2000,
                       :repeat_times     => 10,
                       :max_time         => 30000,
-                      :voice            => 'allison'
+                      :voice            => 'allison',
+                      :renderer         => 'swift'
         end
 
         its(:interrupt_on)     { should be == :speech }
@@ -37,6 +39,7 @@ module Punchblock
         its(:repeat_times)     { should be == 10 }
         its(:max_time)         { should be == 30000 }
         its(:voice)            { should be == 'allison' }
+        its(:renderer)         { should be == 'swift' }
       end
 
       describe "from a stanza" do
@@ -49,7 +52,8 @@ module Punchblock
         repeat-interval='2000'
         repeat-times='10'
         max-time='30000'
-        voice='allison'>Hello world</output>
+        voice='allison'
+        renderer='swift'>Hello world</output>
           MESSAGE
         end
 
@@ -64,6 +68,7 @@ module Punchblock
         its(:repeat_times)     { should be == 10 }
         its(:max_time)         { should be == 30000 }
         its(:voice)            { should be == 'allison' }
+        its(:renderer)         { should be == 'swift' }
         its(:text)             { should be == 'Hello world' }
       end
 
@@ -124,8 +129,8 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-              command.expects :paused!
+              mock_client.should_receive(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+              command.should_receive :paused!
               command.pause!
             end
           end
@@ -168,8 +173,8 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-              command.expects :resumed!
+              mock_client.should_receive(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+              command.should_receive :resumed!
               command.resume!
             end
           end
@@ -212,7 +217,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
+              mock_client.should_receive(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
               command.stop!
             end
           end
@@ -244,10 +249,10 @@ module Punchblock
 
               it "should send its command properly" do
                 seek_action = command.seek_action seek_options
-                command.stubs(:seek_action).returns seek_action
-                mock_client.expects(:execute_command).with(seek_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-                command.expects :seeking!
-                command.expects :stopped_seeking!
+                command.stub(:seek_action).and_return seek_action
+                mock_client.should_receive(:execute_command).with(seek_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+                command.should_receive :seeking!
+                command.should_receive :stopped_seeking!
                 command.seek! seek_options
                 seek_action.request!
                 seek_action.execute!
@@ -311,10 +316,10 @@ module Punchblock
 
               it "should send its command properly" do
                 speed_up_action = command.speed_up_action
-                command.stubs(:speed_up_action).returns speed_up_action
-                mock_client.expects(:execute_command).with(speed_up_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-                command.expects :speeding_up!
-                command.expects :stopped_speeding!
+                command.stub(:speed_up_action).and_return speed_up_action
+                mock_client.should_receive(:execute_command).with(speed_up_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+                command.should_receive :speeding_up!
+                command.should_receive :stopped_speeding!
                 command.speed_up!
                 speed_up_action.request!
                 speed_up_action.execute!
@@ -369,10 +374,10 @@ module Punchblock
 
               it "should send its command properly" do
                 slow_down_action = command.slow_down_action
-                command.stubs(:slow_down_action).returns slow_down_action
-                mock_client.expects(:execute_command).with(slow_down_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-                command.expects :slowing_down!
-                command.expects :stopped_speeding!
+                command.stub(:slow_down_action).and_return slow_down_action
+                mock_client.should_receive(:execute_command).with(slow_down_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+                command.should_receive :slowing_down!
+                command.should_receive :stopped_speeding!
                 command.slow_down!
                 slow_down_action.request!
                 slow_down_action.execute!
@@ -444,10 +449,10 @@ module Punchblock
 
               it "should send its command properly" do
                 volume_up_action = command.volume_up_action
-                command.stubs(:volume_up_action).returns volume_up_action
-                mock_client.expects(:execute_command).with(volume_up_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-                command.expects :voluming_up!
-                command.expects :stopped_voluming!
+                command.stub(:volume_up_action).and_return volume_up_action
+                mock_client.should_receive(:execute_command).with(volume_up_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+                command.should_receive :voluming_up!
+                command.should_receive :stopped_voluming!
                 command.volume_up!
                 volume_up_action.request!
                 volume_up_action.execute!
@@ -502,10 +507,10 @@ module Punchblock
 
               it "should send its command properly" do
                 volume_down_action = command.volume_down_action
-                command.stubs(:volume_down_action).returns volume_down_action
-                mock_client.expects(:execute_command).with(volume_down_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-                command.expects :voluming_down!
-                command.expects :stopped_voluming!
+                command.stub(:volume_down_action).and_return volume_down_action
+                mock_client.should_receive(:execute_command).with(volume_down_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+                command.should_receive :voluming_down!
+                command.should_receive :stopped_voluming!
                 command.volume_down!
                 volume_down_action.request!
                 volume_down_action.execute!

data/spec/punchblock/component/record_spec.rb

@@ -78,8 +78,8 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-              command.expects :paused!
+              mock_client.should_receive(:execute_command).with(command.pause_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+              command.should_receive :paused!
               command.pause!
             end
           end
@@ -122,8 +122,8 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').returns true
-              command.expects :resumed!
+              mock_client.should_receive(:execute_command).with(command.resume_action, :target_call_id => '123abc', :component_id => 'abc123').and_return true
+              command.should_receive :resumed!
               command.resume!
             end
           end
@@ -196,7 +196,7 @@ module Punchblock
             end
 
             it "should send its command properly" do
-              mock_client.expects(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
+              mock_client.should_receive(:execute_command).with(command.stop_action, :target_call_id => '123abc', :component_id => 'abc123')
               command.stop!
             end
           end

data/spec/punchblock/connection/asterisk_spec.rb

@@ -15,7 +15,7 @@ module Punchblock
         }
       end
 
-      let(:mock_event_handler) { stub_everything 'Event Handler' }
+      let(:mock_event_handler) { stub('Event Handler').as_null_object }
 
       let(:connection) { Asterisk.new options }
 
@@ -37,26 +37,26 @@ module Punchblock
 
       describe '#run' do
         it 'starts the RubyAMI::Client' do
-          subject.ami_client.expects(:start).once
+          subject.ami_client.should_receive(:start).once
           lambda { subject.run }.should raise_error DisconnectedError
         end
       end
 
       describe '#stop' do
         it 'stops the RubyAMI::Client' do
-          subject.ami_client.expects(:stop).once
+          subject.ami_client.should_receive(:stop).once
           subject.stop
         end
 
         it 'shuts down the translator' do
-          subject.translator.expects(:shutdown!).once
+          subject.translator.should_receive(:shutdown!).once
           subject.stop
         end
       end
 
       it 'sends events from RubyAMI to the translator' do
         event = mock 'RubyAMI::Event'
-        subject.translator.expects(:handle_ami_event!).once.with event
+        subject.translator.should_receive(:handle_ami_event!).once.with event
         subject.ami_client.handle_event event
       end
 
@@ -64,7 +64,7 @@ module Punchblock
         it 'sends a command to the translator' do
           command = mock 'Command'
           options = {:foo => :bar}
-          subject.translator.expects(:execute_command!).once.with command, options
+          subject.translator.should_receive(:execute_command!).once.with command, options
           subject.write command, options
         end
       end
@@ -74,7 +74,7 @@ module Punchblock
           offer = Event::Offer.new
           offer.target_call_id = '9f00061'
 
-          mock_event_handler.expects(:call).once.with offer
+          mock_event_handler.should_receive(:call).once.with offer
           subject.handle_event offer
         end
       end

data/spec/punchblock/connection/freeswitch_spec.rb

@@ -17,7 +17,7 @@ module Punchblock
         }
       end
 
-      let(:mock_event_handler) { stub_everything 'Event Handler' }
+      let(:mock_event_handler) { stub('Event Handler').as_null_object }
 
       let(:connection) { described_class.new options }
 
@@ -43,27 +43,27 @@ module Punchblock
 
       describe '#run' do
         it 'starts a RubyFS stream' do
-          # subject.expects(:new_fs_stream).once.with('127.0.0.1', 8021, 'test').returns mock_stream
-          subject.stream.expects(:run).once
+          # subject.should_receive(:new_fs_stream).once.with('127.0.0.1', 8021, 'test').and_return mock_stream
+          subject.stream.should_receive(:run).once
           lambda { subject.run }.should raise_error(DisconnectedError)
         end
       end
 
       describe '#stop' do
         it 'stops the RubyFS::Stream' do
-          subject.stream.expects(:shutdown).once
+          subject.stream.should_receive(:shutdown).once
           subject.stop
         end
 
         it 'shuts down the translator' do
-          subject.translator.expects(:terminate).once
+          subject.translator.should_receive(:terminate).once
           subject.stop
         end
       end
 
       it 'sends events from RubyFS to the translator' do
         event = mock 'RubyFS::Event'
-        subject.translator.expects(:handle_es_event!).once.with event
+        subject.translator.should_receive(:handle_es_event!).once.with event
         subject.stream.fire_event event
       end
 
@@ -71,7 +71,7 @@ module Punchblock
         it 'sends a command to the translator' do
           command = mock 'Command'
           options = {:foo => :bar}
-          subject.translator.expects(:execute_command!).once.with command, options
+          subject.translator.should_receive(:execute_command!).once.with command, options
           subject.write command, options
         end
       end
@@ -81,7 +81,7 @@ module Punchblock
           offer = Event::Offer.new
           offer.target_call_id = '9f00061'
 
-          mock_event_handler.expects(:call).once.with offer
+          mock_event_handler.should_receive(:call).once.with offer
           subject.handle_event offer
         end
       end

data/spec/punchblock/connection/xmpp_spec.rb

@@ -8,7 +8,7 @@ module Punchblock
       let(:options)     { { :root_domain => 'rayo.net' } }
       let(:connection)  { XMPP.new({:username => '1@app.rayo.net', :password => 1}.merge(options)) }
 
-      let(:mock_event_handler) { stub_everything 'Event Handler' }
+      let(:mock_event_handler) { stub('Event Handler').as_null_object }
 
       before do
         connection.event_handler = mock_event_handler
@@ -87,9 +87,9 @@ module Punchblock
 </output>
         MSG
         output = RayoNode.import parse_stanza(output).root
-        connection.expects(:write_to_stream).once.returns true
+        connection.should_receive(:write_to_stream).once.and_return true
         iq = Blather::Stanza::Iq.new :set, '9f00061@call.rayo.net'
-        connection.expects(:create_iq).returns iq
+        connection.should_receive(:create_iq).and_return iq
 
         write_thread = Thread.new do
           connection.write offer.call_id, output
@@ -127,7 +127,7 @@ module Punchblock
 
       it 'should send a "Chat" presence when ready' do
         client = connection.send :client
-        client.expects(:write).once.with do |stanza|
+        client.should_receive(:write).once.with do |stanza|
           stanza.to.should be == 'rayo.net'
           stanza.should be_a Blather::Stanza::Presence::Status
           stanza.chat?.should be true
@@ -137,7 +137,7 @@ module Punchblock
 
       it 'should send a "Do Not Disturb" presence when not_ready' do
         client = connection.send :client
-        client.expects(:write).once.with do |stanza|
+        client.should_receive(:write).once.with do |stanza|
           stanza.to.should be == 'rayo.net'
           stanza.should be_a Blather::Stanza::Presence::Status
           stanza.dnd?.should be true
@@ -180,7 +180,7 @@ module Punchblock
             let(:handle_presence) { connection.__send__ :handle_presence, example_offer }
 
             it 'should call the event handler with the event' do
-              mock_event_handler.expects(:call).once.with do |event|
+              mock_event_handler.should_receive(:call).once.with do |event|
                 event.should be_instance_of Event::Offer
                 event.target_call_id.should be == '9f00061'
                 event.domain.should be == 'call.rayo.net'
@@ -207,7 +207,7 @@ module Punchblock
             let(:example_irrelevant_event) { import_stanza irrelevant_xml }
 
             it 'should not handle the event' do
-              mock_event_handler.expects(:call).never
+              mock_event_handler.should_receive(:call).never
               lambda { connection.__send__ :handle_presence, example_irrelevant_event }.should throw_symbol(:pass)
             end
           end
@@ -307,7 +307,7 @@ module Punchblock
       describe "receiving events from a mixer" do
         context "after joining the mixer" do
           before do
-            subject.send(:client).expects :write_with_handler
+            subject.send(:client).should_receive :write_with_handler
             subject.write Command::Join.new(:mixer_name => 'foomixer')
           end
 
@@ -322,7 +322,7 @@ module Punchblock
           let(:active_speaker_event) { import_stanza active_speaker_xml }
 
           it "should tag those events with a mixer name, rather than a call ID" do
-            mock_event_handler.expects(:call).once.with do |event|
+            mock_event_handler.should_receive(:call).once.with do |event|
               event.should be_instance_of Event::StartedSpeaking
               event.target_mixer_name.should be == 'foomixer'
               event.target_call_id.should be nil

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

@@ -7,7 +7,7 @@ module Punchblock
     class Asterisk
       describe Call do
         let(:channel)         { 'SIP/foo' }
-        let(:translator)      { stub_everything 'Translator::Asterisk' }
+        let(:translator)      { stub('Translator::Asterisk').as_null_object }
         let(:agi_env) do
           {
             :agi_request      => 'async',
@@ -88,7 +88,7 @@ module Punchblock
                                                           :to       => '1000',
                                                           :from     => 'Jane Smith <SIP/5678>',
                                                           :headers  => sip_headers
-            translator.expects(:handle_pb_event).with expected_offer
+            translator.should_receive(:handle_pb_event).with expected_offer
             subject.send_offer
           end
 
@@ -104,15 +104,15 @@ module Punchblock
 
           context "with a call that is already answered" do
             it 'should not send the EXEC Progress command' do
-              subject.wrapped_object.expects(:'answered?').returns true
-              subject.wrapped_object.expects(:send_agi_action).with("EXEC Progress").never
+              subject.wrapped_object.should_receive(:'answered?').and_return true
+              subject.wrapped_object.should_receive(:send_agi_action).with("EXEC Progress").never
               subject.send_progress
             end
           end
 
           context "with an unanswered call" do
             before do
-              subject.wrapped_object.expects(:'answered?').returns(false).at_least_once
+              subject.wrapped_object.should_receive(:'answered?').at_least(:once).and_return(false)
             end
 
             context "with a call that is outbound" do
@@ -124,7 +124,7 @@ module Punchblock
               end
 
               it 'should not send the EXEC Progress command' do
-                subject.wrapped_object.expects(:send_agi_action).with("EXEC Progress").never
+                subject.wrapped_object.should_receive(:send_agi_action).with("EXEC Progress").never
                 subject.send_progress
               end
             end
@@ -135,12 +135,12 @@ module Punchblock
               end
 
               it 'should send the EXEC Progress command to a call that is inbound and not answered' do
-                subject.wrapped_object.expects(:send_agi_action).with("EXEC Progress")
+                subject.wrapped_object.should_receive(:send_agi_action).with("EXEC Progress")
                 subject.send_progress
               end
 
               it 'should send the EXEC Progress command only once if called twice' do
-                subject.wrapped_object.expects(:send_agi_action).with("EXEC Progress").once
+                subject.wrapped_object.should_receive(:send_agi_action).with("EXEC Progress").once
                 subject.send_progress
                 subject.send_progress
               end
@@ -170,7 +170,7 @@ module Punchblock
                                                                                  :variable    => "punchblock_call_id=#{subject.id}"
                                                                                }).tap { |a| a.request! }
 
-            translator.expects(:execute_global_command!).once.with expected_action
+            translator.should_receive(:execute_global_command!).once.with expected_action
             subject.dial dial_command
           end
 
@@ -188,7 +188,7 @@ module Punchblock
                                                                                    :variable    => "punchblock_call_id=#{subject.id}"
                                                                                  }).tap { |a| a.request! }
 
-              translator.expects(:execute_global_command!).once.with expected_action
+              translator.should_receive(:execute_global_command!).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -210,7 +210,7 @@ module Punchblock
                                                                                    :timeout     => 10000
                                                                                  }).tap { |a| a.request! }
 
-              translator.expects(:execute_global_command!).once.with expected_action
+              translator.should_receive(:execute_global_command!).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -231,7 +231,7 @@ module Punchblock
                                                                                    :variable    => "punchblock_call_id=#{subject.id},SIPADDHEADER51=\"X-foo: bar\",SIPADDHEADER52=\"X-doo: dah\""
                                                                                  }).tap { |a| a.request! }
 
-              translator.expects(:execute_global_command!).once.with expected_action
+              translator.should_receive(:execute_global_command!).once.with expected_action
               subject.dial dial_command
             end
           end
@@ -253,7 +253,7 @@ module Punchblock
             subject.dial dial_command
             accept_command = Command::Accept.new
             accept_command.request!
-            subject.wrapped_object.expects(:send_agi_action).never
+            subject.wrapped_object.should_receive(:send_agi_action).never
             subject.execute_command accept_command
             accept_command.response(0.5).should be true
           end
@@ -276,15 +276,15 @@ module Punchblock
             let(:cause_txt) { 'Normal Clearing' }
 
             it "should cause the actor to be terminated" do
-              translator.expects(:handle_pb_event).twice
+              translator.should_receive(:handle_pb_event).twice
               subject.process_ami_event ami_event
               sleep 5.5
               subject.should_not be_alive
             end
 
             it "de-registers the call from the translator" do
-              translator.stubs :handle_pb_event
-              translator.expects(:deregister_call).once.with(subject)
+              translator.stub :handle_pb_event
+              translator.should_receive(:deregister_call).once.with(subject)
               subject.process_ami_event ami_event
             end
 
@@ -296,9 +296,9 @@ module Punchblock
               expected_complete_event = Punchblock::Event::Complete.new :target_call_id => subject.id, :component_id => component.id
               expected_complete_event.reason = Punchblock::Event::Complete::Hangup.new
               expected_end_event = Punchblock::Event::End.new :reason => :hangup, :target_call_id  => subject.id
-              end_sequence = sequence 'end events'
-              translator.expects(:handle_pb_event).with(expected_complete_event).once.in_sequence(end_sequence)
-              translator.expects(:handle_pb_event).with(expected_end_event).once.in_sequence(end_sequence)
+
+              translator.should_receive(:handle_pb_event).with(expected_complete_event).once.ordered
+              translator.should_receive(:handle_pb_event).with(expected_end_event).once.ordered
               subject.process_ami_event ami_event
             end
 
@@ -309,7 +309,7 @@ module Punchblock
               it 'should send an end (hangup) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :hangup,
                                                                 :target_call_id  => subject.id
-                translator.expects(:handle_pb_event).with expected_end_event
+                translator.should_receive(:handle_pb_event).with expected_end_event
                 subject.process_ami_event ami_event
               end
             end
@@ -321,7 +321,7 @@ module Punchblock
               it 'should send an end (hangup) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :hangup,
                                                                 :target_call_id  => subject.id
-                translator.expects(:handle_pb_event).with expected_end_event
+                translator.should_receive(:handle_pb_event).with expected_end_event
                 subject.process_ami_event ami_event
               end
             end
@@ -333,7 +333,7 @@ module Punchblock
               it 'should send an end (busy) event to the translator' do
                 expected_end_event = Punchblock::Event::End.new :reason   => :busy,
                                                                 :target_call_id  => subject.id
-                translator.expects(:handle_pb_event).with expected_end_event
+                translator.should_receive(:handle_pb_event).with expected_end_event
                 subject.process_ami_event ami_event
               end
             end
@@ -349,7 +349,7 @@ module Punchblock
                 it 'should send an end (timeout) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :timeout,
                                                                   :target_call_id  => subject.id
-                  translator.expects(:handle_pb_event).with expected_end_event
+                  translator.should_receive(:handle_pb_event).with expected_end_event
                   subject.process_ami_event ami_event
                 end
               end
@@ -367,7 +367,7 @@ module Punchblock
                 it 'should send an end (reject) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :reject,
                                                                   :target_call_id  => subject.id
-                  translator.expects(:handle_pb_event).with expected_end_event
+                  translator.should_receive(:handle_pb_event).with expected_end_event
                   subject.process_ami_event ami_event
                 end
               end
@@ -419,7 +419,7 @@ module Punchblock
                 it 'should send an end (error) event to the translator' do
                   expected_end_event = Punchblock::Event::End.new :reason   => :error,
                                                                   :target_call_id  => subject.id
-                  translator.expects(:handle_pb_event).with expected_end_event
+                  translator.should_receive(:handle_pb_event).with expected_end_event
                   subject.process_ami_event ami_event
                 end
               end
@@ -447,7 +447,7 @@ module Punchblock
             end
 
             it 'should send the event to the component' do
-              component.expects(:handle_ami_event).once.with ami_event
+              component.should_receive(:handle_ami_event).once.with ami_event
               subject.process_ami_event ami_event
             end
           end
@@ -474,7 +474,7 @@ module Punchblock
               it 'should send a ringing event' do
                 expected_ringing = Punchblock::Event::Ringing.new
                 expected_ringing.target_call_id = subject.id
-                translator.expects(:handle_pb_event).with expected_ringing
+                translator.should_receive(:handle_pb_event).with expected_ringing
                 subject.process_ami_event ami_event
               end
 
@@ -491,7 +491,7 @@ module Punchblock
               it 'should send a ringing event' do
                 expected_answered = Punchblock::Event::Answered.new
                 expected_answered.target_call_id = subject.id
-                translator.expects(:handle_pb_event).with expected_answered
+                translator.should_receive(:handle_pb_event).with expected_answered
                 subject.process_ami_event ami_event
               end
 
@@ -523,7 +523,7 @@ module Punchblock
               let(:uniqueid)  { '<null>' }
 
               it 'should not send an end event' do
-                translator.expects(:handle_pb_event).once.with is_a(Punchblock::Event::Asterisk::AMI::Event)
+                translator.should_receive(:handle_pb_event).once.with an_instance_of(Punchblock::Event::Asterisk::AMI::Event)
                 subject.process_ami_event ami_event
               end
             end
@@ -533,7 +533,7 @@ module Punchblock
               let(:uniqueid)  { '1235' }
 
               it 'should not send an end event' do
-                translator.expects(:handle_pb_event).once.with is_a(Punchblock::Event::Asterisk::AMI::Event)
+                translator.should_receive(:handle_pb_event).once.with an_instance_of(Punchblock::Event::Asterisk::AMI::Event)
                 subject.process_ami_event ami_event
               end
             end
@@ -545,7 +545,7 @@ module Punchblock
               it 'should send an error end event' do
                 expected_end_event = Punchblock::Event::End.new :reason         => :error,
                                                                 :target_call_id => subject.id
-                translator.expects(:handle_pb_event).with expected_end_event
+                translator.should_receive(:handle_pb_event).with expected_end_event
                 subject.process_ami_event ami_event
               end
             end
@@ -565,7 +565,7 @@ module Punchblock
             let(:response) { mock 'Response' }
 
             it 'should execute the handler' do
-              response.expects(:call).once.with ami_event
+              response.should_receive(:call).once.with ami_event
               subject.register_handler :ami, :name => 'DTMF' do |event|
                 response.call event
               end
@@ -637,8 +637,8 @@ module Punchblock
 
             before do
               translator.register_call other_call
-              translator.expects(:call_for_channel).with(other_channel).returns(other_call)
-              other_call.expects(:id).returns other_call_id
+              translator.should_receive(:call_for_channel).with(other_channel).and_return(other_call)
+              other_call.should_receive(:id).and_return other_call_id
             end
 
             context "of state 'Link'" do
@@ -652,12 +652,12 @@ module Punchblock
               end
 
               it 'sends the Joined event when the call is the first channel' do
-                translator.expects(:handle_pb_event).with expected_joined
+                translator.should_receive(:handle_pb_event).with expected_joined
                 subject.process_ami_event ami_event
               end
 
               it 'sends the Joined event when the call is the second channel' do
-                translator.expects(:handle_pb_event).with expected_joined
+                translator.should_receive(:handle_pb_event).with expected_joined
                 subject.process_ami_event switched_ami_event
               end
             end
@@ -673,12 +673,12 @@ module Punchblock
               end
 
               it 'sends the Unjoined event when the call is the first channel' do
-                translator.expects(:handle_pb_event).with expected_unjoined
+                translator.should_receive(:handle_pb_event).with expected_unjoined
                 subject.process_ami_event ami_event
               end
 
               it 'sends the Unjoined event when the call is the second channel' do
-                translator.expects(:handle_pb_event).with expected_unjoined
+                translator.should_receive(:handle_pb_event).with expected_unjoined
                 subject.process_ami_event switched_ami_event
               end
             end
@@ -717,8 +717,8 @@ module Punchblock
 
             before do
               translator.register_call other_call
-              translator.expects(:call_for_channel).with(other_channel).returns(other_call)
-              other_call.expects(:id).returns other_call_id
+              translator.should_receive(:call_for_channel).with(other_channel).and_return(other_call)
+              other_call.should_receive(:id).and_return other_call_id
             end
 
             let :expected_unjoined do
@@ -729,12 +729,12 @@ module Punchblock
             end
 
             it 'sends the Unjoined event when the call is the first channel' do
-              translator.expects(:handle_pb_event).with expected_unjoined
+              translator.should_receive(:handle_pb_event).with expected_unjoined
               subject.process_ami_event ami_event
             end
 
             it 'sends the Unjoined event when the call is the second channel' do
-              translator.expects(:handle_pb_event).with expected_unjoined
+              translator.should_receive(:handle_pb_event).with expected_unjoined
               subject.process_ami_event switched_ami_event
             end
           end
@@ -762,7 +762,7 @@ module Punchblock
           end
 
           it 'sends the AMI event to the connection as a PB event' do
-            translator.expects(:handle_pb_event).with expected_pb_event
+            translator.should_receive(:handle_pb_event).with expected_pb_event
             subject.process_ami_event ami_event
           end
 
@@ -862,9 +862,9 @@ module Punchblock
             let(:mock_action) { mock 'Component::Asterisk::AGI::Command', :id => 'foo' }
 
             it 'should create an AGI command component actor and execute it asynchronously' do
-              mock_action.expects(:internal=).never
-              Component::Asterisk::AGICommand.expects(:new_link).once.with(command, subject).returns mock_action
-              mock_action.expects(:execute!).once
+              mock_action.should_receive(:internal=).never
+              Component::Asterisk::AGICommand.should_receive(:new_link).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:execute!).once
               subject.execute_command command
             end
           end
@@ -877,9 +877,9 @@ module Punchblock
             let(:mock_action) { mock 'Component::Asterisk::Output', :id => 'foo' }
 
             it 'should create an Output component and execute it asynchronously' do
-              Component::Output.expects(:new_link).once.with(command, subject).returns mock_action
-              mock_action.expects(:internal=).never
-              mock_action.expects(:execute!).once
+              Component::Output.should_receive(:new_link).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:internal=).never
+              mock_action.should_receive(:execute!).once
               subject.execute_command command
             end
           end
@@ -892,9 +892,9 @@ module Punchblock
             let(:mock_action) { mock 'Component::Asterisk::Input', :id => 'foo' }
 
             it 'should create an Input component and execute it asynchronously' do
-              Component::Input.expects(:new_link).once.with(command, subject).returns mock_action
-              mock_action.expects(:internal=).never
-              mock_action.expects(:execute!).once
+              Component::Input.should_receive(:new_link).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:internal=).never
+              mock_action.should_receive(:execute!).once
               subject.execute_command command
             end
           end
@@ -907,9 +907,9 @@ module Punchblock
             let(:mock_action) { mock 'Component::Asterisk::Record', :id => 'foo' }
 
             it 'should create a Record component and execute it asynchronously' do
-              Component::Record.expects(:new_link).once.with(command, subject).returns mock_action
-              mock_action.expects(:internal=).never
-              mock_action.expects(:execute!).once
+              Component::Record.should_receive(:new_link).once.with(command, subject).and_return mock_action
+              mock_action.should_receive(:internal=).never
+              mock_action.should_receive(:execute!).once
               subject.execute_command command
             end
           end
@@ -929,7 +929,7 @@ module Punchblock
               before { subject.register_component mock_component }
 
               it 'should send the command to the component for execution' do
-                mock_component.expects(:execute_command).once
+                mock_component.should_receive(:execute_command).once
                 subject.execute_command command
               end
             end
@@ -963,7 +963,7 @@ module Punchblock
                   raise 'Woops, I died'
                 end
 
-                translator.expects(:handle_pb_event).once.with expected_event
+                translator.should_receive(:handle_pb_event).once.with expected_event
 
                 lambda { component.oops }.should raise_error(/Woops, I died/)
                 sleep 0.1
@@ -998,7 +998,7 @@ module Punchblock
           context "with a join command" do
             let(:other_call_id)     { "abc123" }
             let(:other_channel)     { 'SIP/bar' }
-            let(:other_translator)  { stub_everything 'Translator::Asterisk' }
+            let(:other_translator)  { stub('Translator::Asterisk').as_null_object }
 
             let :other_call do
               Call.new other_channel, other_translator
@@ -1009,7 +1009,7 @@ module Punchblock
             end
 
             it "executes the proper dialplan Bridge application" do
-              translator.expects(:call_with_id).with(other_call_id).returns(other_call)
+              translator.should_receive(:call_with_id).with(other_call_id).and_return(other_call)
               subject.execute_command command
               agi_command = subject.wrapped_object.instance_variable_get(:'@current_agi_command')
               agi_command.name.should be == "EXEC Bridge"
@@ -1017,7 +1017,7 @@ module Punchblock
             end
 
             it "adds the join to the @pending_joins hash" do
-              translator.expects(:call_with_id).with(other_call_id).returns(other_call)
+              translator.should_receive(:call_with_id).with(other_call_id).and_return(other_call)
               subject.execute_command command
               subject.pending_joins[other_channel].should be command
             end
@@ -1036,7 +1036,7 @@ module Punchblock
             end
 
             it "executes the unjoin through redirection" do
-              translator.expects(:call_with_id).with(other_call_id).returns(nil)
+              translator.should_receive(:call_with_id).with(other_call_id).and_return(nil)
               subject.execute_command command
               ami_action = subject.wrapped_object.instance_variable_get(:'@current_ami_action')
               ami_action.name.should be == "redirect"
@@ -1050,7 +1050,7 @@ module Punchblock
             end
 
             it "executes the unjoin through redirection, on the subject call and the other call" do
-              translator.expects(:call_with_id).with(other_call_id).returns(other_call)
+              translator.should_receive(:call_with_id).with(other_call_id).and_return(other_call)
               subject.execute_command command
               ami_action = subject.wrapped_object.instance_variable_get(:'@current_ami_action')
               ami_action.name.should be == "redirect"
@@ -1066,7 +1066,7 @@ module Punchblock
             end
 
             it "handles redirect errors" do
-              translator.expects(:call_with_id).with(other_call_id).returns(nil)
+              translator.should_receive(:call_with_id).with(other_call_id).and_return(nil)
               subject.execute_command command
               ami_action = subject.wrapped_object.instance_variable_get(:'@current_ami_action')
               ami_action.name.should be == "redirect"
@@ -1086,7 +1086,7 @@ module Punchblock
         describe '#send_agi_action' do
           it 'should send an appropriate AsyncAGI AMI action' do
             pending
-            subject.wrapped_object.expects(:send_ami_action).once.with('AGI', 'Command' => 'FOO', 'Channel' => subject.channel)
+            subject.wrapped_object.should_receive(:send_ami_action).once.with('AGI', 'Command' => 'FOO', 'Channel' => subject.channel)
             subject.send_agi_action 'FOO'
           end
         end
@@ -1097,7 +1097,7 @@ module Punchblock
 
           it 'should send the action to the AMI client' do
             action = RubyAMI::Action.new 'foo', :foo => :bar
-            translator.expects(:send_ami_action).once.with action
+            translator.should_receive(:send_ami_action).once.with action
             subject.send_ami_action 'foo', :foo => :bar
           end
         end