punchblock 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49f42b835052273a5744b92e6b84779b2782e0cc
-  data.tar.gz: fbcc1abd28ccbf6fbd8ecb200fda82c31ec1ac6c
+  metadata.gz: 4f0d1de96c4233bf0c4b8ed7943e4dc93e23138c
+  data.tar.gz: 57aeccc7ef70667f12f582f96b9a40e357d1e1f2
 SHA512:
-  metadata.gz: 5f6b8381a4bb5f30389ee46854e7a5ce569147721de0af96d4a995cea6ca5a6b3f97ecdf53538ea81c48cda8530476f5568a66b985c14254bd9c5f9254993cf8
-  data.tar.gz: 7af2927dda7105ab22949cecca00725c97906f0df79d3996b662e0460c3e562137ed3f2a4bab3293902cec8c525165fb67d624727bd2708f70a9ac9ec25e6056
+  metadata.gz: 605b57ffde8d82ceb9fc87f625a21c1c9ac55fc32135a4d3bd9c3b689febabe4741e8877a7eeae2f0c5bd9861583bce9643d17289d5a5b15d79ac91f254cf0d5
+  data.tar.gz: 57030a3403b343c3c6846d1b2bd958837ccca4caf25afbef8a2babad25a0b17e25ad17790d5d5680a303bb4a8695ce73357e17dd7a5e6da9e1b1f238f39c4941

data/CHANGELOG.md

@@ -1,17 +1,18 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
-# [v2.0.0.beta1](https://github.com/adhearsion/punchblock/compare/v1.9.4...v2.0.0.beta1) - [2013-08-20](https://rubygems.org/gems/punchblock/versions/2.0.0.beta1)
-  * Bugfix: Reconnect dead Asterisk streams correctly
-  * Feature: Added FS support for initial timeout and final timeout on Record.
+# [v2.0.0.beta2](https://github.com/adhearsion/punchblock/compare/v1.9.4...v2.0.0.beta2) - [2013-08-27](https://rubygems.org/gems/punchblock/versions/2.0.0.beta2)
   * Feature: Compliance with v0.2 of the published Rayo spec (http://xmpp.org/extensions/xep-0327.html)
-  * Feature: Add support for Rayo Prompt component (no support on FS)
+  * Feature: Add support for Rayo Prompt component
+  * Feature: Added FS support for initial timeout and final timeout on Record
   * Change: Models are now plain ruby objects, not XML nodes, and are imported from/exported to XML when necessary for communicating over XMPP.
   * Change: `#headers` and AMI `#attributes` now do not have their names modified. A header of `'Call-ID'` will no longer be modified to `:call_id`.
   * Change: AMI Events/Actions now have `#headers(=)` rather than `#attributes(=)`
   * Change: Remove event queue
+  * Change: Removed `media_engine` and `default_voice` settings
+  * Bugfix: Reconnect dead Asterisk streams correctly
   * Bugfix: Include AMI response text_body in AMI component complete events
   * Bugfix: Avoid crashing translators (Asterisk or FreeSWITCH) by instructing them to call back to terminated Call objects
-  * Bugfix: Detect MRCPSynth failure in output component.
+  * Bugfix: Detect MRCPSynth failure in output component
   * Bugfix: Handle AMI errors indicating dead channels correctly
 
 # [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)

data/lib/punchblock/connection/asterisk.rb

@@ -10,9 +10,8 @@ module Punchblock
 
       def initialize(options = {})
         @stream_options = options.values_at(:host, :port, :username, :password)
-        @translator_options = options.values_at(:media_engine)
         @ami_client = new_ami_stream
-        @translator = Translator::Asterisk.new @ami_client, self, *@translator_options
+        @translator = Translator::Asterisk.new @ami_client, self
         super()
       end
 

data/lib/punchblock/connection/freeswitch.rb

@@ -9,7 +9,7 @@ module Punchblock
       attr_accessor :event_handler
 
       def initialize(options = {})
-        @translator = Translator::Freeswitch.new self, options[:media_engine], options[:default_voice]
+        @translator = Translator::Freeswitch.new self
         @stream_options = options.values_at(:host, :port, :password)
         @stream = new_fs_stream
         super()

data/lib/punchblock/core_ext/blather/stanza.rb

@@ -2,15 +2,16 @@
 
 module Blather
   class Stanza
+    RAYO_NODE_PATH = "(#{Punchblock::RAYO_NAMESPACES.keys.map { |k| "#{k}:*" }.join("|")})".freeze
     ##
     # @return [Punchblock::RayoNode] a child of RayoNode
     #   representing the Rayo command/event contained within the stanza
     #
     def rayo_node
-      first_child = at_xpath '*'
-      Punchblock::RayoNode.from_xml first_child, nil, component_id if first_child
-    rescue Punchblock::RayoNode::InvalidNodeError
-      nil
+      @rayo_node ||= begin
+        first_child = at_xpath RAYO_NODE_PATH, Punchblock::RAYO_NAMESPACES
+        Punchblock::RayoNode.from_xml first_child, nil, component_id if first_child
+      end
     end
 
     ##

data/lib/punchblock/rayo_node.rb

@@ -7,8 +7,6 @@ module Punchblock
   class RayoNode
     include Virtus
 
-    InvalidNodeError = Class.new Punchblock::Error
-
     @@registrations = {}
 
     class_attribute :registered_ns, :registered_name
@@ -65,7 +63,8 @@ module Punchblock
 
     def inherit(xml_node)
       xml_node.attributes.each do |key, attr_node|
-        send "#{key.gsub('-', '_')}=", xml_node[key]
+        setter_method = "#{key.gsub('-', '_')}="
+        send setter_method, xml_node[key] if respond_to?(setter_method)
       end
       self
     end

data/lib/punchblock/translator/asterisk.rb

@@ -18,7 +18,7 @@ module Punchblock
       autoload :Channel
       autoload :Component
 
-      attr_reader :ami_client, :connection, :media_engine, :calls
+      attr_reader :ami_client, :connection, :calls
 
       REDIRECT_CONTEXT = 'adhearsion-redirect'
       REDIRECT_EXTENSION = '1'
@@ -28,8 +28,8 @@ module Punchblock
 
       trap_exit :actor_died
 
-      def initialize(ami_client, connection, media_engine = nil)
-        @ami_client, @connection, @media_engine = ami_client, connection, media_engine
+      def initialize(ami_client, connection)
+        @ami_client, @connection = ami_client, connection
         @calls, @components, @channel_to_call_id = {}, {}, {}
       end
 

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

@@ -14,10 +14,6 @@ module Punchblock
           UniMRCPError          = Class.new Punchblock::Error
           PlaybackError         = Class.new Punchblock::Error
 
-          def setup
-            @media_engine = @call.translator.media_engine
-          end
-
           def execute
             raise OptionError, 'An SSML document is required.' unless @component_node.render_documents.first.value
             raise OptionError, 'Only a single document is supported.' unless @component_node.render_documents.size == 1
@@ -29,7 +25,7 @@ module Punchblock
 
             early = !@call.answered?
 
-            rendering_engine = @component_node.renderer || @media_engine || :asterisk
+            rendering_engine = @component_node.renderer || :asterisk
 
             case rendering_engine.to_sym
             when :asterisk

data/lib/punchblock/translator/freeswitch.rb

@@ -18,14 +18,14 @@ module Punchblock
       autoload :Call
       autoload :Component
 
-      attr_reader :connection, :media_engine, :default_voice, :calls
+      attr_reader :connection, :calls
 
       trap_exit :actor_died
 
       finalizer :finalize
 
-      def initialize(connection, media_engine = nil, default_voice = nil)
-        @connection, @media_engine, @default_voice = connection, media_engine, default_voice
+      def initialize(connection)
+        @connection = connection
         @calls, @components = {}, {}
         setup_handlers
       end
@@ -62,7 +62,7 @@ module Punchblock
 
         register_handler :es, :event_name => 'CHANNEL_PARK' do |event|
           throw :pass if es_event_known_call? event
-          call = Call.new event[:unique_id], current_actor, event.content.select { |k,v| k.to_s =~ /variable/ }, stream, @media_engine, @default_voice
+          call = Call.new event[:unique_id], current_actor, event.content.select { |k,v| k.to_s =~ /variable/ }, stream
           link call
           register_call call
           call.async.send_offer
@@ -135,7 +135,7 @@ module Punchblock
       def execute_global_command(command)
         case command
         when Punchblock::Command::Dial
-          call = Call.new_link Punchblock.new_uuid, current_actor, nil, stream, @media_engine, @default_voice
+          call = Call.new_link Punchblock.new_uuid, current_actor, nil, stream
           register_call call
           call.async.dial command
         else

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

@@ -37,12 +37,12 @@ module Punchblock
         REJECT_TO_HANGUP_REASON = Hash.new 'NORMAL_TEMPORARY_FAILURE'
         REJECT_TO_HANGUP_REASON.merge! :busy => 'USER_BUSY', :decline => 'CALL_REJECTED'
 
-        attr_reader :id, :translator, :es_env, :direction, :stream, :media_engine, :default_voice
+        attr_reader :id, :translator, :es_env, :direction, :stream
 
         trap_exit :actor_died
 
-        def initialize(id, translator, es_env = nil, stream = nil, media_engine = nil, default_voice = nil)
-          @id, @translator, @stream, @media_engine, @default_voice = id, translator, stream, media_engine, default_voice
+        def initialize(id, translator, es_env = nil, stream = nil)
+          @id, @translator, @stream = id, translator, stream
           @es_env = es_env || {}
           @components = {}
           @pending_joins, @pending_unjoins = {}, {}
@@ -205,14 +205,14 @@ module Punchblock
             hangup REJECT_TO_HANGUP_REASON[command.reason]
             command.response = true
           when Punchblock::Component::Output
-            media_renderer = command.renderer || media_engine || :freeswitch
-            case media_renderer.to_sym
-            when :freeswitch, :native, nil
+            media_renderer = command.renderer || :freeswitch
+            case media_renderer.to_s
+            when 'freeswitch', 'native'
               execute_component Component::Output, command
-            when :flite
-              execute_component Component::FliteOutput, command, media_engine, default_voice
+            when 'flite'
+              execute_component Component::FliteOutput, command
             else
-              execute_component Component::TTSOutput, command, media_engine, default_voice
+              execute_component Component::TTSOutput, command
             end
           when Punchblock::Component::Input
             execute_component Component::Input, command

data/lib/punchblock/translator/freeswitch/component/abstract_output.rb

@@ -7,10 +7,10 @@ module Punchblock
         class AbstractOutput < Component
           UnrenderableDocError = Class.new OptionError
 
-          def execute(*args)
+          def execute
             validate
             send_ref
-            do_output(*args)
+            do_output
           rescue UnrenderableDocError => e
             with_error 'unrenderable document error', e.message
           rescue OptionError => e

data/lib/punchblock/translator/freeswitch/component/flite_output.rb

@@ -7,6 +7,10 @@ module Punchblock
         class FliteOutput < TTSOutput
           private
 
+          def renderer
+            :flite
+          end
+
           def document
             @component_node.render_documents.first.value.inner_text.to_s
           end

data/lib/punchblock/translator/freeswitch/component/tts_output.rb

@@ -7,12 +7,16 @@ module Punchblock
         class TTSOutput < AbstractOutput
           private
 
-          def do_output(engine, default_voice = nil)
+          def do_output
             register_handler :es, :event_name => 'CHANNEL_EXECUTE_COMPLETE' do |event|
               send_complete_event finish_reason
             end
-            voice = @component_node.voice || default_voice || 'kal'
-            application :speak, [engine, voice, document].join('|')
+            voice = @component_node.voice || :kal
+            application :speak, [renderer, voice, document].join('|')
+          end
+
+          def renderer
+            @component_node.renderer || :flite
           end
 
           def document

data/lib/punchblock/version.rb

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

data/spec/punchblock/connection/asterisk_spec.rb

@@ -10,8 +10,7 @@ module Punchblock
           :host     => '127.0.0.1',
           :port     => 5038,
           :username => 'test',
-          :password => 'test',
-          :media_engine => :swift
+          :password => 'test'
         }
       end
 
@@ -32,10 +31,6 @@ module Punchblock
         subject.translator.connection.should be subject
       end
 
-      it 'should set the media engine on the translator' do
-        subject.translator.media_engine.should be == :swift
-      end
-
       describe '#run' do
         it 'starts the RubyAMI::Stream' do
           subject.ami_client.async.should_receive(:run).once do

data/spec/punchblock/connection/freeswitch_spec.rb

@@ -5,15 +5,11 @@ require 'spec_helper'
 module Punchblock
   module Connection
     describe Freeswitch do
-      let(:media_engine)  { :flite }
-      let(:default_voice) { :hal }
       let :options do
         {
-          :host           => '127.0.0.1',
-          :port           => 8021,
-          :password       => 'test',
-          :media_engine   => media_engine,
-          :default_voice  => default_voice
+          :host     => '127.0.0.1',
+          :port     => 8021,
+          :password => 'test'
         }
       end
 
@@ -33,14 +29,6 @@ module Punchblock
         subject.translator.connection.should be subject
       end
 
-      it 'should set the media engine on the translator' do
-        subject.translator.media_engine.should be media_engine
-      end
-
-      it 'should set the default voice on the translator' do
-        subject.translator.default_voice.should be default_voice
-      end
-
       describe '#run' do
         it 'starts a RubyFS stream' do
           # subject.should_receive(:new_fs_stream).once.with('127.0.0.1', 8021, 'test').and_return mock_stream

data/spec/punchblock/connection/xmpp_spec.rb

@@ -125,21 +125,6 @@ module Punchblock
       end
 
       describe '#handle_presence' do
-        let :offer_xml do
-          <<-MSG
-<presence to='16577@app.rayo.net/1' from='9f00061@call.rayo.net'>
-  <offer xmlns="urn:xmpp:rayo:1" to="sip:whatever@127.0.0.1" from="sip:ylcaomxb@192.168.1.9">
-  <header name="Max-Forwards" value="70"/>
-  <header name="Content-Length" value="367"/>
-  </offer>
-</presence>
-          MSG
-        end
-
-        let(:example_offer) { import_stanza offer_xml }
-
-        it { example_offer.should be_a Blather::Stanza::Presence }
-
         let :complete_xml do
           <<-MSG
 <presence to='16577@app.rayo.net/1' from='9f00061@call.rayo.net/fgh4590'>
@@ -154,9 +139,34 @@ module Punchblock
 
         it { example_complete.should be_a Blather::Stanza::Presence }
 
+        describe "accessing the rayo node for a presence stanza" do
+          it "should import the rayo node" do
+            example_complete.rayo_node.should be_a Punchblock::Event::Complete
+          end
+
+          it "should be memoized" do
+            example_complete.rayo_node.should be example_complete.rayo_node
+          end
+        end
+
         describe "presence received" do
+          let(:handle_presence) { connection.__send__ :handle_presence, example_event }
+
           describe "from an offer" do
-            let(:handle_presence) { connection.__send__ :handle_presence, example_offer }
+            let :offer_xml do
+              <<-MSG
+    <presence to='16577@app.rayo.net/1' from='9f00061@call.rayo.net'>
+      <offer xmlns="urn:xmpp:rayo:1" to="sip:whatever@127.0.0.1" from="sip:ylcaomxb@192.168.1.9">
+      <header name="Max-Forwards" value="70"/>
+      <header name="Content-Length" value="367"/>
+      </offer>
+    </presence>
+              MSG
+            end
+
+            let(:example_event) { import_stanza offer_xml }
+
+            it { example_event.should be_a Blather::Stanza::Presence }
 
             it 'should call the event handler with the event' do
               mock_event_handler.should_receive(:call).once.with do |event|
@@ -173,16 +183,24 @@ module Punchblock
             let :irrelevant_xml do
               <<-MSG
 <presence to='16577@app.rayo.net/1' from='9f00061@call.rayo.net/fgh4590'>
-  <foo/>
+  <foo bar="baz"/>
 </presence>
               MSG
             end
 
-            let(:example_irrelevant_event) { import_stanza irrelevant_xml }
+            let(:example_event) { import_stanza irrelevant_xml }
+
+            it 'should not be considered to be a rayo event' do
+              example_event.rayo_event?.should be_false
+            end
+
+            it 'should have a nil rayo_node' do
+              example_event.rayo_node.should be_nil
+            end
 
             it 'should not handle the event' do
               mock_event_handler.should_receive(:call).never
-              lambda { connection.__send__ :handle_presence, example_irrelevant_event }.should throw_symbol(:pass)
+              lambda { handle_presence }.should throw_symbol(:pass)
             end
           end
         end

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

@@ -20,9 +20,8 @@ module Punchblock
           end
 
           let(:connection)    { MockConnection.new }
-          let(:media_engine)  { nil }
           let(:ami_client)    { double('AMI') }
-          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection }
           let(:call)          { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
 
           let :ssml_doc do

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

@@ -9,9 +9,8 @@ module Punchblock
         describe Input do
           include HasMockCallbackConnection
 
-          let(:media_engine)    { nil }
           let(:ami_client)      { double('AMI') }
-          let(:translator)      { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:translator)      { Punchblock::Translator::Asterisk.new ami_client, connection }
           let(:call)            { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
           let(:original_command_options) { {} }
 

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

@@ -9,9 +9,8 @@ module Punchblock
         describe MRCPNativePrompt do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { :unimrcp }
           let(:ami_client)    { double('AMI') }
-          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection }
           let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
 
           let :ssml_doc do

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

@@ -9,9 +9,8 @@ module Punchblock
         describe MRCPPrompt do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { :unimrcp }
           let(:ami_client)    { double('AMI') }
-          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection }
           let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
 
           let :ssml_doc do

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

@@ -9,10 +9,10 @@ module Punchblock
         describe Output do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { nil }
-          let(:ami_client)    { double('AMI') }
-          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
-          let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
+          let(:renderer)    { nil }
+          let(:ami_client)  { double('AMI') }
+          let(:translator)  { Punchblock::Translator::Asterisk.new ami_client, connection }
+          let(:mock_call)   { Punchblock::Translator::Asterisk::Call.new 'foo', translator, ami_client, connection }
 
           let :original_command do
             Punchblock::Component::Output.new command_options
@@ -24,8 +24,10 @@ module Punchblock
             end
           end
 
+          let(:command_opts) { {} }
+
           let :command_options do
-            { :render_document => {:value => ssml_doc} }
+            { :render_document => {:value => ssml_doc}, renderer: renderer }
           end
 
           subject { Output.new original_command, mock_call }
@@ -37,8 +39,8 @@ module Punchblock
           describe '#execute' do
             before { original_command.request! }
 
-            context 'with an invalid media engine' do
-              let(:media_engine) { 'foobar' }
+            context 'with an invalid renderer' do
+              let(:renderer) { 'foobar' }
 
               it "should return an error and not execute any actions" do
                 subject.execute
@@ -47,8 +49,8 @@ module Punchblock
               end
             end
 
-            context 'with a media engine of :swift' do
-              let(:media_engine) { 'swift' }
+            context 'with a renderer of :swift' do
+              let(:renderer) { 'swift' }
 
               let(:audio_filename) { 'http://foo.com/bar.mp3' }
 
@@ -59,10 +61,8 @@ module Punchblock
                 end
               end
 
-              let(:command_opts) { {} }
-
               let :command_options do
-                { :render_document => {:value => ssml_doc} }.merge(command_opts)
+                { :render_document => {:value => ssml_doc}, renderer: renderer }.merge(command_opts)
               end
 
               def ssml_with_options(prefix = '', postfix = '')
@@ -169,8 +169,8 @@ module Punchblock
               end
             end
 
-            context 'with a media engine of :unimrcp' do
-              let(:media_engine) { :unimrcp }
+            context 'with a renderer of :unimrcp' do
+              let(:renderer) { :unimrcp }
 
               let(:audio_filename) { 'http://foo.com/bar.mp3' }
 
@@ -184,7 +184,7 @@ module Punchblock
               let(:command_opts) { {} }
 
               let :command_options do
-                { :render_document => {:value => ssml_doc} }.merge(command_opts)
+                { :render_document => {:value => ssml_doc}, renderer: renderer }.merge(command_opts)
               end
 
               let(:synthstatus) { 'OK' }
@@ -422,8 +422,8 @@ module Punchblock
               end
             end
 
-            [:asterisk, nil].each do |media_engine|
-              context "with a media engine of #{media_engine.inspect}" do
+            [:asterisk, nil].each do |renderer|
+              context "with a renderer of #{renderer.inspect}" do
                 def expect_playback(filename = audio_filename)
                   mock_call.should_receive(:execute_agi_command).once.with('EXEC Playback', filename).and_return code: 200
                 end
@@ -443,7 +443,7 @@ module Punchblock
                 let(:command_opts) { {} }
 
                 let :command_options do
-                  { :render_document => {:value => ssml_doc} }.merge(command_opts)
+                  { :render_document => {:value => ssml_doc}, renderer: renderer }.merge(command_opts)
                 end
 
                 let :original_command do
@@ -864,35 +864,6 @@ module Punchblock
                 end
               end
             end
-
-            context "with a media renderer set on itself" do
-              let(:media_engine) { :swift }
-              let(:audio_filename) { '/foo/bar.wav' }
-              let :ssml_doc do
-                RubySpeech::SSML.draw do
-                  audio :src => audio_filename
-                end
-              end
-
-              let(:command_opts) { {:renderer => :asterisk} }
-
-              let :command_options do
-                { :render_document => {:value => ssml_doc} }.merge(command_opts)
-              end
-
-              let :original_command do
-                Punchblock::Component::Output.new command_options
-              end
-
-              let(:playbackstatus) { 'SUCCESS' }
-              before { mock_call.stub(:channel_var).with('PLAYBACKSTATUS').and_return playbackstatus }
-
-              it "should use the media renderer set and not the platform default" do
-                expect_answered
-                mock_call.should_receive(:execute_agi_command).once.with 'EXEC Playback', audio_filename
-                subject.execute
-              end
-            end
           end
 
           describe "#execute_command" do

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

@@ -9,10 +9,9 @@ module Punchblock
         describe Record do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { nil }
           let(:channel)       { 'SIP/foo' }
           let(:ami_client)    { double('AMI Client').as_null_object }
-          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection, media_engine }
+          let(:translator)    { Punchblock::Translator::Asterisk.new ami_client, connection }
           let(:mock_call)     { Punchblock::Translator::Asterisk::Call.new channel, translator, ami_client, connection }
 
           let :original_command do

data/spec/punchblock/translator/asterisk_spec.rb

@@ -8,9 +8,8 @@ module Punchblock
     describe Asterisk do
       let(:ami_client)    { double 'RubyAMI::Client' }
       let(:connection)    { double 'Connection::Asterisk', handle_event: nil }
-      let(:media_engine)  { :asterisk }
 
-      let(:translator) { Asterisk.new ami_client, connection, media_engine }
+      let(:translator) { Asterisk.new ami_client, connection }
 
       subject { translator }
 
@@ -19,16 +18,6 @@ module Punchblock
 
       after { translator.terminate if translator.alive? }
 
-      context 'with a configured media engine of :asterisk' do
-        let(:media_engine) { :asterisk }
-        its(:media_engine) { should be == :asterisk }
-      end
-
-      context 'with a configured media engine of :unimrcp' do
-        let(:media_engine) { :unimrcp }
-        its(:media_engine) { should be == :unimrcp }
-      end
-
       describe '#shutdown' do
         it "instructs all calls to shutdown" do
           call = Asterisk::Call.new 'foo', subject, ami_client, connection

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

@@ -6,10 +6,8 @@ module Punchblock
   module Translator
     class Freeswitch
       describe Call do
-        let(:id) { Punchblock.new_uuid }
+        let(:id)            { Punchblock.new_uuid }
         let(:stream)        { double('RubyFS::Stream').as_null_object }
-        let(:media_engine)  { 'freeswitch' }
-        let(:default_voice) { :hal }
         let(:translator)    { Freeswitch.new double('Connection::Freeswitch').as_null_object }
         let(:es_env) do
           {
@@ -165,13 +163,12 @@ module Punchblock
           }
         end
 
-        subject { Call.new id, translator, es_env, stream, media_engine, default_voice }
+        subject { Call.new id, translator, es_env, stream }
 
-        its(:id)            { should be == id }
-        its(:translator)    { should be translator }
-        its(:es_env)        { should be == es_env }
-        its(:stream)        { should be stream }
-        its(:media_engine)  { should be media_engine }
+        its(:id)          { should be == id }
+        its(:translator)  { should be translator }
+        its(:es_env)      { should be == es_env }
+        its(:stream)      { should be stream }
 
         describe '#register_component' do
           it 'should make the component accessible by ID' do
@@ -777,15 +774,15 @@ module Punchblock
 
           context 'with an Output component' do
             let :command do
-              Punchblock::Component::Output.new
+              Punchblock::Component::Output.new renderer: renderer
             end
 
             let(:mock_component) { Translator::Freeswitch::Component::Output.new(command, subject) }
 
-            ['freeswitch', nil].each do |media_engine|
-              let(:media_engine) { media_engine }
+            ['freeswitch', 'native', nil].each do |renderer|
+              let(:renderer) { renderer }
 
-              context "with a media engine of #{media_engine}" do
+              context "with a renderer of #{renderer}" do
                 it 'should create an Output component and execute it asynchronously' do
                   Component::Output.should_receive(:new_link).once.with(command, subject).and_return mock_component
                   mock_component.should_receive(:execute).once
@@ -795,50 +792,35 @@ module Punchblock
               end
             end
 
-            context 'with the media engine of :flite' do
-              let(:media_engine) { :flite }
+            context 'with the renderer of :flite' do
+              let(:renderer) { :flite }
 
               it 'should create a FliteOutput component and execute it asynchronously using flite and the calls default voice' do
                 Component::FliteOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
+                mock_component.should_receive(:execute).once
                 subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
             end
 
-            context 'with the media engine of :cepstral' do
-              let(:media_engine) { :cepstral }
+            context 'with the renderer of :cepstral' do
+              let(:renderer) { :cepstral }
 
               it 'should create a TTSOutput component and execute it asynchronously using cepstral and the calls default voice' do
                 Component::TTSOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
+                mock_component.should_receive(:execute).once
                 subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
             end
 
-            context 'with the media engine of :unimrcp' do
-              let(:media_engine) { :unimrcp }
+            context 'with the renderer of :unimrcp' do
+              let(:renderer) { :unimrcp }
 
               it 'should create a TTSOutput component and execute it asynchronously using unimrcp and the calls default voice' do
                 Component::TTSOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
-                subject.execute_command command
-                subject.component_with_id(mock_component.id).should be mock_component
-              end
-            end
-
-            context "with a media renderer set on the component" do
-              let(:media_engine) { :cepstral }
-              let(:media_renderer) { :native }
-              let :command_with_renderer do
-                Punchblock::Component::Output.new :renderer => media_renderer
-              end
-
-              it "should use the component media engine and not the platform one if it is set" do
-                Component::Output.should_receive(:new_link).once.with(command_with_renderer, subject).and_return mock_component
                 mock_component.should_receive(:execute).once
-                subject.execute_command command_with_renderer
+                subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
             end

data/spec/punchblock/translator/freeswitch/component/flite_output_spec.rb

@@ -9,10 +9,8 @@ module Punchblock
         describe FliteOutput do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { :flite }
-          let(:default_voice) { nil }
-          let(:translator)    { Punchblock::Translator::Freeswitch.new connection }
-          let(:mock_call)     { Punchblock::Translator::Freeswitch::Call.new 'foo', translator }
+          let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
+          let(:mock_call)   { Punchblock::Translator::Freeswitch::Call.new 'foo', translator }
 
           let :original_command do
             Punchblock::Component::Output.new command_options
@@ -29,7 +27,7 @@ module Punchblock
           end
 
           def execute
-            subject.execute media_engine, default_voice
+            subject.execute
           end
 
           subject { described_class.new original_command, mock_call }
@@ -37,7 +35,7 @@ module Punchblock
           describe '#execute' do
             before { original_command.request! }
             def expect_playback(voice = :kal)
-              subject.wrapped_object.should_receive(:application).once.with :speak, "#{media_engine}|#{voice}|FOO"
+              subject.wrapped_object.should_receive(:application).once.with :speak, "flite|#{voice}|FOO"
             end
 
             let(:command_opts) { {} }

data/spec/punchblock/translator/freeswitch/component/tts_output_spec.rb

@@ -9,10 +9,8 @@ module Punchblock
         describe TTSOutput do
           include HasMockCallbackConnection
 
-          let(:media_engine)  { :flite }
-          let(:default_voice) { :hal }
-          let(:translator)    { Punchblock::Translator::Freeswitch.new connection }
-          let(:mock_call)     { Punchblock::Translator::Freeswitch::Call.new 'foo', translator }
+          let(:translator)  { Punchblock::Translator::Freeswitch.new connection }
+          let(:mock_call)   { Punchblock::Translator::Freeswitch::Call.new 'foo', translator }
 
           let :original_command do
             Punchblock::Component::Output.new command_options
@@ -25,19 +23,19 @@ module Punchblock
           end
 
           let :command_options do
-            { :render_document => {:value => ssml_doc} }
+            { :render_document => {:value => ssml_doc}, :renderer => :flite }
           end
 
           def execute
-            subject.execute media_engine, default_voice
+            subject.execute
           end
 
           subject { described_class.new original_command, mock_call }
 
           describe '#execute' do
             before { original_command.request! }
-            def expect_playback(voice = default_voice)
-              subject.wrapped_object.should_receive(:application).once.with :speak, "#{media_engine}|#{voice}|#{ssml_doc}"
+            def expect_playback(voice = :kal, renderer = :flite)
+              subject.wrapped_object.should_receive(:application).once.with :speak, "#{renderer}|#{voice}|#{ssml_doc}"
             end
 
             let :ssml_doc do

data/spec/punchblock/translator/freeswitch_spec.rb

@@ -6,10 +6,8 @@ module Punchblock
   module Translator
     describe Freeswitch do
       let(:connection)    { double 'Connection::Freeswitch' }
-      let(:media_engine)  { :flite }
-      let(:default_voice) { :hal }
 
-      let(:translator)  { described_class.new connection, media_engine, default_voice }
+      let(:translator)  { described_class.new connection }
       let(:stream)      { double 'RubyFS::Stream' }
 
       before { connection.should_receive(:stream).at_most(:once).and_return stream }
@@ -248,8 +246,6 @@ module Punchblock
             call.should be_a Freeswitch::Call
             call.translator.should be subject
             call.stream.should be stream
-            call.media_engine.should be media_engine
-            call.default_voice.should be default_voice
           end
 
           it 'should instruct the call to send a dial' do
@@ -430,8 +426,6 @@ module Punchblock
           call.should be_a Freeswitch::Call
           call.translator.should be subject
           call.stream.should be stream
-          call.media_engine.should be media_engine
-          call.default_voice.should be default_voice
           call.es_env.should be ==  {
             :variable_direction                   => "inbound",
             :variable_uuid                        => "3f0e1e18-c056-11e1-b099-fffeda3ce54f",

data/spec/spec_helper.rb

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

metadata

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