punchblock 1.8.2 → 1.9.0

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

@@ -17,7 +17,6 @@ module Punchblock
           include DeadActorSafety
 
           attr_reader :id, :call, :call_id
-          attr_accessor :internal
 
           def initialize(component_node, call = nil)
             @component_node, @call = component_node, call
@@ -34,7 +33,7 @@ module Punchblock
             command.response = ProtocolError.new.setup 'command-not-acceptable', "Did not understand command for component #{id}", call_id, id
           end
 
-          def send_complete_event(reason, recording = nil)
+          def send_complete_event(reason, recording = nil, should_terminate = true)
             return if @complete
             @complete = true
             event = Punchblock::Event::Complete.new.tap do |c|
@@ -42,17 +41,13 @@ module Punchblock
               c << recording if recording
             end
             send_event event
-            terminate
+            terminate if should_terminate
           end
 
           def send_event(event)
             event.component_id    = id
             event.target_call_id  = call_id
-            if internal
-              @component_node.add_event event
-            else
-              safe_from_dead_actors { translator.handle_pb_event event }
-            end
+            safe_from_dead_actors { translator.handle_pb_event event }
           end
 
           def logger_id
@@ -66,7 +61,11 @@ module Punchblock
           private
 
           def translator
-            call.translator
+            @translator ||= call.translator
+          end
+
+          def ami_client
+            translator.ami_client
           end
 
           def set_node_response(value)
@@ -80,6 +79,10 @@ module Punchblock
           def with_error(name, text)
             set_node_response ProtocolError.new.setup(name, text)
           end
+
+          def complete_with_error(error)
+            send_complete_event Punchblock::Event::Complete::Error.new(details: error)
+          end
         end
       end
     end

data/lib/punchblock/translator/asterisk.rb

@@ -10,6 +10,7 @@ module Punchblock
 
       extend ActiveSupport::Autoload
 
+      autoload :AGICommand
       autoload :Call
       autoload :Component
 
@@ -65,12 +66,8 @@ module Punchblock
         return unless event.is_a? RubyAMI::Event
 
         if event.name.downcase == "fullybooted"
-          @fully_booted_count += 1
-          if @fully_booted_count >= 2
-            handle_pb_event Connection::Connected.new
-            @fully_booted_count = 0
-            run_at_fully_booted
-          end
+          handle_pb_event Connection::Connected.new
+          run_at_fully_booted
           return
         end
 
@@ -122,11 +119,11 @@ module Punchblock
       def execute_global_command(command)
         case command
         when Punchblock::Component::Asterisk::AMI::Action
-          component = Component::Asterisk::AMIAction.new command, current_actor
+          component = Component::Asterisk::AMIAction.new command, current_actor, ami_client
           register_component component
           component.async.execute
         when Punchblock::Command::Dial
-          call = Call.new_link command.to, current_actor
+          call = Call.new_link command.to, current_actor, ami_client, connection
           register_call call
           call.async.dial command
         else
@@ -134,21 +131,14 @@ module Punchblock
         end
       end
 
-      def send_ami_action(name, headers = {}, &block)
-        ami_client.send_action name, headers, &block
-      end
-
       def run_at_fully_booted
-        send_ami_action('Command', {
-          'Command' => "dialplan add extension #{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY},AGI,agi:async into #{REDIRECT_CONTEXT}"
-        })
-        send_ami_action('Command', {
-          'Command' => "dialplan show #{REDIRECT_CONTEXT}"
-        }) do |result|
-          if result.text_body =~ /failed/
-            pb_logger.error "Punchblock failed to add the #{REDIRECT_EXTENSION} extension to the #{REDIRECT_CONTEXT} context. Please add a [#{REDIRECT_CONTEXT}] entry to your dialplan."
-          end
+        send_ami_action 'Command', 'Command' => "dialplan add extension #{REDIRECT_EXTENSION},#{REDIRECT_PRIORITY},AGI,agi:async into #{REDIRECT_CONTEXT}"
+
+        result = send_ami_action 'Command', 'Command' => "dialplan show #{REDIRECT_CONTEXT}"
+        if result.text_body =~ /failed/
+          pb_logger.error "Punchblock failed to add the #{REDIRECT_EXTENSION} extension to the #{REDIRECT_CONTEXT} context. Please add a [#{REDIRECT_CONTEXT}] entry to your dialplan."
         end
+
         check_recording_directory
       end
 
@@ -168,6 +158,10 @@ module Punchblock
 
       private
 
+      def send_ami_action(name, headers = {})
+        ami_client.send_action name, headers
+      end
+
       def handle_varset_ami_event(event)
         return unless event.name == 'VarSet' && event['Variable'] == 'punchblock_call_id' && (call = call_with_id event['Value'])
 
@@ -213,7 +207,7 @@ module Punchblock
 
         return if env[:agi_extension] == 'h' || env[:agi_type] == 'Kill'
 
-        call = Call.new event['Channel'], current_actor, env
+        call = Call.new event['Channel'], current_actor, ami_client, connection, env
         link call
         register_call call
         call.async.send_offer

data/lib/punchblock/translator/dtmf_recognizer.rb

@@ -3,10 +3,6 @@
 module Punchblock
   module Translator
     class DTMFRecognizer
-      include Celluloid
-
-      finalizer :finalize
-
       def initialize(responder, grammar, initial_timeout = nil, inter_digit_timeout = nil)
         @responder = responder
         self.grammar = grammar
@@ -45,6 +41,10 @@ module Punchblock
         @grammar.normalize_whitespace
       end
 
+      def after(*args, &block)
+        @responder.after *args, &block
+      end
+
       def initial_timeout=(other)
         raise OptionError, 'An initial timeout value that is negative (and not -1) is invalid.' if other < -1
         @initial_timeout = other

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

@@ -11,9 +11,10 @@ module Punchblock
           private
 
           def register_dtmf_event_handler
+            component = current_actor
             call.register_handler :es, :event_name => 'DTMF' do |event|
               safe_from_dead_actors do
-                @recognizer << event[:dtmf_digit]
+                component.process_dtmf event[:dtmf_digit]
               end
             end
           end

data/lib/punchblock/translator/input_component.rb

@@ -6,8 +6,7 @@ module Punchblock
       def execute
         validate
 
-        component = current_actor
-        @recognizer = DTMFRecognizer.new current_actor,
+        @recognizer = DTMFRecognizer.new self,
                                          @component_node.grammar.value,
                                          (@component_node.initial_timeout || -1),
                                          (@component_node.inter_digit_timeout || -1)
@@ -54,6 +53,7 @@ module Punchblock
 
       def complete(reason)
         unregister_dtmf_event_handler
+        @recognizer.finalize if @recognizer
         send_complete_event reason
       end
     end

data/lib/punchblock/version.rb

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

data/punchblock.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<future-resource>, ["~> 1.0"]
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.5"]
   s.add_runtime_dependency %q<celluloid>, ["~> 0.13"]
-  s.add_runtime_dependency %q<ruby_ami>, ["~> 1.2", ">= 1.2.1"]
+  s.add_runtime_dependency %q<ruby_ami>, ["~> 2.0"]
   s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]
 

data/spec/punchblock/connection/asterisk_spec.rb

@@ -25,7 +25,7 @@ module Punchblock
         subject.event_handler = mock_event_handler
       end
 
-      its(:ami_client) { should be_a RubyAMI::Client }
+      its(:ami_client) { should be_a RubyAMI::Stream }
 
       it 'should set the connection on the translator' do
         subject.translator.connection.should be subject
@@ -36,15 +36,15 @@ module Punchblock
       end
 
       describe '#run' do
-        it 'starts the RubyAMI::Client' do
-          subject.ami_client.should_receive(:start).once
+        it 'starts the RubyAMI::Stream' do
+          subject.ami_client.should_receive(:run).once
           lambda { subject.run }.should raise_error DisconnectedError
         end
       end
 
       describe '#stop' do
-        it 'stops the RubyAMI::Client' do
-          subject.ami_client.should_receive(:stop).once
+        it 'stops the RubyAMI::Stream' do
+          subject.ami_client.should_receive(:terminate).once
           subject.stop
         end
 
@@ -55,9 +55,10 @@ module Punchblock
       end
 
       it 'sends events from RubyAMI to the translator' do
-        event = mock 'RubyAMI::Event'
+        event = RubyAMI::Event.new 'FullyBooted'
         subject.translator.async.should_receive(:handle_ami_event).once.with event
-        subject.ami_client.handle_event event
+        subject.translator.async.should_receive(:handle_ami_event).once.with RubyAMI::Stream::Disconnected.new
+        subject.ami_client.message_received event
       end
 
       describe '#write' do