adhearsion 2.6.4 → 3.0.0.beta1

data/lib/adhearsion/call.rb

@@ -17,7 +17,7 @@ module Adhearsion
     ExpiredError    = Class.new Celluloid::DeadActorError
 
     # @private
-    class ActorProxy < Celluloid::ActorProxy
+    class ActorProxy < Celluloid::CellProxy
       def method_missing(meth, *args, &block)
         super(meth, *args, &block)
       rescue ::Celluloid::DeadActorError
@@ -89,7 +89,6 @@ module Adhearsion
       @duration     = nil
       @auto_hangup  = true
       @after_hangup_lifetime = nil
-      @call_terminating = false
 
       self << offer if offer
     end
@@ -161,14 +160,18 @@ module Adhearsion
 
     #
     # Wait for the call to end. Returns immediately if the call has already ended, else blocks until it does so.
+    # @param [Integer, nil] timeout a timeout after which to unblock, returning `:timeout`
     # @return [Symbol] the reason for the call ending
+    # @raises [Celluloid::ConditionError] in case of a specified timeout expiring
     #
-    def wait_for_end
+    def wait_for_end(timeout = nil)
       if end_reason
         end_reason
       else
-        @end_blocker.wait
+        @end_blocker.wait(timeout)
       end
+    rescue Celluloid::ConditionError => e
+      abort e
     end
 
     #
@@ -200,22 +203,16 @@ module Adhearsion
 
     # @private
     def register_initial_handlers
-      register_event_handler Punchblock::Event::Offer do |offer|
+      register_event_handler Adhearsion::Event::Offer do |offer|
         @offer  = offer
         @client = offer.client
         @start_time = offer.timestamp.to_time
       end
 
-      register_event_handler Punchblock::HasHeaders do |event|
+      register_event_handler Adhearsion::HasHeaders do |event|
         merge_headers event.headers
       end
 
-      register_event_handler Punchblock::Event::Complete do |event|
-        if event.reason.is_a? Punchblock::Event::Complete::Hangup
-          terminating! unless terminating?
-        end
-      end
-
       on_joined do |event|
         if event.call_uri
           target = event.call_uri
@@ -245,7 +242,6 @@ module Adhearsion
 
       on_end do |event|
         logger.info "Call #{from} -> #{to} ended due to #{event.reason}#{" (code #{event.platform_code})" if event.platform_code}"
-        terminating! unless terminating?
         @end_time = event.timestamp.to_time
         @duration = @end_time - @start_time if @start_time
         clear_from_active_calls
@@ -253,7 +249,7 @@ module Adhearsion
         @end_code = event.platform_code
         @end_blocker.broadcast event.reason
         @commands.terminate
-        after(@after_hangup_lifetime || Adhearsion.config.platform.after_hangup_lifetime) { terminate }
+        after(@after_hangup_lifetime || Adhearsion.config.core.after_hangup_lifetime) { terminate }
       end
     end
 
@@ -276,7 +272,7 @@ module Adhearsion
     # @option target [String] mixer_name The mixer name to guard on
     #
     def on_joined(target = nil, &block)
-      register_event_handler Punchblock::Event::Joined, *guards_for_target(target) do |event|
+      register_event_handler Adhearsion::Event::Joined, *guards_for_target(target) do |event|
         block.call event
       end
     end
@@ -289,7 +285,7 @@ module Adhearsion
     # @option target [String] mixer_name The mixer name to guard on
     #
     def on_unjoined(target = nil, &block)
-      register_event_handler Punchblock::Event::Unjoined, *guards_for_target(target), &block
+      register_event_handler Adhearsion::Event::Unjoined, *guards_for_target(target), &block
     end
 
     # @private
@@ -298,19 +294,7 @@ module Adhearsion
     end
 
     def on_end(&block)
-      register_event_handler Punchblock::Event::End, &block
-    end
-
-    def terminating!
-      logger.debug "Call is terminating"
-      @call_terminating = true
-    end
-
-    #
-    # @return [Boolean] if the call is currently terminating/terminated
-    #
-    def terminating?
-      !active? || @call_terminating
+      register_event_handler Adhearsion::Event::End, &block
     end
 
     #
@@ -321,21 +305,21 @@ module Adhearsion
     end
 
     def accept(headers = nil)
-      @accept_command ||= write_and_await_response Punchblock::Command::Accept.new(:headers => headers)
-    rescue Punchblock::ProtocolError => e
+      @accept_command ||= write_and_await_response Adhearsion::Rayo::Command::Accept.new(:headers => headers)
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
     def answer(headers = nil)
-      write_and_await_response Punchblock::Command::Answer.new(:headers => headers)
-    rescue Punchblock::ProtocolError => e
+      write_and_await_response Adhearsion::Rayo::Command::Answer.new(:headers => headers)
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
     def reject(reason = :busy, headers = nil)
-      write_and_await_response Punchblock::Command::Reject.new(:reason => reason, :headers => headers)
+      write_and_await_response Adhearsion::Rayo::Command::Reject.new(:reason => reason, :headers => headers)
       Adhearsion::Events.trigger_immediately :call_rejected, call: current_actor, reason: reason
-    rescue Punchblock::ProtocolError => e
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -354,8 +338,8 @@ module Adhearsion
     # @param [String] to the target to redirect to, eg a SIP URI
     # @param [Hash, optional] headers a set of headers to send along with the redirect instruction
     def redirect(to, headers = nil)
-      write_and_await_response Punchblock::Command::Redirect.new(to: to, headers: headers)
-    rescue Punchblock::ProtocolError => e
+      write_and_await_response Adhearsion::Rayo::Command::Redirect.new(to: to, headers: headers)
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -363,8 +347,8 @@ module Adhearsion
       return false unless active?
       logger.info "Hanging up"
       @end_reason = true
-      write_and_await_response Punchblock::Command::Hangup.new(:headers => headers)
-    rescue Punchblock::ProtocolError => e
+      write_and_await_response Adhearsion::Rayo::Command::Hangup.new(:headers => headers)
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -401,10 +385,10 @@ module Adhearsion
         unjoined_condition.countdown!
       end
 
-      command = Punchblock::Command::Join.new options.merge(join_options_with_target(target))
+      command = Adhearsion::Rayo::Command::Join.new options.merge(join_options_with_target(target))
       write_and_await_response command
       {command: command, joined_condition: joined_condition, unjoined_condition: unjoined_condition}
-    rescue Punchblock::ProtocolError => e
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -417,9 +401,9 @@ module Adhearsion
     #
     def unjoin(target = nil)
       logger.info "Unjoining from #{target}"
-      command = Punchblock::Command::Unjoin.new join_options_with_target(target)
+      command = Adhearsion::Rayo::Command::Unjoin.new join_options_with_target(target)
       write_and_await_response command
-    rescue Punchblock::ProtocolError => e
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -462,14 +446,14 @@ module Adhearsion
     end
 
     def mute
-      write_and_await_response Punchblock::Command::Mute.new
-    rescue Punchblock::ProtocolError => e
+      write_and_await_response Adhearsion::Rayo::Command::Mute.new
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
     def unmute
-      write_and_await_response Punchblock::Command::Unmute.new
-    rescue Punchblock::ProtocolError => e
+      write_and_await_response Adhearsion::Rayo::Command::Unmute.new
+    rescue Adhearsion::ProtocolError => e
       abort e
     end
 
@@ -482,7 +466,7 @@ module Adhearsion
 
       response = defer { command.response timeout }
       case response
-      when Punchblock::ProtocolError
+      when Adhearsion::ProtocolError
         if response.name == :item_not_found
           error_handler[Hangup.new(@end_reason)]
         else
@@ -501,10 +485,10 @@ module Adhearsion
 
     # @private
     def write_command(command)
-      abort Hangup.new(@end_reason) unless active? || command.is_a?(Punchblock::Command::Hangup)
+      abort Hangup.new(@end_reason) unless active? || command.is_a?(Adhearsion::Rayo::Command::Hangup)
       merge_headers command.headers if command.respond_to? :headers
       logger.debug "Executing command #{command.inspect}"
-      unless command.is_a?(Punchblock::Command::Dial)
+      unless command.is_a?(Adhearsion::Rayo::Command::Dial)
         command.target_call_id = id
         command.domain = domain
       end

data/lib/adhearsion/call_controller.rb

@@ -1,13 +1,12 @@
 # encoding: utf-8
 
 require 'countdownlatch'
+
 %w(
   dial
   input
-  menu_dsl
   output
   record
-  utility
 ).each { |r| require "adhearsion/call_controller/#{r}" }
 
 module Adhearsion
@@ -16,7 +15,6 @@ module Adhearsion
     include Input
     include Output
     include Record
-    include Utility
 
     class_attribute :callbacks
 
@@ -99,7 +97,7 @@ module Adhearsion
     end
 
     def bg_exec(completion_callback = nil)
-      Celluloid::ThreadHandle.new do
+      Celluloid::ThreadHandle.new(Celluloid.actor_system) do
         catching_standard_errors do
           exec_with_callback completion_callback
         end
@@ -164,7 +162,7 @@ module Adhearsion
       @active_components.each do |component|
         begin
           component.stop!
-        rescue Punchblock::Component::InvalidActionError
+        rescue Adhearsion::Rayo::Component::InvalidActionError
         end
       end
     end
@@ -205,8 +203,8 @@ module Adhearsion
     def write_and_await_response(command)
       block_until_resumed
       call.write_and_await_response command
-      if command.is_a?(Punchblock::Component::ComponentNode)
-        command.register_event_handler Punchblock::Event::Complete do |event|
+      if command.is_a?(Adhearsion::Rayo::Component::ComponentNode)
+        command.register_event_handler Adhearsion::Event::Complete do |event|
           @active_components.delete command
           throw :pass
         end
@@ -221,11 +219,7 @@ module Adhearsion
       yield component if block_given?
 
       complete_event = component.complete_event
-      raise Adhearsion::Error, [complete_event.reason.details, component.inspect].join(": ") if complete_event.reason.is_a? Punchblock::Event::Complete::Error
-      if complete_event.reason.is_a? Punchblock::Event::Complete::Hangup
-        call.terminating! unless call.terminating?
-        raise Call::Hangup
-      end
+      raise Adhearsion::Error, [complete_event.reason.details, component.inspect].join(": ") if complete_event.reason.is_a? Adhearsion::Event::Complete::Error
       component
     end
 

data/lib/adhearsion/call_controller/dial.rb

@@ -33,9 +33,11 @@ module Adhearsion
       # @option options [Numeric] :for this option can be thought of best as a timeout.
       #   i.e. timeout after :for if no one answers the call
       #
-      # @option options [CallController] :confirm the controller to execute on the first outbound call to be answered, to give an opportunity to screen the call. The calls will be joined if the outbound call is still active after this controller completes.
+      # @option options [CallController] :confirm Confirmation controller to execute. Confirmation will be attempted on all answered calls, and calls will be allowed to progress through confirmation in parallel. The first to complete confirmation will be joined to the A-leg, with the others being hung up.
       # @option options [Hash] :confirm_metadata Metadata to set on the confirmation controller before executing it. This is shared between all calls if dialing multiple endpoints; if you care about it being mutated, you should provide an immutable value (using eg https://github.com/harukizaemon/hamster).
       #
+      # @option options [CallController] :apology controller to execute on calls which lose the race to complete confirmation before they are hung up
+      #
       # @option options [CallController] :cleanup The controller to execute on each call being cleaned up. This can be used, for instance, to notify that the call is being terminated. Calls are terminated right after this controller completes execution. If this is not specified, calls are silently terminated during cleanup.
       # @option options [Hash] :cleanup_metadata Metadata to set on the cleanup controller before executing it. Defaults to :confirm_metadata if not specified.
       #
@@ -68,23 +70,6 @@ module Adhearsion
         catching_standard_errors { dial.delete_logger if dial }
       end
 
-      # Dial one or more third parties and join one to this call after execution of a confirmation controller.
-      # Confirmation will be attempted on all answered calls, and calls will be allowed to progress through confirmation in parallel. The first to complete confirmation will be joined to the A-leg, with the others being hung up.
-      #
-      # @option options [CallController] :apology controller to execute on calls which lose the race to complete confirmation before they are hung up
-      #
-      # @see #dial
-      def dial_and_confirm(to, options = {})
-        dial = ParallelConfirmationDial.new to, options, call
-        dial.run(self)
-        dial.await_completion
-        dial.terminate_ringback
-        dial.cleanup_calls
-        dial.status
-      ensure
-        catching_standard_errors { dial.delete_logger if dial }
-      end
-
       class Dial
         attr_accessor :status
 
@@ -163,8 +148,6 @@ module Adhearsion
             end
 
             new_call.on_answer do |event|
-              pre_confirmation_tasks new_call
-
               new_call.on_joined @call do |joined|
                 join_status.started joined.timestamp.to_time
               end
@@ -377,6 +360,8 @@ module Adhearsion
           @confirmation_controller = @options.delete :confirm
           @confirmation_metadata = @options.delete :confirm_metadata
 
+          @apology_controller = @options.delete :apology
+
           @pre_join = @options.delete :pre_join
           @ringback = @options.delete :ringback
 
@@ -388,16 +373,18 @@ module Adhearsion
           @skip_cleanup = false
         end
 
-        def pre_confirmation_tasks(call)
-          on_all_except call do |target_call|
-            logger.info "#dial hanging up call #{target_call.id} because this call has been answered by another channel"
-            target_call.hangup
-          end
-        end
-
         def pre_join_tasks(call)
           @pre_join.call(call) if @pre_join
           terminate_ringback
+          on_all_except call do |target_call|
+            if @apology_controller
+              logger.info "#dial executing apology controller #{@apology_controller} on call #{target_call.id} because this call has been confirmed by another channel"
+              target_call.async.execute_controller @apology_controller.new(target_call, @confirmation_metadata), ->(call) { call.hangup }
+            else
+              logger.info "#dial hanging up call #{target_call.id} because this call has been confirmed by another channel"
+              target_call.hangup
+            end
+          end
         end
 
         def on_all_except(call)
@@ -411,7 +398,7 @@ module Adhearsion
 
         def ignoring_missing_joins
           yield
-        rescue Punchblock::ProtocolError => e
+        rescue Adhearsion::ProtocolError => e
           raise unless e.name == :service_unavailable
         end
 
@@ -422,31 +409,6 @@ module Adhearsion
         end
       end
 
-      class ParallelConfirmationDial < Dial
-        private
-
-        def set_defaults
-          super
-          @apology_controller = @options.delete :apology
-        end
-
-        def pre_confirmation_tasks(call)
-        end
-
-        def pre_join_tasks(call)
-          super
-          on_all_except call do |target_call|
-            if @apology_controller
-              logger.info "#dial executing apology controller #{@apology_controller} on call #{target_call.id} because this call has been confirmed by another channel"
-              target_call.async.execute_controller @apology_controller.new(target_call, @confirmation_metadata), ->(call) { call.hangup }
-            else
-              logger.info "#dial hanging up call #{target_call.id} because this call has been confirmed by another channel"
-              target_call.hangup
-            end
-          end
-        end
-      end
-
       class DialStatus
         # The collection of calls created during the dial operation
         attr_accessor :calls

data/lib/adhearsion/call_controller/input.rb

@@ -1,90 +1,60 @@
 # encoding: utf-8
 
+require 'adhearsion/call_controller/input/ask_grammar_builder'
+require 'adhearsion/call_controller/input/prompt_builder'
+require 'adhearsion/call_controller/input/menu_builder'
+
 module Adhearsion
   class CallController
     module Input
 
-      Result = Struct.new(:response, :status, :menu) do
-        def to_s
-          response
-        end
-
-        def inspect
-          "#<Adhearsion::CallController::Input::Result response=#{response.inspect}, status=#{status.inspect}>"
-        end
-      end
+      InputError = Class.new Adhearsion::Error
 
       #
-      # Prompts for input via DTMF, handling playback of prompts,
-      # timeouts, digit limits and terminator digits.
+      # Prompts for input, handling playback of prompts, DTMF grammar construction, and execution
       #
-      # @example A basic digit collection:
+      # @example A basic DTMF digit collection:
       #   ask "Welcome, ", "/opt/sounds/menu-prompt.mp3",
-      #       :timeout => 10, :terminator => '#', :limit => 3 do |buffer|
-      #     buffer == "12980"
-      #   end
+      #       timeout: 10, terminator: '#', limit: 3
       #
       # The first arguments will be a list of sounds to play, as accepted by #play, including strings for TTS, Date and Time objects, and file paths.
-      # :timeout, :terminator and :limit options may then be specified.
-      # A block may be passed which is invoked on each digit being collected. If it returns true, the collection is terminated.
+      # :timeout, :terminator and :limit options may be specified to automatically construct a grammar, or grammars may be manually specified.
       #
       # @param [Object, Array<Object>] args A list of outputs to play, as accepted by #play
-      # @param [Hash] options Options to use for the menu
+      # @param [Hash] options Options to modify the grammar
       # @option options [Boolean] :interruptible If the prompt should be interruptible or not. Defaults to true
       # @option options [Integer] :limit Digit limit (causes collection to cease after a specified number of digits have been collected)
       # @option options [Integer] :timeout Timeout in seconds before the first and between each input digit
       # @option options [String] :terminator Digit to terminate input
+      # @option options [RubySpeech::GRXML::Grammar, Array<RubySpeech::GRXML::Grammar>] :grammar One of a collection of grammars to execute
+      # @option options [String, Array<String>] :grammar_url One of a collection of URLs for grammars to execute
+      # @option options [Hash] :input_options A hash of options passed directly to the Input constructor
+      # @option options [Hash] :output_options A hash of options passed directly to the Output constructor
       #
-      # @return [Result] a result object from which the #response and #status may be established
+      # @return [Result] a result object from which the details of the utterance may be established
       #
       # @see Output#play
-      # @see CallController#pass
+      # @see Adhearsion::Rayo::Component::Input.new
+      # @see Adhearsion::Rayo::Component::Output.new
       #
-      def ask(*args, options, &block)
-        logger.warn "This implementation of #ask is deprecated due to issues with dropped DTMF. For a solution, see http://adhearsion.com/docs/common_problems#toc_3"
+      def ask(*args)
+        options = args.last.kind_of?(Hash) ? args.pop : {}
+        prompts = args.flatten.compact
 
-        unless options.is_a?(Hash)
-          args << options
-          options = {}
-        end
-        sound_files = args.flatten
+        options[:grammar] || options[:grammar_url] || options[:limit] || options[:terminator] || raise(ArgumentError, "You must specify at least one of limit, terminator or grammar")
 
-        menu_instance = MenuDSL::Menu.new options do
-          validator(&block) if block
-        end
-        menu_instance.validate :basic
-        result_of_menu = nil
+        grammars = AskGrammarBuilder.new(options).grammars
 
-        catch :finish do
-          until MenuDSL::Menu::MenuResultDone === result_of_menu
-            raise unless menu_instance.should_continue?
+        output_document = prompts.empty? ? nil : output_formatter.ssml_for_collection(prompts)
 
-            result_of_menu = menu_instance.continue
-
-            if result_of_menu.is_a?(MenuDSL::Menu::MenuGetAnotherDigit)
-              next_digit = play_sound_files_for_menu menu_instance, sound_files
-              if next_digit
-                menu_instance << next_digit
-              else
-                menu_instance.timeout!
-                throw :finish
-              end
-            end
-          end
-        end
-
-        Result.new.tap do |result|
-          result.response = menu_instance.result
-          result.status   = menu_instance.status
-          result.menu     = menu_instance
-        end
+        PromptBuilder.new(output_document, grammars, options).execute self
       end
 
       # Creates and manages a multiple choice menu driven by DTMF, handling playback of prompts,
       # invalid input, retries and timeouts, and final failures.
       #
       # @example A complete example of the method is as follows:
-      #   menu "Welcome, ", "/opt/sounds/menu-prompt.mp3", :tries => 2, :timeout => 10 do
+      #   menu "Welcome, ", "/opt/sounds/menu-prompt.mp3", tries: 2, timeout: 10 do
       #     match 1, OperatorController
       #
       #     match 10..19 do
@@ -92,7 +62,7 @@ module Adhearsion
       #     end
       #
       #     match 5, 6, 9 do |exten|
-      #      play "The #{exten} extension is currently not active"
+      #       play "The #{exten} extension is currently not active"
       #     end
       #
       #     match '7', OfficeController
@@ -111,14 +81,12 @@ module Adhearsion
       # Input is matched against patterns, and the first exact match has it's payload executed.
       # Matched input is passed in to the associated block, or to the controller through #options.
       #
-      # Allowed payloads are the name of a controller class, in which case it is executed through its #run method, or a block.
+      # Allowed payloads are the name of a controller class, in which case it is executed through its #run method, or a block, which is executed in the context of the current controller.
       #
       # #invalid has its associated block executed when the input does not possibly match any pattern.
-      # #timeout's block is run when time expires before or between input digits.
+      # #timeout's block is run when timeout expires before receiving any input
       # #failure runs its block when the maximum number of tries is reached without an input match.
       #
-      # #validator runs its block on each digit being collected. If it returns true, the collection is terminated.
-      #
       # Execution of the current context resumes after #menu finishes. If you wish to jump to an entirely different controller, use #pass.
       # Menu will return :failed if failure was reached, or :done if a match was executed.
       #
@@ -127,117 +95,26 @@ module Adhearsion
       # @option options [Integer] :tries Number of tries allowed before failure
       # @option options [Integer] :timeout Timeout in seconds before the first and between each input digit
       # @option options [Boolean] :interruptible If the prompt should be interruptible or not. Defaults to true
+      # @option options [String, Symbol] :mode Input mode to accept. May be :voice or :dtmf.
+      # @option options [Hash] :input_options A hash of options passed directly to the Input constructor
+      # @option options [Hash] :output_options A hash of options passed directly to the Output constructor
       #
-      # @return [Result] a result object from which the #response and #status may be established
+      # @return [Result] a result object from which the details of the utterance may be established
       #
       # @see Output#play
       # @see CallController#pass
       #
-      def menu(*args, options, &block)
-        logger.warn "This implementation of #menu is deprecated due to issues with dropped DTMF. For a solution, see http://adhearsion.com/docs/common_problems#toc_3"
+      def menu(*args, &block)
+        raise ArgumentError, "You must specify a block to build the menu" unless block
+        options = args.last.kind_of?(Hash) ? args.pop : {}
+        prompts = args.flatten.compact
 
-        unless options.is_a?(Hash)
-          args << options
-          options = {}
-        end
-        sound_files = args.flatten
+        menu_builder = MenuBuilder.new(options, &block)
 
-        menu_instance = MenuDSL::Menu.new options, &block
-        menu_instance.validate
-        result_of_menu = nil
+        output_document = prompts.empty? ? nil : output_formatter.ssml_for_collection(prompts)
 
-        catch :finish do
-          until MenuDSL::Menu::MenuResultDone === result_of_menu
-            if menu_instance.should_continue?
-              result_of_menu = menu_instance.continue
-            else
-              logger.debug "Menu failed to get valid input. Calling \"failure\" hook."
-              menu_instance.execute_failure_hook
-              throw :finish
-            end
-
-            case result_of_menu
-            when MenuDSL::Menu::MenuResultInvalid
-              logger.debug "Menu received invalid input. Calling \"invalid\" hook and restarting."
-              menu_instance.execute_invalid_hook
-              menu_instance.restart!
-              result_of_menu = nil
-            when MenuDSL::Menu::MenuGetAnotherDigit
-              next_digit = play_sound_files_for_menu menu_instance, sound_files
-              if next_digit
-                menu_instance << next_digit
-              else
-                case result_of_menu
-                when MenuDSL::Menu::MenuGetAnotherDigitOrFinish
-                  jump_to result_of_menu.match_object, :extension => result_of_menu.new_extension
-                  throw :finish
-                when MenuDSL::Menu::MenuGetAnotherDigitOrTimeout
-                  logger.debug "Menu timed out. Calling \"timeout\" hook and restarting."
-                  menu_instance.execute_timeout_hook
-                  menu_instance.restart!
-                  result_of_menu = nil
-                end
-              end
-            when MenuDSL::Menu::MenuResultFound
-              logger.debug "Menu received valid input (#{result_of_menu.new_extension}). Calling the matching hook."
-              jump_to result_of_menu.match_object, :extension => result_of_menu.new_extension
-              throw :finish
-            end
-          end
-        end
-
-        Result.new.tap do |result|
-          result.response = menu_instance.result
-          result.status   = menu_instance.status
-          result.menu     = menu_instance
-        end
+        menu_builder.execute output_document, self
       end
-
-      # @private
-      def play_sound_files_for_menu(menu_instance, sound_files)
-        digit = nil
-        if sound_files.any? && menu_instance.digit_buffer_empty?
-          if menu_instance.interruptible
-            digit = interruptible_play(*sound_files, renderer: menu_instance.renderer)
-          else
-            play(*sound_files, renderer: menu_instance.renderer)
-          end
-        end
-        digit || wait_for_digit(menu_instance.timeout)
-      end
-
-      #
-      # Waits for a single digit and returns it, or returns nil if nothing was pressed
-      #
-      # @param [Integer] timeout the timeout to wait before returning, in seconds. nil or -1 mean no timeout.
-      # @return [String, nil] the pressed key, or nil if timeout was reached.
-      #
-      # @private
-      #
-      def wait_for_digit(timeout = 1)
-        timeout = nil if timeout == -1
-        timeout *= 1_000 if timeout
-        input_component = execute_component_and_await_completion Punchblock::Component::Input.new :mode => :dtmf,
-          :initial_timeout => timeout,
-          :inter_digit_timeout => timeout,
-            :grammar => {
-              :value => grammar_accept.to_s
-          }
-
-        reason = input_component.complete_event.reason
-        result = reason.respond_to?(:utterance) ? reason.utterance : nil
-        parse_dtmf result
-      end
-
-      # @private
-      def jump_to(match_object, overrides = nil)
-        if match_object.block
-          instance_exec overrides[:extension], &match_object.block
-        else
-          invoke match_object.match_payload, overrides
-        end
-      end
-
     end
   end
 end