adhearsion 1.2.4 → 1.2.5

data/CHANGELOG

@@ -1,3 +1,14 @@
+support/1.x.x
+
+1.2.5
+  - Catch missing exceptions raised in the after_initialized hook
+  - Fixed memory leak in logging when lots of calls come in with unique call id's.
+  - Fixed bug where we modified the filename variable passed to #record, which could lead to confusion by callers
+  - Avoid some bugs on Ruby 1.8 and JRuby
+  - Fixed a bug where generated component config files were not loaded
+  - Prevent infinite loops when raising exceptions in exception handlers
+  - ahn command now avoids issues with mismatch between installed and bundled gems
+
 1.2.4
   - Backported Thor-based generators from Adhearsion 2 in order to escape Rubigen.
 

data/adhearsion.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "pry"
 
   # Development dependencies
-  s.add_development_dependency 'rspec', [">= 2.4.0"]
+  s.add_development_dependency 'rspec', [">= 2.4.0", '< 2.8.0']
   s.add_development_dependency 'flexmock'
   s.add_development_dependency 'activerecord', [">= 2.1.0"]
   s.add_development_dependency 'rake'

data/bin/ahn

@@ -22,8 +22,6 @@
 $:.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
 require 'rubygems'
-require 'bundler/setup'
-require 'adhearsion'
 require 'adhearsion/cli'
 
-Adhearsion::CLI::AhnCommand.execute!
+Adhearsion::CLI::AhnCommand.execute!

data/lib/adhearsion/cli.rb

@@ -4,4 +4,6 @@ require 'adhearsion/script_ahn_loader'
 # the rest of this script is not run.
 Adhearsion::ScriptAhnLoader.exec_script_ahn!
 
+require 'bundler/setup'
+require 'adhearsion'
 require 'adhearsion/commands'

data/lib/adhearsion/component_manager.rb

@@ -72,20 +72,19 @@ module Adhearsion
       #
       def configuration_for_component_named(component_name)
         # Look for configuration in #{AHN_ROOT}/config/components first
-        if File.exists?("#{AHN_ROOT}/config/components/#{component_name}.yml")
-          return YAML.load_file "#{AHN_ROOT}/config/components/#{component_name}.yml"
-        end
-
+        # Look for configuration in #{AHN_ROOT}/components/#{component_name}/config next
         # Next try the local app component directory
-        component_dir = File.join(@path_to_container_directory, component_name)
-        config_file = File.join component_dir, "#{component_name}.yml"
-        if File.exists?(config_file)
-          YAML.load_file config_file
-        else
-          # Nothing found? Return an empty hash
-          ahn_log.warn "No configuration found for requested component #{component_name}"
-          return {}
+        %W{
+          #{AHN_ROOT}/config/components/#{component_name}.yml
+          #{AHN_ROOT}/components/#{component_name}/config/#{component_name}.yml
+          #{File.join @path_to_container_directory, component_name, "#{component_name}.yml"}
+        }.each do |filename|
+          return YAML.load_file filename if File.exists?(filename)
         end
+
+        # Nothing found? Return an empty hash
+        ahn_log.warn "No configuration found for requested component #{component_name}"
+        {}
       end
 
       def extend_object_with(object, *scopes)

data/lib/adhearsion/version.rb

@@ -2,7 +2,7 @@ module Adhearsion #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1 unless defined? MAJOR
     MINOR = 2 unless defined? MINOR
-    TINY  = 4 unless defined? TINY
+    TINY  = 5 unless defined? TINY
 
     STRING = [MAJOR, MINOR, TINY].join('.') unless defined? STRING
   end

data/lib/adhearsion/voip/asterisk/commands.rb

@@ -299,7 +299,7 @@ module Adhearsion
         # by default.
         #
         # @param [string] file name to record to.  Full path information is optional.  If you want to change the
-        #   format of the file you will want to add a .<valid extention> to the end of the file name specifying the 
+        #   format of the file you will want to add a .<valid extention> to the end of the file name specifying the
         #   filetype you want to record in.  Alternately you can pass it is as :format in the options
         #
         # @param [hash] options
@@ -315,42 +315,37 @@ module Adhearsion
         # +:format+ - the format of the file to be recorded
         #
         # Silence and maxduration is specified in seconds.
-        # 
-        # @return [String] The filename of the recorded file.  
-        #         
+        #
+        # @return [String] The filename of the recorded file.
+        #
         # @example Asterisk generated filename
         #   filename = record
         # @example Specified filename
         #   record '/path/to/my-file.gsm'
         # @example All options specified
         #   record 'my-file.gsm', :silence => 5, :maxduration => 120
-        # 
+        #
         # @deprecated please use {#record_to_file} instead
         def record(*args)
-          options = args.last.kind_of?(Hash) ? args.last : {}
-          filename = args.first && !args.first.kind_of?(Hash) ? String.new(args.first) : "/tmp/recording_%d"
-          if filename.index("%d")
-            if @call.variables.has_key?(:recording_counter)
-              @call.variables[:recording_counter] += 1
-            else
-              @call.variables[:recording_counter]  = 0
-            end
-            filename = filename % @call.variables[:recording_counter]
-            @call.variables[:recording_counter] -= 1
-          end
-
-          if (!options.has_key?(:format))
-            format = filename.slice!(/\.[^\.]+$/)
-            if (format.nil?)
-              ahn_log.agi.warn "Format not specified and not detected.  Defaulting to \"gsm\""
-              format = "gsm"
-            end
-            format.sub!(/^\./, "")
-          else
+          options = args.last.kind_of?(Hash) ? args.pop : {}
+          filename = args.shift || "/tmp/recording_%d"
+          filename = increment_filename_counter filename
+
+          # Work around Ruby 1.8 limitation with *args
+          newargs = []
+          newargs << filename
+          newargs += args
+          newargs << options
+          record_to_file *newargs
+
+          # Reconstruct the logic that took place in #base_record_to_file, since it does not return the
+          # constructed filename
+          if (options.has_key?(:format))
             format = options[:format]
+          else
+            filename, format = format_from_filename filename
           end
-          record_to_file(*args)
-          filename + "." + format
+          "#{filename}.#{format}"
         end
 
         # Records a sound file with the given name. If no filename is specified a file named by Asterisk
@@ -359,7 +354,7 @@ module Adhearsion
         # by default.
         #
         # @param [string] file name to record to.  Full path information is optional.  If you want to change the
-        #   format of the file you will want to add a .<valid extention> to the end of the file name specifying the 
+        #   format of the file you will want to add a .<valid extention> to the end of the file name specifying the
         #   filetype you want to record in.  If you don't specify a valid extension it will default to gsm and a
         #   .gsm will be added to the file.  If you don't specify a filename it will write one in /tmp/recording_%d
         #   with %d being a counter that increments from 0 onward for the particular call you are making.
@@ -377,11 +372,11 @@ module Adhearsion
         # +:format+ - the format of the file to be recorded.  This will over-ride a implicit format in a file extension and append a .<format> to the end of the file.
         #
         # Silence and maxduration is specified in seconds.
-        # 
-        # @return [Symbol] One of the follwing..... :hangup, :write_error, :success_dtmf, :success_timeout  
-        #        
+        #
+        # @return [Symbol] One of the follwing..... :hangup, :write_error, :success_dtmf, :success_timeout
+        #
         # A sound file will be recorded to the specifed file unless a :write_error is returned.  A :success_dtmf is
-        # for when a call was ended with a DTMF tone.  A :success_timeout is returned when a call times out due to 
+        # for when a call was ended with a DTMF tone.  A :success_timeout is returned when a call times out due to
         # a silence longer than the specified silence or if the recording reaches the maxduration.
         #
         # @example Asterisk generated filename
@@ -408,12 +403,16 @@ module Adhearsion
           return_values.first
         end
 
-        # this is a base methor record_to_file and record_to_file! and should only be used via those methods
-        #
-        def base_record_to_file(*args)
-          options = args.last.kind_of?(Hash) ? args.pop : {}
-          filename = args.shift || "/tmp/recording_#{new_guid}_%d"
+        def format_from_filename(filename)
+          filename, format = filename.match(/(^.*)\.([^\.]+)$/).captures rescue [filename, nil]
+          if (format.nil?)
+            ahn_log.agi.warn "Format not specified and not detected.  Defaulting to \"gsm\""
+            format = "gsm"
+          end
+          [filename, format]
+        end
 
+        def increment_filename_counter(filename)
           if filename.index("%d")
             if @call.variables.has_key?(:recording_counter)
               @call.variables[:recording_counter] += 1
@@ -422,16 +421,21 @@ module Adhearsion
             end
             filename = filename % @call.variables[:recording_counter]
           end
+          filename
+        end
 
-          if (!options.has_key?(:format))
-            format = filename.slice!(/\.[^\.]+$/)
-            if (format.nil?)
-              ahn_log.agi.warn "Format not specified and not detected.  Defaulting to \"gsm\""
-              format = "gsm"
-            end
-            format.sub!(/^\./, "")
+        # this is a base methor record_to_file and record_to_file! and should only be used via those methods
+        #
+        def base_record_to_file(*args)
+          options = args.last.kind_of?(Hash) ? args.pop : {}
+          filename = args.shift || "/tmp/recording_#{new_guid}_%d"
+
+          filename = increment_filename_counter filename
+
+          if (options.has_key?(:format))
+            format = options[:format]
           else
-            format = options.delete(:format)
+            filename, format = format_from_filename filename
           end
 
           # maxduration must be in milliseconds when using RECORD FILE
@@ -441,15 +445,15 @@ module Adhearsion
           escapedigits = options.delete(:escapedigits) || "#"
           silence     = options.delete(:silence) || 0
 
-          response_params = filename, format, escapedigits, maxduration, 0          
+          response_params = filename, format, escapedigits, maxduration, 0
           response_values = []
- 
-          if !options.has_key? :beep 
+
+          if !options.has_key? :beep
             response_params << 'BEEP'
           elsif options[:beep]
             play_soundfile options[:beep]
             playback_response = get_variable('PLAYBACKSTATUS')
-            if playback_response != PLAYBACK_SUCCESS 
+            if playback_response != PLAYBACK_SUCCESS
               response_values << :playback_error
               response_values << playback_response
             end
@@ -465,7 +469,7 @@ module Adhearsion
           if resp.match /hangup/
             response_values << :hangup
           elsif resp.match /writefile/
-            response_values << :write_error 
+            response_values << :write_error
           elsif resp.match /dtmf/
             response_values << :success_dtmf
           elsif resp.match /timeout/
@@ -757,6 +761,7 @@ module Adhearsion
           initial_timeout     = options[:initial_timeout] || timeout
           interdigit_timeout  = options[:interdigit_timeout] || timeout
           terminating_key     = options[:accept_key]
+          raise ArgumentError, ":accept_key must not be empty" if terminating_key == ""
           terminating_key = if terminating_key
             terminating_key.to_s
           elsif number_of_digits.nil? && !terminating_key.equal?(false)

data/lib/adhearsion/voip/call.rb

@@ -298,10 +298,6 @@ module Adhearsion
       end
     end
 
-    def ahn_log(*args)
-      Adhearsion::Logging::DefaultAdhearsionLogger.send Adhearsion::Logging::AdhearsionLogger.sanitized_logger_name(unique_identifier), *args
-    end
-
     def define_variable_accessors(recipient=self)
       variables.each do |key, value|
         define_singleton_accessor_with_pair(key, value, recipient)

data/lib/adhearsion/voip/dial_plan.rb

@@ -93,10 +93,6 @@ module Adhearsion
         Components.component_manager.extend_object_with(self, :dialplan) if Components.component_manager
       end
 
-      def ahn_log(*args)
-        @call.ahn_log *args
-      end
-
     end
 
     class Manager

data/lib/theatre.rb

@@ -68,6 +68,7 @@ module Theatre
             callback.call payload
           end
         rescue => captured_error_to_be_returned
+          Adhearsion::Events.trigger '/exception', captured_error_to_be_returned
           captured_error_to_be_returned
         end
       end
@@ -136,7 +137,7 @@ module Theatre
           next_invocation = @master_queue.pop
           return :stopped if next_invocation.equal? :THEATRE_SHUTDOWN!
           next_invocation.start
-        rescue Exception => error
+        rescue StandardError => error
           Adhearsion::Events.trigger(['exception'], error)
         end
       end

data/lib/theatre/invocation.rb

@@ -22,9 +22,10 @@ module Theatre
     #
     def initialize(namespace, callback, payload=:theatre_no_payload)
       raise ArgumentError, "Callback must be a Proc" unless callback.kind_of? Proc
+      @namespace     = namespace
+      @callback      = callback
       @payload       = payload
       @unique_id     = new_guid.freeze
-      @callback      = callback
       @current_state = :new
       @state_lock    = Mutex.new
 
@@ -63,6 +64,14 @@ module Theatre
         end
         with_state_lock { @current_state = :success }
       rescue => e
+        if Array(@namespace).first =~ /exception/
+          # Exception encountered in exception handler.  Do not perpetuate the loop.
+          ahn_log.error "Exception encountered in exception handler!"
+          ahn_log.error e.message
+          ahn_log.error e.backtrace.join("\n")
+        else
+          Adhearsion::Events.trigger('/exception', e)
+        end
         @error = e
         with_state_lock { @current_state = :error }
       ensure

data/spec/adhearsion/logging_spec.rb

@@ -42,9 +42,9 @@ describe 'The ahn_log command' do
   end
 
   it "handles crazy logger names" do
-    ahn_log.send :'locals@DEMO_ca.ll&', "hey"
-    Log4r::Logger['locals@DEMO_ca.ll&'].should_not be nil
-    ahn_log.send(:'localsdemo_call').should == Log4r::Logger['locals@DEMO_ca.ll&']
+    ahn_log.send :'locals@DEMO_call&', "hey"
+    Log4r::Logger['locals@DEMO_call&'].should_not be nil
+    ahn_log.send(:'localsdemo_call').should == Log4r::Logger['locals@DEMO_call&']
   end
 
 end

data/spec/adhearsion/voip/asterisk/commands_spec.rb

@@ -29,7 +29,7 @@ module DialplanCommandTestHelpers
   class MockCall
     attr_accessor :variables
 
-    def initialize 
+    def initialize
       @variables = {}
     end
 
@@ -284,7 +284,7 @@ describe 'receiving a hangup' do
     end
     the_following_code {
       mock_call.read()
-    }.should raise_error(Adhearsion::Hangup)   
+    }.should raise_error(Adhearsion::Hangup)
   end
 end
 
@@ -743,28 +743,33 @@ describe 'the #record method' do
 
   it 'create a default filename if no file is specifed and icrement it on subsequent calls' do
     mock_call.call.variables.delete :recording_counter
-    mock_call.should_receive(:new_guid).once.and_return('2345')
-    mock_call.should_receive(:new_guid).once.and_return('4322')
-    mock_call.should_receive(:response).once.with('RECORD FILE', '/tmp/recording_2345_0', 'gsm', '26', -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
-    mock_call.should_receive(:response).once.with('RECORD FILE', '/tmp/recording_4322_1', 'gsm', '26', -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
+    mock_call.should_receive(:response).once.with('RECORD FILE', '/tmp/recording_0', 'gsm', '26', -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
+    mock_call.should_receive(:response).once.with('RECORD FILE', '/tmp/recording_1', 'gsm', '26', -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record(:beep => nil, :escapedigits => '26').should == '/tmp/recording_0.gsm'
     mock_call.record(:beep => nil, :escapedigits => '26').should == '/tmp/recording_1.gsm'
-  end  
+  end
+
+  it 'should not modify the passed-in file name' do
+    mock_call.should_receive(:response).once.with('RECORD FILE', 'foo', 'wav', '#', -1, 0, 'BEEP').and_return("200 result=-1 (hangup) endpos=167840\n")
+    filename = 'foo.wav'
+    mock_call.record(filename).should == 'foo.wav'
+    filename.should == 'foo.wav'
+  end
 
   it 'determine the format from the filename' do
     mock_call.should_receive(:response).once.with('RECORD FILE', 'foo', 'wav', '26', -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record('foo.wav', :beep => nil, :escapedigits => '26').should == 'foo.wav'
-  end  
+  end
 
   it 'set the format of a file via the :format option' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "wav", "#", 2000, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record('foo', :beep => nil, :maxduration => 2, :format => 'wav').should == 'foo.wav'
-  end  
+  end
 
   it 'set the format of a file via the :format option over-riding a implicit format' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo.wav", "mpeg", "#", 2000, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record('foo.wav', :beep => nil, :maxduration => 2, :format => 'mpeg').should == 'foo.wav.mpeg'
-  end  
+  end
 end
 
 describe 'the #record_to_file method' do
@@ -778,47 +783,47 @@ describe 'the #record_to_file method' do
   it 'should return :write error if the recording had a problem writing the file' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0, "BEEP").and_return("200 result=-1 (writefile) endpos=167840\n")
     mock_call.record_to_file('foo').should == :write_error
-  end  
+  end
 
   it 'should return :success_dtmf if the recording was completed successfully with a dtmf tone to end' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0, "BEEP").and_return("200 result=35 (dtmf) endpos=29120\n")
     mock_call.record_to_file('foo').should == :success_dtmf
-  end  
+  end
 
   it 'should return :success_timeout if the recording was completed successfully by timing out with silence' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0, "BEEP").and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo').should == :success_timeout
-  end  
+  end
 
   it 'not send a beep if a :beep=>nil is passed in' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => nil).should == :success_timeout
-  end  
+  end
 
   it 'set the silence if it is passed in' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0, 's=2').and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => nil, :silence => 2).should == :success_timeout
-  end  
+  end
 
   it 'set the maxduration if it is passed in' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", 2000, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => nil, :maxduration => 2).should == :success_timeout
-  end  
+  end
 
   it 'set the format of a file via the :format option' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "wav", "#", 2000, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => nil, :maxduration => 2, :format => 'wav').should == :success_timeout
-  end  
+  end
 
   it 'set the format of a file via the :format option over-riding a implicit format' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo.wav", "mpeg", "#", 2000, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo.wav', :beep => nil, :maxduration => 2, :format => 'mpeg').should == :success_timeout
-  end  
+  end
 
   it 'set the escapedigits if it is passed in' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => nil, :escapedigits => '26').should == :success_timeout
-  end  
+  end
 
   it 'play a passed in beep file if it is passed in' do
     mock_call.should_receive(:execute).once.with(:playback, 'my_awesome_beep.wav').and_return(true)
@@ -826,7 +831,7 @@ describe 'the #record_to_file method' do
     pbx_should_respond_with_playback_success
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => 'my_awesome_beep.wav', :escapedigits => '26').should == :success_timeout
-  end  
+  end
 
   it "should silently fail if the beep file passed in can't be played" do
     mock_call.should_receive(:execute).once.with(:playback, 'my_awesome_beep.wav').and_return(true)
@@ -834,12 +839,12 @@ describe 'the #record_to_file method' do
     pbx_should_respond_with_playback_failure
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo', :beep => 'my_awesome_beep.wav', :escapedigits => '26').should == :success_timeout
-  end  
+  end
 
   it 'determine the format from the filename' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "wav", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file('foo.wav', :beep => nil, :escapedigits => '26').should == :success_timeout
-  end  
+  end
 
   it 'create a default filename if no file is specifed and icrement it on subsequent calls' do
     mock_call.should_receive(:new_guid).once.and_return('2345')
@@ -848,7 +853,7 @@ describe 'the #record_to_file method' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "/tmp/recording_4322_1", "gsm", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file(:beep => nil, :escapedigits => '26').should == :success_timeout
     mock_call.record_to_file(:beep => nil, :escapedigits => '26').should == :success_timeout
-  end  
+  end
 end
 
 describe 'The #record_to_file! method' do
@@ -862,19 +867,19 @@ describe 'The #record_to_file! method' do
     the_following_code {
       mock_call.record_to_file!('foo', :beep => 'my_awesome_beep.wav', :escapedigits => '26').should == :success_timeout
     }.should raise_error Adhearsion::VoIP::PlaybackError
-  end  
+  end
 
   it 'should throw RecordError if the recording had a problem writing the file' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "gsm", "#", -1, 0, "BEEP").and_return("200 result=-1 (writefile) endpos=167840\n")
     the_following_code {
       mock_call.record_to_file!('foo').should == :write_error
     }.should raise_error Adhearsion::VoIP::RecordError
-  end  
+  end
 
   it 'should be able get a response from a successfull call' do
     mock_call.should_receive(:response).once.with("RECORD FILE", "foo", "wav", "26", -1, 0).and_return("200 result=0 (timeout) endpos=21600\n")
     mock_call.record_to_file!('foo.wav', :beep => nil, :escapedigits => '26').should == :success_timeout
-  end  
+  end
 end
 
 describe 'The #input method' do
@@ -1193,6 +1198,10 @@ describe 'The #input method' do
     pbx_was_asked_to_play files
   end
 
+  it 'should raise ArgumentError if passed an empty :accept_key' do
+    expect { mock_call.input 1, :accept_key => "" }.to raise_error ArgumentError
+  end
+
 end
 
 describe 'The #input! method' do
@@ -1389,6 +1398,10 @@ describe 'The #input! method' do
     pbx_was_asked_to_play played_files
   end
 
+  it 'should raise ArgumentError if passed an empty :accept_key' do
+    expect { mock_call.input 1, :accept_key => "" }.to raise_error ArgumentError
+  end
+
 end
 
 describe "The #variable method" do

data/spec/theatre/invocation_spec.rb

@@ -64,6 +64,27 @@ describe "Using Invocations that've been ran through the Theatre" do
     invocation.error.should be_instance_of(ArgumentError)
   end
 
+  it "should trigger an exception event if an exception was raised" do
+    invocation = Theatre::Invocation.new("/namespace/whatever", lambda { raise ArgumentError, "this error is intentional" })
+    flexmock(Adhearsion::Events).should_receive(:trigger).once.with('/exception', FlexMock.any)
+    invocation.queued
+    invocation.start
+  end
+
+  it "should NOT trigger an exception if the exception occurs in an exception namespace" do
+    invocation = Theatre::Invocation.new("/exception", lambda { raise ArgumentError, "this error is intentional" })
+    flexmock(Adhearsion::Events).should_receive(:trigger).never
+    invocation.queued
+    invocation.start
+  end
+
+  it "should do the right thing with exceptions triggered with the wrong namespace" do
+    invocation = Theatre::Invocation.new(['exception'], lambda { raise ArgumentError, "this error is intentional" })
+    flexmock(Adhearsion::Events).should_receive(:trigger).never
+    invocation.queued
+    invocation.start
+  end
+
   it "should have a status of :success if no expection was raised" do
     callback = lambda { "No errors raised here!" }
     invocation = Theatre::Invocation.new("/namespace/whatever", callback)

data/spec/theatre/theatre_class_spec.rb

@@ -69,6 +69,7 @@ describe "Theatre::Theatre" do
         theatre.register_callback_at_namespace "breakage", callback
       end
 
+      flexmock(Adhearsion::Events).should_receive(:trigger).once.with('/exception', FlexMock.on {|e| e.is_a?(StandardError)})
       return_value = theatre.trigger_immediately("breakage")
       return_value.first.should equal(1)
       return_value[1].should be_instance_of(LocalJumpError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhearsion
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-26 00:00:00.000000000 Z
+date: 2012-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152387620 !ruby/object:Gem::Requirement
+  requirement: &2164812460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152387620
+  version_requirements: *2164812460
 - !ruby/object:Gem::Dependency
   name: log4r
-  requirement: &2152387100 !ruby/object:Gem::Requirement
+  requirement: &2164810380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,10 +35,10 @@ dependencies:
         version: 1.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *2152387100
+  version_requirements: *2164810380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152386600 !ruby/object:Gem::Requirement
+  requirement: &2164809260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 2.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152386600
+  version_requirements: *2164809260
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152386200 !ruby/object:Gem::Requirement
+  requirement: &2164808200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152386200
+  version_requirements: *2164808200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152385680 !ruby/object:Gem::Requirement
+  requirement: &2164806740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152385680
+  version_requirements: *2164806740
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152385260 !ruby/object:Gem::Requirement
+  requirement: &2164805980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152385260
+  version_requirements: *2164805980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152384840 !ruby/object:Gem::Requirement
+  requirement: &2164805280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152384840
+  version_requirements: *2164805280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152384380 !ruby/object:Gem::Requirement
+  requirement: &2164804440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,21 +101,24 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152384380
+  version_requirements: *2164804440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152383840 !ruby/object:Gem::Requirement
+  requirement: &2164841480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.4.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *2152383840
+  version_requirements: *2164841480
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: &2152383380 !ruby/object:Gem::Requirement
+  requirement: &2164839340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +126,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152383380
+  version_requirements: *2164839340
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152382820 !ruby/object:Gem::Requirement
+  requirement: &2164837440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,10 +137,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *2152382820
+  version_requirements: *2164837440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152382360 !ruby/object:Gem::Requirement
+  requirement: &2164848960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +148,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152382360
+  version_requirements: *2164848960
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152381860 !ruby/object:Gem::Requirement
+  requirement: &2164848040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -156,10 +159,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152381860
+  version_requirements: *2164848040
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  requirement: &2152381440 !ruby/object:Gem::Requirement
+  requirement: &2164846980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,10 +170,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152381440
+  version_requirements: *2164846980
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &2152397320 !ruby/object:Gem::Requirement
+  requirement: &2164845760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -178,7 +181,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152397320
+  version_requirements: *2164845760
 description: Adhearsion is an open-source telephony development framework
 email: dev&Adhearsion.com
 executables:
@@ -367,7 +370,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2749044386952630171
+      hash: -4214800250478439630
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -376,7 +379,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2749044386952630171
+      hash: -4214800250478439630
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10