adhearsion 2.0.0.beta1 → 2.0.0.rc1

data/lib/adhearsion/menu_dsl/menu_builder.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   module MenuDSL
 
@@ -8,11 +10,12 @@ module Adhearsion
       def initialize
         @patterns = []
         @menu_callbacks = {}
+        @context = nil
       end
 
       def build(&block)
         @context = eval "self", block.binding
-        instance_eval &block
+        instance_eval(&block)
       end
 
       def match(*args, &block)
@@ -35,8 +38,13 @@ module Adhearsion
         @patterns
       end
 
+      def has_matchers?
+        @patterns.size > 0
+      end
+
       def execute_hook_for(symbol, input)
         callback = @menu_callbacks[symbol]
+        return unless callback
         @context.instance_exec input, &callback
       end
 
@@ -55,6 +63,11 @@ module Adhearsion
         @menu_callbacks[:failure] = block
       end
 
+      def validator(&block)
+        raise LocalJumpError, "Must supply a block!" unless block_given?
+        @menu_callbacks[:validator] = block
+      end
+
       def calculate_matches_for(result)
         CalculatedMatchCollection.new.tap do |collection|
           weighted_match_calculators.each do |pattern|

data/lib/adhearsion/menu_dsl/range_match_calculator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   module MenuDSL
 
@@ -42,7 +44,8 @@ module Adhearsion
           power = 0
           while num < last
             ones_count = 10**power - 1
-            matches.concat ([num, first].max..[num + ones_count, last].min).to_a
+            range = ([num, first].max..[num + ones_count, last].min).to_a
+            matches.concat range
             num *= 10
             power += 1
           end

data/lib/adhearsion/menu_dsl/string_match_calculator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   module MenuDSL
 

data/lib/adhearsion/outbound_call.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   class OutboundCall < Call
     attr_reader :dial_command

data/lib/adhearsion/plugin.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
 
   # Plugin is the core of extension of Adhearsion framework and provides the easiest
@@ -99,9 +101,9 @@ module Adhearsion
       end
 
       def load_tasks
-        o = Object.new.tap { |o| o.extend Rake::DSL if defined? Rake::DSL }
+        container = Object.new.tap { |o| o.extend Rake::DSL if defined? Rake::DSL }
         tasks.each do |block|
-          o.instance_eval &block
+          container.instance_eval(&block)
         end
       end
 
@@ -124,7 +126,7 @@ module Adhearsion
       end
 
       def inherited(base)
-        logger.debug "Detected new plugin: #{base.name}"
+        logger.info "Detected new plugin: #{base.name}"
         subclasses << base
       end
 
@@ -159,15 +161,15 @@ module Adhearsion
       end
 
       # Recursively initialization of all the loaded plugins
-      def init_plugins *args
+      def init_plugins(*args)
         initializers.tsort.each do |initializer|
-          initializer.run *args
+          initializer.run(*args)
         end
       end
 
-      def run_plugins *args
+      def run_plugins(*args)
         runners.tsort.each do |runner|
-          runner.run *args
+          runner.run(*args)
         end
       end
 

data/lib/adhearsion/plugin/collection.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'tsort'
 
 module Adhearsion
@@ -8,7 +10,7 @@ module Adhearsion
       alias :tsort_each_node :each
 
       def tsort_each_child(child, &block)
-        select { |i| i.before == child.name || i.name == child.after }.each &block
+        select { |i| i.before == child.name || i.name == child.after }.each(&block)
       end
 
       def +(other)

data/lib/adhearsion/plugin/initializer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   class Plugin
     class Initializer
@@ -21,7 +23,7 @@ module Adhearsion
       end
 
       def run(*args)
-        @context.instance_exec *args, &block
+        @context.instance_exec(*args, &block)
       end
 
       def bind(context)

data/lib/adhearsion/process.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'state_machine'
 require 'singleton'
 require 'socket'
@@ -41,7 +43,7 @@ module Adhearsion
       end
 
       event :stop do
-        transition :rejecting => :stopped
+        transition all => :stopped
       end
 
       event :force_stop do
@@ -81,12 +83,16 @@ module Adhearsion
       Events.trigger_immediately :shutdown
 
       Console.stop
+
+      logger.info "Adhearsion shut down"
     end
 
     def stop_when_zero_calls
+      i = 0
       until Adhearsion.active_calls.count == 0
-        logger.trace "Stop requested but we still have #{Adhearsion.active_calls.count} active calls."
+        logger.info "Stop requested but we still have #{Adhearsion.active_calls.count} active calls." if (i % 50) == 0
         sleep 0.2
+        i += 1
       end
       final_shutdown
     end

data/lib/adhearsion/punchblock_plugin.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   class PunchblockPlugin < Plugin
     extend ActiveSupport::Autoload
@@ -41,7 +43,7 @@ module Adhearsion
       end
 
       def execute_component(command, timeout = 60)
-        client.execute_command command
+        client.execute_command command, :async => true
         response = command.response timeout
         raise response if response.is_a? Exception
         command

data/lib/adhearsion/punchblock_plugin/initializer.rb

@@ -1,3 +1,7 @@
+# encoding: utf-8
+
+require 'blather'
+
 module Adhearsion
   class PunchblockPlugin
     class Initializer
@@ -8,12 +12,15 @@ module Adhearsion
       class << self
         def init
           self.config = Adhearsion.config[:punchblock]
+
+          username = self.config.username
           connection_class = case (self.config.platform || :xmpp)
           when :xmpp
-            username = [self.config.username, resource].join('/')
+            username = Blather::JID.new username
+            username = Blather::JID.new username.node, username.domain, resource unless username.resource
+            username = username.to_s
             ::Punchblock::Connection::XMPP
           when :asterisk
-            username = self.config.username
             ::Punchblock::Connection::Asterisk
           end
 
@@ -50,7 +57,7 @@ module Adhearsion
 
           # Handle events from Punchblock via events system
           self.client.register_event_handler do |event|
-            Events.trigger :punchblock, event
+            handle_event event
           end
 
           Events.punchblock ::Punchblock::Connection::Connected do |event|
@@ -81,6 +88,7 @@ module Adhearsion
           blocker = ConditionVariable.new
 
           Events.punchblock ::Punchblock::Connection::Connected do
+            Adhearsion::Process.booted
             m.synchronize { blocker.broadcast }
           end
 
@@ -103,15 +111,21 @@ module Adhearsion
             client.run
           rescue ::Punchblock::DisconnectedError => e
             # We only care about disconnects if the process is up or booting
-            if [:booting, :running].include? Adhearsion::Process.state_name
-              self.attempts += 1
-              Adhearsion::Process.reset unless Adhearsion::Process.state_name == :booting
-              logger.error "Connection lost. Attempting reconnect #{self.attempts} of #{self.config.reconnect_attempts}"
-              sleep self.config.reconnect_timer
-              retry unless self.attempts >= self.config.reconnect_attempts
-              logger.fatal "Connection retry attempts exceeded"
-              raise e
+            return unless [:booting, :running].include? Adhearsion::Process.state_name
+
+            Adhearsion::Process.reset unless Adhearsion::Process.state_name == :booting
+
+            self.attempts += 1
+
+            if self.attempts >= self.config.reconnect_attempts
+              logger.fatal "Connection lost. Connection retry attempts exceeded."
+              Adhearsion::Process.stop!
+              return
             end
+
+            logger.error "Connection lost. Attempting reconnect #{self.attempts} of #{self.config.reconnect_attempts}"
+            sleep self.config.reconnect_timer
+            retry
           rescue ::Punchblock::ProtocolError => e
             logger.fatal "The connection failed due to a protocol error: #{e.name}."
             raise e
@@ -123,6 +137,7 @@ module Adhearsion
             call = Adhearsion.active_calls.from_offer offer
             case Adhearsion::Process.state_name
             when :booting, :rejecting
+              logger.info "Declining call because the process is not yet running."
               call.reject :decline
             when :running
               call.accept
@@ -142,6 +157,14 @@ module Adhearsion
           end
         end
 
+        def handle_event(event)
+          Events.trigger :punchblock, event
+          case event
+          when Punchblock::Event::Asterisk::AMI::Event
+            Events.trigger :ami, event
+          end
+        end
+
         def resource
           [Adhearsion::Process.fqdn, ::Process.pid].join '-'
         end

data/lib/adhearsion/router.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   class Router
     extend ActiveSupport::Autoload
@@ -8,7 +10,7 @@ module Adhearsion
 
     def initialize(&block)
       @routes = []
-      instance_exec &block
+      instance_exec(&block)
     end
 
     def route(*args, &block)
@@ -23,7 +25,7 @@ module Adhearsion
 
     def handle(call)
       return unless route = match(call)
-      logger.debug "Call #{call.id} passing through router matched route #{route}"
+      logger.info "Call #{call.id} selected route \"#{route.name}\" (#{route.target})"
       route.dispatcher
     end
   end

data/lib/adhearsion/router/route.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Adhearsion
   class Router
     class Route

data/lib/adhearsion/script_ahn_loader.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'pathname'
 require 'rbconfig'
 

data/lib/adhearsion/tasks.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'adhearsion'
 
 Dir[File.join(File.dirname(__FILE__), "tasks/*.rb")].each do |file|

data/lib/adhearsion/tasks/configuration.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 namespace :config do
   desc "Show configuration values; accepts a parameter: [nil|platform|<plugin-name>|all]"
   task :show, [:name] => [:environment] do |t, args|

data/lib/adhearsion/tasks/debugging.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+task :debugging => :environment do
+  initializer = Adhearsion::Initializer.new
+  puts
+  puts "Some info about your application environment:"
+  puts initializer.debugging_items.join("\n\n")
+end

data/lib/adhearsion/tasks/environment.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 task :environment do
   require 'adhearsion/punchblock_plugin'
 

data/lib/adhearsion/tasks/plugins.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 desc "List the configured plugins"
 task :plugins => :environment do |t,args|
   if Adhearsion::Plugin.subclasses.length > 0

data/lib/adhearsion/tasks/testing.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 begin
   require 'rspec/core/rake_task'
 rescue LoadError

data/lib/adhearsion/version.rb

@@ -1,5 +1,7 @@
+# encoding: utf-8
+
 module Adhearsion #:nodoc:
-  VERSION = '2.0.0.beta1'
+  VERSION = '2.0.0.rc1'
 
   class PkgVersion
     include Comparable

data/pre-commit

@@ -0,0 +1,2 @@
+#!/bin/sh
+rake encodeify

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -13,11 +15,14 @@ module Adhearsion
       let(:second_other_call_id)    { new_uuid }
       let(:second_other_mock_call)  { flexmock OutboundCall.new, :id => second_other_call_id }
 
-      let(:mock_end)      { flexmock Punchblock::Event::End.new, :reason => :hangup }
       let(:mock_answered) { Punchblock::Event::Answered.new }
 
       let(:latch) { CountDownLatch.new 1 }
 
+      def mock_end(reason = :hangup)
+        flexmock Punchblock::Event::End.new, :reason => reason
+      end
+
       describe "#dial" do
         before do
           other_mock_call
@@ -48,14 +53,16 @@ module Adhearsion
 
         describe "without a block" do
           before do
-            flexmock(other_mock_call).should_receive(:dial).once
+            flexmock(other_mock_call).should_receive(:dial).once.with(to, options)
             flexmock(other_mock_call).should_receive(:hangup).once
             flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
           end
 
+          let(:options) { { :foo => :bar } }
+
           def dial_in_thread
             Thread.new do
-              status = subject.dial to
+              status = subject.dial to, options
               latch.countdown!
               status
             end
@@ -113,13 +120,29 @@ module Adhearsion
 
               sleep 0.5
 
-              other_mock_call << mock_end
+              other_mock_call << mock_end(:reject)
 
               latch.wait(2).should be_true
 
               t.join
               status = t.value
-              status.result.should == :no_answer
+              status.result.should be == :no_answer
+            end
+          end
+
+          context "when the call ends with an error" do
+            it "has an overall dial status of :error" do
+              t = dial_in_thread
+
+              sleep 0.5
+
+              other_mock_call << mock_end(:error)
+
+              latch.wait(2).should be_true
+
+              t.join
+              status = t.value
+              status.result.should be == :error
             end
           end
 
@@ -138,28 +161,32 @@ module Adhearsion
 
               t.join
               status = t.value
-              status.result.should == :answer
+              status.result.should be == :answer
             end
           end
         end
 
         describe "with multiple third parties specified" do
+          let(:options) { {} }
+          let(:other_options) { options }
+          let(:second_other_options) { options }
+
           before do
             second_other_mock_call
 
             flexmock(OutboundCall).should_receive(:new).and_return other_mock_call, second_other_mock_call
 
-            flexmock(other_mock_call).should_receive(:dial).once
+            flexmock(other_mock_call).should_receive(:dial).once.with(to, other_options)
             flexmock(other_mock_call).should_receive(:hangup).once
 
-            flexmock(second_other_mock_call).should_receive(:dial).once
+            flexmock(second_other_mock_call).should_receive(:dial).once.with(second_to, second_other_options)
             flexmock(second_other_mock_call).should_receive(:join).never
             flexmock(second_other_mock_call).should_receive(:hangup).once
           end
 
           def dial_in_thread
             Thread.new do
-              status = subject.dial [to, second_to]
+              status = subject.dial [to, second_to], options
               latch.countdown!
               status
             end
@@ -213,24 +240,94 @@ module Adhearsion
             status.calls.each { |c| c.should be_a OutboundCall }
           end
 
+          describe "with options overrides" do
+            let(:options) do
+              {
+                :from => 'foo',
+                :timeout => 3000,
+                :headers => {
+                  :x_foo => 'bar'
+                }
+              }
+            end
+
+            let(:dial_other_options) do
+              {
+                :foo => 'bar',
+                :headers => {
+                  :x_foo => 'buzz'
+                }
+              }
+            end
+
+            let(:other_options) do
+              {
+                :from => 'foo',
+                :timeout => 3000,
+                :foo => 'bar',
+                :headers => {
+                  :x_foo => 'buzz'
+                }
+
+              }
+            end
+
+            let(:dial_second_other_options) do
+              {
+                :timeout => 5000,
+                :headers => {
+                  :x_bar => 'barbuzz'
+                }
+              }
+            end
+
+            let(:second_other_options) do
+              {
+                :from => 'foo',
+                :timeout => 5000,
+                :headers => {
+                  :x_foo => 'bar',
+                  :x_bar => 'barbuzz'
+                }
+              }
+            end
+
+            it "with multiple destinations as an hash, with overrides for each, and an options hash, it dials each call with specified options" do
+              t = Thread.new do
+                subject.dial({
+                  to => dial_other_options,
+                  second_to => dial_second_other_options
+                }, options)
+                latch.countdown!
+              end
+
+              latch.wait(1).should be_false
+              other_mock_call << mock_end
+              latch.wait(1).should be_false
+              second_other_mock_call << mock_end
+              latch.wait(2).should be_true
+              t.join
+            end
+          end
+
           context "when all calls are rejected" do
             it "has an overall dial status of :no_answer" do
               t = dial_in_thread
 
               sleep 0.5
 
-              other_mock_call << mock_end
-              second_other_mock_call << mock_end
+              other_mock_call << mock_end(:reject)
+              second_other_mock_call << mock_end(:reject)
 
               latch.wait(2).should be_true
 
               t.join
               status = t.value
-              status.result.should == :no_answer
+              status.result.should be == :no_answer
             end
           end
 
-          context "when a call is answered and joined" do
+          context "when a call is answered and joined, and the other ends with an error" do
             it "has an overall dial status of :answer" do
               flexmock(other_mock_call).should_receive(:join).once.with(call)
               flexmock(second_other_mock_call).should_receive(:hangup).once
@@ -242,13 +339,13 @@ module Adhearsion
               other_mock_call << mock_answered
               other_mock_call << mock_end
 
-              second_other_mock_call << mock_end
+              second_other_mock_call << mock_end(:error)
 
               latch.wait(1).should be_true
 
               t.join
               status = t.value
-              status.result.should == :answer
+              status.result.should be == :answer
             end
           end
         end
@@ -271,20 +368,12 @@ module Adhearsion
 
             latch.wait
             time = Time.now - time
-            time.to_i.should == timeout
+            time.to_i.should be == timeout
             t.join
             status = t.value
-            status.result.should == :timeout
+            status.result.should be == :timeout
           end
         end
-
-      	describe "with a block" do
-          it "uses the block as the controller for the new call"
-
-          it "joins the new call to the existing call once the block returns"
-
-          it "does not try to join the calls if the new call is hungup when the block returns"
-        end
       end#describe #dial
     end
   end