punchblock 2.5.3 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ef1da0eed86d39e520b4e10984e068c8dc62e6
-  data.tar.gz: 6b48e400972ac2516337faae2a52f85089dab0cc
+  metadata.gz: ade03e2779ab1cdbeec2d6f3745571abc1713b81
+  data.tar.gz: accbf90369fded5cb31bb010b2fbe02c9f887ec3
 SHA512:
-  metadata.gz: f8b33066c0816e1ac83c9911e3a8ba5b9ca717344d9bd970709a3555ba92e52f3170886ba3261d5b9b66ed95dd49e4edee63311723dc026f4f302d60c7e058d8
-  data.tar.gz: 6156cb56046135c814b3e11fe1844236d075a227e12972c2efa63a56ad5079314791a131b2e22136222a7626497af1f23beca04596f0200bb0732ec67b4448cd
+  metadata.gz: 4b3c942cfd4e6f6acd1dd8d2042dc0ef7cd50fb795ef2a0e96fcfa97afba700c5778c2c89637a61d79704be3f0d2f0849aea353ce269dd67fb82f293cb4a0eb3
+  data.tar.gz: 3c0ddd90d0c21bd82de65d3d792fc0d0f898acd6d2e728a2a03482c86dd001665e38e7ce5c2a881a413bb5c0e9771c85c099f33323ae2d68db7033c93733e60d

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.6.0](https://github.com/adhearsion/punchblock/compare/v2.5.3...v2.6.0) - [2015-02-01](https://rubygems.org/gems/punchblock/versions/2.6.0)
+  * Feature: Support recognition-timeout settings on UniMRCP-based ASR on Asterisk ([#228](https://github.com/adhearsion/punchblock/pull/228))
+  * Feature: Implement redirect command on Asterisk ([#219](https://github.com/adhearsion/punchblock/pull/219))
+  * Feature: Allow arbitrary media headers ([#237](https://github.com/adhearsion/punchblock/pull/237))
+  * Bugfix: Complete 1-to-1 mapping of UniMRCP RECOG_COMPLETION_CAUSE values to Punchblock::Complete events
+
 # [v2.5.3](https://github.com/adhearsion/punchblock/compare/v2.5.2...v2.5.3) - [2014-09-22](https://rubygems.org/gems/punchblock/versions/2.5.3)
   * Bugfix: Prevent Asterisk translator death due to dead DTMF recognizers ([#221](https://github.com/adhearsion/punchblock/pull/221), [adhearsion/adhearsion#479](https://github.com/adhearsion/adhearsion/issues/479))
   * Bugfix: Be more intelligent about only stripping true file extensions off filenames for playback on Asterisk ([adhearsion/adhearsion#482](https://github.com/adhearsion/adhearsion/issues/482))

data/lib/punchblock/component/input.rb

@@ -3,6 +3,9 @@
 module Punchblock
   module Component
     class Input < ComponentNode
+
+      include HasHeaders
+
       NLSML_NAMESPACE = 'http://www.ietf.org/xml/ns/mrcpv2'
 
       register :input, :input
@@ -34,6 +37,9 @@ module Punchblock
       # @return [Integer] Indicates (in the case of DTMF input) the amount of time (in milliseconds) between input digits which may expire before a timeout is triggered.
       attribute :inter_digit_timeout, Integer
 
+      # @return [Integer] Indicates the amount of time during input that recognition will occur before a timeout is triggered.
+      attribute :recognition_timeout, Integer
+
       attribute :grammars, Array, default: []
       def grammars=(others)
         super others.map { |other| Grammar.new(other) }
@@ -65,7 +71,8 @@ module Punchblock
           'terminator' => terminator,
           'sensitivity' => sensitivity,
           'initial-timeout' => initial_timeout,
-          'inter-digit-timeout' => inter_digit_timeout
+          'inter-digit-timeout' => inter_digit_timeout,
+          'recognition-timeout' => recognition_timeout
         }
       end
 

data/lib/punchblock/component/output.rb

@@ -3,6 +3,9 @@
 module Punchblock
   module Component
     class Output < ComponentNode
+
+      include HasHeaders
+
       register :output, :output
 
       class Document < RayoNode

data/lib/punchblock/has_headers.rb

@@ -11,7 +11,7 @@ module Punchblock
     end
 
     def inherit(xml_node)
-      xml_node.xpath('//ns:header', ns: self.class.registered_ns).to_a.each do |header|
+      xml_node.xpath('//ns:header', ns: RAYO_NAMESPACES[:core]).to_a.each do |header|
         if headers.has_key?(header[:name])
           headers[header[:name]] = [headers[header[:name]]]
           headers[header[:name]] << header[:value]
@@ -26,7 +26,7 @@ module Punchblock
       super
       headers.each do |name, value|
         Array(value).each do |v|
-          root.header name: name, value: v
+          root.header name: name, value: v, xmlns: RAYO_NAMESPACES[:core]
         end
       end
     end

data/lib/punchblock/translator/asterisk/call.rb

@@ -212,6 +212,15 @@ module Punchblock
               execute_agi_command 'EXEC Congestion'
             end
             command.response = true
+          when Command::Redirect
+            execute_agi_command 'EXEC Transfer', command.to
+            status = channel_var 'TRANSFERSTATUS'
+            command.response = case status
+            when 'SUCCESS'
+              true
+            else
+              ProtocolError.new.setup 'error', "TRANSFERSTATUS was #{status}", id
+            end
           when Punchblock::Component::Asterisk::AGI::Command
             execute_component Component::Asterisk::AGICommand, command
           when Punchblock::Component::Output

data/lib/punchblock/translator/asterisk/component/mrcp_recog_prompt.rb

@@ -9,6 +9,16 @@ module Punchblock
         module MRCPRecogPrompt
           UniMRCPError = Class.new Punchblock::Error
 
+          MRCP_ERRORS = {
+            '004' => 'RECOGNIZE failed due to grammar load failure.',
+            '005' => 'RECOGNIZE failed due to grammar compilation failure.',
+            '006' => 'RECOGNIZE request terminated prematurely due to a recognizer error.',
+            '007' => 'RECOGNIZE request terminated because speech was too early.',
+            '009' => 'Failure accessing a URI.',
+            '010' => 'Language not supported.',
+            '016' => 'Any DEFINE-GRAMMAR error other than grammar-load-failure and grammar-compilation-failure.',
+          }
+
           def execute
             setup_defaults
             validate
@@ -17,8 +27,8 @@ module Punchblock
             complete
           rescue ChannelGoneError
             call_ended
-          rescue UniMRCPError
-            complete_with_error 'Terminated due to UniMRCP error'
+          rescue UniMRCPError => e
+            complete_with_error e.message
           rescue RubyAMI::Error => e
             complete_with_error "Terminated due to AMI error '#{e.message}'"
           rescue OptionError => e
@@ -34,6 +44,7 @@ module Punchblock
 
             raise OptionError, "An initial-timeout value must be -1 or a positive integer." if @initial_timeout < -1
             raise OptionError, "An inter-digit-timeout value must be -1 or a positive integer." if @inter_digit_timeout < -1
+            raise OptionError, "A recognition-timeout value must be -1, 0, or a positive integer." if @recognition_timeout < -1
           end
 
           def execute_app(app, *args)
@@ -48,6 +59,7 @@ module Punchblock
               opts[:spl] = input_node.language if input_node.language
               opts[:ct] = input_node.min_confidence if input_node.min_confidence
               opts[:sl] = input_node.sensitivity if input_node.sensitivity
+              opts[:t]  = input_node.recognition_timeout if @recognition_timeout > -1
               yield opts
             end
           end
@@ -55,6 +67,7 @@ module Punchblock
           def setup_defaults
             @initial_timeout = input_node.initial_timeout || -1
             @inter_digit_timeout = input_node.inter_digit_timeout || -1
+            @recognition_timeout = input_node.recognition_timeout || -1
           end
 
           def grammars
@@ -84,20 +97,24 @@ module Punchblock
           end
 
           def complete
-            case @call.channel_var('RECOG_STATUS') 
+            case @call.channel_var('RECOG_STATUS')
             when 'INTERRUPTED'
               send_complete_event Punchblock::Component::Input::Complete::NoMatch.new
             when 'ERROR'
               raise UniMRCPError
-            else 
-              send_complete_event case @call.channel_var('RECOG_COMPLETION_CAUSE')
-              when '000'
+            else
+              send_complete_event case cause = @call.channel_var('RECOG_COMPLETION_CAUSE')
+              when '000', '008', '012'
                 nlsml = RubySpeech.parse URI.decode(@call.channel_var('RECOG_RESULT'))
                 Punchblock::Component::Input::Complete::Match.new nlsml: nlsml
-              when '001'
+              when '001', '003', '013', '014', '015'
                 Punchblock::Component::Input::Complete::NoMatch.new
-              when '002'
+              when '002', '011'
                 Punchblock::Component::Input::Complete::NoInput.new
+              when *MRCP_ERRORS.keys
+                raise UniMRCPError, MRCP_ERRORS[cause]
+              else
+                raise UniMRCPError
               end
             end
           end

data/lib/punchblock/version.rb

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

data/spec/punchblock/component/input_spec.rb

@@ -19,8 +19,10 @@ module Punchblock
                     :language             => 'en-US',
                     :initial_timeout      => 2000,
                     :inter_digit_timeout  => 2000,
+                    :recognition_timeout  => 0,
                     :sensitivity          => 0.5,
-                    :min_confidence       => 0.5
+                    :min_confidence       => 0.5,
+                    :headers              => { 'Confidence-Threshold' => '0.5', 'Sensitivity-Level' => '0.2' }
         end
 
         describe '#grammars' do
@@ -63,6 +65,11 @@ module Punchblock
           it { should be == 2000 }
         end
 
+        describe '#recognition_timeout' do
+          subject { super().recognition_timeout }
+          it { should be == 0 }
+        end
+
         describe '#sensitivity' do
           subject { super().sensitivity }
           it { should be == 0.5 }
@@ -106,6 +113,11 @@ module Punchblock
           end
         end
 
+        describe '#headers' do
+          subject { super().headers }
+          it { should be == { 'Confidence-Threshold' => '0.5', 'Sensitivity-Level' => '0.2' } }
+        end
+
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml subject.to_rayo
@@ -118,8 +130,10 @@ module Punchblock
             expect(new_instance.language).to eq('en-US')
             expect(new_instance.initial_timeout).to eq(2000)
             expect(new_instance.inter_digit_timeout).to eq(2000)
+            expect(new_instance.recognition_timeout).to eq(0)
             expect(new_instance.sensitivity).to eq(0.5)
             expect(new_instance.min_confidence).to eq(0.5)
+            expect(new_instance.headers).to eq({ 'Confidence-Threshold' => '0.5', 'Sensitivity-Level' => '0.2' })
           end
 
           it "should wrap the grammar value in CDATA" do
@@ -148,6 +162,7 @@ module Punchblock
        language="en-US"
        initial-timeout="2000"
        inter-digit-timeout="2000"
+       recognition-timeout="0"
        sensitivity="0.5"
        min-confidence="0.5">
   <grammar content-type="application/grammar+custom">
@@ -156,6 +171,8 @@ module Punchblock
   <grammar content-type="application/grammar+custom">
     <![CDATA[ [10 DIGITS] ]]>
   </grammar>
+  <header xmlns='urn:xmpp:rayo:1' name="Confidence-Threshold" value="0.5" />
+  <header xmlns='urn:xmpp:rayo:1' name="Sensitivity-Level" value="0.2" />
 </input>
           MESSAGE
         end
@@ -204,6 +221,11 @@ module Punchblock
           it { should be == 2000 }
         end
 
+        describe '#recognition_timeout' do
+          subject { super().recognition_timeout }
+          it { should be == 0 }
+        end
+
         describe '#sensitivity' do
           subject { super().sensitivity }
           it { should be == 0.5 }
@@ -222,6 +244,11 @@ module Punchblock
             it { should be == [] }
           end
         end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should be == { 'Confidence-Threshold' => '0.5', 'Sensitivity-Level' => '0.2' } }
+        end
       end
 
       def grxml_doc(mode = :dtmf)

data/spec/punchblock/component/output_spec.rb

@@ -72,7 +72,8 @@ module Punchblock
                       :max_time         => 30000,
                       :voice            => 'allison',
                       :renderer         => 'swift',
-                      :render_document  => {:value => ssml_doc}
+                      :render_document  => {:value => ssml_doc},
+                      :headers          => { 'Jump-Size' => '2', 'Kill-On-Barge-In' => 'false' }
         end
 
         describe '#interrupt_on' do
@@ -185,6 +186,11 @@ module Punchblock
           end
         end
 
+        describe '#headers' do
+          subject { super().headers }
+          it { should be == { 'Jump-Size' => '2', 'Kill-On-Barge-In' => 'false' } }
+        end
+
         describe "exporting to Rayo" do
           it "should export to XML that can be understood by its parser" do
             new_instance = RayoNode.from_xml Nokogiri::XML(subject.to_rayo.to_xml, nil, nil, Nokogiri::XML::ParseOptions::NOBLANKS).root
@@ -198,6 +204,7 @@ module Punchblock
             expect(new_instance.voice).to eq('allison')
             expect(new_instance.renderer).to eq('swift')
             expect(new_instance.render_documents).to eq([Output::Document.new(:value => ssml_doc)])
+            expect(new_instance.headers).to eq({ 'Jump-Size' => '2', 'Kill-On-Barge-In' => 'false' })
           end
 
           it "should wrap the document value in CDATA" do
@@ -258,6 +265,8 @@ module Punchblock
       </speak>
     ]]>
   </document>
+  <header xmlns='urn:xmpp:rayo:1' name="Jump-Size" value="2" />
+  <header xmlns='urn:xmpp:rayo:1' name="Kill-On-Barge-In" value="false" />
 </output>
           MESSAGE
         end
@@ -330,6 +339,11 @@ module Punchblock
             it { should be == [Output::Document.new(content_type: 'text/uri-list', value: ['http://example.com/hello.mp3', 'http://example.com/goodbye.mp3'])] }
           end
         end
+
+        describe '#headers' do
+          subject { super().headers }
+          it { should be == { 'Jump-Size' => '2', 'Kill-On-Barge-In' => 'false' } }
+        end
       end
 
       describe Output::Document do

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

@@ -1166,6 +1166,71 @@ module Punchblock
             end
           end
 
+          context 'with a redirect command' do
+            let(:command) { Command::Redirect.new to: 'other@place.com' }
+
+            let(:transferstatus) { 'SUCCESS' }
+            let :status_event do
+              RubyAMI::Event.new 'VarSet',
+                "Privilege" => "dialplan,all",
+                "Channel"   => "SIP/1234-00000000",
+                "Variable"  => "TRANSFERSTATUS",
+                "Value"     => transferstatus,
+                "Uniqueid"  => "1326210224.0"
+            end
+
+            before do
+              subject.process_ami_event status_event
+            end
+
+            it "should send an EXEC Transfer AGI command" do
+              subject.should_receive(:execute_agi_command).with('EXEC Transfer', 'other@place.com').and_return code: 200
+              subject.execute_command command
+              command.response(0.5).should be true
+            end
+
+            context "when TRANSFERSTATUS is 'FAILURE'" do
+              let(:transferstatus) { 'FAILURE' }
+
+              it "should return an error" do
+                subject.should_receive(:execute_agi_command).with('EXEC Transfer', 'other@place.com').and_return code: 200
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', 'TRANSFERSTATUS was FAILURE', subject.id)
+              end
+            end
+
+            context "when TRANSFERSTATUS is 'UNSUPPORTED'" do
+              let(:transferstatus) { 'UNSUPPORTED' }
+
+              it "should return an error" do
+                subject.should_receive(:execute_agi_command).with('EXEC Transfer', 'other@place.com').and_return code: 200
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', 'TRANSFERSTATUS was UNSUPPORTED', subject.id)
+              end
+            end
+
+            context "when the AMI commannd raises an error" do
+              let(:message) { 'Some error' }
+              let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
+
+              before { subject.should_receive(:execute_agi_command).and_raise error }
+
+              it "should return an error with the message" do
+                subject.execute_command command
+                command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
+              end
+
+              context "because the channel is gone" do
+                let(:error) { ChannelGoneError }
+
+                it "should return an :item_not_found event for the call" do
+                  subject.execute_command command
+                  command.response(0.5).should be == ProtocolError.new.setup(:item_not_found, "Could not find a call with ID #{subject.id}", subject.id)
+                end
+              end
+            end
+          end
+
           context 'with a reject command' do
             let(:command) { Command::Reject.new }
 

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

@@ -182,7 +182,7 @@ module Punchblock
                 end
 
                 context "when MRCPRecog completes" do
-                  context "with a match" do
+                  shared_context "with a match" do
                     let :expected_nlsml do
                       RubySpeech::NLSML.draw do
                         interpretation grammar: 'session:grammar-0', confidence: 0.43 do
@@ -201,39 +201,73 @@ module Punchblock
                     end
                   end
 
-                  context "with a nomatch cause" do
-                    let(:recog_completion_cause) { '001' }
+                  context "with a  match cause" do
+                    %w{000 008 012}.each do |code|
+                      context "when the MRCP recognition response code is #{code}" do
+                        let(:recog_completion_cause) { code }
 
-                    it 'should send a nomatch complete event' do
-                      expected_complete_reason = Punchblock::Component::Input::Complete::NoMatch.new
-                      expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
-                      subject.execute
-                      expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        it_behaves_like 'with a match'
+                      end
                     end
                   end
 
-                  context "with a noinput cause" do
-                    let(:recog_completion_cause) { '002' }
-
-                    it 'should send a nomatch complete event' do
-                      expected_complete_reason = Punchblock::Component::Input::Complete::NoInput.new
-                      expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
-                      subject.execute
-                      expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                  context "with a nomatch cause" do
+                    %w{001 003 013 014 015}.each do |code|
+                      context "with value #{code}" do
+                        let(:recog_completion_cause) { code }
+
+                        it 'should send a nomatch complete event' do
+                          expected_complete_reason = Punchblock::Component::Input::Complete::NoMatch.new
+                          expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
+                          subject.execute
+                          expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        end
+                      end
                     end
                   end
 
-                  context "when the RECOG_STATUS variable is set to 'ERROR'" do
-                    let(:recog_status) { 'ERROR' }
+                  context "with a noinput cause" do
+                    %w{002 011}.each do |code|
+                      context "with value #{code}" do
+                        let(:recog_completion_cause) { code }
+
+                        specify do
+                          expected_complete_reason = Punchblock::Component::Input::Complete::NoInput.new
+                          expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
+                          subject.execute
+                          expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        end
+                      end
+                    end
+                  end
 
-                    it "should send an error complete event" do
+                  shared_context 'should send an error complete event' do
+                    specify do
                       expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
                       subject.execute
                       complete_reason = original_command.complete_event(0.1).reason
                       expect(complete_reason).to be_a Punchblock::Event::Complete::Error
-                      expect(complete_reason.details).to eq("Terminated due to UniMRCP error")
                     end
                   end
+
+                  context 'with an error cause' do
+                    %w{004 005 006 007 009 010 016}.each do |code|
+                      context "when the MRCP recognition response code is #{code}" do
+                        let(:recog_completion_cause) { code }
+                        it_behaves_like 'should send an error complete event'
+                      end
+                    end
+                  end
+
+                  context 'with an invalid cause' do
+                    let(:recog_completion_cause) { '999' }
+                    it_behaves_like 'should send an error complete event'
+                  end
+
+                  context "when the RECOG_STATUS variable is set to 'ERROR'" do
+                    let(:recog_status) { 'ERROR' }
+                    it_behaves_like 'should send an error complete event'
+                  end
                 end
 
                 context "when we get a RubyAMI Error" do

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

@@ -174,7 +174,7 @@ module Punchblock
                 end
 
                 context "when SynthAndRecog completes" do
-                  context "with a match" do
+                  shared_context "with a match" do
                     let :expected_nlsml do
                       RubySpeech::NLSML.draw do
                         interpretation grammar: 'session:grammar-0', confidence: 0.43 do
@@ -193,49 +193,72 @@ module Punchblock
                     end
                   end
 
-                  context "with a nomatch cause" do
-                    let(:recog_completion_cause) { '001' }
+                  context "with a  match cause" do
+                    %w{000 008 012}.each do |code|
+                      context "when the MRCP recognition response code is #{code}" do
+                        let(:recog_completion_cause) { code }
 
-                    it 'should send a nomatch complete event' do
-                      expected_complete_reason = Punchblock::Component::Input::Complete::NoMatch.new
-                      expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
-                      subject.execute
-                      expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        it_behaves_like 'with a match'
+                      end
+                    end
+                  end
+
+                  context "with a nomatch cause" do
+                    %w{001 003 013 014 015}.each do |code|
+                      context "with value #{code}" do
+                        let(:recog_completion_cause) { code }
+
+                        it 'should send a nomatch complete event' do
+                          expected_complete_reason = Punchblock::Component::Input::Complete::NoMatch.new
+                          expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
+                          subject.execute
+                          expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        end
+                      end
                     end
                   end
 
                   context "with a noinput cause" do
-                    let(:recog_completion_cause) { '002' }
+                    %w{002 011}.each do |code|
+                      context "with value #{code}" do
+                        let(:recog_completion_cause) { code }
+
+                        specify do
+                          expected_complete_reason = Punchblock::Component::Input::Complete::NoInput.new
+                          expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
+                          subject.execute
+                          expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                        end
+                      end
+                    end
+                  end
 
-                    it 'should send a nomatch complete event' do
-                      expected_complete_reason = Punchblock::Component::Input::Complete::NoInput.new
+                  shared_context 'should send an error complete event' do
+                    specify do
                       expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
                       subject.execute
-                      expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                      complete_reason = original_command.complete_event(0.1).reason
+                      expect(complete_reason).to be_a Punchblock::Event::Complete::Error
                     end
                   end
 
-                  context "when the RECOG_STATUS variable is set to 'INTERRUPTED' after a successful recognition" do
-                    let(:recog_status) { 'INTERRUPTED' }
-
-                    it "should send an error complete event" do
-                      expected_complete_reason = Punchblock::Component::Input::Complete::NoMatch.new
-                      expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
-                      subject.execute
-                      expect(original_command.complete_event(0.1).reason).to eq(expected_complete_reason)
+                  context 'with an error cause' do
+                    %w{004 005 006 007 009 010 016}.each do |code|
+                      context "when the MRCP recognition response code is #{code}" do
+                        let(:recog_completion_cause) { code }
+                        it_behaves_like 'should send an error complete event'
+                      end
                     end
                   end
 
+                  context 'with an invalid cause' do
+                    let(:recog_completion_cause) { '999' }
+                    it_behaves_like 'should send an error complete event'
+                  end
+
                   context "when the RECOG_STATUS variable is set to 'ERROR'" do
                     let(:recog_status) { 'ERROR' }
-
-                    it "should send an error complete event" do
-                      expect(mock_call).to receive(:execute_agi_command).and_return code: 200, result: 1
-                      subject.execute
-                      complete_reason = original_command.complete_event(0.1).reason
-                      expect(complete_reason).to be_a Punchblock::Event::Complete::Error
-                      expect(complete_reason.details).to eq("Terminated due to UniMRCP error")
-                    end
+                    it_behaves_like 'should send an error complete event'
                   end
                 end
 
@@ -511,6 +534,45 @@ module Punchblock
             end
           end
 
+          describe 'Input#recognition-timeout' do
+            context 'a positive number' do
+              let(:input_command_opts) { { recognition_timeout: 1000 } }
+
+              it 'should pass the t option to SynthAndRecog' do
+                expect_synthandrecog_with_options(/t=1000/)
+                subject.execute
+              end
+            end
+
+            context '0' do
+              let(:input_command_opts) { { recognition_timeout: 0 } }
+
+              it 'should pass the t option to SynthAndRecog' do
+                expect_synthandrecog_with_options(/t=0/)
+                subject.execute
+              end
+            end
+
+            context 'a negative number' do
+              let(:input_command_opts) { { recognition_timeout: -1000 } }
+
+              it "should return an error and not execute any actions" do
+                subject.execute
+                error = ProtocolError.new.setup 'option error', 'A recognition-timeout value must be -1, 0, or a positive integer.'
+                expect(original_command.response(0.1)).to eq(error)
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { recognition_timeout: nil } }
+
+              it 'should not pass any options to SynthAndRecog' do
+                expect_synthandrecog_with_options(//)
+                subject.execute
+              end
+            end
+          end
+
           describe 'Input#inter-digit-timeout' do
             context 'a positive number' do
               let(:input_command_opts) { { inter_digit_timeout: 1000 } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 2.6.0
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -559,7 +559,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: punchblock
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Punchblock is a telephony middleware library