punchblock 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2afefcb37df1adbbdbd78069ace76a6e7a90ff6a
-  data.tar.gz: 19c35819dbc195978dc642e89171e8ce2369cb9c
+  metadata.gz: e8cab569413379f9b64819195dbecb7b8f921182
+  data.tar.gz: 84ff42e219d7ab469132aedc89467c99c8e3666b
 SHA512:
-  metadata.gz: 424af09c594e3ef4f26ae02452ebae5bdaf7b7c1f3df1b2235914e3397360468c9135905bb61e352a0b09097e4958538dec4645778413dcd61d5740a41e6b70b
-  data.tar.gz: 809aa86ad8b9e5c211c774279f27d7f853a05802bb7c52b2c95f5d23477e8ff4f6c708d5f678c3c770821692727375748a2510d6ab284c5d7906910c45539986
+  metadata.gz: 36e448fa84bb6ad08baedf61ee0fe85b131de31f1801306f97428d6affd718f5b9957cd16d059ea195a9e63dc53b1aa511e5897bd6bd50cd15c07d132344cc70
+  data.tar.gz: f328f5d65afd54685f29dd7e64607f9a069fd87477b18758610ee28e37f979cea9982ad0e7297b8c4acd1a41dd89bb57b316dacedad12e9bc842c9f50026068a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # [develop](https://github.com/adhearsion/punchblock)
 
+# [v1.9.2](https://github.com/adhearsion/punchblock/compare/v1.9.1...v1.9.2) - [2013-05-10](https://rubygems.org/gems/punchblock/versions/1.9.2)
+  * Bugfix: We were raising an exception on connection shutdown due to waiting for the connection to end incorrectly.
+  * Bugfix/Perf: FreeSWITCH Call actors were being kept alive after hangup for no reason
+  * Bugfix/Perf: FreeSWITCH component complete events were looping out of the actor
+  * Perf: We were wasting CPU cycles listening to all ES events when we really don't need to
+
 # [v1.9.1](https://github.com/adhearsion/punchblock/compare/v1.9.0...v1.9.1) - [2013-05-08](https://rubygems.org/gems/punchblock/versions/1.9.1)
   * Bugfix: AMI errors indicating dead channels were not being handled correctly
   * Bugfix: We were broken on Celluloid 0.14 due to changes in block execution semantics between actors

data/lib/punchblock/connection/asterisk.rb

@@ -15,7 +15,8 @@ module Punchblock
       end
 
       def run
-        ami_client.run
+        ami_client.async.run
+        Celluloid::Actor.join(ami_client)
         raise DisconnectedError
       end
 

data/lib/punchblock/connection/freeswitch.rb

@@ -37,7 +37,11 @@ module Punchblock
       private
 
       def new_fs_stream
-        RubyFS::Stream.new(*@stream_options, lambda { |e| translator.async.handle_es_event e })
+        RubyFS::Stream.new(*@stream_options, lambda { |e| translator.async.handle_es_event e }, event_mask)
+      end
+
+      def event_mask
+        %w{CHANNEL_PARK CHANNEL_ANSWER CHANNEL_STATE CHANNEL_HANGUP CHANNEL_BRIDGE CHANNEL_UNBRIDGE CHANNEL_EXECUTE_COMPLETE DTMF RECORD_STOP}
       end
 
       def start_stream

data/lib/punchblock/translator/freeswitch/call.rb

@@ -245,13 +245,13 @@ module Punchblock
         def send_end_event(reason)
           send_pb_event Event::End.new(:reason => reason)
           translator.deregister_call current_actor
-          after(5) { terminate }
+          terminate
         end
 
         def execute_component(type, command, *execute_args)
           type.new_link(command, current_actor).tap do |component|
             register_component component
-            component.async.execute(*execute_args)
+            component.execute(*execute_args)
           end
         end
 

data/lib/punchblock/translator/freeswitch/component/output.rb

@@ -33,9 +33,8 @@ module Punchblock
           end
 
           def playback(path)
-            op = current_actor
             register_handler :es, :event_name => 'CHANNEL_EXECUTE_COMPLETE' do |event|
-              op.async.send_complete_event complete_reason_for_event(event)
+              send_complete_event complete_reason_for_event(event)
             end
             application 'playback', path
           end

data/lib/punchblock/translator/freeswitch/component/tts_output.rb

@@ -8,9 +8,8 @@ module Punchblock
           private
 
           def do_output(engine, default_voice = nil)
-            op = current_actor
             register_handler :es, :event_name => 'CHANNEL_EXECUTE_COMPLETE' do |event|
-              op.async.send_complete_event success_reason
+              send_complete_event success_reason
             end
             voice = @component_node.voice || default_voice || 'kal'
             application :speak, [engine, voice, document].join('|')

data/lib/punchblock/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Punchblock
-  VERSION = "1.9.1"
+  VERSION = "1.9.2"
 end

data/punchblock.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency %q<has-guarded-handlers>, ["~> 1.5"]
   s.add_runtime_dependency %q<celluloid>, ["~> 0.14"]
   s.add_runtime_dependency %q<ruby_ami>, ["~> 2.0"]
-  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.0"]
+  s.add_runtime_dependency %q<ruby_fs>, ["~> 1.1"]
   s.add_runtime_dependency %q<ruby_speech>, ["~> 1.0"]
 
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

data/spec/punchblock/connection/asterisk_spec.rb

@@ -37,7 +37,9 @@ module Punchblock
 
       describe '#run' do
         it 'starts the RubyAMI::Stream' do
-          subject.ami_client.should_receive(:run).once
+          subject.ami_client.async.should_receive(:run).once do
+            subject.ami_client.terminate
+          end
           lambda { subject.run }.should raise_error DisconnectedError
         end
       end

data/spec/punchblock/translator/freeswitch/call_spec.rb

@@ -344,7 +344,7 @@ module Punchblock
             it "should cause the actor to be terminated" do
               translator.should_receive(:handle_pb_event).once
               subject.handle_es_event es_event
-              sleep 5.5
+              sleep 0.25
               subject.should_not be_alive
             end
 
@@ -782,7 +782,7 @@ module Punchblock
               context "with a media engine of #{media_engine}" do
                 it 'should create an Output component and execute it asynchronously' do
                   Component::Output.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                  mock_component.async.should_receive(:execute).once
+                  mock_component.should_receive(:execute).once
                   subject.execute_command command
                   subject.component_with_id(mock_component.id).should be mock_component
                 end
@@ -794,7 +794,7 @@ module Punchblock
 
               it 'should create a FliteOutput component and execute it asynchronously using flite and the calls default voice' do
                 Component::FliteOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.async.should_receive(:execute).once.with(media_engine, default_voice)
+                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
                 subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
@@ -805,7 +805,7 @@ module Punchblock
 
               it 'should create a TTSOutput component and execute it asynchronously using cepstral and the calls default voice' do
                 Component::TTSOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.async.should_receive(:execute).once.with(media_engine, default_voice)
+                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
                 subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
@@ -816,7 +816,7 @@ module Punchblock
 
               it 'should create a TTSOutput component and execute it asynchronously using unimrcp and the calls default voice' do
                 Component::TTSOutput.should_receive(:new_link).once.with(command, subject).and_return mock_component
-                mock_component.async.should_receive(:execute).once.with(media_engine, default_voice)
+                mock_component.should_receive(:execute).once.with(media_engine, default_voice)
                 subject.execute_command command
                 subject.component_with_id(mock_component.id).should be mock_component
               end
@@ -831,7 +831,7 @@ module Punchblock
 
               it "should use the component media engine and not the platform one if it is set" do
                 Component::Output.should_receive(:new_link).once.with(command_with_renderer, subject).and_return mock_component
-                mock_component.async.should_receive(:execute).once
+                mock_component.should_receive(:execute).once
                 subject.execute_command command_with_renderer
                 subject.component_with_id(mock_component.id).should be mock_component
               end
@@ -847,7 +847,7 @@ module Punchblock
 
             it 'should create an Input component and execute it asynchronously' do
               Component::Input.should_receive(:new_link).once.with(command, subject).and_return mock_component
-              mock_component.async.should_receive(:execute).once
+              mock_component.should_receive(:execute).once
               subject.execute_command command
             end
           end
@@ -861,7 +861,7 @@ module Punchblock
 
             it 'should create a Record component and execute it asynchronously' do
               Component::Record.should_receive(:new_link).once.with(command, subject).and_return mock_component
-              mock_component.async.should_receive(:execute).once
+              mock_component.should_receive(:execute).once
               subject.execute_command command
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchblock
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Jason Goecke
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: niceogiri
@@ -150,14 +150,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ruby_speech
   requirement: !ruby/object:Gem::Requirement