punchblock 1.5.1 → 1.5.2

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.5.2](https://github.com/adhearsion/punchblock/compare/v1.5.1...v1.5.2) - [2012-10-25](https://rubygems.org/gems/punchblock/versions/1.5.2)
+  * Bugfix: Use correct GRXML content type
+  * Bugfix: Fix UniMRCP for documents containing commas
+  * Bugfix: Bump Celluloid dependency to avoid issues with serialising AMI
+
 # [v1.5.1](https://github.com/adhearsion/punchblock/compare/v1.5.0...v1.5.1) - [2012-10-11](https://rubygems.org/gems/punchblock/versions/1.5.1)
   * Update: Bump Celluloid dependency
   * Bugfix: Input grammars referenced by URL now no longer specify a content type

data/lib/punchblock/component/input.rb

@@ -254,7 +254,7 @@ module Punchblock
         private
 
         def grxml_content_type
-          'application/grammar+grxml'
+          'application/srgs+xml'
         end
 
         def grxml?

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

@@ -53,7 +53,7 @@ module Punchblock
               playback opts
             when :unimrcp
               send_ref
-              @call.send_agi_action! 'EXEC MRCPSynth', escaped_doc, mrcpsynth_options do |complete_event|
+              @call.send_agi_action! 'EXEC MRCPSynth', escape_commas(escaped_doc), mrcpsynth_options do |complete_event|
                 output_component.send_complete_event! success_reason
               end
             when :swift
@@ -97,6 +97,11 @@ module Punchblock
             @component_node.ssml.to_s.squish.gsub(/["\\]/) { |m| "\\#{m}" }
           end
 
+          def escape_commas(text)
+            text.gsub(/,/, '\\,')
+          end
+
+
           def mrcpsynth_options
             [].tap do |opts|
               opts << 'i=any' if [:any, :dtmf].include? @component_node.interrupt_on

data/lib/punchblock/version.rb

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

data/punchblock.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<state_machine>, ["~> 1.0"]
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.3"]
-  s.add_runtime_dependency %q<celluloid>, ["~> 0.12", ">= 0.12.1"]
+  s.add_runtime_dependency %q<celluloid>, ["~> 0.12", ">= 0.12.3"]
   s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1"]
   s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]

data/spec/punchblock/component/input_spec.rb

@@ -80,7 +80,7 @@ module Punchblock
       describe Input::Grammar do
         describe "when not passing a content type" do
           subject { Input::Grammar.new :value => grxml_doc }
-          its(:content_type) { should be == 'application/grammar+grxml' }
+          its(:content_type) { should be == 'application/srgs+xml' }
         end
 
         describe 'with a simple grammar' do
@@ -94,9 +94,9 @@ module Punchblock
         end
 
         describe 'with a GRXML grammar' do
-          subject { Input::Grammar.new :value => grxml_doc, :content_type => 'application/grammar+grxml' }
+          subject { Input::Grammar.new :value => grxml_doc, :content_type => 'application/srgs+xml' }
 
-          its(:content_type) { should be == 'application/grammar+grxml' }
+          its(:content_type) { should be == 'application/srgs+xml' }
 
           let(:expected_message) { "<![CDATA[ #{grxml_doc} ]]>" }
 

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

@@ -162,6 +162,22 @@ module Punchblock
                 subject.execute
               end
 
+              context "when the SSML document contains commas" do
+                let :ssml_doc do
+                  RubySpeech::SSML.draw do
+                    string "this, here, is a test"
+                  end
+                end
+
+                it 'should escape TTS strings containing a comma' do
+                  mock_call.expects(:send_agi_action!).once.with do |*args|
+                    args[0].should be == 'EXEC MRCPSynth'
+                    args[1].should match(/this\\, here\\, is a test/)
+                  end
+                  subject.execute
+                end
+              end
+
               it 'should send a complete event when MRCPSynth completes' do
                 def mock_call.send_agi_action!(*args, &block)
                   block.call Punchblock::Component::Asterisk::AGI::Command::Complete::Success.new(:code => 200, :result => 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -119,7 +119,7 @@ dependencies:
         version: '0.12'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '0.12'
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.12.3
 - !ruby/object:Gem::Dependency
   name: ruby_ami
   requirement: !ruby/object:Gem::Requirement
@@ -515,7 +515,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2734494276677076274
+      hash: 1038933123642374556
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: