adhearsion 2.5.0 → 2.5.2

data/spec/adhearsion/call_spec.rb

@@ -18,13 +18,15 @@ module Adhearsion
     let(:to)      { 'sip:you@there.com' }
     let(:from)    { 'sip:me@here.com' }
     let(:transport) { 'footransport' }
+    let(:base_time) { Time.local(2008, 9, 1, 12, 0, 0) }
     let :offer do
       Punchblock::Event::Offer.new target_call_id: call_id,
                                    domain: domain,
                                    transport: transport,
                                    to: to,
                                    from: from,
-                                   headers: headers
+                                   headers: headers,
+                                   timestamp: base_time
     end
 
     subject { Adhearsion::Call.new offer }
@@ -85,8 +87,6 @@ module Adhearsion
     end
 
     it "should mark its start time" do
-      base_time = Time.local(2008, 9, 1, 12, 0, 0)
-      Timecop.freeze base_time
       subject.start_time.should == base_time
     end
 
@@ -650,12 +650,12 @@ module Adhearsion
     end
 
     describe "#write_command" do
-      let(:mock_command) { double('Command') }
+      let(:command) { Punchblock::Command::Answer.new }
 
-      it "should asynchronously write the command to the Punchblock connection" do
+      it "should write the command to the Punchblock connection" do
         subject.wrapped_object.should_receive(:client).once.and_return mock_client
-        mock_client.should_receive(:execute_command).once.with(mock_command, call_id: call_id, domain: domain, async: true).and_return true
-        subject.write_command mock_command
+        mock_client.should_receive(:execute_command).once.with(Punchblock::Command::Answer.new(target_call_id: call_id, domain: domain)).and_return true
+        subject.write_command command
       end
 
       describe "with a hungup call" do
@@ -664,14 +664,14 @@ module Adhearsion
         end
 
         it "should raise a Hangup exception" do
-          lambda { subject.write_command mock_command }.should raise_error(Call::Hangup)
+          lambda { subject.write_command command }.should raise_error(Call::Hangup)
         end
 
         describe "if the command is a Hangup" do
-          let(:mock_command) { Punchblock::Command::Hangup.new }
+          let(:command) { Punchblock::Command::Hangup.new }
 
           it "should not raise a Hangup exception" do
-            lambda { subject.write_command mock_command }.should_not raise_error
+            lambda { subject.write_command command }.should_not raise_error
           end
         end
       end
@@ -755,6 +755,8 @@ module Adhearsion
 
       describe "when the response times out" do
         before do
+          message.target_call_id = call_id
+          message.domain = domain
           message.should_receive(:response).and_raise Timeout::Error
         end
 

data/spec/adhearsion/calls_spec.rb

@@ -103,6 +103,8 @@ module Adhearsion
         subject << call
         call.terminate
 
+        sleep 0.1
+
         subject.size.should be == size_before
         subject[call_id].should be_nil
         subject.with_uri(call_uri).should be_nil

data/spec/adhearsion/outbound_call_spec.rb

@@ -9,15 +9,23 @@ module Adhearsion
     its(:id) { should be_nil }
     its(:variables) { should be == {} }
 
-    let(:mock_client) { double 'Punchblock Client' }
+    let(:mock_client) { double 'Punchblock Client', execute_command: true, new_call_uri: call_uri }
 
     before do
       PunchblockPlugin::Initializer.client = mock_client
+      Adhearsion.active_calls.clear
     end
 
     its(:client) { should be mock_client }
     its(:start_time) { should be nil }
 
+    let(:transport) { 'xmpp' }
+    let(:call_id)   { SecureRandom.uuid }
+    let(:domain)    { 'rayo.net' }
+    let(:call_uri)  { "xmpp:#{call_id}@rayo.net" }
+    let(:to)        { '+1800 555-0199' }
+    let(:from)      { '+1800 555-0122' }
+
     it "should allow timers to be registered from outside" do
       foo = :bar
       subject.after(1) { foo = :baz }
@@ -98,6 +106,10 @@ module Adhearsion
           Punchblock::Command::Dial.any_instance.should_receive(:response).and_return StandardError.new("User not registered")
         end
 
+        after do
+          Adhearsion.active_calls.restart_supervisor
+        end
+
         it "should raise the exception in the caller" do
           expect { subject.dial to }.to raise_error("User not registered")
         end
@@ -144,26 +156,49 @@ module Adhearsion
     end
 
     describe "#dial" do
-      def expect_message_waiting_for_response(message)
-        subject.wrapped_object.should_receive(:write_and_await_response).once.with(message, 60, true).and_return do
-          message.transport = transport
-          message.target_call_id = call_id
-          message.domain = domain
-          message
+      def expect_message_waiting_for_response(message, uri = call_uri)
+        subject.wrapped_object.should_receive(:write_and_await_response).once.with(message, 60, true).and_return do |real_message|
+          real_message.request!
+          real_message.response = Punchblock::Ref.new(uri: uri)
+          real_message
         end
       end
 
-      let(:transport) { 'footransport' }
-      let(:call_id)   { 'abc123' }
-      let(:domain)    { 'rayo.net' }
-      let(:to)        { '+1800 555-0199' }
-      let(:from)      { '+1800 555-0122' }
+      let(:expected_dial_command) { Punchblock::Command::Dial.new(:to => to, :from => from, :uri => call_uri) }
+
+      context "while waiting for a response" do
+        before do
+          mock_client.should_receive(:execute_command).once.with(expected_dial_command).and_return true
+          subject.async.dial to, from: from
+          sleep 1
+        end
 
-      let(:expected_dial_command) { Punchblock::Command::Dial.new(:to => to, :from => from) }
+        it "should set the dial command" do
+          subject.dial_command.should be == expected_dial_command
+        end
+
+        it "should know its requested URI" do
+          subject.uri.should be == call_uri
+        end
+
+        it "should know its requested ID" do
+          subject.id.should be == call_id
+        end
+
+        it "should know its domain" do
+          subject.domain.should be == domain
+        end
+
+        it "should be entered in the active calls registry" do
+          Adhearsion.active_calls[call_id].should be subject
+        end
+      end
 
       context "with a successful response" do
+        let(:returned_uri) { call_uri }
+
         before do
-          expect_message_waiting_for_response expected_dial_command
+          expect_message_waiting_for_response expected_dial_command, returned_uri
         end
 
         it "should send a dial stanza, wait for the response" do
@@ -172,12 +207,12 @@ module Adhearsion
 
         it "should set the dial command" do
           subject.dial to, :from => from
-          subject.dial_command.should be == expected_dial_command
+          subject.dial_command.should be == Punchblock::Command::Dial.new(:to => to, :from => from, :uri => call_uri, target_call_id: call_id, domain: domain, transport: transport)
         end
 
         it "should set the URI from the reference" do
           subject.dial to, :from => from
-          subject.uri.should be == "footransport:abc123@rayo.net"
+          subject.uri.should be == call_uri
         end
 
         it "should set the call ID from the reference" do
@@ -201,11 +236,35 @@ module Adhearsion
         end
 
         it "should add the call to the active calls registry" do
-          Adhearsion.active_calls.clear
           subject.dial to, :from => from
           Adhearsion.active_calls[call_id].should be subject
         end
 
+        context "when a different ref is returned than the one expected" do
+          let(:returned_uri) { 'xmpp:otherid@wonderland.lit' }
+
+          before do
+            subject.dial to, :from => from
+          end
+
+          it "should set the URI from the reference" do
+            subject.uri.should be == returned_uri
+          end
+
+          it "should set the call ID from the reference" do
+            subject.id.should be == 'otherid'
+          end
+
+          it "should set the call domain from the reference" do
+            subject.domain.should be == 'wonderland.lit'
+          end
+
+          it "should make the call addressible in the active calls registry by the new ID" do
+            Adhearsion.active_calls[call_id].should be_nil
+            Adhearsion.active_calls['otherid'].should be subject
+          end
+        end
+
         it "should immediately fire the :call_dialed event giving the call" do
           Adhearsion::Events.should_receive(:trigger_immediately).once.with(:call_dialed, subject)
           subject.dial to, :from => from
@@ -226,6 +285,10 @@ module Adhearsion
           Punchblock::Command::Dial.any_instance.should_receive(:response).and_return StandardError.new("User not registered")
         end
 
+        after do
+          Adhearsion.active_calls.restart_supervisor
+        end
+
         it "should raise the exception in the caller" do
           expect { subject.dial to }.to raise_error("User not registered")
         end
@@ -235,6 +298,12 @@ module Adhearsion
           sleep 0.1
           subject.should_not be_alive
         end
+
+        it "should remove the call from the active calls hash" do
+          expect { subject.dial to }.to raise_error("User not registered")
+          sleep 0.1
+          Adhearsion.active_calls[call_id].should be_nil
+        end
       end
     end
 

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -276,7 +276,19 @@ module Adhearsion
         end
 
         describe "with an inactive call" do
-          it "should log an warning" do
+          it "should log a warning" do
+            Adhearsion::Logging.get_logger(Initializer).should_receive(:warn).once.with("Event received for inactive call #{call_id}: #{mock_event.inspect}")
+            Initializer.dispatch_call_event mock_event
+          end
+        end
+
+        describe "when the registry contains a dead call" do
+          before do
+            mock_call.terminate
+            Adhearsion.active_calls[mock_call.id] = mock_call
+          end
+
+          it "should log a warning" do
             Adhearsion::Logging.get_logger(Initializer).should_receive(:warn).once.with("Event received for inactive call #{call_id}: #{mock_event.inspect}")
             Initializer.dispatch_call_event mock_event
           end

data/spec/adhearsion_spec.rb

@@ -80,18 +80,6 @@ describe Adhearsion do
     it "should return the same instance each time" do
       Adhearsion.active_calls.should be Adhearsion.active_calls
     end
-
-    it "should create a new collection if the existing one dies" do
-      original = Adhearsion.active_calls
-      original.terminate
-      original.should_not be_alive
-
-      sleep 0.25
-
-      current = Adhearsion.active_calls
-      current.should be_alive
-      current.should_not be original
-    end
   end
 
   describe "#statistics" do

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ RSpec.configure do |config|
 
   config.before :each do
     Adhearsion.router = nil
+    Punchblock.stub new_request_id: 'foo'
   end
 
   config.after :each do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.2
 platform: ruby
 authors:
 - Jay Phillips
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,14 +179,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -305,14 +305,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -592,7 +592,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Adhearsion, open-source telephony development framework