adhearsion 2.1.3 → 2.2.0

data/spec/adhearsion/calls_spec.rb

@@ -83,6 +83,19 @@ module Adhearsion
       end
     end
 
+    describe "when a call in the collection terminates cleanly" do
+      it "is removed from the collection" do
+        call_id = call.id
+        size_before = subject.size
+
+        subject << call
+        call.terminate
+
+        subject.size.should be == size_before
+        subject[call_id].should be_nil
+      end
+    end
+
     describe "when a call in the collection crashes" do
       let(:wrapped_object) { call.wrapped_object }
 

data/spec/adhearsion/initializer_spec.rb

@@ -34,6 +34,13 @@ describe Adhearsion::Initializer do
       end
     end
 
+    it "should start the stats aggregator" do
+      flexmock(Adhearsion).should_receive(:statistics).at_least.once
+      stub_behavior_for_initializer_with_no_path_changing_behavior do
+        Adhearsion::Initializer.start
+      end
+    end
+
     it "should create a pid file in the app's path when given 'true' as the pid_file hash key argument" do
       stub_behavior_for_initializer_with_no_path_changing_behavior do
          flexmock(File).should_receive(:open).with(File.join(path, 'adhearsion.pid'), 'w', Proc).at_least.once

data/spec/adhearsion/outbound_call_spec.rb

@@ -58,6 +58,15 @@ module Adhearsion
           call << Punchblock::Event::Answered.new
           sleep 0.5
         end
+
+        context "with controller metadata specified" do
+          it "should set the metadata on the controller" do
+            flexmock(mock_call).should_receive(:dial).once.with(to, {})
+            flexmock(mock_call).should_receive(:execute_controller).once.with(FlexMock.on { |c| c.is_a?(controller) && c.metadata == {:foo => 'bar'}}, Proc)
+            call = OutboundCall.originate to, :controller => controller, :controller_metadata => {:foo => 'bar'}
+            call << Punchblock::Event::Answered.new
+          end
+        end
       end
 
       context "when given a block" do
@@ -137,6 +146,11 @@ module Adhearsion
         Adhearsion.active_calls[call_id].should be subject
       end
 
+      it "should immediately fire the :call_dialed event giving the call" do
+        flexmock(Adhearsion::Events).should_receive(:trigger_immediately).once.with(:call_dialed, subject)
+        subject.dial to, :from => from
+      end
+
       it "should not modify the provided options" do
         options = {:from => from}
         original_options = Marshal.load(Marshal.dump(options))

data/spec/adhearsion/punchblock_plugin_spec.rb

@@ -13,16 +13,19 @@ module Adhearsion
     describe '#execute_component' do
       let(:message)     { Punchblock::Command::Accept.new }
       let(:response)    { :foo }
-      let(:mock_client) { flexmock 'Client', :execute_command => true }
+      let(:mock_client) { flexmock 'Client' }
+
+      let(:execute_expectation) { PunchblockPlugin.client.should_receive(:execute_command).once }
 
       before do
         PunchblockPlugin::Initializer.client = mock_client
         flexmock message, :execute! => true
         message.response = response
+        execute_expectation
       end
 
       it "writes a command to the client" do
-        flexmock(PunchblockPlugin.client).should_receive(:execute_command).once.with(message, :async => true)
+        execute_expectation.with(message, :async => true)
         PunchblockPlugin.execute_component message
       end
 

data/spec/adhearsion/router/openended_route_spec.rb

@@ -26,7 +26,8 @@ module Adhearsion
 
           it "should accept the call" do
             flexmock(call).should_receive(:accept).once
-            route.dispatch call
+            route.dispatch call, lambda { latch.countdown! }
+            latch.wait(2).should be true
           end
 
           it "should instruct the call to use an instance of the controller" do

data/spec/adhearsion/router/route_spec.rb

@@ -115,9 +115,17 @@ module Adhearsion
           let(:controller)  { CallController }
           let(:route)       { Route.new 'foobar', controller }
 
+          it "should immediately fire the :call_routed event giving the call and route" do
+            flexmock(Adhearsion::Events).should_receive(:trigger_immediately).once.with(:call_routed, call: call, route: route)
+            flexmock(call).should_receive(:hangup).once
+            route.dispatch call, lambda { latch.countdown! }
+            latch.wait(2).should be true
+          end
+
           it "should accept the call" do
             flexmock(call).should_receive(:accept).once
-            route.dispatch call
+            route.dispatch call, lambda { latch.countdown! }
+            latch.wait(2).should be true
           end
 
           it "should instruct the call to use an instance of the controller" do

data/spec/adhearsion/router/unaccepting_route_spec.rb

@@ -26,7 +26,8 @@ module Adhearsion
 
           it "should not accept the call" do
             flexmock(call).should_receive(:accept).never
-            route.dispatch call
+            route.dispatch call, lambda { latch.countdown! }
+            latch.wait(2).should be true
           end
 
           it "should instruct the call to use an instance of the controller" do

data/spec/adhearsion/statistics/dump_spec.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Adhearsion::Statistics::Dump do
+  it "should have a timestamp" do
+    origin_time = Time.now
+    dump = Adhearsion::Statistics::Dump.new timestamp: origin_time
+    dump.timestamp.should == origin_time
+  end
+
+  it "should have a hash of call counts" do
+    counts = {dialed: 0, offered: 0, routed: 0, rejected: 0, active: 0}
+    dump = Adhearsion::Statistics::Dump.new call_counts: counts
+    dump.call_counts.should == counts
+  end
+
+  it "should have a hash of call counts by route" do
+    counts = {"my route" => 1, "your route" => 10}
+    dump = Adhearsion::Statistics::Dump.new calls_by_route: counts
+    dump.calls_by_route.should == counts
+  end
+
+  it "should be equal to another dump if they share the same timestamp" do
+    origin_time = Time.now
+    dump1 = Adhearsion::Statistics::Dump.new timestamp: origin_time
+    dump2 = Adhearsion::Statistics::Dump.new timestamp: origin_time
+    dump1.should be == dump2
+  end
+
+  it "should compare based on the timestamp" do
+    origin_time = Time.now
+    dump1 = Adhearsion::Statistics::Dump.new timestamp: origin_time
+    dump2 = Adhearsion::Statistics::Dump.new timestamp: (origin_time + 1)
+    dump1.should be < dump2
+    dump2.should be > dump1
+  end
+end

data/spec/adhearsion/statistics_spec.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Adhearsion::Statistics do
+  before do
+    subject.setup_event_handlers
+    flexmock(Adhearsion.active_calls).should_receive(:count).and_return 0
+  end
+
+  after do
+    Adhearsion.router = nil
+  end
+
+  describe "#dump" do
+    it "should report 0 calls offered, routed, rejected, active & completed" do
+      subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 0, rejected: 0, active: 0}
+    end
+
+    it "should report 0 calls for each route in the router" do
+      subject.dump.calls_by_route.should == {}
+      Adhearsion.router.route 'your route', Adhearsion::CallController
+      Adhearsion.router.route 'my route', Adhearsion::CallController
+      subject.dump.calls_by_route.should == {'your route' => 0, 'my route' => 0}
+    end
+  end
+
+  it "should listen for dialed call events and increment the dialed call count" do
+    Adhearsion::Events.trigger_immediately :call_dialed, :foo_call
+    subject.dump.call_counts.should == {dialed: 1, offered: 0, routed: 0, rejected: 0, active: 0}
+  end
+
+  it "should listen for call offer events and increment the offered call count" do
+    Adhearsion::Events.trigger_immediately :punchblock, Punchblock::Event::Offer.new
+    subject.dump.call_counts.should == {dialed: 0, offered: 1, routed: 0, rejected: 0, active: 0}
+  end
+
+  context "when call_routed events are triggered" do
+    let(:route) { Adhearsion::Router::Route.new('my route') }
+
+    before do
+      Adhearsion.router.route 'your route', Adhearsion::CallController
+      Adhearsion.router.route 'my route', Adhearsion::CallController
+
+      Adhearsion::Events.trigger_immediately :call_routed, call: :foo, route: route
+    end
+
+    it "should increment the routed call count" do
+      subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 1, rejected: 0, active: 0}
+    end
+
+    it "should increment the calls_by_route counter for the route matched" do
+      subject.dump.calls_by_route.should == {'your route' => 0, 'my route' => 1}
+    end
+  end
+
+  it "should listen for rejected call events and increment the rejected call count" do
+    Adhearsion::Events.trigger_immediately :call_rejected, call: :foo, reason: :bar
+    subject.dump.call_counts.should == {dialed: 0, offered: 0, routed: 0, rejected: 1, active: 0}
+  end
+end

data/spec/adhearsion_spec.rb

@@ -14,7 +14,7 @@ describe Adhearsion do
       Adhearsion.config[:platform].root.should be_nil
     end
   end
-  
+
   describe "#root" do
     it "should return the set root" do
       Adhearsion.root = "./"
@@ -92,6 +92,26 @@ describe Adhearsion do
     end
   end
 
+  describe "#statistics" do
+    it "should be a statistics aggregator" do
+      Adhearsion.statistics.should be_a Adhearsion::Statistics
+    end
+
+    it "should return the same instance each time" do
+      Adhearsion.statistics.should be Adhearsion.statistics
+    end
+
+    it "should create a new aggregator if the existing one dies" do
+      original = Adhearsion.statistics
+      original.terminate
+      original.should_not be_alive
+
+      current = Adhearsion.statistics
+      current.should be_alive
+      current.should_not be original
+    end
+  end
+
   describe "#status" do
     it "should be the process status name" do
       Adhearsion.status.should be == :booting

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+$testing = true
+
 unless ENV['SKIP_RCOV']
   require 'simplecov'
   require 'simplecov-rcov'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-11 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,7 +171,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -493,6 +493,7 @@ files:
 - lib/adhearsion/call_controller/dial.rb
 - lib/adhearsion/call_controller/input.rb
 - lib/adhearsion/call_controller/menu_dsl.rb
+- lib/adhearsion/call_controller/menu_dsl/array_match_calculator.rb
 - lib/adhearsion/call_controller/menu_dsl/calculated_match.rb
 - lib/adhearsion/call_controller/menu_dsl/calculated_match_collection.rb
 - lib/adhearsion/call_controller/menu_dsl/fixnum_match_calculator.rb
@@ -533,6 +534,7 @@ files:
 - lib/adhearsion/generators/app/templates/lib/simon_game.rb
 - lib/adhearsion/generators/app/templates/rspec
 - lib/adhearsion/generators/app/templates/script/ahn
+- lib/adhearsion/generators/app/templates/spec/call_controllers/simon_game_spec.rb
 - lib/adhearsion/generators/app/templates/spec/spec_helper.rb
 - lib/adhearsion/generators/controller/controller_generator.rb
 - lib/adhearsion/generators/controller/templates/lib/controller.rb
@@ -567,6 +569,7 @@ files:
 - lib/adhearsion/router/unaccepting_route.rb
 - lib/adhearsion/rspec.rb
 - lib/adhearsion/script_ahn_loader.rb
+- lib/adhearsion/statistics.rb
 - lib/adhearsion/tasks.rb
 - lib/adhearsion/tasks/configuration.rb
 - lib/adhearsion/tasks/debugging.rb
@@ -576,6 +579,7 @@ files:
 - pre-commit
 - spec/adhearsion/call_controller/dial_spec.rb
 - spec/adhearsion/call_controller/input_spec.rb
+- spec/adhearsion/call_controller/menu_dsl/array_match_calculator_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/calculated_match_collection_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/calculated_match_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/fixnum_match_calculator_spec.rb
@@ -609,6 +613,8 @@ files:
 - spec/adhearsion/router/route_spec.rb
 - spec/adhearsion/router/unaccepting_route_spec.rb
 - spec/adhearsion/router_spec.rb
+- spec/adhearsion/statistics/dump_spec.rb
+- spec/adhearsion/statistics_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb
 - spec/spec_helper.rb
@@ -630,7 +636,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325641181526579229
+      hash: -4557802099463492271
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -639,10 +645,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325641181526579229
+      hash: -4557802099463492271
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adhearsion, open-source telephony development framework
@@ -664,6 +670,7 @@ test_files:
 - features/support/utils.rb
 - spec/adhearsion/call_controller/dial_spec.rb
 - spec/adhearsion/call_controller/input_spec.rb
+- spec/adhearsion/call_controller/menu_dsl/array_match_calculator_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/calculated_match_collection_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/calculated_match_spec.rb
 - spec/adhearsion/call_controller/menu_dsl/fixnum_match_calculator_spec.rb
@@ -697,6 +704,8 @@ test_files:
 - spec/adhearsion/router/route_spec.rb
 - spec/adhearsion/router/unaccepting_route_spec.rb
 - spec/adhearsion/router_spec.rb
+- spec/adhearsion/statistics/dump_spec.rb
+- spec/adhearsion/statistics_spec.rb
 - spec/adhearsion_spec.rb
 - spec/capture_warnings.rb
 - spec/spec_helper.rb