punchblock 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f10d1a6318fae48550e671b7ad0a640894efb2c6
-  data.tar.gz: ae3dbdd141ef0c7d87ff9a447424e88ae698071e
+  metadata.gz: 6fd9d8e6a3b698f31b5807e789454fc7231ed468
+  data.tar.gz: 4128a656a2bbbba2a1dedf0cb9a8a7269a8f73be
 SHA512:
-  metadata.gz: ccb4bc2c83d83264172a5c544a710c7d74ad09ff14eea994fb3e6611991d9f9cdfe2e216570b287d55f5d204c3495c0e8276ba71a0e6ffe0c73946ca106434a9
-  data.tar.gz: d8cce27023aa8319c78c0e8202e9202c8def91adf799a8b46df38e33552a7a5055630cdc6bac77d8d312b2eba3427b35c6b9a5915a63126715a9615236912d3b
+  metadata.gz: a89def0af7a9299fe9278115c9495694c7092d34b54d6a20148e00761999b484a21682b9ed867dd3880e5720177a7e8341f5487677f0aa9d38df28d268d17f9d
+  data.tar.gz: 9a6a06392dc2c41a29f55443c2093d1505be65974f2796308ce9ea3b3b1e02b5b6b198ff634e7794d27d89319ceede8d73dcd1de157b4b2aeae01e3645b50bff

data/.travis.yml

@@ -8,6 +8,7 @@ rvm:
   - ruby-head
 matrix:
   allow_failures:
+    - rvm: 1.9.2
     - rvm: ruby-head
     - rvm: rbx-19mode
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.0.1](https://github.com/adhearsion/punchblock/compare/v2.0.0...v2.0.1) - [2013-09-17](https://rubygems.org/gems/punchblock/versions/2.0.1)
+  * Bugfix: Allow audio file URIs with file extensions on Asterisk
+  * Bugfix: Input timers were being started before output finished on Asterisk composed prompts
+  * Bugfix: Input initial timers were being started on Asterisk composed prompts even if the prompt was barged
+  * Bugfix: Output was being interrupted on Asterisk composed prompts at every DTMF keypress, even if the output was already finished
+
 # [v2.0.0](https://github.com/adhearsion/punchblock/compare/v1.9.4...v2.0.0) - [2013-08-29](https://rubygems.org/gems/punchblock/versions/2.0.0)
   * Feature: Compliance with v0.2 of the published Rayo spec (http://xmpp.org/extensions/xep-0327.html)
   * Feature: Add support for Rayo Prompt component

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

@@ -13,6 +13,8 @@ module Punchblock
             output_command.request!
             setup_dtmf_recognizer
 
+            @output_incomplete = true
+
             output_component = Output.new_link(output_command, @call)
             call.register_component output_component
             fut = output_component.future.execute
@@ -24,14 +26,24 @@ module Punchblock
               set_node_response output_command.response
             end
 
-            fut.value unless @component_node.barge_in # Block until output is complete
-
-            register_dtmf_event_handler
-            start_timers
+            if @component_node.barge_in
+              @barged = false
+              register_dtmf_event_handler
+              fut.value # Block until output is complete before starting timers
+              @output_incomplete = false
+              start_timers unless @barged
+            else
+              fut.value # Block until output is complete before allowing input
+              register_dtmf_event_handler
+              start_timers
+            end
           end
 
           def process_dtmf(digit)
-            call.async.redirect_back if @component_node.barge_in
+            if @component_node.barge_in && @output_incomplete
+              call.async.redirect_back
+              @barged = true
+            end
             super
           end
 

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

@@ -86,7 +86,7 @@ module Punchblock
             @filenames ||= render_doc.children.map do |node|
               case node
               when RubySpeech::SSML::Audio
-                node.src.sub('file://', '')
+                node.src.sub('file://', '').gsub(/\.[^\.]*$/, '')
               when String
                 raise if node.include?(' ')
                 node

data/lib/punchblock/version.rb

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

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

@@ -296,6 +296,7 @@ module Punchblock
             it "should cause the actor to be terminated" do
               translator.should_receive(:handle_pb_event).twice
               subject.process_ami_event ami_event
+              Celluloid::Actor.join(subject, 1)
               subject.should_not be_alive
             end
 

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

@@ -26,7 +26,7 @@ module Punchblock
 
           let :ssml_doc do
             RubySpeech::SSML.draw do
-              audio src: 'http://foo.com/bar.mp3'
+              audio src: 'tt-monkeys'
             end
           end
 
@@ -92,7 +92,7 @@ module Punchblock
             context '#barge_in' do
               context 'true' do
                 it "should execute an output component on the call and return a ref" do
-                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'http://foo.com/bar.mp3')
+                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end
@@ -116,7 +116,7 @@ module Punchblock
 
               context 'false' do
                 it "should execute an output component on the call" do
-                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'http://foo.com/bar.mp3')
+                  call.should_receive(:execute_agi_command).once.with('EXEC Playback', 'tt-monkeys')
                   subject.execute
                   original_command.response(0.1).should be_a Ref
                 end

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

@@ -432,7 +432,7 @@ module Punchblock
                   mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', audio_filename + ',noanswer').and_return code: 200
                 end
 
-                let(:audio_filename) { 'http://foo.com/bar.mp3' }
+                let(:audio_filename) { 'tt-monkeys' }
 
                 let :ssml_doc do
                   RubySpeech::SSML.draw do
@@ -494,6 +494,26 @@ module Punchblock
                       end
                     end
 
+                    context "when the audio filename has an extension" do
+                      let(:audio_filename) { 'tt-monkeys.wav' }
+
+                      it 'should playback the audio file using Playback' do
+                        expect_answered
+                        expect_playback 'tt-monkeys'
+                        subject.execute
+                      end
+
+                      context "when there are other dots in the filename" do
+                        let(:audio_filename) { 'blue.tt-monkeys.wav' }
+
+                        it 'should playback the audio file using Playback' do
+                          expect_answered
+                          expect_playback 'blue.tt-monkeys'
+                          subject.execute
+                        end
+                      end
+                    end
+
                     context "when we get a RubyAMI Error" do
                       it "should send an error complete event" do
                         expect_answered
@@ -591,8 +611,8 @@ module Punchblock
                   end
 
                   context 'with multiple audio SSML nodes' do
-                    let(:audio_filename1) { 'http://foo.com/bar.mp3' }
-                    let(:audio_filename2) { 'http://foo.com/baz.mp3' }
+                    let(:audio_filename1) { 'foo' }
+                    let(:audio_filename2) { 'bar' }
                     let :ssml_doc do
                       RubySpeech::SSML.draw do
                         audio :src => audio_filename1

data/spec/spec_helper.rb

@@ -25,7 +25,7 @@ RSpec.configure do |config|
   end
 
   config.after :each do
-    if Object.const_defined?(:Celluloid)
+    if defined?(:Celluloid)
       Celluloid.shutdown
       Celluloid.boot
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri