adhearsion 2.1.0 → 2.1.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.1.1](https://github.com/adhearsion/adhearsion/compare/v2.1.0...v2.1.1) - [2012-09-05](https://rubygems.org/gems/adhearsion/versions/2.1.1)
+  * Bugfix: #dial timeout now does not place an upper limit on the duration of a bridged call
+
 # [2.1.0](https://github.com/adhearsion/adhearsion/compare/v2.0.1...v2.1.0) - [2012-08-07](https://rubygems.org/gems/adhearsion/versions/2.1.0)
 
 ## Features

data/lib/adhearsion/call_controller/dial.rb

@@ -139,6 +139,7 @@ module Adhearsion
 
         def await_completion
           @latch.wait(@options[:timeout]) || status.timeout!
+          @latch.wait if status.result == :answer
         end
 
         def cleanup_calls

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -388,6 +388,38 @@ module Adhearsion
             status = t.value
             status.result.should be == :timeout
           end
+
+          describe "if someone answers before the timeout elapses" do
+            it "should not abort until the far end hangs up" do
+              flexmock(other_mock_call).should_receive(:dial).once.with(to, hsh(:timeout => timeout))
+              flexmock(other_mock_call).should_receive(:join).once.with(call)
+              flexmock(other_mock_call).should_receive(:hangup).once
+              flexmock(OutboundCall).should_receive(:new).and_return other_mock_call
+
+              time = Time.now
+
+              t = Thread.new do
+                status = subject.dial to, :timeout => timeout
+                latch.countdown!
+                status
+              end
+
+              latch.wait(2).should be_false
+
+              other_mock_call << mock_answered
+
+              latch.wait(2).should be_false
+
+              other_mock_call << mock_end
+
+              latch.wait(0.1).should be_true
+              time = Time.now - time
+              time.to_i.should be > timeout
+              t.join
+              status = t.value
+              status.result.should be == :answer
+            end
+          end
         end
 
         describe "with a confirmation controller" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -624,7 +624,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4451670451160143860
+      hash: -995464147813502065
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -633,10 +633,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4451670451160143860
+      hash: -995464147813502065
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Adhearsion, open-source telephony development framework