punchblock 2.6.0 → 2.7.0

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

@@ -30,6 +30,8 @@ module Punchblock
             { :render_document => {:value => ssml_doc}, renderer: renderer }
           end
 
+          let(:ast13mode) { false }
+
           subject { Output.new original_command, mock_call }
 
           def expect_answered(value = true)
@@ -933,10 +935,15 @@ module Punchblock
 
                 describe 'interrupt_on' do
                   def ami_event_for_dtmf(digit, position)
-                    RubyAMI::Event.new 'DTMF',
-                      'Digit' => digit.to_s,
-                      'Start' => position == :start ? 'Yes' : 'No',
-                      'End'   => position == :end ? 'Yes' : 'No'
+                    if ast13mode
+                      RubyAMI::Event.new 'DTMF' + (position == :start ? 'Begin' : '') + (position == :end ? 'End' : ''),
+                        'Digit' => digit.to_s
+                    else
+                      RubyAMI::Event.new 'DTMF',
+                        'Digit' => digit.to_s,
+                        'Start' => position == :start ? 'Yes' : 'No',
+                        'End'   => position == :end ? 'Yes' : 'No'
+                    end
                   end
 
                   def send_ami_events_for_dtmf(digit)
@@ -1664,10 +1671,15 @@ module Punchblock
 
               describe 'interrupt_on' do
                 def ami_event_for_dtmf(digit, position)
-                  RubyAMI::Event.new 'DTMF',
-                    'Digit' => digit.to_s,
-                    'Start' => position == :start ? 'Yes' : 'No',
-                    'End'   => position == :end ? 'Yes' : 'No'
+                  if ast13mode
+                    RubyAMI::Event.new 'DTMF' + (position == :start ? 'Begin' : '') + (position == :end ? 'End' : ''),
+                      'Digit' => digit.to_s
+                  else
+                    RubyAMI::Event.new 'DTMF',
+                      'Digit' => digit.to_s,
+                      'Start' => position == :start ? 'Yes' : 'No',
+                      'End'   => position == :end ? 'Yes' : 'No'
+                  end
                 end
 
                 def send_ami_events_for_dtmf(digit)
@@ -1736,17 +1748,21 @@ module Punchblock
                     expect(subject).to receive(:send_finish).and_return nil
                   end
 
+                  def send_correct_complete_event
+                    expect(mock_call).to receive :redirect_back
+                    subject.execute
+                    expect(original_command.response(0.1)).to be_a Ref
+                    expect(original_command).not_to be_complete
+                    send_ami_events_for_dtmf 1
+                    mock_call.process_ami_event ami_event
+                    sleep 0.2
+                    expect(original_command).to be_complete
+                    expect(reason).to be_a Punchblock::Component::Output::Complete::Finish
+                  end
+
                   context "when a DTMF digit is received" do
                     it "sends the correct complete event" do
-                      expect(mock_call).to receive :redirect_back
-                      subject.execute
-                      expect(original_command.response(0.1)).to be_a Ref
-                      expect(original_command).not_to be_complete
-                      send_ami_events_for_dtmf 1
-                      mock_call.process_ami_event ami_event
-                      sleep 0.2
-                      expect(original_command).to be_complete
-                      expect(reason).to be_a Punchblock::Component::Output::Complete::Finish
+                      send_correct_complete_event
                     end
 
                     it "redirects the call back to async AGI" do
@@ -1755,6 +1771,13 @@ module Punchblock
                       expect(original_command.response(0.1)).to be_a Ref
                       send_ami_events_for_dtmf 1
                     end
+
+                    context 'with an Asterisk 13 DTMFEnd event' do
+                      let(:ast13mode) { true }
+                      it "sends the correct complete event" do
+                        send_correct_complete_event
+                      end
+                    end
                   end
                 end
 

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

@@ -44,9 +44,10 @@ module Punchblock
                 expect(mock_call).to receive(:redirect_back)
                 expect(mock_call).to receive(:register_handler).with { |type, *guards|
                   expect(type).to eq(:ami)
-                  expect(guards.size).to eq(2)
-                  expect(guards[0]).to be_a Proc
-                  expect(guards[1]).to eq({:name => 'AsyncAGI'})
+                  expect(guards.size).to eq(1)
+                  expect(guards[0]).to be_a Array
+                  expect(guards[0][0]).to eq({:name => 'AsyncAGI', [:[], 'SubEvent']=>'Start'})
+                  expect(guards[0][1]).to eq({:name => 'AsyncAGIExec'})
                 }
 
                 subject.execute_command command

data/spec/punchblock/translator/asterisk_spec.rb

@@ -377,14 +377,8 @@ module Punchblock
               'Env'      => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
           end
 
-          before { allow(subject.wrapped_object).to receive :handle_pb_event }
-
-          it 'should be able to look up the call by channel ID' do
-            subject.handle_ami_event ami_event
-            call = subject.call_for_channel('SIP/1234-00000000')
-            expect(call).to be_a Asterisk::Call
-            expect(call.agi_env).to be_a Hash
-            expect(call.agi_env).to eq({
+          let :expected_agi_env do
+            {
               :agi_request      => 'async',
               :agi_channel      => 'SIP/1234-00000000',
               :agi_language     => 'en',
@@ -405,7 +399,17 @@ module Punchblock
               :agi_enhanced     => '0.0',
               :agi_accountcode  => '',
               :agi_threadid     => '4366221312'
-            })
+            }
+          end
+
+          before { allow(subject.wrapped_object).to receive :handle_pb_event }
+
+          it 'should be able to look up the call by channel ID' do
+            subject.handle_ami_event ami_event
+            call = subject.call_for_channel('SIP/1234-00000000')
+            expect(call).to be_a Asterisk::Call
+            expect(call.agi_env).to be_a Hash
+            expect(call.agi_env).to eq(expected_agi_env)
           end
 
           it 'should instruct the call to send an offer' do
@@ -415,6 +419,29 @@ module Punchblock
             subject.handle_ami_event ami_event
           end
 
+          context 'with an Asterisk 13 AsyncAGIStart event' do
+            let :ami_event do
+              RubyAMI::Event.new 'AsyncAGIStart',
+              'Channel'  => "SIP/1234-00000000",
+              'Env'      => "agi_request%3A%20async%0Aagi_channel%3A%20SIP%2F1234-00000000%0Aagi_language%3A%20en%0Aagi_type%3A%20SIP%0Aagi_uniqueid%3A%201320835995.0%0Aagi_version%3A%201.8.4.1%0Aagi_callerid%3A%205678%0Aagi_calleridname%3A%20Jane%20Smith%0Aagi_callingpres%3A%200%0Aagi_callingani2%3A%200%0Aagi_callington%3A%200%0Aagi_callingtns%3A%200%0Aagi_dnid%3A%201000%0Aagi_rdnis%3A%20unknown%0Aagi_context%3A%20default%0Aagi_extension%3A%201000%0Aagi_priority%3A%201%0Aagi_enhanced%3A%200.0%0Aagi_accountcode%3A%20%0Aagi_threadid%3A%204366221312%0A%0A"
+            end
+
+            it 'should be able to look up the call by channel ID' do
+              subject.handle_ami_event ami_event
+              call = subject.call_for_channel('SIP/1234-00000000')
+              expect(call).to be_a Asterisk::Call
+              expect(call.agi_env).to be_a Hash
+              expect(call.agi_env).to eq(expected_agi_env)
+            end
+
+            it 'should instruct the call to send an offer' do
+              mock_call = double('Asterisk::Call').as_null_object
+              expect(Asterisk::Call).to receive(:new).once.and_return mock_call
+              expect(mock_call).to receive(:send_offer).once
+              subject.handle_ami_event ami_event
+            end
+          end
+
           context 'if a call already exists for a matching channel' do
             let(:call) { Asterisk::Call.new "SIP/1234-00000000", subject, ami_client, connection }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-01 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri