punchblock 1.9.3 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ff3ea16e07ba9b68609f3fd2e92f83042da06b5
-  data.tar.gz: c165944f3bccf0cdb604106e8378557d7dd9c695
+  metadata.gz: 1cb4362475b7ff78950c6a3b6c26079e98f5741a
+  data.tar.gz: 6e6bf5c7f14bf24e1ea4ca9cb84b1f8e2365935b
 SHA512:
-  metadata.gz: 3d65f082760974940de41c52a9a27cfa539270221e392f7df25865294c12ec80e9ad6a32ebad1b00e991aa808690cf444b1c4ff78ca4f08e86e1bad16132c35b
-  data.tar.gz: b136fbe1f8647e8298c70bccd148cb662578c3bfab3ac6191149d8f19b4e621138b38ee46143c3bc246198afc804eb72bd753c57d7ebb8854e077634d6b0bad5
+  metadata.gz: b5b5d40cd306d3e292b56189f085165c3a39f2e4f069f7b7298cafee1ad65f7b3a597a1db49c79771f1027b3026d0ee6bb9576020b4114c7e08c4ce19aef6b48
+  data.tar.gz: 93b07c8cc0bdb8472c4b511008e054068c13a79dfa780fe08a3f09ac4b9dbc76b195e55505128291bdef3262461bfb7fb634ba672a8670589c1c6ca3928f664b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.9.4](https://github.com/adhearsion/punchblock/compare/v1.9.3...v1.9.4) - [2013-06-08](https://rubygems.org/gems/punchblock/versions/1.9.4)
+  * Bugfix: Finish more setup before sending output ref on Asterisk
+  * Bugfix: Allow early media TTS on Asterisk in addition to audio playback
+  * Bugfix: Correctly mark Asterisk calls as answered after successfully executing an answer command
+
 # [v1.9.3](https://github.com/adhearsion/punchblock/compare/v1.9.2...v1.9.3) - [2013-05-16](https://rubygems.org/gems/punchblock/versions/1.9.3)
   * Bugfix: Improve error messages when trying to execute stop commands on components in an invalid state
 

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

@@ -181,6 +181,7 @@ module Punchblock
             end
           when Command::Answer
             execute_agi_command 'ANSWER'
+            @answered = true
             command.response = true
           when Command::Hangup
             send_ami_action 'Hangup', 'Channel' => channel, 'Cause' => 16

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

@@ -39,8 +39,6 @@ module Punchblock
 
               path = filenames.join '&'
 
-              send_ref
-
               @call.send_progress if early
 
               if interrupt
@@ -50,12 +48,16 @@ module Punchblock
                 end
               end
 
+              send_ref
+
               opts = early ? "#{path},noanswer" : path
               @call.execute_agi_command 'EXEC Playback', opts
             when :unimrcp
+              @call.send_progress if early
               send_ref
               @call.execute_agi_command 'EXEC MRCPSynth', escape_commas(escaped_doc), mrcpsynth_options
             when :swift
+              @call.send_progress if early
               send_ref
               @call.execute_agi_command 'EXEC Swift', swift_doc
             else

data/lib/punchblock/version.rb

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

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

@@ -929,6 +929,12 @@ module Punchblock
               command.response(0.5).should be true
             end
 
+            it "should be answered" do
+              subject.wrapped_object.should_receive(:execute_agi_command)
+              subject.execute_command command
+              subject.should be_answered
+            end
+
             context "when the AMI commannd raises an error" do
               let(:message) { 'Some error' }
               let(:error)   { RubyAMI::Error.new.tap { |e| e.message = message } }
@@ -940,6 +946,11 @@ module Punchblock
                 command.response(0.5).should be == ProtocolError.new.setup('error', message, subject.id)
               end
 
+              it "should not be answered" do
+                subject.execute_command command
+                subject.should_not be_answered
+              end
+
               context "with message 'No such channel'" do
                 let(:message) { 'No such channel' }
 

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

@@ -31,7 +31,7 @@ module Punchblock
           subject { Output.new original_command, mock_call }
 
           def expect_answered(value = true)
-            mock_call.should_receive(:answered?).at_least(:once).and_return(value)
+            mock_call.stub(:answered?).and_return(value)
           end
 
           describe '#execute' do
@@ -70,6 +70,8 @@ module Punchblock
                 prefix + base_doc + postfix
               end
 
+              before { expect_answered }
+
               it "should execute Swift" do
                 mock_call.should_receive(:execute_agi_command).once.with 'EXEC Swift', ssml_with_options
                 subject.execute
@@ -92,6 +94,16 @@ module Punchblock
                 end
               end
 
+              context "when the call is not answered" do
+                before { expect_answered false }
+
+                it "should send progress" do
+                  mock_call.should_receive(:send_progress)
+                  mock_call.should_receive(:execute_agi_command).and_return code: 200, result: 1
+                  subject.execute
+                end
+              end
+
               describe 'interrupt_on' do
                 context "set to nil" do
                   let(:command_opts) { { :interrupt_on => nil } }
@@ -104,7 +116,6 @@ module Punchblock
                 context "set to :any" do
                   let(:command_opts) { { :interrupt_on => :any } }
                   it "should add the interrupt options to the argument" do
-                    expect_answered
                     mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options('', '|1|1')).and_return code: 200, result: 1
                     subject.execute
                   end
@@ -113,7 +124,6 @@ module Punchblock
                 context "set to :dtmf" do
                   let(:command_opts) { { :interrupt_on => :dtmf } }
                   it "should add the interrupt options to the argument" do
-                    expect_answered
                     mock_call.should_receive(:execute_agi_command).once.with('EXEC Swift', ssml_with_options('', '|1|1')).and_return code: 200, result: 1
                     subject.execute
                   end
@@ -174,6 +184,8 @@ module Punchblock
                 end.and_return code: 200, result: 1
               end
 
+              before { expect_answered }
+
               it "should execute MRCPSynth" do
                 mock_call.should_receive(:execute_agi_command).once.with('EXEC MRCPSynth', ssml_doc.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }, '').and_return code: 200, result: 1
                 subject.execute
@@ -212,6 +224,16 @@ module Punchblock
                 end
               end
 
+              context "when the call is not answered" do
+                before { expect_answered false }
+
+                it "should send progress" do
+                  mock_call.should_receive(:send_progress)
+                  mock_call.should_receive(:execute_agi_command).and_return code: 200, result: 1
+                  subject.execute
+                end
+              end
+
               describe 'ssml' do
                 context 'unset' do
                   let(:command_opts) { { :ssml => nil } }
@@ -348,7 +370,6 @@ module Punchblock
                 context "set to :any" do
                   let(:command_opts) { { :interrupt_on => :any } }
                   it "should pass the i option to MRCPSynth" do
-                    expect_answered
                     expect_mrcpsynth_with_options(/i=any/)
                     subject.execute
                   end
@@ -357,7 +378,6 @@ module Punchblock
                 context "set to :dtmf" do
                   let(:command_opts) { { :interrupt_on => :dtmf } }
                   it "should pass the i option to MRCPSynth" do
-                    expect_answered
                     expect_mrcpsynth_with_options(/i=any/)
                     subject.execute
                   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.9.3
+  version: 1.9.4
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -476,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubyforge_project: punchblock
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Punchblock is a telephony middleware library