punchblock 1.9.4 → 2.0.0.beta1

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

@@ -7,10 +7,10 @@ module Punchblock
     class Freeswitch
       describe Call do
         let(:id) { Punchblock.new_uuid }
-        let(:stream)        { stub('RubyFS::Stream').as_null_object }
+        let(:stream)        { double('RubyFS::Stream').as_null_object }
         let(:media_engine)  { 'freeswitch' }
         let(:default_voice) { :hal }
-        let(:translator)    { Freeswitch.new stub('Connection::Freeswitch').as_null_object }
+        let(:translator)    { Freeswitch.new double('Connection::Freeswitch').as_null_object }
         let(:es_env) do
           {
             :variable_direction                   => "inbound",
@@ -90,78 +90,78 @@ module Punchblock
 
         let :headers do
           {
-            :x_variable_direction                   => "inbound",
-            :x_variable_uuid                        => "3f0e1e18-c056-11e1-b099-fffeda3ce54f",
-            :x_variable_session_id                  => "1",
-            :x_variable_sip_local_network_addr      => "109.148.160.137",
-            :x_variable_sip_network_ip              => "192.168.1.74",
-            :x_variable_sip_network_port            => "59253",
-            :x_variable_sip_received_ip             => "192.168.1.74",
-            :x_variable_sip_received_port           => "59253",
-            :x_variable_sip_via_protocol            => "udp",
-            :x_variable_sip_authorized              => "true",
-            :x_variable_sip_number_alias            => "1000",
-            :x_variable_sip_auth_username           => "1000",
-            :x_variable_sip_auth_realm              => "127.0.0.1",
-            :x_variable_number_alias                => "1000",
-            :x_variable_user_name                   => "1000",
-            :x_variable_domain_name                 => "127.0.0.1",
-            :x_variable_record_stereo               => "true",
-            :x_variable_default_gateway             => "example.com",
-            :x_variable_default_areacode            => "918",
-            :x_variable_transfer_fallback_extension => "operator",
-            :x_variable_toll_allow                  => "domestic,international,local",
-            :x_variable_accountcode                 => "1000",
-            :x_variable_user_context                => "default",
-            :x_variable_effective_caller_id_name    => "Extension 1000",
-            :x_variable_effective_caller_id_number  => "1000",
-            :x_variable_outbound_caller_id_name     => "FreeSWITCH",
-            :x_variable_outbound_caller_id_number   => "0000000000",
-            :x_variable_callgroup                   => "techsupport",
-            :x_variable_sip_from_user               => "1000",
-            :x_variable_sip_from_uri                => "1000@127.0.0.1",
-            :x_variable_sip_from_host               => "127.0.0.1",
-            :x_variable_sip_from_user_stripped      => "1000",
-            :x_variable_sip_from_tag                => "1248111553",
-            :x_variable_sofia_profile_name          => "internal",
-            :x_variable_sip_full_via                => "SIP/2.0/UDP 192.168.1.74:59253;rport=59253;branch=z9hG4bK2021947958",
-            :x_variable_sip_full_from               => "<sip:1000@127.0.0.1>;tag=1248111553",
-            :x_variable_sip_full_to                 => "<sip:10@127.0.0.1>",
-            :x_variable_sip_req_user                => "10",
-            :x_variable_sip_req_uri                 => "10@127.0.0.1",
-            :x_variable_sip_req_host                => "127.0.0.1",
-            :x_variable_sip_to_user                 => "10",
-            :x_variable_sip_to_uri                  => "10@127.0.0.1",
-            :x_variable_sip_to_host                 => "127.0.0.1",
-            :x_variable_sip_contact_user            => "1000",
-            :x_variable_sip_contact_port            => "59253",
-            :x_variable_sip_contact_uri             => "1000@192.168.1.74:59253",
-            :x_variable_sip_contact_host            => "192.168.1.74",
-            :x_variable_channel_name                => "sofia/internal/1000@127.0.0.1",
-            :x_variable_sip_call_id                 => "1251435211@127.0.0.1",
-            :x_variable_sip_user_agent              => "YATE/4.1.0",
-            :x_variable_sip_via_host                => "192.168.1.74",
-            :x_variable_sip_via_port                => "59253",
-            :x_variable_sip_via_rport               => "59253",
-            :x_variable_max_forwards                => "20",
-            :x_variable_presence_id                 => "1000@127.0.0.1",
-            :x_variable_switch_r_sdp                => "v=0\r\no=yate 1340801245 1340801245 IN IP4 172.20.10.3\r\ns=SIP Call\r\nc=IN IP4 172.20.10.3\r\nt=0 0\r\nm=audio 25048 RTP/AVP 0 8 11 98 97 102 103 104 105 106 101\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:11 L16/8000\r\na=rtpmap:98 iLBC/8000\r\na=fmtp:98 mode=20\r\na=rtpmap:97 iLBC/8000\r\na=fmtp:97 mode=30\r\na=rtpmap:102 SPEEX/8000\r\na=rtpmap:103 SPEEX/16000\r\na=rtpmap:104 SPEEX/32000\r\na=rtpmap:105 iSAC/16000\r\na=rtpmap:106 iSAC/32000\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:30\r\n",
-            :x_variable_remote_media_ip             => "172.20.10.3",
-            :x_variable_remote_media_port           => "25048",
-            :x_variable_sip_audio_recv_pt           => "0",
-            :x_variable_sip_use_codec_name          => "PCMU",
-            :x_variable_sip_use_codec_rate          => "8000",
-            :x_variable_sip_use_codec_ptime         => "30",
-            :x_variable_read_codec                  => "PCMU",
-            :x_variable_read_rate                   => "8000",
-            :x_variable_write_codec                 => "PCMU",
-            :x_variable_write_rate                  => "8000",
-            :x_variable_endpoint_disposition        => "RECEIVED",
-            :x_variable_call_uuid                   => "3f0e1e18-c056-11e1-b099-fffeda3ce54f",
-            :x_variable_open                        => "true",
-            :x_variable_rfc2822_date                => "Wed, 27 Jun 2012 13:47:25 +0100",
-            :x_variable_export_vars                 => "RFC2822_DATE",
-            :x_variable_current_application         => "park"
+            'X-variable_direction'                   => "inbound",
+            'X-variable_uuid'                        => "3f0e1e18-c056-11e1-b099-fffeda3ce54f",
+            'X-variable_session_id'                  => "1",
+            'X-variable_sip_local_network_addr'      => "109.148.160.137",
+            'X-variable_sip_network_ip'              => "192.168.1.74",
+            'X-variable_sip_network_port'            => "59253",
+            'X-variable_sip_received_ip'             => "192.168.1.74",
+            'X-variable_sip_received_port'           => "59253",
+            'X-variable_sip_via_protocol'            => "udp",
+            'X-variable_sip_authorized'              => "true",
+            'X-variable_sip_number_alias'            => "1000",
+            'X-variable_sip_auth_username'           => "1000",
+            'X-variable_sip_auth_realm'              => "127.0.0.1",
+            'X-variable_number_alias'                => "1000",
+            'X-variable_user_name'                   => "1000",
+            'X-variable_domain_name'                 => "127.0.0.1",
+            'X-variable_record_stereo'               => "true",
+            'X-variable_default_gateway'             => "example.com",
+            'X-variable_default_areacode'            => "918",
+            'X-variable_transfer_fallback_extension' => "operator",
+            'X-variable_toll_allow'                  => "domestic,international,local",
+            'X-variable_accountcode'                 => "1000",
+            'X-variable_user_context'                => "default",
+            'X-variable_effective_caller_id_name'    => "Extension 1000",
+            'X-variable_effective_caller_id_number'  => "1000",
+            'X-variable_outbound_caller_id_name'     => "FreeSWITCH",
+            'X-variable_outbound_caller_id_number'   => "0000000000",
+            'X-variable_callgroup'                   => "techsupport",
+            'X-variable_sip_from_user'               => "1000",
+            'X-variable_sip_from_uri'                => "1000@127.0.0.1",
+            'X-variable_sip_from_host'               => "127.0.0.1",
+            'X-variable_sip_from_user_stripped'      => "1000",
+            'X-variable_sip_from_tag'                => "1248111553",
+            'X-variable_sofia_profile_name'          => "internal",
+            'X-variable_sip_full_via'                => "SIP/2.0/UDP 192.168.1.74:59253;rport=59253;branch=z9hG4bK2021947958",
+            'X-variable_sip_full_from'               => "<sip:1000@127.0.0.1>;tag=1248111553",
+            'X-variable_sip_full_to'                 => "<sip:10@127.0.0.1>",
+            'X-variable_sip_req_user'                => "10",
+            'X-variable_sip_req_uri'                 => "10@127.0.0.1",
+            'X-variable_sip_req_host'                => "127.0.0.1",
+            'X-variable_sip_to_user'                 => "10",
+            'X-variable_sip_to_uri'                  => "10@127.0.0.1",
+            'X-variable_sip_to_host'                 => "127.0.0.1",
+            'X-variable_sip_contact_user'            => "1000",
+            'X-variable_sip_contact_port'            => "59253",
+            'X-variable_sip_contact_uri'             => "1000@192.168.1.74:59253",
+            'X-variable_sip_contact_host'            => "192.168.1.74",
+            'X-variable_channel_name'                => "sofia/internal/1000@127.0.0.1",
+            'X-variable_sip_call_id'                 => "1251435211@127.0.0.1",
+            'X-variable_sip_user_agent'              => "YATE/4.1.0",
+            'X-variable_sip_via_host'                => "192.168.1.74",
+            'X-variable_sip_via_port'                => "59253",
+            'X-variable_sip_via_rport'               => "59253",
+            'X-variable_max_forwards'                => "20",
+            'X-variable_presence_id'                 => "1000@127.0.0.1",
+            'X-variable_switch_r_sdp'                => "v=0\r\no=yate 1340801245 1340801245 IN IP4 172.20.10.3\r\ns=SIP Call\r\nc=IN IP4 172.20.10.3\r\nt=0 0\r\nm=audio 25048 RTP/AVP 0 8 11 98 97 102 103 104 105 106 101\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:11 L16/8000\r\na=rtpmap:98 iLBC/8000\r\na=fmtp:98 mode=20\r\na=rtpmap:97 iLBC/8000\r\na=fmtp:97 mode=30\r\na=rtpmap:102 SPEEX/8000\r\na=rtpmap:103 SPEEX/16000\r\na=rtpmap:104 SPEEX/32000\r\na=rtpmap:105 iSAC/16000\r\na=rtpmap:106 iSAC/32000\r\na=rtpmap:101 telephone-event/8000\r\na=ptime:30\r\n",
+            'X-variable_remote_media_ip'             => "172.20.10.3",
+            'X-variable_remote_media_port'           => "25048",
+            'X-variable_sip_audio_recv_pt'           => "0",
+            'X-variable_sip_use_codec_name'          => "PCMU",
+            'X-variable_sip_use_codec_rate'          => "8000",
+            'X-variable_sip_use_codec_ptime'         => "30",
+            'X-variable_read_codec'                  => "PCMU",
+            'X-variable_read_rate'                   => "8000",
+            'X-variable_write_codec'                 => "PCMU",
+            'X-variable_write_rate'                  => "8000",
+            'X-variable_endpoint_disposition'        => "RECEIVED",
+            'X-variable_call_uuid'                   => "3f0e1e18-c056-11e1-b099-fffeda3ce54f",
+            'X-variable_open'                        => "true",
+            'X-variable_rfc2822_date'                => "Wed, 27 Jun 2012 13:47:25 +0100",
+            'X-variable_export_vars'                 => "RFC2822_DATE",
+            'X-variable_current_application'         => "park"
           }
         end
 
@@ -176,7 +176,7 @@ module Punchblock
         describe '#register_component' do
           it 'should make the component accessible by ID' do
             component_id = 'abc123'
-            component    = mock 'Translator::Freeswitch::Component', :id => component_id
+            component    = double 'Translator::Freeswitch::Component', :id => component_id
             subject.register_component component
             subject.component_with_id(component_id).should be component
           end
@@ -350,13 +350,13 @@ module Punchblock
 
             it "de-registers the call from the translator" do
               translator.stub :handle_pb_event
-              translator.should_receive(:deregister_call).once.with(subject)
+              translator.should_receive(:deregister_call).once.with(id)
               subject.handle_es_event es_event
             end
 
             it "should cause all components to send complete events before sending end event" do
               ssml_doc = RubySpeech::SSML.draw { audio { 'foo.wav' } }
-              comp_command = Punchblock::Component::Output.new :ssml => ssml_doc
+              comp_command = Punchblock::Component::Output.new :render_document => {:value => ssml_doc}
               comp_command.request!
               component = subject.execute_command comp_command
               comp_command.response(0.1).should be_a Ref
@@ -374,7 +374,6 @@ module Punchblock
               'NORMAL_CLEARING',
               'ORIGINATOR_CANCEL',
               'SYSTEM_SHUTDOWN',
-              'MANAGER_REQUEST',
               'BLIND_TRANSFER',
               'ATTENDED_TRANSFER',
               'PICKED_OFF',
@@ -392,6 +391,17 @@ module Punchblock
               end
             end
 
+            context "with a MANAGER_REQUEST cause" do
+              let(:cause) { 'MANAGER_REQUEST' }
+
+              it 'should send an end (hangup-command) event to the translator' do
+                expected_end_event = Punchblock::Event::End.new :reason         => :hangup_command,
+                                                                :target_call_id => subject.id
+                translator.should_receive(:handle_pb_event).with expected_end_event
+                subject.handle_es_event es_event
+              end
+            end
+
             context "with a user busy cause" do
               let(:cause) { 'USER_BUSY' }
 
@@ -500,7 +510,7 @@ module Punchblock
           end
 
           context 'with an event for a known component' do
-            let(:mock_component_node) { mock 'Punchblock::Component::Output' }
+            let(:mock_component_node) { double 'Punchblock::Component::Output' }
             let :component do
               Component::Output.new mock_component_node, subject
             end
@@ -581,7 +591,7 @@ module Punchblock
               RubyFS::Event.new nil, :event_name => 'DTMF'
             end
 
-            let(:response) { mock 'Response' }
+            let(:response) { double 'Response' }
 
             it 'should execute the handler' do
               response.should_receive(:call).once.with es_event
@@ -596,10 +606,8 @@ module Punchblock
             let(:other_call_id) { Punchblock.new_uuid }
 
             let :expected_joined do
-              Punchblock::Event::Joined.new.tap do |joined|
-                joined.target_call_id = subject.id
-                joined.call_id = other_call_id
-              end
+              Punchblock::Event::Joined.new target_call_id: subject.id,
+                call_uri: other_call_id
             end
 
             context "where this is the joining call" do
@@ -637,10 +645,8 @@ module Punchblock
             let(:other_call_id) { Punchblock.new_uuid }
 
             let :expected_unjoined do
-              Punchblock::Event::Unjoined.new.tap do |joined|
-                joined.target_call_id = subject.id
-                joined.call_id = other_call_id
-              end
+              Punchblock::Event::Unjoined.new target_call_id: subject.id,
+                call_uri: other_call_id
             end
 
             context "where this is the unjoining call" do
@@ -738,7 +744,7 @@ module Punchblock
             let(:command) { Command::Hangup.new }
 
             it "should send a hangup message and set the command's response" do
-              expect_hangup_with_reason 'NORMAL_CLEARING'
+              expect_hangup_with_reason 'MANAGER_REQUEST'
               subject.execute_command command
               command.response(0.5).should be true
             end
@@ -874,7 +880,7 @@ module Punchblock
             end
 
             let :mock_component do
-              mock 'Component', :id => component_id
+              double 'Component', :id => component_id
             end
 
             context "for a known component ID" do
@@ -888,19 +894,17 @@ module Punchblock
 
             context "for a component which began executing but crashed" do
               let :component_command do
-                Punchblock::Component::Output.new :ssml => RubySpeech::SSML.draw
+                Punchblock::Component::Output.new :render_document => {:value => RubySpeech::SSML.draw}
               end
 
-              let(:comp_id) { component_command.response.id }
+              let(:comp_id) { component_command.response.component_id }
 
               let(:subsequent_command) { Punchblock::Component::Stop.new :component_id => comp_id }
 
               let :expected_event do
-                Punchblock::Event::Complete.new.tap do |e|
-                  e.target_call_id = subject.id
-                  e.component_id = comp_id
-                  e.reason = Punchblock::Event::Complete::Error.new
-                end
+                Punchblock::Event::Complete.new target_call_id: subject.id,
+                  component_id: comp_id,
+                  reason: Punchblock::Event::Complete::Error.new
               end
 
               before do
@@ -951,7 +955,7 @@ module Punchblock
             let(:other_call_id) { Punchblock.new_uuid }
 
             let :command do
-              Punchblock::Command::Join.new :call_id => other_call_id
+              Punchblock::Command::Join.new :call_uri => other_call_id
             end
 
             it "executes the proper uuid_bridge command" do
@@ -983,7 +987,7 @@ module Punchblock
             let(:other_call_id) { Punchblock.new_uuid }
 
             let :command do
-              Punchblock::Command::Unjoin.new :call_id => other_call_id
+              Punchblock::Command::Unjoin.new :call_uri => other_call_id
             end
 
             it "executes the unjoin via transfer to park" do

data/spec/punchblock/translator/freeswitch/component/flite_output_spec.rb

@@ -25,7 +25,7 @@ module Punchblock
           end
 
           let :command_options do
-            { :ssml => ssml_doc }
+            { :render_document => {:value => ssml_doc} }
           end
 
           def execute
@@ -43,16 +43,16 @@ module Punchblock
             let(:command_opts) { {} }
 
             let :command_options do
-              { :ssml => ssml_doc }.merge(command_opts)
+              { :render_document => {:value => ssml_doc} }.merge(command_opts)
             end
 
             let :original_command do
               Punchblock::Component::Output.new command_options
             end
 
-            describe 'ssml' do
+            describe 'document' do
               context 'unset' do
-                let(:command_opts) { { :ssml => nil } }
+                let(:ssml_doc) { nil }
                 it "should return an error and not execute any actions" do
                   execute
                   error = ProtocolError.new.setup 'option error', 'An SSML document is required.'
@@ -70,7 +70,16 @@ module Punchblock
                   expect_playback
                   execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE")
-                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
+                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Finish
+                end
+              end
+
+              context 'with multiple documents' do
+                let(:command_opts) { { :render_documents => [{:value => ssml_doc}, {:value => ssml_doc}] } }
+                it "should return an error and not execute any actions" do
+                  subject.execute
+                  error = ProtocolError.new.setup 'option error', 'Only a single document is supported.'
+                  original_command.response(0.1).should be == error
                 end
               end
             end
@@ -215,11 +224,11 @@ module Punchblock
                 end
               end
 
-              context "set to :speech" do
-                let(:command_opts) { { :interrupt_on => :speech } }
+              context "set to :voice" do
+                let(:command_opts) { { :interrupt_on => :voice } }
                 it "should return an error and not execute any actions" do
                   execute
-                  error = ProtocolError.new.setup 'option error', 'An interrupt-on value of speech is unsupported.'
+                  error = ProtocolError.new.setup 'option error', 'An interrupt-on value of voice is unsupported.'
                   original_command.response(0.1).should be == error
                 end
               end

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

@@ -11,7 +11,7 @@ module Punchblock
 
           let(:id)          { Punchblock.new_uuid }
           let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
-          let(:mock_stream) { mock('RubyFS::Stream') }
+          let(:mock_stream) { double('RubyFS::Stream') }
           let(:call)        { Punchblock::Translator::Freeswitch::Call.new id, translator, nil, mock_stream }
 
           let(:original_command_options) { {} }
@@ -74,13 +74,17 @@ module Punchblock
                   sleep 0.5
                 end
 
+                let :expected_nlsml do
+                  RubySpeech::NLSML.draw do
+                    interpretation confidence: 1 do
+                      instance "dtmf-1 dtmf-2"
+                      input "12", mode: :dtmf
+                    end
+                  end
+                end
+
                 let :expected_event do
-                  Punchblock::Component::Input::Complete::Success.new :mode => :dtmf,
-                    :confidence => 1,
-                    :utterance => '12',
-                    :interpretation => 'dtmf-1 dtmf-2',
-                    :component_id => subject.id,
-                    :target_call_id => call.id
+                  Punchblock::Component::Input::Complete::Match.new nlsml: expected_nlsml
                 end
 
                 it "should send a success complete event with the relevant data" do
@@ -100,8 +104,7 @@ module Punchblock
                 end
 
                 let :expected_event do
-                  Punchblock::Component::Input::Complete::NoMatch.new :component_id => subject.id,
-                                                                      :target_call_id => call.id
+                  Punchblock::Component::Input::Complete::NoMatch.new
                 end
 
                 it "should send a nomatch complete event" do
@@ -119,6 +122,15 @@ module Punchblock
                   original_command.response(0.1).should be == error
                 end
               end
+
+              context 'with multiple grammars' do
+                let(:original_command_opts) { { :grammars => [{:value => grammar}, {:value => grammar}] } }
+                it "should return an error and not execute any actions" do
+                  subject.execute
+                  error = ProtocolError.new.setup 'option error', 'Only a single grammar is supported.'
+                  original_command.response(0.1).should be == error
+                end
+              end
             end
 
             describe 'mode' do
@@ -140,8 +152,8 @@ module Punchblock
                 end
               end
 
-              context 'speech' do
-                let(:original_command_opts) { { :mode => :speech } }
+              context 'voice' do
+                let(:original_command_opts) { { :mode => :voice } }
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'A mode value other than DTMF is unsupported.'
@@ -167,7 +179,7 @@ module Punchblock
                   send_dtmf 1
                   sleep 1.5
                   send_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::Success
+                  reason.should be_a Punchblock::Component::Input::Complete::Match
                 end
 
                 it "should cause a NoInput complete event to be sent after the timeout" do
@@ -218,10 +230,10 @@ module Punchblock
                   send_dtmf 1
                   sleep 0.5
                   send_dtmf 2
-                  reason.should be_a Punchblock::Component::Input::Complete::Success
+                  reason.should be_a Punchblock::Component::Input::Complete::Match
                 end
 
-                it "should cause a NoMatch complete event to be sent after the timeout" do
+                it "should cause a InterDigitTimeout complete event to be sent after the timeout" do
                   subject.execute
                   sleep 1.5
                   send_dtmf 1

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

@@ -23,7 +23,7 @@ module Punchblock
           end
 
           let :command_options do
-            { :ssml => ssml_doc }
+            { :render_document => {:value => ssml_doc} }
           end
 
           subject { Output.new original_command, mock_call }
@@ -45,16 +45,17 @@ module Punchblock
             let(:command_opts) { {} }
 
             let :command_options do
-              { :ssml => ssml_doc }.merge(command_opts)
+              { :render_document => {:value => ssml_doc} }.merge(command_opts)
             end
 
             let :original_command do
               Punchblock::Component::Output.new command_options
             end
 
-            describe 'ssml' do
+            describe 'document' do
               context 'unset' do
-                let(:command_opts) { { :ssml => nil } }
+                let(:ssml_doc) { nil }
+
                 it "should return an error and not execute any actions" do
                   subject.execute
                   error = ProtocolError.new.setup 'option error', 'An SSML document is required.'
@@ -62,38 +63,10 @@ module Punchblock
                 end
               end
 
-              context 'with a string (not SSML)' do
-                let :command_options do
-                  { :text => 'Foo Bar' }
-                end
-
-                it "should return an unrenderable document error" do
-                  subject.execute
-                  error = ProtocolError.new.setup 'unrenderable document error', 'The provided document could not be rendered. See http://adhearsion.com/docs/common_problems#unrenderable-document-error for details.'
-                  original_command.response(0.1).should be == error
-                end
-
-                context 'with a single text node without spaces' do
-                  let(:audio_filename) { 'http://foo.com/bar.mp3' }
-                  let :command_options do
-                    {
-                      :ssml => RubySpeech::SSML.draw { string audio_filename }
-                    }
-                  end
-
-                  it 'should playback the audio file using the playback application' do
-                    expect_playback
-                    subject.execute
-                  end
-                end
-              end
-
               context 'with a single audio SSML node' do
                 let(:audio_filename) { 'http://foo.com/bar.mp3' }
-                let :command_options do
-                  {
-                    :ssml => RubySpeech::SSML.draw { audio :src => audio_filename }
-                  }
+                let :ssml_doc do
+                  RubySpeech::SSML.draw { audio :src => audio_filename }
                 end
 
                 it 'should playback the audio file using the playback application' do
@@ -105,7 +78,7 @@ module Punchblock
                   expect_playback
                   subject.execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE", :application_response => 'FILE PLAYED')
-                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
+                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Finish
                 end
 
                 context "when playback returns an error" do
@@ -125,13 +98,11 @@ module Punchblock
               context 'with multiple audio SSML nodes' do
                 let(:audio_filename1) { 'http://foo.com/bar.mp3' }
                 let(:audio_filename2) { 'http://foo.com/baz.mp3' }
-                let :command_options do
-                  {
-                    :ssml => RubySpeech::SSML.draw do
-                      audio :src => audio_filename1
-                      audio :src => audio_filename2
-                    end
-                  }
+                let :ssml_doc do
+                  RubySpeech::SSML.draw do
+                    audio :src => audio_filename1
+                    audio :src => audio_filename2
+                  end
                 end
 
                 it 'should playback all audio files using playback' do
@@ -143,17 +114,15 @@ module Punchblock
                   expect_playback([audio_filename1, audio_filename2].join('!'))
                   subject.execute
                   subject.handle_es_event RubyFS::Event.new(nil, :event_name => "CHANNEL_EXECUTE_COMPLETE", :application_response => "FILE PLAYED")
-                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Success
+                  original_command.complete_event(0.1).reason.should be_a Punchblock::Component::Output::Complete::Finish
                 end
               end
 
               context "with an SSML document containing elements other than <audio/>" do
-                let :command_options do
-                  {
-                    :ssml => RubySpeech::SSML.draw do
-                      string "Foo Bar"
-                    end
-                  }
+                let :ssml_doc do
+                  RubySpeech::SSML.draw do
+                    string "Foo Bar"
+                  end
                 end
 
                 it "should return an unrenderable document error" do
@@ -162,6 +131,15 @@ module Punchblock
                   original_command.response(0.1).should be == error
                 end
               end
+
+              context 'with multiple documents' do
+                let(:command_opts) { { :render_documents => [{:value => ssml_doc}, {:value => ssml_doc}] } }
+                it "should return an error and not execute any actions" do
+                  subject.execute
+                  error = ProtocolError.new.setup 'option error', 'Only a single document is supported.'
+                  original_command.response(0.1).should be == error
+                end
+              end
             end
 
             describe 'start-offset' do
@@ -304,11 +282,11 @@ module Punchblock
                 end
               end
 
-              context "set to :speech" do
-                let(:command_opts) { { :interrupt_on => :speech } }
+              context "set to :voice" do
+                let(:command_opts) { { :interrupt_on => :voice } }
                 it "should return an error and not execute any actions" do
                   subject.execute
-                  error = ProtocolError.new.setup 'option error', 'An interrupt-on value of speech is unsupported.'
+                  error = ProtocolError.new.setup 'option error', 'An interrupt-on value of voice is unsupported.'
                   original_command.response(0.1).should be == error
                 end
               end