adhearsion 2.0.0.rc3 → 2.0.0.rc4

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # [develop](https://github.com/adhearsion/adhearsion)
 
+# [2.0.0.rc4](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc3...v2.0.0.rc4) - [2012-03-30](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc4)
+  * Feature: `Call#execute_controller` now takes a post-execution callback (proc)
+  * Feature: App generator now includes directory scaffolding for call controller specs and a sample `spec_helper.rb` which loads app config and the `lib/` directory
+  * Bugfix: Calls should be hung up when router executed controllers complete, not after everything executed by `Call#execute_controller`
+  * Bugfix: Deal with race conditions raising exceptions when hanging up calls after a controller executes
+  * Bugfix: Updates to new dependency APIs
+  * Bugfix: Ensure `Call::Hangup` exceptions are captured properly by the router and fix test synchronization
+
 # [2.0.0.rc3](https://github.com/adhearsion/adhearsion/compare/v2.0.0.rc2...v2.0.0.rc3) - [2012-03-23](https://rubygems.org/gems/adhearsion/versions/2.0.0.rc3)
   * Bugfix/Change: `Adhearsion::Calls` (`Adhearsion.active_calls`) now exactly mirrors the Hash API
   * Bugfix: Fix mis-use of `PlaybackError` (wrong namespace)

data/adhearsion.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # Runtime dependencies
   s.add_runtime_dependency 'bundler', [">= 1.0.10"]
-  s.add_runtime_dependency 'punchblock', [">= 0.10.0"]
+  s.add_runtime_dependency 'punchblock', [">= 0.12.0"]
   s.add_runtime_dependency 'logging', [">= 1.6.1"]
   s.add_runtime_dependency 'adhearsion-loquacious', [">= 1.9.0"]
   s.add_runtime_dependency 'activesupport', [">= 3.0.10"]

data/features/app_generator.feature

@@ -10,14 +10,19 @@ Feature: Adhearsion App Generator
       | lib                   |
       | config                |
       | script                |
+      | spec                  |
+      | spec/call_controllers |
+      | spec/support          |
 
     And the following files should exist:
       | .gitignore            |
+      | .rspec                |
       | config/adhearsion.rb  |
       | config/environment.rb |
       | Gemfile               |
       | lib/simon_game.rb     |
       | script/ahn            |
+      | spec/spec_helper.rb   |
       | README.md             |
       | Rakefile              |
       | Procfile              |

data/features/cli_generate.feature

@@ -5,5 +5,11 @@ Feature: Adhearsion Ahn CLI (generate)
 
   Scenario: Listing generators
     When I run `ahn generate`
-    Then the output should contain "Please choose a generator below."
-    And the output should contain "controller"
+    Then the output should contain "Available generators:"
+    And the output should contain "controller [controller_name]: A call controller template. 'controller_name' should be the disired class name, either CamelCase or under_scored."
+    Then the output should contain "plugin [plugin_name]: A plugin template. 'plugin_name' should be the disired plugin module name, either CamelCase or under_scored."
+
+  Scenario: Generator help
+    When I run `ahn help generate`
+    Then the output should contain "controller [controller_name]: A call controller template. 'controller_name' should be the disired class name, either CamelCase or under_scored."
+    Then the output should contain "plugin [plugin_name]: A plugin template. 'plugin_name' should be the disired plugin module name, either CamelCase or under_scored."

data/lib/adhearsion/call.rb

@@ -43,7 +43,7 @@ module Adhearsion
     end
 
     def id
-      offer.call_id if offer
+      offer.target_call_id if offer
     end
 
     def tags
@@ -90,13 +90,13 @@ module Adhearsion
       end
 
       register_event_handler Punchblock::Event::Joined do |event|
-        target = event.other_call_id || event.mixer_name
+        target = event.call_id || event.mixer_name
         signal :joined, target
         throw :pass
       end
 
       register_event_handler Punchblock::Event::Unjoined do |event|
-        target = event.other_call_id || event.mixer_name
+        target = event.call_id || event.mixer_name
         signal :unjoined, target
         throw :pass
       end
@@ -176,15 +176,12 @@ module Adhearsion
     def join_options_with_target(target, options = {})
       options.merge(case target
       when Call
-        { :other_call_id => target.id }
+        { :call_id => target.id }
       when String
-        { :other_call_id => target }
+        { :call_id => target }
       when Hash
         abort ArgumentError.new "You cannot specify both a call ID and mixer name" if target.has_key?(:call_id) && target.has_key?(:mixer_name)
-        target.tap do |t|
-          t[:other_call_id] = t[:call_id]
-          t.delete :call_id
-        end
+        target
       else
         abort ArgumentError.new "Don't know how to join to #{target.inspect}"
       end)
@@ -258,15 +255,15 @@ module Adhearsion
       "#<#{self.class}:#{id} #{attrs.join ', '}>"
     end
 
-    def execute_controller(controller, latch = nil)
+    def execute_controller(controller, completion_callback = nil)
+      call = current_actor
       Thread.new do
         catching_standard_errors do
           begin
             CallController.exec controller
           ensure
-            hangup
+            completion_callback.call call if completion_callback
           end
-          latch.countdown! if latch
         end
       end.tap { |t| Adhearsion::Process.important_threads << t }
     end

data/lib/adhearsion/call_controller.rb

@@ -69,6 +69,7 @@ module Adhearsion
       Events.trigger :exception, [e, logger]
     ensure
       after_call
+      logger.debug "Finished executing controller #{self.inspect}"
     end
 
     def run
@@ -145,7 +146,7 @@ module Adhearsion
       end
       block_until_resumed
       join_command = call.join target, options
-      waiter = join_command.other_call_id || join_command.mixer_name
+      waiter = join_command.call_id || join_command.mixer_name
       if async
         call.wait_for_joined waiter
       else

data/lib/adhearsion/call_controller/dial.rb

@@ -64,7 +64,7 @@ module Adhearsion
               end
             end
 
-            new_call.register_event_handler Punchblock::Event::Unjoined, :other_call_id => call.id do |unjoined|
+            new_call.register_event_handler Punchblock::Event::Unjoined, :call_id => call.id do |unjoined|
               new_call["dial_countdown_#{call.id}"] = true
               latch.countdown!
               throw :pass

data/lib/adhearsion/cli_commands.rb

@@ -3,6 +3,10 @@
 require 'fileutils'
 require 'adhearsion/script_ahn_loader'
 require 'thor'
+require 'adhearsion/generators/controller/controller_generator'
+require 'adhearsion/generators/plugin/plugin_generator'
+Adhearsion::Generators.add_generator :controller, Adhearsion::Generators::ControllerGenerator
+Adhearsion::Generators.add_generator :plugin, Adhearsion::Generators::PluginGenerator
 
 class Thor
   class Task
@@ -34,17 +38,12 @@ module Adhearsion
         Generators::AppGenerator.start
       end
 
-      desc "generate [generator_name] arguments", "Invoke a generator"
+      desc "generate [generator_name] arguments", Generators.help
       def generate(generator_name = nil, *args)
-        require 'adhearsion/generators/controller/controller_generator'
-        Generators.add_generator :controller, Adhearsion::Generators::ControllerGenerator
-        require 'adhearsion/generators/plugin/plugin_generator'
-        Generators.add_generator :plugin, Adhearsion::Generators::PluginGenerator
-
         if generator_name
           Generators.invoke generator_name
         else
-          Generators.help
+          help 'generate'
         end
       end
 

data/lib/adhearsion/generators.rb

@@ -10,13 +10,12 @@ module Adhearsion
 
       # Show help message with available generators.
       def help(command = 'generate')
-        puts "Usage: ahn #{command} GENERATOR_NAME [args] [options]"
-        puts
-        puts "Please choose a generator below."
-        puts
+        "".tap do |h|
+          h << "Available generators:\n"
 
-        mappings.each_pair do |name, klass|
-          puts name
+          mappings.each_pair do |name, klass|
+            h << "* " << klass.desc << "\n"
+          end
         end
       end
 

data/lib/adhearsion/generators/app/app_generator.rb

@@ -4,13 +4,16 @@ module Adhearsion
   module Generators
     class AppGenerator < Generator
 
-      BASEDIRS = %w( config lib script )
+      BASEDIRS = %w( config lib script spec )
+      EMPTYDIRS = %w( spec/call_controllers spec/support )
 
       def setup_project
         self.destination_root = @generator_name
         BASEDIRS.each { |dir| directory dir }
+        EMPTYDIRS.each { |dir| empty_directory dir }
         template "Gemfile.erb", "Gemfile"
         copy_file "gitignore", ".gitignore"
+        copy_file "rspec", ".rspec"
         copy_file "Procfile"
         copy_file "Rakefile"
         copy_file "README.md"

data/lib/adhearsion/generators/app/templates/rspec

@@ -0,0 +1 @@
+--colour

data/lib/adhearsion/generators/app/templates/spec/spec_helper.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+ENV["AHN_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'adhearsion/rspec'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

data/lib/adhearsion/generators/controller/controller_generator.rb

@@ -6,6 +6,10 @@ module Adhearsion
 
       argument :controller_name, :type => :string
 
+      def self.short_desc
+        "A call controller template. 'controller_name' should be the disired class name, either CamelCase or under_scored."
+      end
+
       def create_controller
         raise Exception, "Generator commands need to be run in an Adhearsion app directory" unless ScriptAhnLoader.in_ahn_application?('.')
         self.destination_root = '.'

data/lib/adhearsion/generators/generator.rb

@@ -33,10 +33,14 @@ module Adhearsion
         @desc ||= if usage && File.exist?(usage)
           ERB.new(File.read(usage)).result(binding)
         else
-          "Description:\n    Create #{base_name.humanize.downcase} files for #{generator_name} generator."
+          "#{generator_name} [#{arguments.drop(2).map(&:name).join(', ')}]: #{short_desc}."
         end
       end
 
+      def self.short_desc
+        nil
+      end
+
       # Convenience method to get the namespace from the class name. It's the
       # same as Thor default except that the Generator at the end of the class
       # is removed.

data/lib/adhearsion/generators/plugin/plugin_generator.rb

@@ -6,11 +6,14 @@ module Adhearsion
 
       argument :plugin_name, :type => :string
 
+      def self.short_desc
+        "A plugin template. 'plugin_name' should be the disired plugin module name, either CamelCase or under_scored."
+      end
 
       def create_plugin
         @plugin_file = @plugin_name.underscore
         self.destination_root = '.'
-        
+
         empty_directory @plugin_file
         empty_directory "#{@plugin_file}/lib"
         empty_directory "#{@plugin_file}/lib/#{@plugin_file}"

data/lib/adhearsion/outbound_call.rb

@@ -16,7 +16,7 @@ module Adhearsion
     end
 
     def id
-      dial_command.call_id if dial_command
+      dial_command.target_call_id if dial_command
     end
 
     def client

data/lib/adhearsion/punchblock_plugin/initializer.rb

@@ -73,7 +73,7 @@ module Adhearsion
             event.source.trigger_event_handler event
           end
 
-          Events.punchblock proc { |e| e.respond_to?(:call_id) }, :call_id do |event|
+          Events.punchblock proc { |e| e.respond_to?(:target_call_id) }, :target_call_id do |event|
             dispatch_call_event event
           end
         end
@@ -150,10 +150,10 @@ module Adhearsion
         end
 
         def dispatch_call_event(event)
-          if call = Adhearsion.active_calls[event.call_id]
+          if call = Adhearsion.active_calls[event.target_call_id]
             call.deliver_message! event
           else
-            logger.error "Event received for inactive call #{event.call_id}: #{event.inspect}"
+            logger.error "Event received for inactive call #{event.target_call_id}: #{event.inspect}"
           end
         end
 

data/lib/adhearsion/router/route.rb

@@ -22,14 +22,20 @@ module Adhearsion
       end
 
       def dispatcher
-        @dispatcher ||= lambda do |call|
+        @dispatcher ||= lambda do |call, callback = nil|
           controller = if target.respond_to?(:call)
             CallController.new call, &target
           else
             target.new call
           end
 
-          call.execute_controller controller
+          call.execute_controller controller, lambda { |call|
+            begin
+              call.hangup
+            rescue Call::Hangup
+            end
+            callback.call if callback
+          }
         end
       end
 

data/lib/adhearsion/rspec.rb

@@ -0,0 +1,7 @@
+# encoding: utf-8
+
+require 'adhearsion'
+
+initializer = Adhearsion::Initializer.new
+initializer.load_lib_folder
+initializer.load_config

data/lib/adhearsion/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Adhearsion #:nodoc:
-  VERSION = '2.0.0.rc3'
+  VERSION = '2.0.0.rc4'
 end

data/spec/adhearsion/call_controller/dial_spec.rb

@@ -225,7 +225,7 @@ module Adhearsion
             latch.wait(1).should be_false
 
             other_mock_call << mock_answered
-            other_mock_call << Punchblock::Event::Unjoined.new(:other_call_id => call.id)
+            other_mock_call << Punchblock::Event::Unjoined.new(:call_id => call.id)
 
             latch.wait(1).should be_false
 

data/spec/adhearsion/call_controller_spec.rb

@@ -216,16 +216,16 @@ module Adhearsion
     describe "#join" do
       it "delegates to the call, blocking first until it is allowed to execute, and unblocking when an unjoined event is received" do
         flexmock(subject).should_receive(:block_until_resumed).once.ordered
-        flexmock(subject.call).should_receive(:join).once.with('call1', :foo => :bar).ordered.and_return Punchblock::Command::Join.new(:other_call_id => 'call1')
+        flexmock(subject.call).should_receive(:join).once.with('call1', :foo => :bar).ordered.and_return Punchblock::Command::Join.new(:call_id => 'call1')
         latch = CountDownLatch.new 1
         Thread.new do
           subject.join 'call1', :foo => :bar
           latch.countdown!
         end
         latch.wait(1).should be false
-        subject.call << Punchblock::Event::Joined.new(:other_call_id => 'call1')
+        subject.call << Punchblock::Event::Joined.new(:call_id => 'call1')
         latch.wait(1).should be false
-        subject.call << Punchblock::Event::Unjoined.new(:other_call_id => 'call1')
+        subject.call << Punchblock::Event::Unjoined.new(:call_id => 'call1')
         latch.wait(1).should be true
       end
 
@@ -249,14 +249,14 @@ module Adhearsion
       context "with :async => true" do
         it "delegates to the call, blocking first until it is allowed to execute, and unblocking when the joined event is received" do
           flexmock(subject).should_receive(:block_until_resumed).once.ordered
-          flexmock(subject.call).should_receive(:join).once.with('call1', :foo => :bar).ordered.and_return Punchblock::Command::Join.new(:other_call_id => 'call1')
+          flexmock(subject.call).should_receive(:join).once.with('call1', :foo => :bar).ordered.and_return Punchblock::Command::Join.new(:call_id => 'call1')
           latch = CountDownLatch.new 1
           Thread.new do
             subject.join 'call1', :foo => :bar, :async => true
             latch.countdown!
           end
           latch.wait(1).should be false
-          subject.call << Punchblock::Event::Joined.new(:other_call_id => 'call1')
+          subject.call << Punchblock::Event::Joined.new(:call_id => 'call1')
           latch.wait(1).should be true
         end
 
@@ -317,7 +317,7 @@ module Adhearsion
       let(:response)  { Punchblock::Event::Complete.new }
 
       before do
-        expect_message_waiting_for_response component
+        expect_message_of_type_waiting_for_response component
         component.execute!
         component.complete_event = response
       end

data/spec/adhearsion/call_spec.rb

@@ -17,7 +17,7 @@ module Adhearsion
     let(:to)      { 'sip:you@there.com' }
     let(:from)    { 'sip:me@here.com' }
     let :offer do
-      Punchblock::Event::Offer.new :call_id => call_id,
+      Punchblock::Event::Offer.new :target_call_id => call_id,
                                    :to      => to,
                                    :from    => from,
                                    :headers => headers
@@ -313,7 +313,7 @@ module Adhearsion
         end
 
         context "where the name is :item_not_found" do
-          let(:response) { new_exception.new :item_not_found }
+          let(:response) { new_exception.new.setup :item_not_found }
 
           it "should raise a Hangup exception" do
             flexmock(Events).should_receive(:trigger).never
@@ -463,13 +463,13 @@ module Adhearsion
           let(:target)  { flexmock Call.new, :id => call_id }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => call_id
+            expect_join_with_options :call_id => call_id
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => call_id, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => call_id, :media => :bridge, :direction => :recv
               subject.join target, :media => :bridge, :direction => :recv
             end
           end
@@ -479,13 +479,13 @@ module Adhearsion
           let(:target) { rand.to_s }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => target
+            expect_join_with_options :call_id => target
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => target, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => target, :media => :bridge, :direction => :recv
               subject.join target, :media => :bridge, :direction => :recv
             end
           end
@@ -496,13 +496,13 @@ module Adhearsion
           let(:target)  { { :call_id => call_id } }
 
           it "should send a join command joining to the provided call ID" do
-            expect_join_with_options :other_call_id => call_id
+            expect_join_with_options :call_id => call_id
             subject.join target
           end
 
           context "and direction/media options" do
             it "should send a join command with the correct options" do
-              expect_join_with_options :other_call_id => call_id, :media => :bridge, :direction => :recv
+              expect_join_with_options :call_id => call_id, :media => :bridge, :direction => :recv
               subject.join target.merge({:media => :bridge, :direction => :recv})
             end
           end
@@ -548,7 +548,7 @@ module Adhearsion
           let(:target)  { flexmock Call.new, :id => call_id }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => call_id
+            expect_unjoin_with_options :call_id => call_id
             subject.unjoin target
           end
         end
@@ -557,7 +557,7 @@ module Adhearsion
           let(:target) { rand.to_s }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => target
+            expect_unjoin_with_options :call_id => target
             subject.unjoin target
           end
         end
@@ -567,7 +567,7 @@ module Adhearsion
           let(:target)  { { :call_id => call_id } }
 
           it "should send an unjoin command unjoining from the provided call ID" do
-            expect_unjoin_with_options :other_call_id => call_id
+            expect_unjoin_with_options :call_id => call_id
             subject.unjoin target
           end
         end
@@ -617,20 +617,13 @@ module Adhearsion
 
         it "should call #execute on the controller instance" do
           flexmock(CallController).should_receive(:exec).once.with mock_controller
-          subject.execute_controller mock_controller, latch
-          latch.wait(3).should be_true
-        end
-
-        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.execute_controller mock_controller, latch
+          subject.execute_controller mock_controller, lambda { |call| latch.countdown! }
           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
+          controller_thread = subject.execute_controller mock_controller, lambda { |call| latch.countdown! }
           Adhearsion::Process.important_threads.should include controller_thread
         end
 
@@ -641,10 +634,18 @@ module Adhearsion
             l.should be subject.logger
             latch.countdown!
           end
-          subject.execute_controller BrokenController.new(subject), latch
+          subject.execute_controller BrokenController.new(subject), lambda { |call| latch.countdown! }
           latch.wait(3).should be true
           Adhearsion::Events.clear_handlers :exception
         end
+
+        it "should execute a callback after the controller executes" do
+          flexmock(CallController).should_receive(:exec)
+          foo = nil
+          subject.execute_controller mock_controller, lambda { |call| foo = call; latch.countdown! }
+          latch.wait(3).should be_true
+          foo.should be subject
+        end
       end
 
       describe "#register_controller" do

data/spec/adhearsion/calls_spec.rb

@@ -12,7 +12,7 @@ module Adhearsion
     end
 
     def new_offer(call_id = nil, headers = {})
-      Punchblock::Event::Offer.new :call_id => call_id || random_call_id, :headers => headers
+      Punchblock::Event::Offer.new :target_call_id => call_id || random_call_id, :headers => headers
     end
 
     it 'can create a call and add it to the collection' do

data/spec/adhearsion/outbound_call_spec.rb

@@ -60,7 +60,7 @@ module Adhearsion
     describe "#dial" do
       def expect_message_waiting_for_response(message)
         flexmock(subject.wrapped_object).should_receive(:write_and_await_response).once.with(message, 60).and_return do
-          message.call_id = call_id
+          message.target_call_id = call_id
           message
         end
       end

data/spec/adhearsion/punchblock_plugin/initializer_spec.rb

@@ -52,7 +52,7 @@ module Adhearsion
       end
 
       let(:call_id)   { rand }
-      let(:offer)     { ::Punchblock::Event::Offer.new.tap { |o| o.call_id = call_id } }
+      let(:offer)     { ::Punchblock::Event::Offer.new.tap { |o| o.target_call_id = call_id } }
       let(:mock_call) { flexmock('Call', :id => call_id).tap { |call| call.should_ignore_missing } }
 
       describe "starts the client with the default values" do
@@ -245,7 +245,7 @@ module Adhearsion
 
       describe "dispatching a component event" do
         let(:component)   { flexmock 'ComponentNode' }
-        let(:mock_event)  { flexmock 'Event', :call_id => call_id, :source => component }
+        let(:mock_event)  { flexmock 'Event', :target_call_id => call_id, :source => component }
 
         before do
           initialize_punchblock
@@ -258,7 +258,7 @@ module Adhearsion
       end
 
       describe "dispatching a call event" do
-        let(:mock_event)  { flexmock 'Event', :call_id => call_id }
+        let(:mock_event)  { flexmock 'Event', :target_call_id => call_id }
 
         describe "with an active call" do
           before do
@@ -273,7 +273,7 @@ module Adhearsion
         end
 
         describe "with an inactive call" do
-          let(:mock_event) { flexmock 'Event', :call_id => call_id }
+          let(:mock_event) { flexmock 'Event', :target_call_id => call_id }
 
           it "should log an error" do
             flexmock(Adhearsion::Logging.get_logger(Initializer)).should_receive(:error).once.with("Event received for inactive call #{call_id}: #{mock_event.inspect}")

data/spec/adhearsion/router/route_spec.rb

@@ -102,14 +102,33 @@ module Adhearsion
       describe "dispatching a call" do
         let(:call) { Call.new }
 
+        let(:latch) { CountDownLatch.new 1 }
+
         context "via a call controller" do
           let(:controller)  { CallController }
           let(:route)       { Route.new 'foobar', controller }
 
           it "should instruct the call to use an instance of the controller" do
-            flexmock(call).should_receive(:execute_controller).once.with controller
+            flexmock(call).should_receive(:execute_controller).once.with controller, Proc
             route.dispatcher.call call
           end
+
+          it "should hangup the call after all controllers have executed" do
+            flexmock(call).should_receive(:hangup).once
+            route.dispatcher.call call, lambda { latch.countdown! }
+            latch.wait(2).should be true
+          end
+
+          context "if hangup raises a Call::Hangup" do
+            before { flexmock(call).should_receive(:hangup).once.and_raise Call::Hangup }
+
+            it "should not raise an exception" do
+              lambda do
+                route.dispatcher.call call, lambda { latch.countdown! }
+                latch.wait(2).should be true
+              end.should_not raise_error
+            end
+          end
         end
 
         context "via a block" do
@@ -120,7 +139,7 @@ module Adhearsion
           end
 
           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|
+            flexmock(call).should_receive(:execute_controller).once.with(CallController, Proc).and_return do |controller|
               controller.block.call.should be == :foobar
             end
             route.dispatcher.call call

data/spec/spec_helper.rb

@@ -28,6 +28,8 @@ end
 
 Thread.abort_on_exception = true
 
+UUID.state_file = false
+
 Bundler.require(:default, :test) if defined?(Bundler)
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }

data/spec/support/call_controller_test_helpers.rb

@@ -28,6 +28,11 @@ module CallControllerTestHelpers
     message.request!
   end
 
+  def expect_message_of_type_waiting_for_response(message)
+    subject.should_receive(:write_and_await_response).once.with(message.class).and_return message
+    message.request!
+  end
+
   def expect_component_execution(component)
     subject.should_receive(:execute_component_and_await_completion).once.with(component).and_return(component)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc3
+  version: 2.0.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156158800 !ruby/object:Gem::Requirement
+  requirement: &2156866840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,21 +24,21 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156158800
+  version_requirements: *2156866840
 - !ruby/object:Gem::Dependency
   name: punchblock
-  requirement: &2156157380 !ruby/object:Gem::Requirement
+  requirement: &2156865600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156157380
+  version_requirements: *2156865600
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &2156151240 !ruby/object:Gem::Requirement
+  requirement: &2156864400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156151240
+  version_requirements: *2156864400
 - !ruby/object:Gem::Dependency
   name: adhearsion-loquacious
-  requirement: &2156150320 !ruby/object:Gem::Requirement
+  requirement: &2156863220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156150320
+  version_requirements: *2156863220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156145860 !ruby/object:Gem::Requirement
+  requirement: &2156862080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2156145860
+  version_requirements: *2156862080
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156145040 !ruby/object:Gem::Requirement
+  requirement: &2156861160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156145040
+  version_requirements: *2156861160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156144460 !ruby/object:Gem::Requirement
+  requirement: &2156860540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156144460
+  version_requirements: *2156860540
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2156143460 !ruby/object:Gem::Requirement
+  requirement: &2156859720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156143460
+  version_requirements: *2156859720
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156142480 !ruby/object:Gem::Requirement
+  requirement: &2156858580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156142480
+  version_requirements: *2156858580
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2156141680 !ruby/object:Gem::Requirement
+  requirement: &2156857240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156141680
+  version_requirements: *2156857240
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &2156140700 !ruby/object:Gem::Requirement
+  requirement: &2156855960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +134,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156140700
+  version_requirements: *2156855960
 - !ruby/object:Gem::Dependency
   name: future-resource
-  requirement: &2156139480 !ruby/object:Gem::Requirement
+  requirement: &2156854240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2156139480
+  version_requirements: *2156854240
 - !ruby/object:Gem::Dependency
   name: ruby_speech
-  requirement: &2156127780 !ruby/object:Gem::Requirement
+  requirement: &2156852180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +156,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156127780
+  version_requirements: *2156852180
 - !ruby/object:Gem::Dependency
   name: countdownlatch
-  requirement: &2156126940 !ruby/object:Gem::Requirement
+  requirement: &2156851480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +167,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156126940
+  version_requirements: *2156851480
 - !ruby/object:Gem::Dependency
   name: has-guarded-handlers
-  requirement: &2156123960 !ruby/object:Gem::Requirement
+  requirement: &2156850640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,10 +178,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156123960
+  version_requirements: *2156850640
 - !ruby/object:Gem::Dependency
   name: girl_friday
-  requirement: &2156121080 !ruby/object:Gem::Requirement
+  requirement: &2156849760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -189,10 +189,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156121080
+  version_requirements: *2156849760
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2156120300 !ruby/object:Gem::Requirement
+  requirement: &2156848240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -200,10 +200,10 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2156120300
+  version_requirements: *2156848240
 - !ruby/object:Gem::Dependency
   name: celluloid
-  requirement: &2156119260 !ruby/object:Gem::Requirement
+  requirement: &2156847120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -211,10 +211,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156119260
+  version_requirements: *2156847120
 - !ruby/object:Gem::Dependency
   name: deep_merge
-  requirement: &2156118360 !ruby/object:Gem::Requirement
+  requirement: &2156846580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -222,10 +222,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156118360
+  version_requirements: *2156846580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156117620 !ruby/object:Gem::Requirement
+  requirement: &2156844180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -233,10 +233,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156117620
+  version_requirements: *2156844180
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2156116220 !ruby/object:Gem::Requirement
+  requirement: &2156843420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -244,10 +244,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156116220
+  version_requirements: *2156843420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156115240 !ruby/object:Gem::Requirement
+  requirement: &2156842020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -255,10 +255,10 @@ dependencies:
         version: 3.0.10
   type: :development
   prerelease: false
-  version_requirements: *2156115240
+  version_requirements: *2156842020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156114600 !ruby/object:Gem::Requirement
+  requirement: &2156841380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -266,10 +266,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156114600
+  version_requirements: *2156841380
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2156113920 !ruby/object:Gem::Requirement
+  requirement: &2156840600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -277,10 +277,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156113920
+  version_requirements: *2156840600
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2156113000 !ruby/object:Gem::Requirement
+  requirement: &2156839920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -288,10 +288,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156113000
+  version_requirements: *2156839920
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156111640 !ruby/object:Gem::Requirement
+  requirement: &2164576620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -299,10 +299,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156111640
+  version_requirements: *2164576620
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152231160 !ruby/object:Gem::Requirement
+  requirement: &2168963940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -310,10 +310,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152231160
+  version_requirements: *2168963940
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &2152229220 !ruby/object:Gem::Requirement
+  requirement: &2157043100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -321,10 +321,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152229220
+  version_requirements: *2157043100
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &2152227900 !ruby/object:Gem::Requirement
+  requirement: &2156949860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -332,10 +332,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152227900
+  version_requirements: *2156949860
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2152226420 !ruby/object:Gem::Requirement
+  requirement: &2156953860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -343,10 +343,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152226420
+  version_requirements: *2156953860
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &2168873960 !ruby/object:Gem::Requirement
+  requirement: &2156944220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -354,7 +354,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2168873960
+  version_requirements: *2156944220
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -420,7 +420,9 @@ files:
 - lib/adhearsion/generators/app/templates/config/environment.rb
 - lib/adhearsion/generators/app/templates/gitignore
 - 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/spec_helper.rb
 - lib/adhearsion/generators/controller/controller_generator.rb
 - lib/adhearsion/generators/controller/templates/lib/controller.rb
 - lib/adhearsion/generators/controller/templates/spec/controller_spec.rb
@@ -458,6 +460,7 @@ files:
 - lib/adhearsion/punchblock_plugin/initializer.rb
 - lib/adhearsion/router.rb
 - lib/adhearsion/router/route.rb
+- lib/adhearsion/rspec.rb
 - lib/adhearsion/script_ahn_loader.rb
 - lib/adhearsion/tasks.rb
 - lib/adhearsion/tasks/configuration.rb
@@ -517,7 +520,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4509344095409013612
+      hash: 1219852997240048480
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: