adhearsion 2.0.0.alpha2 → 2.0.0.alpha3

data/spec/adhearsion/call_spec.rb

@@ -89,15 +89,6 @@ module Adhearsion
       end
     end
 
-    it 'a hungup call removes itself from the active calls' do
-      size_before = Adhearsion.active_calls.size
-
-      call = Adhearsion.active_calls.from_offer offer
-      Adhearsion.active_calls.size.should > size_before
-      call.hangup
-      Adhearsion.active_calls.size.should == size_before
-    end
-
     it 'allows the registration of event handlers which are called when messages are delivered' do
       event = flexmock 'Event'
       event.should_receive(:foo?).and_return true
@@ -134,7 +125,6 @@ module Adhearsion
         end
 
         it "should mark the call as ended" do
-          flexmock(subject).should_receive(:hangup).once
           subject << end_event
           subject.should_not be_active
         end
@@ -148,6 +138,22 @@ module Adhearsion
           flexmock(subject.commands).should_receive(:terminate).once
           subject << end_event
         end
+
+        it "removes itself from the active calls" do
+          size_before = Adhearsion.active_calls.size
+
+          Adhearsion.active_calls << subject
+          Adhearsion.active_calls.size.should > size_before
+
+          subject << end_event
+          Adhearsion.active_calls.size.should == size_before
+        end
+
+        it "shuts down the actor" do
+          subject << end_event
+          sleep 5.1
+          subject.should_not be_alive
+        end
       end
     end
 
@@ -203,14 +209,14 @@ module Adhearsion
 
       it "should asynchronously write the command to the Punchblock connection" do
         mock_client = flexmock('Client')
-        flexmock(subject).should_receive(:client).once.and_return mock_client
+        flexmock(subject.wrapped_object).should_receive(:client).once.and_return mock_client
         mock_client.should_receive(:execute_command).once.with(mock_command, :call_id => subject.id).and_return true
         subject.write_command mock_command
       end
 
       describe "with a hungup call" do
         before do
-          flexmock(subject).should_receive(:active?).and_return(false)
+          flexmock(subject.wrapped_object).should_receive(:active?).and_return(false)
         end
 
         it "should raise a Hangup exception" do
@@ -237,7 +243,7 @@ module Adhearsion
       end
 
       it "writes a command to the call" do
-        flexmock(subject).should_receive(:write_command).once.with(message)
+        flexmock(subject.wrapped_object).should_receive(:write_command).once.with(message)
         subject.write_and_await_response message
       end
 
@@ -270,13 +276,25 @@ module Adhearsion
           lambda { subject.write_and_await_response message }.should raise_error Exception
         end
       end
+
+      describe "when the response times out" do
+        before do
+          message.should_receive(:response).and_raise Timeout::Error
+        end
+
+        it "should raise the error in the caller but not crash the actor" do
+          lambda { subject.write_and_await_response message }.should raise_error Timeout::Error
+          sleep 0.5
+          subject.should be_alive
+        end
+      end
     end
 
     describe "basic control commands" do
       include FlexMock::ArgumentTypes
 
       def expect_message_waiting_for_response(message)
-        flexmock(subject).should_receive(:write_and_await_response).once.with(message).and_return(message)
+        flexmock(subject.wrapped_object).should_receive(:write_and_await_response).once.with(message).and_return(message)
       end
 
       describe '#accept' do
@@ -294,6 +312,14 @@ module Adhearsion
             subject.accept headers
           end
         end
+
+        describe "a second time" do
+          it "should only send one Accept message" do
+            expect_message_waiting_for_response Punchblock::Command::Accept.new
+            subject.accept
+            subject.accept
+          end
+        end
       end
 
       describe '#answer' do
@@ -344,29 +370,29 @@ module Adhearsion
         end
       end
 
-      describe "#hangup!" do
+      describe "#hangup" do
         describe "if the call is not active" do
           before do
-            flexmock(subject).should_receive(:active?).and_return false
+            flexmock(subject.wrapped_object).should_receive(:active?).and_return false
           end
 
           it "should do nothing and return false" do
             flexmock(subject).should_receive(:write_and_await_response).never
-            subject.hangup!.should be false
+            subject.hangup.should be false
           end
         end
 
         describe "if the call is active" do
           it "should mark the call inactive" do
             expect_message_waiting_for_response Punchblock::Command::Hangup.new
-            subject.hangup!
+            subject.hangup
             subject.should_not be_active
           end
 
           describe "with no headers" do
             it 'should send a Hangup message' do
               expect_message_waiting_for_response Punchblock::Command::Hangup.new
-              subject.hangup!
+              subject.hangup
             end
           end
 
@@ -374,7 +400,7 @@ module Adhearsion
             it 'should send a Hangup message with the correct headers' do
               headers = {:foo => 'bar'}
               expect_message_waiting_for_response Punchblock::Command::Hangup.new(:headers => headers)
-              subject.hangup! headers
+              subject.hangup headers
             end
           end
         end
@@ -484,7 +510,7 @@ module Adhearsion
         let(:mock_controller) { flexmock 'CallController' }
 
         before do
-          flexmock subject, :write_and_await_response => true
+          flexmock subject.wrapped_object, :write_and_await_response => true
         end
 
         it "should call #execute on the controller instance" do
@@ -495,7 +521,7 @@ module Adhearsion
 
         it "should hangup the call after all controllers have executed" do
           flexmock(CallController).should_receive(:exec).once.with mock_controller
-          subject.should_receive(:hangup!).once
+          subject.should_receive(:hangup).once
           subject.execute_controller mock_controller, latch
           latch.wait(3).should be_true
         end
@@ -548,12 +574,5 @@ module Adhearsion
         end
       end
     end
-
-    describe Call::Registry do
-      it "should set a value and retrieve it" do
-        Adhearsion::Call::Registry[:test_value] = '123'
-        Adhearsion::Call::Registry[:test_value].should == '123'
-      end
-    end
   end
 end

data/spec/adhearsion/calls_spec.rb

@@ -47,5 +47,12 @@ module Adhearsion
 
       subject.with_tag(:moderator).should == [tagged_call]
     end
+
+    describe "#<<" do
+      it "should allow chaining" do
+        subject << Call.new(new_offer) << Call.new(new_offer)
+        subject.size.should == 2
+      end
+    end
   end
 end

data/spec/adhearsion/configuration_spec.rb

@@ -24,9 +24,9 @@ describe Adhearsion::Configuration do
     end
 
     it "should allow to update a config value" do
-      subject.platform.automatically_accept_incoming_calls.should == true
-      subject.platform.automatically_accept_incoming_calls = false
-      subject.platform.automatically_accept_incoming_calls.should == false
+      subject.platform.environment.should == :development
+      subject.platform.environment = :production
+      subject.platform.environment.should == :production
     end
 
     it "should allow to create new config values" do
@@ -39,7 +39,7 @@ describe Adhearsion::Configuration do
     subject do
       Adhearsion::Configuration.new do
         root "foo", :desc => "Adhearsion application root folder"
-        automatically_accept_incoming_calls false, :desc => "Adhearsion will not accept automatically any inbound call"
+        environment :development, :desc => "Active environment. Supported values: development, production, staging, test"
       end
     end
 
@@ -47,8 +47,8 @@ describe Adhearsion::Configuration do
       subject.platform.root.should == "foo"
     end
 
-    it "should return the automatically_accept_incoming_calls value" do
-      subject.platform.automatically_accept_incoming_calls.should == false
+    it "should return the environment value" do
+      subject.platform.environment.should == :development
     end
 
     it "should return a description for the platform configuration" do
@@ -56,9 +56,9 @@ describe Adhearsion::Configuration do
     end
 
     it "should allow to update a config value" do
-      subject.platform.automatically_accept_incoming_calls.should == false
-      subject.platform.automatically_accept_incoming_calls = true
-      subject.platform.automatically_accept_incoming_calls.should == true
+      subject.platform.environment.should == :development
+      subject.platform.environment = :production
+      subject.platform.environment.should == :production
     end
 
     it "should allow to create new config values" do
@@ -87,7 +87,7 @@ describe Adhearsion::Configuration do
     end
 
     it "should allow to retrieve any platform configuration value" do
-      subject.automatically_accept_incoming_calls.should == true
+      subject.environment.should == :development
     end
 
     describe "if configuration has a named environment" do
@@ -187,14 +187,14 @@ describe Adhearsion::Configuration do
     it "should retrieve a string with the platform configuration" do
       desc = subject.description :platform, :show_values => false
       desc.length.should > 0
-      desc.should match /^.*automatically_accept_incoming_calls.*$/
+      desc.should match /^.*environment.*$/
       desc.should match /^.*root.*$/
     end
 
     it "should retrieve a string with the platform configuration and values" do
       desc = subject.description :platform
       desc.length.should > 0
-      desc.should match /^.*automatically_accept_incoming_calls.*true.*$/
+      desc.should match /^.*environment.*:development.*$/
       desc.should match /^.*root.*$/
     end
 
@@ -284,7 +284,7 @@ describe Adhearsion::Configuration do
       it "should retrieve both platform and plugin configuration" do
         desc = subject.description :all
         desc.length.should > 0
-        desc.should match /^.*automatically_accept_incoming_calls.*true.*$/
+        desc.should match /^.*environment.*:development.*$/
         desc.should match /^.*root.*$/
         desc.should match /^.*name.*user.*$/
         desc.should match /^.*password.*password.*$/
@@ -295,7 +295,7 @@ describe Adhearsion::Configuration do
         desc = subject.description :all, :show_values => false
         desc.length.should > 0
         desc.should match /^.*Configuration for platform.*$/
-        desc.should match /^.*automatically_accept_incoming_calls.*$/
+        desc.should match /^.*environment.*$/
         desc.should match /^.*root.*$/
         desc.should match /^.*Configuration for my_plugin.*$/
         desc.should match /^.*name.*$/

data/spec/adhearsion/console_spec.rb

@@ -2,22 +2,142 @@ require 'spec_helper'
 
 module Adhearsion
   describe Console do
+    include FlexMock::ArgumentTypes
     describe "providing hooks to include console functionality" do
       it "should allow mixing in a module globally on all CallController classes" do
-        Adhearsion::Console.mixin TestBiscuit
-        Adhearsion::Console.throwadogabone.should be true
+        Console.mixin TestBiscuit
+        Console.throwadogabone.should be true
       end
     end
 
     describe 'testing for libedit vs. readline' do
       it 'should return true when detecting readline' do
         flexmock(Readline).should_receive(:emacs_editing_mode).once.and_return true
-        Adhearsion::Console.libedit?.should be false
+        Console.libedit?.should be false
       end
 
       it 'should return false when detecting libedit' do
         flexmock(Readline).should_receive(:emacs_editing_mode).once.and_raise NotImplementedError
-        Adhearsion::Console.libedit?.should be true
+        Console.libedit?.should be true
+      end
+    end
+
+    describe "#log_level" do
+      context "with a value" do
+        it "should set the log level via Adhearsion::Logging" do
+          flexmock(Adhearsion::Logging).should_receive(:level=).once.with(:foo)
+          Console.log_level :foo
+        end
+      end
+
+      context "without a value" do
+        it "should return the current level as a symbol" do
+          Adhearsion::Logging.level = :fatal
+          Console.log_level.should == :fatal
+        end
+      end
+    end
+
+    describe "#silence!" do
+      it "should delegate to Adhearsion::Logging" do
+        flexmock(Adhearsion::Logging).should_receive(:silence!).once
+        Console.silence!
+      end
+    end
+
+    describe "#unsilence!" do
+      it "should delegate to Adhearsion::Logging" do
+        flexmock(Adhearsion::Logging).should_receive(:unsilence!).once
+        Console.unsilence!
+      end
+    end
+
+    describe "#shutdown!" do
+      it "should tell the process to shutdown" do
+        flexmock(Adhearsion::Process).should_receive(:shutdown!).once
+        Console.shutdown!
+      end
+    end
+
+    describe "#take" do
+      let(:call)    { Call.new }
+      let(:call_id) { rand.to_s }
+
+      before do
+        Adhearsion.active_calls.clear!
+        flexmock(call).should_receive(:id => call_id)
+      end
+
+      context "with a call" do
+        it "should interact with the call" do
+          flexmock(Console.instance).should_receive(:interact_with_call).once.with call
+          Console.take call
+        end
+      end
+
+      context "with no argument" do
+        context "with one currently active call" do
+          before do
+            Adhearsion.active_calls << call
+          end
+
+          it "should interact with the current call" do
+            flexmock(Console.instance).should_receive(:interact_with_call).once.with call
+            Console.take
+          end
+        end
+
+        context "with multiple current calls" do
+          let(:call2) { Call.new }
+
+          before do
+            flexmock(call2).should_receive :id => rand.to_s
+            Adhearsion.active_calls << call << call2
+          end
+
+          it "should allow selection of the call to use" do
+            mock_io = StringIO.new
+            Console.input = mock_io
+            flexmock(mock_io).should_receive(:gets).once.and_return "1\n"
+            flexmock(Console.instance).should_receive(:interact_with_call).once.with call2
+            Console.take
+          end
+        end
+      end
+
+      context "with a call ID" do
+        context "if an active call with that ID exists" do
+          before do
+            Adhearsion.active_calls << call
+          end
+
+          it "should interact with that call" do
+            flexmock(Console.instance).should_receive(:interact_with_call).once.with call
+            Console.take call_id
+          end
+        end
+
+        context "if an active call with that ID does not exist" do
+          it "should log an error explaining that the call does not exist" do
+            flexmock(Console.logger).should_receive(:error).once.with /does not exist/
+            flexmock(Console.instance).should_receive(:interact_with_call).never
+            Console.take call_id
+          end
+        end
+      end
+    end
+
+    describe "#interact_with_call" do
+      let(:call) { Call.new }
+
+      it "should suspend the call's controller"
+
+      it "should execute an interactive call controller on the call" do
+        flexmock(CallController).should_receive(:exec).once.with(on do |c|
+          c.should be_a Console::InteractiveController
+          c.call.should be call
+        end)
+        Console.interact_with_call call
       end
     end
   end

data/spec/adhearsion/generators_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'adhearsion/generators'
+
+module Adhearsion
+  describe Generators do
+    describe "storing generator mappings" do
+      let(:generator_key) { "example_gen" }
+
+      it "adds a generator to the mappings and returns it" do
+        DummyGenerator = Class.new
+
+        Generators.add_generator generator_key, DummyGenerator
+        Generators.mappings[generator_key].should == DummyGenerator
+      end
+    end
+  end
+end