punchblock 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cf351841230c7cb7a3c6004a3a1dabb79f203df
-  data.tar.gz: 46911f3a2bd9e94791ea7506396b3e0e8dc8c9a7
+  metadata.gz: b468b4ccd6ae157d9309dd8daf2462f6a3c83a26
+  data.tar.gz: 2c60dd9989e3116bb0e3a57271fe813db7ab746a
 SHA512:
-  metadata.gz: 7d625a9dede87541c2d9d49b5769415940f0fe0db4c90c6174387f8f854f00cdc8134f3e99295b1694d2b9e9257ae590dcef879fd64ff72a4231657cf1c51e5f
-  data.tar.gz: 5f33fbb9b113bcc8d6b34466ef4cfad0cab6badbdcb35739498f7c632e56404865d3b8bd8983fe4e38a40f7152e2916f4380b0be85ccef36c633b667fbc96532
+  metadata.gz: 9d67fd215f169976483231ed2228ed7f6005142a10c686eebe6ee6968f84e813cea80675921e5c66dc59e2aef2024502782adbe766204803849295bc21221030
+  data.tar.gz: 37f3f5f6083f2e1123246a7324c9612bd8245b25470adf4024144f9478421d27a65ab9cb23fd89cfa24c96990ae0af6ae64c1e7a335aa71b01c3e5200a153e26

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v2.5.0](https://github.com/adhearsion/punchblock/compare/v2.4.2...v2.5.0) - [2014-03-05](https://rubygems.org/gems/punchblock/versions/2.5.0)
+  * Feature: Support language, sensitivity and minimum confidence on UniMRCP-based ASR on Asterisk
+  * Feature: Support sending messages to calls (eg SIP MESSAGE) on Asterisk
+
 # [v2.4.2](https://github.com/adhearsion/punchblock/compare/v2.4.0...v2.4.2) - [2014-03-04](https://rubygems.org/gems/punchblock/versions/2.4.2)
   * Bugfix: Rayo events should not include their timestamp in comparison. This is not useful in applications, and makes testing more difficult.
 

data/Guardfile

@@ -1,9 +1,13 @@
-guard 'rspec', :cli => '--format documentation' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec/" }
+group 'rspec' do
+  guard 'rspec', :cli => '--format documentation' do
+    watch(%r{^spec/.+_spec\.rb$})
+    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+    watch('spec/spec_helper.rb')  { "spec/" }
+  end
 end
 
-guard 'rake', task: 'benchmark', run_on_start: false do
-  watch(/benchmarks\/*/)
+group 'benchmarks' do
+  guard 'rake', task: 'benchmark', run_on_start: false do
+    watch(/benchmarks\/*/)
+  end
 end

data/lib/punchblock/connection/asterisk.rb

@@ -29,6 +29,10 @@ module Punchblock
         translator.async.execute_command command, options
       end
 
+      def send_message(*args)
+        translator.send_message *args
+      end
+
       def handle_event(event)
         event_handler.call event
       end

data/lib/punchblock/translator/asterisk.rb

@@ -98,6 +98,11 @@ module Punchblock
         connection.handle_event event
       end
 
+      def send_message(call_id, domain, body, options = {})
+        call = call_with_id call_id
+        call.send_message body if call
+      end
+
       def execute_command(command, options = {})
         command.request!
 

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

@@ -159,6 +159,11 @@ module Punchblock
           trigger_handler :ami, ami_event
         end
 
+        def send_message(body)
+          execute_agi_command 'EXEC SendText', body
+        rescue
+        end
+
         def execute_command(command)
           if @block_commands
             command.response = ProtocolError.new.setup :item_not_found, "Could not find a call with ID #{id}", id

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

@@ -46,6 +46,9 @@ module Punchblock
               opts[:nit] = @initial_timeout if @initial_timeout > -1
               opts[:dit] = @inter_digit_timeout if @inter_digit_timeout > -1
               opts[:dttc] = input_node.terminator if input_node.terminator
+              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
               yield opts
             end
           end

data/lib/punchblock/version.rb

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

data/spec/punchblock/connection/asterisk_spec.rb

@@ -97,6 +97,13 @@ module Punchblock
           subject.new_call_uri.should == 'foobar'
         end
       end
+
+      describe '#send_message' do
+        it 'passes the message to the translator for dispatch' do
+          subject.translator.should_receive(:send_message).once.with(:foo)
+          subject.send_message :foo
+        end
+      end
     end
   end
 end

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

@@ -1099,6 +1099,22 @@ module Punchblock
           end
         end
 
+        describe '#send_message' do
+          let(:body) { 'Hello world' }
+
+          it "should invoke SendText" do
+            subject.should_receive(:execute_agi_command).with('EXEC SendText', body).and_return code: 200
+            subject.send_message body
+          end
+
+          context "when an AMI error is received" do
+            it "is silently ignored" do
+              subject.should_receive(:execute_agi_command).with('EXEC SendText', body).and_raise RubyAMI::Error.new.tap { |e| e.message = 'Call not found' }
+              subject.send_message body
+            end
+          end
+        end
+
         describe '#execute_command' do
           before do
             command.request!

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

@@ -576,11 +576,43 @@ module Punchblock
           end
 
           describe 'Input#sensitivity' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { sensitivity: '0.2' } }
+
+              it 'should pass the sl option to MRCPRecog' do
+                expect_mrcprecog_with_options(/sl=0.2/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { sensitivity: nil } }
+
+              it 'should not pass any options to MRCPRecog' do
+                expect_mrcprecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe 'Input#min-confidence' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { min_confidence: '0.5' } }
+
+              it 'should pass the ct option to MRCPRecog' do
+                expect_mrcprecog_with_options(/ct=0.5/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { min_confidence: nil } }
+
+              it 'should not pass any options to MRCPRecog' do
+                expect_mrcprecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe 'Input#max-silence' do
@@ -592,7 +624,23 @@ module Punchblock
           end
 
           describe 'Input#language' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { language: 'en-GB' } }
+
+              it 'should pass the spl option to MRCPRecog' do
+                expect_mrcprecog_with_options(/spl=en-GB/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { language: nil } }
+
+              it 'should not pass any options to MRCPRecog' do
+                expect_mrcprecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe "#execute_command" do

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

@@ -568,11 +568,43 @@ module Punchblock
           end
 
           describe 'Input#sensitivity' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { sensitivity: '0.2' } }
+
+              it 'should pass the sl option to SynthAndRecog' do
+                expect_synthandrecog_with_options(/sl=0.2/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { sensitivity: nil } }
+
+              it 'should not pass any options to SynthAndRecog' do
+                expect_synthandrecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe 'Input#min-confidence' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { min_confidence: '0.5' } }
+
+              it 'should pass the ct option to SynthAndRecog' do
+                expect_synthandrecog_with_options(/ct=0.5/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { min_confidence: nil } }
+
+              it 'should not pass any options to SynthAndRecog' do
+                expect_synthandrecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe 'Input#max-silence' do
@@ -584,7 +616,23 @@ module Punchblock
           end
 
           describe 'Input#language' do
-            pending
+            context 'a string' do
+              let(:input_command_opts) { { language: 'en-GB' } }
+
+              it 'should pass the spl option to SynthAndRecog' do
+                expect_synthandrecog_with_options(/spl=en-GB/)
+                subject.execute
+              end
+            end
+
+            context 'unset' do
+              let(:input_command_opts) { { language: nil } }
+
+              it 'should not pass any options to SynthAndRecog' do
+                expect_synthandrecog_with_options(//)
+                subject.execute
+              end
+            end
           end
 
           describe "#execute_command" do

data/spec/punchblock/translator/asterisk_spec.rb

@@ -59,6 +59,29 @@ module Punchblock
         end
       end
 
+      describe '#send_message' do
+        let(:call_id) { 'abc123' }
+        let(:body) { 'hello world' }
+        let(:call) { Translator::Asterisk::Call.new 'SIP/foo', subject, ami_client, connection }
+
+        before do
+          call.stub(:id).and_return call_id
+          subject.register_call call
+        end
+
+        it 'sends the command to the call for execution' do
+          call.should_receive(:send_message).once.with body
+          subject.send_message call_id, 'example.com', body, subject: 'stuff'
+        end
+
+        context "when the call doesn't exist" do
+          it "should not crash the translator" do
+            subject.send_message 'oops', 'example.com', body, subject: 'stuff'
+            subject.should be_alive
+          end
+        end
+      end
+
       describe '#register_call' do
         let(:call_id) { 'abc123' }
         let(:channel) { 'SIP/foo' }
@@ -235,10 +258,11 @@ module Punchblock
                 subject.execute_global_command earlier_command
 
                 @first_call = subject.call_with_id(requested_uri)
+
+                subject.execute_global_command command
               end
 
               it "should set the command response to a conflict error" do
-                subject.execute_global_command command
                 command.response(0.1).should == ProtocolError.new.setup(:conflict, 'Call ID already in use')
               end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri