adhearsion 2.0.0.beta1 → 2.0.0.rc1

data/spec/adhearsion/menu_dsl/range_match_calculator_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -8,8 +10,8 @@ module Adhearsion
         digits_that_begin_with_eleven = [110..119, 1100..1111].map { |x| Array(x) }.flatten
         calculator = RangeMatchCalculator.new 11..1111, :match_payload_doesnt_matter
         match = calculator.match 11
-        match.exact_matches.should == [11]
-        match.potential_matches.should == digits_that_begin_with_eleven
+        match.exact_matches.should be == [11]
+        match.potential_matches.should be == digits_that_begin_with_eleven
       end
 
       it "return values of #match should be an instance of CalculatedMatch" do

data/spec/adhearsion/menu_dsl/string_match_calculator_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -13,12 +15,12 @@ module Adhearsion
           match_case = calculator.match str[0,2]
           match_case.exact_match?.should_not be true
           match_case.potential_match?.should be true
-          match_case.potential_matches.should == [str]
+          match_case.potential_matches.should be == [str]
 
           match_case = calculator.match str
           match_case.exact_match?.should be true
           match_case.potential_match?.should_not be true
-          match_case.exact_matches.should == [str]
+          match_case.exact_matches.should be == [str]
         end
       end
 
@@ -28,7 +30,7 @@ module Adhearsion
           match_case = calculator.match special_digit
           match_case.potential_match?.should_not be true
           match_case.exact_match?.should be true
-          match_case.exact_matches.first.should == special_digit
+          match_case.exact_matches.first.should be == special_digit
         end
       end
     end

data/spec/adhearsion/outbound_call_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -5,7 +7,7 @@ module Adhearsion
     it { should be_a Call }
 
     its(:id) { should be_nil }
-    its(:variables) { should == {} }
+    its(:variables) { should be == {} }
 
     let(:mock_client) { flexmock 'Punchblock Client' }
 
@@ -79,22 +81,22 @@ module Adhearsion
 
       it "should set the dial command" do
         subject.dial to, :from => from
-        subject.dial_command.should == expected_dial_command
+        subject.dial_command.should be == expected_dial_command
       end
 
       it "should set the call ID from the dial command" do
         subject.dial to, :from => from
-        subject.id.should == call_id
+        subject.id.should be == call_id
       end
 
       it "should set the to from the dial command" do
         subject.dial to, :from => from
-        subject.to.should == to
+        subject.to.should be == to
       end
 
       it "should set the 'from' from the dial command" do
         subject.dial to, :from => from
-        subject.from.should == from
+        subject.from.should be == from
       end
 
       it "should add the call to the active calls registry" do

data/spec/adhearsion/plugin_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 include InitializerStubs
@@ -15,12 +17,12 @@ describe Adhearsion::Plugin do
 
     it "should provide the plugin name in a plugin class" do
       ::FooBar = Class.new Adhearsion::Plugin
-      ::FooBar.plugin_name.should == "foo_bar"
+      ::FooBar.plugin_name.should be == "foo_bar"
     end
 
     it "should provide the plugin name in a plugin instance" do
       ::FooBar = Class.new Adhearsion::Plugin
-      ::FooBar.new.plugin_name.should == "foo_bar"
+      ::FooBar.new.plugin_name.should be == "foo_bar"
     end
 
     it "should provide a setter for plugin name" do
@@ -28,7 +30,7 @@ describe Adhearsion::Plugin do
         self.plugin_name = "bar_foo"
       end
 
-      ::FooBar.plugin_name.should == "bar_foo"
+      ::FooBar.plugin_name.should be == "bar_foo"
     end
   end
 
@@ -47,7 +49,7 @@ describe Adhearsion::Plugin do
       end
     }
 
-    its(:plugin_name) { should == :bar_foo }
+    its(:plugin_name) { should be == :bar_foo }
 
     its(:config) { should be_instance_of Loquacious::Configuration }
 
@@ -56,9 +58,9 @@ describe Adhearsion::Plugin do
         subject.config.should respond_to value
       end
 
-      subject.config.name.should     == "user"
-      subject.config.password.should == "password"
-      subject.config.host.should     == "localhost"
+      subject.config.name.should     be == "user"
+      subject.config.password.should be == "password"
+      subject.config.host.should     be == "localhost"
     end
 
     it "should return a description of configuration options" do
@@ -68,7 +70,7 @@ describe Adhearsion::Plugin do
     describe "while updating config values" do
       it "should return the updated value" do
         subject.config.name = "usera"
-        subject.config.name.should == "usera"
+        subject.config.name.should be == "usera"
       end
     end
 
@@ -105,7 +107,7 @@ describe Adhearsion::Plugin do
   end
 
   describe "Adhearsion::Plugin.init_plugins" do
-    before do
+    before(:all) do
       Adhearsion::Plugin.class_eval do
         def self.reset_methods_scope
           @methods_scope = Hash.new { |hash, key| hash[key] = Module.new }
@@ -115,7 +117,9 @@ describe Adhearsion::Plugin do
           @subclasses = nil
         end
       end
+    end
 
+    before do
       Adhearsion::Plugin.reset_methods_scope
       Adhearsion::Plugin.reset_subclasses
     end
@@ -340,29 +344,29 @@ describe Adhearsion::Plugin do
       subject.should be_instance_of Array
     end
 
-    its(:length) { should == 0 }
+    its(:length) { should be == 0 }
 
     it "should not load a new task when there is no block in the method call" do
-      subject.length.should == 0
+      subject.length.should be == 0
       FooBar = Class.new Adhearsion::Plugin do
         tasks
       end
 
-      subject.length.should == 0
+      subject.length.should be == 0
     end
 
     it "should load a new task when there is a block in the method call" do
-      subject.length.should == 0
+      subject.length.should be == 0
       FooBar = Class.new Adhearsion::Plugin do
         tasks do
           puts "foo bar"
         end
       end
-      Adhearsion::Plugin.tasks.length.should == 1
+      Adhearsion::Plugin.tasks.length.should be == 1
     end
 
     it "should execute the tasks blocks while loading rake tasks" do
-      subject.length.should == 0
+      subject.length.should be == 0
       FooBar = Class.new Adhearsion::Plugin do
         tasks do
           FooBar.foo

data/spec/adhearsion/process_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -11,7 +13,8 @@ module Adhearsion
     end
 
     it 'should trigger :stop_requested events on #shutdown' do
-      flexmock(Events).should_receive(:trigger_immediately).once.with(:stop_requested)
+      flexmock(Events).should_receive(:trigger_immediately).once.with(:stop_requested).ordered
+      flexmock(Events).should_receive(:trigger_immediately).once.with(:shutdown).ordered
       Adhearsion::Process.booted
       Adhearsion::Process.shutdown
     end
@@ -56,15 +59,17 @@ module Adhearsion
       end
 
       it "should trigger shutdown handlers synchronously" do
-        shutdown_value = []
+        foo = lambda { |b| b }
 
-        Events.shutdown { shutdown_value << :foo }
-        Events.shutdown { shutdown_value << :bar }
-        Events.shutdown { shutdown_value << :baz }
+        flexmock(foo).should_receive(:[]).once.with(:a).ordered
+        flexmock(foo).should_receive(:[]).once.with(:b).ordered
+        flexmock(foo).should_receive(:[]).once.with(:c).ordered
 
-        Adhearsion::Process.final_shutdown
+        Events.shutdown { sleep 2; foo[:a] }
+        Events.shutdown { sleep 1; foo[:b] }
+        Events.shutdown { foo[:c] }
 
-        shutdown_value.should == [:foo, :bar, :baz]
+        Adhearsion::Process.final_shutdown
       end
 
       it "should stop the console" do

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -57,11 +59,11 @@ module Adhearsion
         subject { initialize_punchblock }
 
         it "should set properly the username value" do
-          subject.username.should == 'usera@127.0.0.1'
+          subject.username.should be == 'usera@127.0.0.1'
         end
 
         it "should set properly the password value" do
-          subject.password.should == '1'
+          subject.password.should be == '1'
         end
 
         it "should set properly the host value" do
@@ -85,15 +87,15 @@ module Adhearsion
         end
 
         it "should properly set the reconnect_attempts value" do
-          subject.reconnect_attempts.should == 1.0/0.0
+          subject.reconnect_attempts.should be == 1.0/0.0
         end
 
         it "should properly set the reconnect_timer value" do
-          subject.reconnect_timer.should == 5
+          subject.reconnect_timer.should be == 5
         end
 
         it "should properly set the media_engine value" do
-          subject.media_engine.should == nil
+          subject.media_engine.should be == nil
         end
       end
 
@@ -107,9 +109,9 @@ module Adhearsion
       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', :media_engine => :swift}
+        overrides = {:username => 'userb@127.0.0.1/foo', :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.merge({:username => 'userb@127.0.0.1/hostname-1234'})).and_return do
+        flexmock(::Punchblock::Connection::XMPP).should_receive(:new).once.with(overrides).and_return do
           flexmock 'Client', :event_handler= => true
         end
         initialize_punchblock overrides
@@ -124,7 +126,7 @@ module Adhearsion
           flexmock(mock_connection).should_receive(:run).once
           t = Thread.new { Initializer.init; Initializer.run }
           t.join 5
-          t.status.should == "sleep"
+          t.status.should be == "sleep"
           Events.trigger_immediately :punchblock, ::Punchblock::Connection::Connected.new
           t.join
         end
@@ -147,17 +149,17 @@ module Adhearsion
 
         it 'should reset the Adhearsion process state to "booting"' do
           Adhearsion::Process.booted
-          Adhearsion::Process.state_name.should == :running
+          Adhearsion::Process.state_name.should be == :running
           mock_client.should_receive(:run).and_raise ::Punchblock::DisconnectedError
-          expect { Initializer.connect_to_server }.should raise_error ::Punchblock::DisconnectedError
-          Adhearsion::Process.state_name.should == :booting
+          flexmock(Adhearsion::Process).should_receive(:reset).at_least.once
+          Initializer.connect_to_server
         end
 
         it 'should retry the connection the specified number of times' do
           Initializer.config.reconnect_attempts = 3
           mock_client.should_receive(:run).and_raise ::Punchblock::DisconnectedError
-          expect { Initializer.connect_to_server }.should raise_error ::Punchblock::DisconnectedError
-          Initializer.attempts.should == 3
+          Initializer.connect_to_server
+          Initializer.attempts.should be == 3
         end
 
         it 'should preserve a Punchblock::ProtocolError exception and give up' do
@@ -294,13 +296,31 @@ module Adhearsion
           end
 
           it "should set properly the username value" do
-            subject.username.should == 'userb@127.0.0.1'
+            subject.username.should be == 'userb@127.0.0.1'
           end
 
           it "should set properly the password value" do
-            subject.password.should == 'abc123'
+            subject.password.should be == 'abc123'
+          end
+        end
+      end
+
+      it "should allow easily registering handlers for AMI events" do
+        result = nil
+        ami_event = Punchblock::Event::Asterisk::AMI::Event.new :name => 'foobar'
+        latch = CountDownLatch.new 1
+
+        Events.draw do
+          ami :name => 'foobar' do |event|
+            result = event
+            latch.countdown!
           end
         end
+
+        Initializer.handle_event ami_event
+
+        latch.wait(1).should be true
+        result.should be ami_event
       end
     end
   end

data/spec/adhearsion/punchblock_plugin_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -20,12 +22,13 @@ module Adhearsion
       end
 
       it "writes a command to the client" do
-        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(message)
+        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(message, :async => true)
         PunchblockPlugin.execute_component message
       end
 
       it "blocks until a response is received" do
         slow_command = Punchblock::Command::Dial.new
+        slow_command.request!
         Thread.new do
           sleep 0.5
           slow_command.response = response

data/spec/adhearsion/router/route_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 module Adhearsion
@@ -17,17 +19,17 @@ module Adhearsion
 
           subject { Route.new name, target, *guards }
 
-          its(:name)    { should == name }
-          its(:target)  { should == target }
-          its(:guards)  { should == guards }
+          its(:name)    { should be == name }
+          its(:target)  { should be == target }
+          its(:guards)  { should be == guards }
         end
 
         describe "with a block target and guards" do
           subject { Route.new(name, *guards) { :foo } }
 
-          its(:name)    { should == name }
+          its(:name)    { should be == name }
           its(:target)  { should be_a Proc }
-          its(:guards)  { should == guards }
+          its(:guards)  { should be == guards }
         end
       end
 
@@ -119,7 +121,7 @@ module Adhearsion
 
           it "should instruct the call to use a CallController with the correct block" do
             flexmock(call).should_receive(:execute_controller).once.with(CallController).and_return do |controller|
-              controller.block.call.should == :foobar
+              controller.block.call.should be == :foobar
             end
             route.dispatcher.call call
           end

data/spec/adhearsion/router_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 FooBarController = Class.new
@@ -39,16 +41,16 @@ module Adhearsion
         end
 
         it "should build up the routes with the correct data" do
-          subject[0].name.should == 'calls from fred'
-          subject[0].guards.should == [{:from => 'fred'}]
-          subject[0].target.should == FooBarController
+          subject[0].name.should be == 'calls from fred'
+          subject[0].guards.should be == [{:from => 'fred'}]
+          subject[0].target.should be == FooBarController
 
-          subject[1].name.should == 'calls from paul'
-          subject[1].guards.should == [{:from => 'paul'}]
+          subject[1].name.should be == 'calls from paul'
+          subject[1].guards.should be == [{:from => 'paul'}]
           subject[1].target.should be_a Proc
 
-          subject[2].name.should == 'catchall'
-          subject[2].guards.should == []
+          subject[2].name.should be == 'catchall'
+          subject[2].guards.should be == []
           subject[2].target.should be_a Proc
         end
       end
@@ -73,17 +75,17 @@ module Adhearsion
 
         context 'with a call from fred' do
           let(:call) { flexmock 'Adhearsion::Call', :from => 'fred' }
-          its(:name) { should == 'calls from fred' }
+          its(:name) { should be == 'calls from fred' }
         end
 
         context 'with a call from paul' do
           let(:call) { flexmock 'Adhearsion::Call', :from => 'paul' }
-          its(:name) { should == 'calls from paul' }
+          its(:name) { should be == 'calls from paul' }
         end
 
         context 'with a call from frank' do
           let(:call) { flexmock 'Adhearsion::Call', :from => 'frank' }
-          its(:name) { should == 'catchall' }
+          its(:name) { should be == 'catchall' }
         end
       end