lib/adhearsion/call_controller/dial.rb in adhearsion-2.0.0.alpha1 vs lib/adhearsion/call_controller/dial.rb in adhearsion-2.0.0.alpha2

- old
+ new

@@ -11,59 +11,59 @@ # You can also specify an array of destinations: each will be called with the same options simultaneously. # The first call answered is joined, the others are hung up. # # @param [Hash] options # - # +:caller_id+ - the caller id number to be used when the call is placed. It is advised you properly adhere to the + # +:from+ - the caller id to be used when the call is placed. It is advised you properly adhere to the # policy of VoIP termination providers with respect to caller id values. # - # +:name+ - this is the name which should be passed with the caller ID information - # if :name=>"John Doe" and :caller_id => "444-333-1000" then the compelete CID and name would be "John Doe" <4443331000> - # support for caller id information varies from country to country and from one VoIP termination provider to another. - # # +:for+ - this option can be thought of best as a timeout. i.e. timeout after :for if no one answers the call - # For example, dial("SIP/jay-desk-650&SIP/jay-desk-601&SIP/jay-desk-601-2", :for => 15.seconds, :caller_id => callerid) + # For example, dial(%w{SIP/jay-desk-650 SIP/jay-desk-601 SIP/jay-desk-601-2}, :for => 15.seconds, :from => callerid) # this call will timeout after 15 seconds if 1 of the 3 extensions being dialed do not pick prior to the 15 second time limit # - # +:options+ - This is a string of options like "Tr" which are supported by the asterisk DIAL application. - # for a complete list of these options and their usage please check the link below. - # - # +:confirm+ - ? - # # @example Make a call to the PSTN using my SIP provider for VoIP termination # dial "SIP/19095551001@my.sip.voip.terminator.us" # # @example Make 3 Simulataneous calls to the SIP extensions, try for 15 seconds and use the callerid # for this call specified by the variable my_callerid - # dial ["SIP/jay-desk-650", "SIP/jay-desk-601", "SIP/jay-desk-601-2"], :for => 15.seconds, :caller_id => my_callerid + # dial %w{SIP/jay-desk-650 SIP/jay-desk-601 SIP/jay-desk-601-2}, :for => 15.seconds, :from => my_callerid # # @example Make a call using the IAX provider to the PSTN - # dial "IAX2/my.id@voipjet/19095551234", :name => "John Doe", :caller_id => "9095551234" + # dial "IAX2/my.id@voipjet/19095551234", :from => "John Doe <9095551234>" # - def dial(to, options = {}) - latch = CountDownLatch.new 1 + def dial(to, options = {}, latch = nil) + latch ||= CountDownLatch.new 1 + + _for = options.delete :for + options[:timeout] ||= _for if _for + calls = Array(to).map do |target| new_call = OutboundCall.new options new_call.on_answer do |event| calls.each do |call_to_hangup, target| call_to_hangup.hangup! unless call_to_hangup.id == new_call.id end - new_call.join call.id + new_call.join call end new_call.on_end do |event| latch.countdown! end [new_call, target] end - calls.each do |call, target| + calls.map! do |call, target| call.dial target, options + call end - latch.wait + timeout = latch.wait options[:timeout] + + return timeout unless timeout + + calls.size == 1 ? calls.first : calls end end#module Dial end end