@@ -6,6 +6,6 @@ - manager_interface - before_call - failed_call - - call_hangup + - hungup_call -# Note: This file is valid YAML for programatic parsing. \ No newline at end of file +# Note: This file is valid YAML for programatic parsing. EVENTS @@ -9,4 +9,4 @@ port: 61613 # subscriptions: # - start_call -# - hangup_call +# - hungup_call app_generators/ahn/templates/components/disabled/stomp_gateway/stomp_gateway.yml @@ -25,7 +25,7 @@ # - events.shutdown # - events.asterisk.before_call # - events.asterisk.failed_call -# - events.asterisk.call_hangup +# - events.asterisk.hungup_call # # # Note: events are mostly for components to register and expose to you. app_generators/ahn/templates/events.rb @@ -34,8 +34,8 @@ module Adhearsion end rescue HungupExtensionCallException => hungup_call begin - ahn_log.agi "Received \"h\" meta-call. Executing /asterisk/call_hangup event callbacks." - Events.trigger [:asterisk, :call_hangup], hungup_call.call + ahn_log.agi "Received \"h\" meta-call. Executing /asterisk/hungup_call event callbacks." + Events.trigger [:asterisk, :hungup_call], hungup_call.call call.hangup! rescue => e ahn_log.agi.error e @@ -78,4 +78,4 @@ module Adhearsion end end end -end \ No newline at end of file +end lib/adhearsion/voip/asterisk/agi_server.rb @@ -63,14 +63,14 @@ context "The AGI server's serve() method" do }.should.throw :triggered end - test 'should execute the call_hangup event when a HungupExtensionCallException is raised' do + test 'should execute the hungup_call event when a HungupExtensionCallException is raised' do call_mock = flexmock 'a bogus call', :hungup_call? => true, :variables => {:extension => "h"}, :unique_identifier => "X" mock_env = flexmock "A mock execution environment which gets passed along in the HungupExtensionCallException" stub_confirmation_manager! flexstub(Adhearsion).should_receive(:receive_call_from).once.and_return(call_mock) flexmock(Adhearsion::DialPlan::Manager).should_receive(:handle).once.and_raise Adhearsion::HungupExtensionCallException.new(mock_env) - flexmock(Adhearsion::Events).should_receive(:trigger).once.with([:asterisk, :call_hangup], mock_env).and_throw :hungup_call + flexmock(Adhearsion::Events).should_receive(:trigger).once.with([:asterisk, :hungup_call], mock_env).and_throw :hungup_call the_following_code { server.serve nil }.should.throw :hungup_call end spec/voip/asterisk/test_agi_server.rb 6d622a4dcb52cfc18b94706b514ec21b6bf9af2e Jayson Vaughn vaughn.jayson@gmail.com http://github.com/jicksta/adhearsion/commit/92daacafbf6bafd4f81abd3f6b96bf6099072d89 92daacafbf6bafd4f81abd3f6b96bf6099072d89 2009-01-26T14:38:00-08:00 2009-01-26T14:38:00-08:00 Modified adhearsion so hungup_call event works. 1. Could not find "/asterisk/call_hangup" in the namespace registry. Did you register it yet? (Theatre::NamespaceNotFound) * You get this if you use the example in events.rb from the app_generator. 2. "lib/adhearsion/events_support.rb" line 32 the namespace is defined as /asterisk/hungup_call * The other events are labeled ' before_call', 'after_call' and so on; I figured hungup_call is what jicksta wants 3. If you use the following example, it will not actually be ran. events.asterisk.hungup_call.each do |call| ahn_log "#{Time.now} Hung up call" end 4. Changed to Events.trigger [:asterisk, :hungup_call], hungup_call.call in /lib/adhearsion/voip/asterisk/agi_server.rb 5. Changed the templates to reflect events.asterisk.hungup_call 6. Changed the spec tests to match 2d1b50d475f5440b8983bfdfe66487ae74bd0e4c Jayson Vaughn vaughn.jayson@gmail.com