adhearsion 2.0.0.alpha3 → 2.0.0.beta1

data/spec/adhearsion/call_controller/output_spec.rb

@@ -289,6 +289,16 @@ module Adhearsion
             subject.speak(string).should be true
           end
         end
+
+        describe "converts the argument to a string" do
+          it 'calls output with a string' do
+            expected_string = "123"
+            argument = 123
+            subject.should_receive(:play_ssml).once.with(argument, {})
+            subject.should_receive(:output).once.with(:text, expected_string, {}).and_return true
+            subject.speak(argument)
+          end
+        end
       end
 
       describe "#ssml_for" do

data/spec/adhearsion/call_controller_spec.rb

@@ -104,6 +104,7 @@ module Adhearsion
       before do
         flexmock subject, :execute_component_and_await_completion => nil
         flexmock call.wrapped_object, :write_and_await_response => nil
+        flexmock call, :register_controller! => nil
         flexmock(Events).should_receive(:trigger).with(:exception, Exception).never
       end
 
@@ -154,22 +155,19 @@ module Adhearsion
       subject { PassController.new call }
 
       before do
-        flexmock(call.wrapped_object).should_receive(:write_and_await_response).and_return nil
+        flexmock call.wrapped_object, :write_and_await_response => nil
+        flexmock call, :register_controller! => nil
         flexmock subject, :execute_component_and_await_completion => nil
         flexmock(SecondController).new_instances.should_receive(:md_check).once.with :foo => 'bar'
         flexmock(Events).should_receive(:trigger).with(:exception, Exception).never
       end
 
-      let(:latch) { CountDownLatch.new 1 }
-
       it "should cease execution of the current controller, and instruct the call to execute another" do
         subject.should_receive(:before).once.ordered
         call.should_receive(:answer).once.ordered
         subject.should_receive(:after).never.ordered
-        call.wrapped_object.should_receive(:hangup).once.ordered
 
-        call.execute_controller subject, latch
-        latch.wait(1).should be_true
+        CallController.exec subject
       end
 
       it "should execute after_call callbacks before passing control" do
@@ -181,12 +179,63 @@ module Adhearsion
       end
     end
 
-    describe '#write_and_await_response' do
+    describe "#write_and_await_response" do
       let(:message) { Punchblock::Command::Accept.new }
 
-      it "delegates to the call" do
-        flexmock(subject.call).should_receive(:write_and_await_response).once.with(message, 20)
-        subject.write_and_await_response message, 20
+      it "delegates to the call, blocking first until it is allowed to execute" do
+        flexmock(subject).should_receive(:block_until_resumed).once.ordered
+        flexmock(subject.call).should_receive(:write_and_await_response).once.ordered.with(message)
+        subject.write_and_await_response message
+      end
+    end
+
+    [ :answer,
+      :reject,
+      :hangup,
+      :mute,
+      :unmute,
+      :join].each do |method_name|
+      describe "##{method_name}" do
+        it "delegates to the call, blocking first until it is allowed to execute" do
+          flexmock(subject).should_receive(:block_until_resumed).once.ordered
+          flexmock(subject.call).should_receive(method_name).once.ordered
+          subject.send method_name
+        end
+      end
+    end
+
+    describe "#block_until_resumed" do
+      context "when the controller has not been paused" do
+        it "should not block" do
+          t1 = Time.now
+          subject.block_until_resumed
+          t2 = Time.now
+
+          (t2 - t1).should < 0.2
+        end
+      end
+
+      context "when the controller is paused" do
+        before { subject.pause! }
+
+        it "should unblock when the controller is unpaused" do
+          t1 = t2 = nil
+          latch = CountDownLatch.new 1
+          t = Thread.new do
+            t1 = Time.now
+            subject.block_until_resumed
+            t2 = Time.now
+            latch.countdown!
+          end
+
+          sleep 0.5
+
+          subject.resume!
+
+          latch.wait(1).should be_true
+
+          (t2 - t1).should >= 0.5
+        end
       end
     end
 
@@ -247,48 +296,6 @@ module Adhearsion
         (Time.now - starting_time).should > 0.5
       end
     end
-
-    describe '#answer' do
-      it "should delegate to the call" do
-        flexmock(call).should_receive(:answer).once.with(:foo)
-        subject.answer :foo
-      end
-    end
-
-    describe '#reject' do
-      it "should delegate to the call" do
-        flexmock(call).should_receive(:reject).once.with(:foo, :bar)
-        subject.reject :foo, :bar
-      end
-    end
-
-    describe '#hangup' do
-      it "should delegate to the call" do
-        flexmock(call).should_receive(:hangup).once.with(:foo)
-        subject.hangup :foo
-      end
-    end
-
-    describe '#mute' do
-      it 'should delegate to the call' do
-        flexmock(call).should_receive(:mute).once
-        subject.mute
-      end
-    end
-
-    describe '#unmute' do
-      it 'should delegate to the call' do
-        flexmock(call).should_receive(:unmute).once
-        subject.unmute
-      end
-    end
-
-    describe '#join' do
-      it 'should delegate to the call' do
-        flexmock(call).should_receive(:join).once.with(:foo)
-        subject.join :foo
-      end
-    end
   end
 end
 

data/spec/adhearsion/call_spec.rb

@@ -39,6 +39,8 @@ module Adhearsion
     its(:offer)   { should be offer }
     its(:client)  { should be mock_client }
 
+    its(:after_end_hold_time) { should == 30 }
+
     describe "its variables" do
       context "with an offer with headers" do
         let(:headers)   { {:x_foo => 'bar'} }
@@ -150,9 +152,11 @@ module Adhearsion
         end
 
         it "shuts down the actor" do
+          flexmock subject.wrapped_object, :after_end_hold_time => 2
           subject << end_event
-          sleep 5.1
+          sleep 2.1
           subject.should_not be_alive
+          lambda { subject.id }.should raise_error Call::ExpiredError, /expired and is no longer accessible/
         end
       end
     end
@@ -270,10 +274,12 @@ module Adhearsion
       end
 
       describe "with an error response" do
-        let(:response) { Exception.new }
+        let(:new_exception) { Class.new Exception }
+        let(:response) { new_exception.new }
 
         it "raises the error" do
-          lambda { subject.write_and_await_response message }.should raise_error Exception
+          flexmock(Events).should_receive(:trigger).never
+          lambda { subject.write_and_await_response message }.should raise_error new_exception
         end
       end
 
@@ -525,6 +531,44 @@ module Adhearsion
           subject.execute_controller mock_controller, latch
           latch.wait(3).should be_true
         end
+
+        it "should add the controller thread to the important threads" do
+          flexmock(CallController).should_receive(:exec)
+          controller_thread = subject.execute_controller mock_controller, latch
+          Adhearsion::Process.important_threads.should include controller_thread
+        end
+      end
+
+      describe "#register_controller" do
+        it "should add the controller to a list on the call" do
+          subject.register_controller :foo
+          subject.controllers.should include :foo
+        end
+      end
+
+      context "with two controllers registered" do
+        let(:controller1) { flexmock 'CallController1' }
+        let(:controller2) { flexmock 'CallController2' }
+
+        before { subject.controllers << controller1 << controller2 }
+
+        describe "#pause_controllers" do
+          it "should pause each of the registered controllers" do
+            controller1.should_receive(:pause!).once
+            controller2.should_receive(:pause!).once
+
+            subject.pause_controllers
+          end
+        end
+
+        describe "#resume_controllers" do
+          it "should resume each of the registered controllers" do
+            controller1.should_receive(:resume!).once
+            controller2.should_receive(:resume!).once
+
+            subject.resume_controllers
+          end
+        end
       end
     end
 

data/spec/adhearsion/console_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 module Adhearsion
   describe Console do
+    before do
+      flexmock Console.instance, :pry => nil
+    end
+
     include FlexMock::ArgumentTypes
     describe "providing hooks to include console functionality" do
       it "should allow mixing in a module globally on all CallController classes" do
@@ -130,7 +134,12 @@ module Adhearsion
     describe "#interact_with_call" do
       let(:call) { Call.new }
 
-      it "should suspend the call's controller"
+      it "should pause the call's controllers, and unpause even if the interactive controller raises" do
+        flexmock(call).should_receive(:pause_controllers).once.ordered
+        flexmock(CallController).should_receive(:exec).once.ordered.and_raise StandardError
+        flexmock(call).should_receive(:resume_controllers).once.ordered
+        lambda { Console.interact_with_call call }.should raise_error StandardError
+      end
 
       it "should execute an interactive call controller on the call" do
         flexmock(CallController).should_receive(:exec).once.with(on do |c|

data/spec/adhearsion/initializer_spec.rb

@@ -9,7 +9,7 @@ describe Adhearsion::Initializer do
 
   describe "#start" do
     before do
-      Adhearsion::Logging.reset
+      ::Logging.reset
       flexmock(Adhearsion::Logging).should_receive(:start).once.and_return('')
       flexmock(::Logging::Appenders::File).should_receive(:assert_valid_logfile).and_return(true)
       flexmock(::Logging::Appenders).should_receive(:file).and_return(nil)
@@ -21,7 +21,7 @@ describe Adhearsion::Initializer do
     end
 
     after :all do
-      Adhearsion::Logging.reset
+      ::Logging.reset
       Adhearsion::Logging.start
       Adhearsion::Logging.silence!
     end
@@ -137,14 +137,14 @@ describe Adhearsion::Initializer do
 
   describe "Initializing logger" do
     before do
-      Adhearsion::Logging.reset
+      ::Logging.reset
       flexmock(::Logging::Appenders::File).should_receive(:assert_valid_logfile).and_return(true)
       flexmock(::Logging::Appenders).should_receive(:file).and_return(nil)
       Adhearsion.config = nil
     end
 
     after :all do
-      Adhearsion::Logging.reset
+      ::Logging.reset
       Adhearsion::Logging.start
       Adhearsion::Logging.silence!
       Adhearsion::Events.reinitialize_queue!
@@ -191,7 +191,7 @@ describe "Updating RAILS_ENV variable" do
   include InitializerStubs
 
   before do
-    Adhearsion::Logging.reset
+    ::Logging.reset
     flexmock(Adhearsion::Logging).should_receive(:start).once.and_return('')
     flexmock(::Logging::Appenders::File).should_receive(:assert_valid_logfile).and_return(true)
     flexmock(::Logging::Appenders).should_receive(:file).and_return(nil)

data/spec/adhearsion/logging_spec.rb

@@ -4,7 +4,7 @@ describe Adhearsion::Logging do
 
   before :all do
     ::Logging.shutdown
-    Adhearsion::Logging.reset
+    ::Logging.reset
     Adhearsion::Logging.init
   end
 
@@ -83,6 +83,22 @@ describe Adhearsion::Logging do
     _foo_logger.object_id.should_not eql(_bar_logger)
   end
 
+  it 'should reopen logfiles' do
+    flexmock(::Logging).should_receive(:reopen).once
+    Adhearsion::Logging.reopen_logs
+  end
+
+  it 'should toggle between :trace and the configured log level' do
+    orig_level = Adhearsion.config.platform.logging['level']
+    Adhearsion.config.platform.logging['level'] = :warn
+    Adhearsion::Logging.level = :warn
+    Adhearsion::Logging.toggle_trace!
+    Adhearsion::Logging.level.should == 0
+    Adhearsion::Logging.toggle_trace!
+    Adhearsion::Logging.level.should == 3
+    Adhearsion.config.platform.logging['level'] = orig_level
+  end
+
   describe 'level changing' do
 
     before  { Adhearsion::Logging.unsilence! }

data/spec/adhearsion/process_spec.rb

@@ -72,5 +72,23 @@ module Adhearsion
         Adhearsion::Process.final_shutdown
       end
     end
+
+    it 'should handle subsequent :shutdown events in the correct order' do
+      Adhearsion::Process.booted
+      Adhearsion::Process.state_name.should be :running
+      Adhearsion::Process.shutdown
+      Adhearsion::Process.state_name.should be :stopping
+      Adhearsion::Process.shutdown
+      Adhearsion::Process.state_name.should be :rejecting
+      Adhearsion::Process.shutdown
+      Adhearsion::Process.state_name.should be :stopped
+      flexmock(Adhearsion::Process.instance).should_receive(:die_now!).once
+      Adhearsion::Process.shutdown
+    end
+
+    it 'should forcibly kill the Adhearsion process on :force_stop' do
+      flexmock(::Process).should_receive(:exit).once.with(1)
+      Adhearsion::Process.force_stop
+    end
   end
 end

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -17,6 +17,7 @@ module Adhearsion
           config.connection_timeout = 60
           config.reconnect_attempts = 1.0/0.0
           config.reconnect_timer    = 5
+          config.media_engine       = nil
         end
       end
 
@@ -35,6 +36,7 @@ module Adhearsion
           config.connection_timeout = options[:connection_timeout] if options.has_key?(:connection_timeout)
           config.reconnect_attempts = options[:reconnect_attempts] if options.has_key?(:reconnect_attempts)
           config.reconnect_timer    = options[:reconnect_timer] if options.has_key?(:reconnect_timer)
+          config.media_engine       = options[:media_engine] if options.has_key?(:media_engine)
         end
 
         Initializer.init
@@ -43,6 +45,8 @@ module Adhearsion
 
       before do
         Events.refresh!
+        flexmock Adhearsion::Process, :fqdn => 'hostname'
+        flexmock ::Process, :pid => 1234
       end
 
       let(:call_id)   { rand }
@@ -87,12 +91,25 @@ module Adhearsion
         it "should properly set the reconnect_timer value" do
           subject.reconnect_timer.should == 5
         end
+
+        it "should properly set the media_engine value" do
+          subject.media_engine.should == nil
+        end
+      end
+
+      it "starts the client with the correct resource" do
+        username = "usera@127.0.0.1/hostname-1234"
+
+        flexmock(::Punchblock::Connection::XMPP).should_receive(:new).once.with(FlexMock.hsh :username => username).and_return do
+          flexmock 'Client', :event_handler= => true
+        end
+        initialize_punchblock
       end
 
       it "starts the client with any overridden settings" do
-        overrides = {:username => 'userb@127.0.0.1', :password => '123', :host => 'foo.bar.com', :port => 200, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com'}
+        overrides = {:username => 'userb@127.0.0.1', :password => '123', :host => 'foo.bar.com', :port => 200, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com', :media_engine => :swift}
 
-        flexmock(::Punchblock::Connection::XMPP).should_receive(:new).once.with(overrides).and_return do
+        flexmock(::Punchblock::Connection::XMPP).should_receive(:new).once.with(overrides.merge({:username => 'userb@127.0.0.1/hostname-1234'})).and_return do
           flexmock 'Client', :event_handler= => true
         end
         initialize_punchblock overrides
@@ -157,7 +174,7 @@ module Adhearsion
       end
 
       describe 'using Asterisk' do
-        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com'} }
+        let(:overrides) { {:username => 'test', :password => '123', :host => 'foo.bar.com', :port => 200, :connection_timeout => 20, :root_domain => 'foo.com', :calls_domain => 'call.foo.com', :mixers_domain => 'mixer.foo.com', :media_engine => :swift} }
 
         it 'should start an Asterisk PB connection' do
           flexmock(::Punchblock::Connection::Asterisk).should_receive(:new).once.with(overrides).and_return do
@@ -247,11 +264,6 @@ module Adhearsion
             Adhearsion.active_calls << mock_call
           end
 
-          it "should log an error" do
-            flexmock(Adhearsion::Logging.get_logger(Initializer)).should_receive(:debug).once.with("Event received for call #{call_id}: #{mock_event.inspect}")
-            Events.trigger_immediately :punchblock, mock_event
-          end
-
           it "should place the event in the call's inbox" do
             mock_call.should_receive(:deliver_message!).once.with(mock_event)
             Initializer.dispatch_call_event mock_event

data/spec/adhearsion/punchblock_plugin_spec.rb

@@ -7,5 +7,47 @@ module Adhearsion
       PunchblockPlugin.client.should be :foo
       PunchblockPlugin::Initializer.client = nil
     end
+
+    describe '#execute_component' do
+      let(:message)     { Punchblock::Command::Accept.new }
+      let(:response)    { :foo }
+      let(:mock_client) { flexmock 'Client', :execute_command => true }
+
+      before do
+        PunchblockPlugin::Initializer.client = mock_client
+        flexmock message, :execute! => true
+        message.response = response
+      end
+
+      it "writes a command to the client" do
+        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(message)
+        PunchblockPlugin.execute_component message
+      end
+
+      it "blocks until a response is received" do
+        slow_command = Punchblock::Command::Dial.new
+        Thread.new do
+          sleep 0.5
+          slow_command.response = response
+        end
+        starting_time = Time.now
+        PunchblockPlugin.execute_component slow_command
+        (Time.now - starting_time).should >= 0.5
+      end
+
+      describe "with a successful response" do
+        it "returns the executed command" do
+          PunchblockPlugin.execute_component(message).should be message
+        end
+      end
+
+      describe "with an error response" do
+        let(:response) { Exception.new }
+
+        it "raises the error" do
+          lambda { PunchblockPlugin.execute_component message }.should raise_error Exception
+        end
+      end
+    end
   end
 end